Commit graph

1062 commits

Author SHA1 Message Date
Diego Prado Gesto
0d780e61ff
Merge branch '4.0' into CURA-5876_fixes 2018-12-13 14:39:11 +01:00
Jaime van Kessel
b7ea075fa9 Merge branch 'fix_toolbutton_style' of github.com:Ultimaker/Cura into 4.0 2018-12-13 13:26:35 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13.
Contributes to CURA-6025.
2018-12-12 17:50:21 +01:00
Diego Prado Gesto
a1d7fa893d Change the style for the toolbuttons that appear in the popup panel of some tools
Contributes to CURA-6024
2018-12-12 17:26:13 +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
4ba448077e Add an empty state, when there are no configurations, showing a label indicating that the list is empty
Contributes to CURA-5876.
2018-12-12 13:33:46 +01:00
Jaime van Kessel
e30ca20c54 Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages 2018-12-12 11:50:26 +01:00
Diego Prado Gesto
a6a16a682d Fix some alignments
Also modify a bit the code in the ConfigurationItem, trying to get rid of a binding loop, but I couldn't (so weird)

Contributes to CURA-5876.
2018-12-12 11:17:44 +01:00
Diego Prado Gesto
ed8292c472 Adjust size and margins of the icon in the action button
Contributes to CURA-5876.
2018-12-11 17:00:02 +01:00
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors
Contributes to CURA-5876.
2018-12-11 16:35:59 +01:00
Diego Prado Gesto
c804610fa6 Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle 2018-12-11 15:19:40 +01:00
Lipu Fei
4e71af45d3
Merge pull request #4958 from Ultimaker/CURA-6018_fix_messages
Fix styling of messages
2018-12-10 15:53:04 +01:00
Diego Prado Gesto
154c6c1ff2 Change the color of the setting control button to be the same as for the small buttons
Contributes to CURA-5941.
2018-12-10 13:42:33 +01:00
Diego Prado Gesto
af37f51cf8 Make the expandable content header to be a common header for every expandable component.
Contributes to CURA-5941.
2018-12-10 13:36:06 +01:00
Diego Prado Gesto
0d55d023a1 Align the message colors with the ones in the designs.
Contributes to CURA-6018.
2018-12-10 11:36:03 +01:00
Diego Prado Gesto
12522c9293 Change hover colors of the small buttons.
Contributes to CURA-5941
2018-12-10 11:19:44 +01:00
Ghostkeeper
b565b111c8
Adjust disabled extruder colour
This also introduces a more global 'disabled' colour as defined by the style guide. I hope that we can gradually transition to this one, but we'll have to adjust some colours here and there.

Contributes to issue CURA-5876.
2018-12-07 15:38:08 +01:00
Jaime van Kessel
f4220da550 Adds rough first version of rating stars
It's not fully polished just yet

CURA-6013
2018-12-07 15:31:33 +01:00
Ghostkeeper
78df27369f
Fill buildplate icon
This is according to our newest designs.

Contributes to issue CURA-5876.
2018-12-07 14:41:30 +01:00
Ghostkeeper
c663681e66
Simplify buildplate icon
Removed all unnecessary crap added by Sketch.

Contributes to issue CURA-5876.
2018-12-07 14:39:43 +01:00
Diego Prado Gesto
26be65e405 Fix some other merge conflicts
Contributes to CURA-6008.
2018-12-07 13:29:16 +01:00
Diego Prado Gesto
46fa33fda5 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:19:19 +01:00
Diego Prado Gesto
9c873faace Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:11:15 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
2018-12-07 12:07:41 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +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
Diego Prado Gesto
47626f6033 Fix the color and proportions of the cura logo in the about panel 2018-12-06 11:57:55 +01:00
Diego Prado Gesto
26a41c3726 Adjust the color of the printer in the printer selector
For that I needed to get rid of the IconLabel component, since in this case the color of the icon and the text is the same (and it makes sense)
2018-12-06 11:45:14 +01:00
Diego Prado Gesto
aab61ce8da Modify the header pattern to be have an empty space in the left and bottom, so when repeating the pattern it doesn't overlap. 2018-12-06 11:35:33 +01:00
Diego Prado Gesto
f655e6c43e Add a pattern in the background of the header.
Adjust some main colors to the ones in the designs.
2018-12-06 11:30:59 +01:00
Diego Prado Gesto
c757bf128e Adjust colors and alignments in the print info panel 2018-12-06 09:12:43 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Diego Prado Gesto
034b1660f7 Adjust sizes in the custom print setup mode
Contributes to CURA-5941.
2018-12-05 13:05:22 +01:00
Ghostkeeper
de78c44461
Fix configuration drop-down for dark theme
This actually changes the secondary colour to be darker for the dark theme, to be more in line with the general theme then.

Contributes to issue CURA-5876.
2018-12-04 16:43:13 +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
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages
It is now the default in Uranium.

Contributes to issue CURA-5876.
2018-12-04 15:04:51 +01:00
Diego Prado Gesto
a66bb4fab1 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:23:00 +01:00
Diego Prado Gesto
c1f5c00a7e Forgot to add the icon 2018-12-04 09:18:45 +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
Diego Prado Gesto
ca3c639069 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:03:13 +01:00
Diego Prado Gesto
004405e5f9 Change the colors to match the designs.
Contributes to CURA-5941.
2018-12-03 17:25:07 +01:00
Diego Prado Gesto
15415dc3b9 Fix position of the tooltips for the settings
Contributes to CURA-5941
2018-12-03 16:53:52 +01:00
Diego Prado Gesto
4e9c595bdd Restyle the settings list
Be sure that the alignments and the margins are corrects according to the designs.

Contributes to CURA-5941.
2018-12-03 15:34:33 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview
Contributes to CURA-5941.
2018-12-03 14:43:35 +01:00
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup.
Align some elements beneath the tabs.

Contributes to CURA-5941.
2018-12-03 13:58:13 +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
Diego Prado Gesto
90281c455b Add global profile selector to the custom print setup panel
Also modify some styles to adjust to the designs.

Contributes to CURA-5941.
2018-12-03 09:45:49 +01:00
Diego Prado Gesto
1cea36b08a Add the row for the support selection in the recommended mode
Contributes to CURA-5941.
2018-12-02 19:01:54 +01:00
Diego Prado Gesto
1caccfb577 Add a binding to react when the infill density changes in the custom panel
Also make the icon dinamic, that will change when the infill density changes.

Contributes to CURA-5941.
2018-12-02 13:40:41 +01:00
Ghostkeeper
f4950cf92b
Give checkboxes a style if they're disabled
Contributes to issue CURA-5876.
2018-11-30 17:04:50 +01:00