GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 01:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,052 Commits 289 Branches 260 Tags
Commit Graph

1020 Commits

Author SHA1 Message Date
j.delarago
8362d4c967 Switch to column layout in RecommendedPrintSetup.qml so that left margins can be put on infill selector and items below it. 
Add warning and reset button when custom profile is select and/or settings have been changed

CURA-8849
 2022-06-15 10:48:04 +02:00
j.delarago
40d473c243 Add circle with letter inside for non default intents 
CURA-8849
 2022-06-14 15:44:11 +02:00
j.delarago
a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix. 
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.

CURA-8849
 2022-06-14 11:41:38 +02:00
j.delarago
6f88adab8e Add new theme colors from figma 
CURA-8849
 2022-06-14 11:27:50 +02:00
j.delarago
e7d4038461 Add new icons for intents 
CURA-8849
 2022-06-14 09:59:52 +02:00
Ghostkeeper
97e2d6a432
Use border only on active state 
Contributes to issue CURA-9217.
 2022-05-10 16:03:55 +02:00
Ghostkeeper
7fda81b678
Show a border around text fields and drop-downs when hovering 
And when they are focused.
This applies to the setting text fields, extruder selectors and drop-downs as well as to the machine settings.

Contributes to issue CURA-9217.
 2022-05-09 17:48:38 +02:00
Remco Burema
76d5f92975 Align colors disabled settings textfield (5 min fix). 
CURA-9252
 2022-05-05 17:54:06 +02:00
j.delarago
94e5a4e1db Masking is not avaliable after the QT6 upgrade, this does a kind of primitive masking by placing a rectangle with a circular hole in it over the image. 
CURA-9104
 2022-04-11 14:10:27 +02:00
Jaime van Kessel
5bec905cb9 Remove fill from multiple SVG's 2022-04-11 11:40:04 +02:00
j.delarago
e076779293 Remove fill from Check.svg which was overriding attempts to recolor image. 
CURA-9101
 2022-04-11 10:56:17 +02:00
Jaime van Kessel
279719099d Also remove fill from default extruderCOlor icon 2022-04-11 10:39:48 +02:00
Jaime van Kessel
17e7c263df Remove fill from extruderColor icon 2022-04-11 10:37:15 +02:00
c.lamboo
baa1d9b87d Use weights from figma 
Checked with @Lorenzo

CURA-8640
 2022-04-01 16:13:31 +02:00
c.lamboo
c6d62c9d83 Update font weights 
In qt6 the font weights are defined in the range 0..1000 where the weights in qt6 were defined in the range 10..100

CURA-8640
 2022-04-01 14:56:43 +02:00
casper
bfa8118c9f Merge branch 'master' into CURA-8979_Materials_Preference_Page 
# Conflicts:
#	resources/qml/ColorDialog.qml
#	resources/qml/Preferences/ProfilesPage.qml
 2022-03-21 13:39:16 +01:00
Jaime van Kessel
97124bf5a9 Fix various QML warnings 
CURA-8979
 2022-03-15 10:32:44 +01:00
Jaime van Kessel
f760ca146d Fix sizing of materialBrandSelection 
This also cleans up some stuff from the theme. Huzzah

CURA-8979
 2022-03-15 10:25:56 +01:00
j.delarago
0ba4dbacc4 Make combobox_wide much wider and swap out existing uses of combobox_wide for combobox. 
CURA-8890
 2022-03-14 13:13:30 +01:00
Casper Lamboo
60f7b2dccb
Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-11 13:43:33 +01:00
casper
912db08b23 Let height of preferences_page_list themes value set height of list item 
CURA-9008
 2022-03-08 09:11:49 +01:00
10r3n20
4f2e7116b7 minor fix to align setting visibility with settings 2022-03-07 16:25:14 +01:00
j.delarago
37a4986406 Reduce width of preferences dialog page selection buttons. 
Reduce width of profiles list and printers list.

CURA-9008
 2022-03-07 16:17:03 +01:00
10r3n20
5499a4cc4c tiny improvements 2022-03-07 16:11:33 +01:00
j.delarago
016cc4e48f Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-07 13:37:58 +01:00
j.delarago
06a30a702c Update Settings view category items to new style 
Removed the fixed height from the SettingView list so that the SettingItems can have a larger height than the SettingCategory

CURA-9005
 2022-03-04 17:23:36 +01:00
j.delarago
719257bb63 Update validation colors to match new designs 
CURA-8991
 2022-03-04 15:05:30 +01:00
j.delarago
1eb16c0ec5 Update SettingTextField to match TextField 
CURA-8991
 2022-03-04 13:53:59 +01:00
j.delarago
7dabcfafb0 Add checkbox square coloring back. 
CURA-8991
 2022-03-04 13:48:01 +01:00
j.delarago
fb42679d08 Update TextField to match designs when disabled. 
CURA-8991
 2022-03-04 13:39:50 +01:00
j.delarago
b3e8c7190e Align radio buttons with new designs. 
Fix radiobutton looking the same checked and unchecked when disabled

CURA-8991
 2022-03-04 13:18:00 +01:00
j.delarago
a26b54f6e2 Fix checkboxes not showing check marks when disabled. 
Update checkboxes to align with new designs.

Update SettingCheckBox to match checkbox styling.

Remove duplicated styling inside cura-dark/theme.json

CURA-8991
 2022-03-04 11:28:11 +01:00
Jaime van Kessel
06eddc3419 Set border_main for darktheme to be darker 
CURA-8975
 2022-03-03 14:01:41 +01:00
j.delarago
b2bed4efdd Fix setting visibility styling working in one theme and not the other. 
CURA-8688
 2022-03-02 09:06:47 +01:00
j.delarago
1b6c3516bd Set default overlay background to background_1 
CURA-8688
 2022-03-01 14:37:48 +01:00
j.delarago
6ad3ef8e7d Update monitor page background colors 
CURA-8688
 2022-03-01 13:22:51 +01:00
j.delarago
2e92a986db adjust dropdown background hover color 
CURA-8688
 2022-03-01 13:13:54 +01:00
j.delarago
ef5fced686 adjust setting valid background color 
CURA-8688
 2022-03-01 12:51:55 +01:00
j.delarago
fc3f0a4ad3 Update setting profile combobox to new style 
CURA-8688
 2022-03-01 12:44:52 +01:00
j.delarago
ac907ca451 Update highlight colors 
CURA-8688
 2022-03-01 12:33:19 +01:00
j.delarago
2fdd7b82d5 Update settings extruder comboboxes and material selection combobox to match new designs 
CURA-8688
 2022-03-01 11:48:41 +01:00
j.delarago
b129eb805f Update message background to match new designs 
CURA-8688
 2022-03-01 10:35:43 +01:00
Jaime van Kessel
24463fbd45 Merge branch 'CURA-8688_qt6_cleanup' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup 2022-02-28 15:24:40 +01:00
j.delarago
97f1b75870 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-28 14:56:27 +01:00
j.delarago
ce86e025d9 New style highlighting on borders 
CURA-8688
 2022-02-28 14:56:07 +01:00
Jaime van Kessel
62f6643a49 Add checkbox disabled color to darktheme 
CURA-8688
 2022-02-28 14:08:26 +01:00
Jaime van Kessel
cc29e2398b Set correct text highlight color for TextField 
CURA-8688
 2022-02-28 13:35:56 +01:00
j.delarago
83661ebd7f Remove duplicate color for primary button. 
Adjust secondary button colors to account for different colors being used between light and dark themes.

CURA-8688
 2022-02-28 12:02:51 +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
17cab9946d Dark theming 
CURA-8688
 2022-02-25 18:18:43 +01:00