6082 Commits

Author SHA1 Message Date
Jaime van Kessel
8d3a5ac7e4 Ensure AskOpenAsProjectOrModel dialog uses cura styling
CURA-8688
2022-02-28 11:47:10 +01:00
j.delarago
4871c98451 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-28 11:44:24 +01:00
j.delarago
7da5903ce3 Update RadioButton to new style
CURA-8688
2022-02-28 11:43:59 +01:00
Jaime van Kessel
78c19559d2 Ensure that Cura styling is applied to the workspace summary dialog
CURA-8688
2022-02-28 11:41:56 +01:00
Jaime van Kessel
b03fbc0d6d Merge branch 'CURA-8688_qt6_cleanup' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup 2022-02-28 11:26:58 +01:00
Jaime van Kessel
f82c0fe525 Merge branch 'replace_controls_1_for_controls_2' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup 2022-02-28 11:26:47 +01:00
Jaime van Kessel
26262e3cac Fix marketplace opening 2022-02-28 11:26:18 +01:00
j.delarago
440d6fa525 Update style of TextFIeld and ComboxBox to match new designs. Remove borders and radius on corners.
Update Prefereces title to be bold and centered with button

Make prefereces pages selection buttons correct height.

CURA-8688
2022-02-28 11:20:31 +01:00
j.delarago
b4edb89eb8 Align menubar colors with new designs.
CURA-8688
2022-02-28 10:21:16 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
2022-02-28 08:51:42 +01:00
j.delarago
7ea0167486 Remove border highlight on hover over menu items, as per new designs
CURA-8688
2022-02-25 15:54:51 +01:00
j.delarago
aba025b5b6 Unify dialog background coloring.
CURA-8988
2022-02-25 13:32:02 +01:00
casper
2d4a389825 Fix dark mode issues for about dialog
CURA-8688
2022-02-25 12:12:57 +01:00
Jaime van Kessel
93a5c44e6c
Fix codestyle
CURA-8978

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-02-24 17:22:10 +01:00
casper
2761aed455 Make number of columns configurable in color dialog
CURA-8938
2022-02-24 15:45:10 +01:00
casper
7dbe5c0f7c Change some margins
CURA-8938
2022-02-24 15:44:46 +01:00
casper
9b06849955 Let the content of the color dialog determine the size of the dialog
CURA-8938
2022-02-24 15:43:22 +01:00
casper
301d68ebf2 Update swatches on swatch color property changed
CURA-8938
2022-02-24 15:42:27 +01:00
Jaime van Kessel
6e59cd23bb Fix hide / show all in setting visibility page
CURA-8978
2022-02-24 15:32:39 +01:00
Jaime van Kessel
96751a0cc0 Merge branch 'CURA-8980_fix_monitor_buttons' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-24 15:22:15 +01:00
j.delarago
61beb963c2 Swap flat buttons for Cura Styled buttons.
These "buttons" function like radiobuttons so a bit of extra styling needed to be added to swap appearance.

Removed fixed width as it breaks centering with Cura buttons

CURA-8980
2022-02-24 14:58:07 +01:00
Evangelos Trantos
a2ce010ec1
Merge pull request #11521 from Ultimaker/CURA-8928_menu_visual_fixes
Menu visual fixes
2022-02-24 13:22:56 +01:00
j.delarago
41e04f2e9d Progress bar causing crash due to incorrect min max value variable names.
Give buttons fixed leftMargin in monitor page so icons are center aligned.

CURA-8980
2022-02-24 11:34:48 +01:00
j.delarago
4510a8b06e Down spinbox button highlighting up spinbox button when clicked.
CURA-8688
2022-02-23 15:15:46 +01:00
j.delarago
b14e29d214 Make general menu combox wider
CURA-8688
2022-02-23 15:13:36 +01:00
j.delarago
111c095f32 Swap RadioButton for styled Cura.RadioButton
CURA-8688
2022-02-23 15:04:58 +01:00
casper
6f27199bb9 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-23 14:09:58 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
2022-02-23 14:09:38 +01:00
j.delarago
c3abfec535 Combobox height/width was being resized by RowLayout causing it to be squished. Assigned a implicit width/height which is used instead of height/width.
CURA-8688
2022-02-23 12:00:11 +01:00
j.delarago
9f75b870a7 Swap "+" and "-" made from Rectangle elements for icons.
CURA-8688
2022-02-22 16:18:01 +01:00
Jaime van Kessel
5d28994b87 Use cura styled combobox 2022-02-22 14:47:27 +01:00
Jaime van Kessel
2c6ba3cd5d Update some USB printing items to controls 2 2022-02-22 11:58:14 +01:00
Jaime van Kessel
f347c6aedf Remove number of unused styles imports 2022-02-22 11:42:41 +01:00
Jaime van Kessel
53331f4757 Remove unused imports 2022-02-22 11:39:00 +01:00
Jaime van Kessel
25d2ed14dd Ensure contentWidth is calculated correctly
CURA-8948
2022-02-22 11:31:46 +01:00
Jaime van Kessel
a14c160d86 Expose flickable direction for TableView
CURA-8948
2022-02-22 11:28:33 +01:00
Jaime van Kessel
8cf9fe7941 Add noWrap to all labels in configurationMenu
CURA-8941
2022-02-22 10:55:22 +01:00
j.delarago
e75993e7f3 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup
# Conflicts:
#	resources/qml/Preferences/MachinesPage.qml
2022-02-22 10:41:25 +01:00
j.delarago
d40e91cc08 Remove unneccesary opacity assignment.
Change padding to styled width

CURA-8688
2022-02-22 10:37:13 +01:00
Joey de l'Arago
9acf35936b
Merge pull request #11506 from Ultimaker/CURA-8949_preferences_styling
Styling of preferences screens
2022-02-22 10:10:21 +01:00
j.delarago
30ca9ab469 Update spinbox to new design. Add reusable UnderlineBackground Component for background of newly designed elements.
CURA-8688
2022-02-21 15:44:16 +01:00
Jaime van Kessel
ba6c0438a1 Fix size of signed out account screen
CURA-8940
2022-02-21 15:27:27 +01:00
Jaime van Kessel
6e8c708f35 Change genericMaterials menu to customized menu
CURA-8928
2022-02-21 13:26:14 +01:00
Jaime van Kessel
85926c6f7a Add padding to menu
CURA-8928
2022-02-21 13:25:00 +01:00
Jaime van Kessel
b0d944f92d Change all unstyled menuseperators to styled ones
CURA-8928
2022-02-21 13:21:51 +01:00
Jaime van Kessel
b79c77cb33 Add left & right padding for MenuSeperator
CURA-8928
2022-02-21 13:20:04 +01:00
Jaime van Kessel
c3745b42b6 Switch contextMenu to Cura.Menu
This fixes all the styling issues that it still had

CURA-8928
2022-02-21 13:15:09 +01:00
Jaime van Kessel
58d04420ed Ensure that edit & help menu have the right styling
They were still using the default Qt Menu instead of Cura.Menu

CURA-8928
2022-02-21 13:13:27 +01:00
Jaime van Kessel
390d12495e Update highlight color of menu
CURA-8928
2022-02-21 13:08:53 +01:00
casper
16325229af Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-21 12:02:36 +01:00