35 Commits

Author SHA1 Message Date
Ghostkeeper
bb49acbb7f
Use correct font for material estimates
Otherwise it uses the system defaults.
2019-07-10 14:42:26 +02:00
Jaime van Kessel
8ae0c695bd Add total cost to the output overview.
This fixes #5529
2019-04-02 11:09:12 +02:00
Ghostkeeper
a831cfa558
Configure whether preview shortcut is visible from ActionPanelWidget property
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.

Contributes to issue CURA-6086.
2019-02-04 15:19:09 +01:00
Jaime van Kessel
cbeadb2343 Set the font of the time estimation to medium bold
This way it will also fit when a very long time is used in german.
If we don't do this, 14 Tages 12 Stunden 33 Minuten didn't fit.

CURA-6097
2019-01-11 14:47:59 +01:00
Jaime van Kessel
ff79e91686 Move the additional components for the save button out of the action panel
CURA-6097
2019-01-10 16:32:43 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
3505eb321f Also add space for the savebutton additional components with the output widget
CURA-6043
2019-01-03 09:42:22 +01:00
Ghostkeeper
66aeb2d1dd
Give print time estimate a large font
Contributes to issue CURA-6025.
2018-12-31 14:28:51 +01:00
Aleksei S
3953c7bb3a Added Tooltip alignment
CURA-6004
2018-12-19 14:24:02 +01:00
Diego Prado Gesto
cbd8e72bd5 Add fixed width to the preview button
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
2018-12-17 10:42:52 +01:00
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Ghostkeeper
8a4a1c9d49
Don't let print info take space if invisible
This way there is a little bit more space for the text 'No time estimation available', which was previously abbreviated to 'No time estimation availa...'.
2018-12-14 13:21:00 +01:00
Diego Prado Gesto
17173aba06 Add a component to show when no configurations are available because lack of connection.
Contributes to CURA-5876.
2018-12-12 17:04:17 +01:00
Diego Prado Gesto
898fd25ddb Remove the component IconLabel since we have a similar one in IconWithText
Contributes to CURA-5941.
2018-12-07 11:43:41 +01:00
Diego Prado Gesto
4b79770d58 Align the buttons in the output process widget
The menu in the output device selector has now a rounded corner.
2018-12-06 13:42:29 +01:00
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
2018-12-04 15:21:36 +01:00
Diego Prado Gesto
e9f8757fac Change the info button in the action panel according to the designs
Adjust the padding in the preview shortcut.
2018-12-04 09:12:57 +01:00
Ghostkeeper
65d3aa4480
Fix broken sizes due to merged theme entry
Merge conflict went wrong, I think.

Contributes to issue CURA-5876.
2018-12-03 11:59:03 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
2018-11-27 15:01:48 +01:00
Diego Prado Gesto
92d0717096 Hide the toolbar and don't show time and material information when loading a gcode
Contributes to CURA-5979.
2018-11-27 15:00:50 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
2018-11-26 17:33:37 +01:00
Ghostkeeper
826044da7e
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
	resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
2018-11-26 13:43:20 +01:00
Jaime van Kessel
b82ea58bc8 Changed all the action buttons to either use primary or secondary button
CURA-5959
2018-11-23 18:07:50 +01:00
Jaime van Kessel
3ba4b9fd81 Add shadows to various used actionbuttons
CURA-5959
2018-11-23 11:20:53 +01:00
Diego Prado Gesto
f866390c7b Fix an issue in the action panel.
When the panel is created while the user is in the preview stage, the
row has no width.

Contributes to CURA-5786.
2018-11-21 16:56:25 +01:00
Ghostkeeper
dca286cea5
Give action button a sane default height
We don't want to give it a default width since that should just adjust to its contents by default, which is fine.

Contributes to issue CURA-5876.
2018-11-20 14:34:06 +01:00
Ghostkeeper
a1068a3ef2
Rename action_panel_button theme entry to action_button
Because it's not just used in the save panel.

Contributes to issue CURA-5876.
2018-11-20 14:24:09 +01:00
Ghostkeeper
42d73836f4
Move default margin by default to Cura's action buttons
So we don't have to repeat that every time you create a new button.

Contributes to issue CURA-5876.
2018-11-20 14:19:55 +01:00
Diego Prado Gesto
3669a3791d Hide the Preview shortcut in the action panel when the active stage is the PreviewStage.
Also adjust the size of the output button when the Preview button is not visible.

Contributes to CURA-5786.
2018-11-11 12:56:30 +01:00
Remco Burema
e66dd2be0b Action-Panel (CURA-5786) can now know about Preview-Stage (CURA-5829). 2018-11-08 15:03:24 +01:00
Diego Prado Gesto
2dfd354b25 Remove function and property that are only used once.
Contributes to CURA-5786.
2018-11-02 16:49:31 +01:00
Diego Prado Gesto
dba31c3af4 Add documentation.
Contributes to CURA-5786.
2018-11-02 16:20:04 +01:00
Diego Prado Gesto
c862e72514 Add the print panel information as a popup that shows when the "i" icon
is clicked.

Contributes to CURA-5786.
2018-11-02 11:10:23 +01:00
Diego Prado Gesto
310539cb6d In the main action panel, only show the total amount of material weight
and length (addition of all extruders). The information panel will show
each cost separately.

Contributes to CURA-5786.
2018-11-02 09:58:35 +01:00