Commit graph

567 commits

Author SHA1 Message Date
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
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
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
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
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
Jaime van Kessel
44c415ff78 Add shadow to ExpandableComponent 2018-11-27 11:58:32 +01:00
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Jaime van Kessel
8e7e8354e7 Set colors to the correct ones 2018-11-27 09:41:45 +01:00
Diego Prado Gesto
6a2bbca7ce Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 17:53:24 +01:00
Jaime van Kessel
5ddb3ff909 Factor out superfluous use of small_tool_button style
The style was overly complicated for what it should do
2018-11-26 17:40:34 +01:00
Jaime van Kessel
a825daea95 Cleanup the Theme.json
There were a lot of sizes that weren't used
2018-11-26 17:10:48 +01:00
Diego Prado Gesto
52b916d45c Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 14:33:41 +01:00
Jaime van Kessel
a654499752 Re-enable hover for marketplace button
CURA-5959
2018-11-26 13:47:22 +01:00
Jaime van Kessel
3c86c0ae6c Fix spacing
CURA-5959
2018-11-26 13:36:45 +01:00
Jaime van Kessel
1fe6501358 Removed unused entries from theme 2018-11-26 13:35:41 +01:00
Lipu Fei
6bed1c1390 Move monitor_checkable_button_style out to styles.qml
CURA-5943
2018-11-26 13:21:55 +01:00
Lipu Fei
d6614941dc Update QtQuick import versions in styles.qml
CURA-5943
2018-11-26 13:15:25 +01:00
Lipu Fei
6bb010e74a Move MonitorButtonStyle to styles.qml
CURA-5943
2018-11-26 13:14:26 +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
e1f3e07f04 Changed Marketplace button to no longer use the action button
The actionButton is weirdly named and overly used. That being said, the marketplace button is unique, so
there is little sense in re-using it
2018-11-23 17:11:20 +01:00
Aleksei S
6d34218012 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-11-23 11:34:46 +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
67dc415b58 Add the connected icon to the printer selector that shows a blue icon
when the printer is connected. If not connected then there is no icon.

Contributes to CURA-5942.
2018-11-23 10:46:55 +01:00
Diego Prado Gesto
1d84bd7356 Improve the machine selector header to show an icon in case it is a
network printer.

Contributes to CURA-5942.
2018-11-22 17:37:10 +01:00
Diego Prado Gesto
2b08857331 Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-22 16:11:34 +01:00
Jaime van Kessel
3f4d379908 Added shadow to slice button
CURA-5959
2018-11-22 15:35:40 +01:00
Diego Prado Gesto
0211122b12 Add a proper component with a label and a rectangle in the background
that shows the type of printer.

Contributes to CURA-5942.
2018-11-22 14:46:13 +01:00
Jaime van Kessel
7a8522ce72 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-22 09:38:06 +01:00
Jaime van Kessel
a9f0402f63 Made size of viewselector themable
CURA-5785
2018-11-22 09:37:36 +01:00
Diego Prado Gesto
3434b30ee0 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 17:08:15 +01:00
Diego Prado Gesto
cbee18597e Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-21 16:59:03 +01:00