3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
18800 commits 312 branches 275 tags 718 MiB
Commit graph

392 commits

Author SHA1 Message Date
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
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
Diego Prado Gesto
a675d6c353 Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/Cura into CURA-5941_restyle_setting_dropdown 2018-11-30 15:17:42 +01:00
Aleksei S
73568d7473 Added icon to the search field which filters settings 
CURA-5941
 2018-11-30 14:51:55 +01:00
Diego Prado Gesto
1a778b3078 Fix qualiy slider alignments 
Contributes to CURA-5941.
 2018-11-30 14:18:07 +01:00
Lipu Fei
6db52dde46 Fix merge conflicts from ui_rework_40 
CURA-5943
 2018-11-29 15:27:06 +01:00
Diego Prado Gesto
990c653af4 Refactor the code a bit more to better align the components in the 
recommended mode.

Contributes to CURA-5941.
 2018-11-28 17:29:25 +01:00
Diego Prado Gesto
56f20648f5 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-11-28 11:58:55 +01:00
Jaime van Kessel
5ed2acadd0 Re-add wizard_progress size 
I was a bit over enthosiastic deleting it as it was still used for the UMO first run wizard
 2018-11-28 11:09:34 +01:00
Diego Prado Gesto
14b460a626 Remove unused styles 2018-11-27 17:25:10 +01:00
Aleksei S
d47806de50 Change style, added close popitem close behaviour 
CURA-5941
 2018-11-27 15:05:35 +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
077b34b433 Fix size of the extruder icon 
Now it should look the same in all places.
 2018-11-27 14:49:01 +01:00
Ghostkeeper
bb9598afd1
Redesign layout of configuration item contents 
This is the new design.

Contributes to issue CURA-5876.
 2018-11-27 13:55:54 +01:00
Aleksei S
6956a732a0 Use tapbar component from UM, change the print_setup_widget width 2018-11-27 13:49:04 +01:00
Jaime van Kessel
fb84b344ec Add gradient to header bar 2018-11-27 12:58:06 +01:00
Ghostkeeper
e751b59b1c
Remove unused configuration item theme entries 
The theme of configuration items is now in sync with the rest of the interface.

Contributes to issue CURA-5876.
 2018-11-27 12:55:58 +01:00