3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28500 commits 340 branches 299 tags 734 MiB
Commit graph

1006 commits

Author SHA1 Message Date
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
j.delarago
7bbea62558 Add base_colors to theme 
If the value of a color is a string, there will be an attempt to fetch this color from base_colors.

CURA-8688
 2022-02-25 14:56:24 +01:00
Jaime van Kessel
c356d37e06 Remove monitor_icon_size from theme 2022-02-25 14:32:34 +01:00
Jaime van Kessel
75ec6f508c Remove unneeded fixed line hight properties 
No idea why this was even done, but there just isnt' a reason to use these.
 2022-02-25 14:27:47 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Jaime van Kessel
1589475dd4 Remove a slew of unusued colors in the theme 2022-02-25 13:54:50 +01:00
Jaime van Kessel
ff0b64a56a Purge bunch of unused sizes from theme 2022-02-25 13:33:32 +01:00
Jaime van Kessel
5f638ed6c6 Generalize the size of the licence window 
No need to have a seperate size of the licence window. Just use
the default modal one
 2022-02-25 13:22:55 +01:00
Jaime van Kessel
b3d3f5546c Remove objectlist items from theme 
THey weren't used anyway, so time to clean up!
 2022-02-25 13:19:59 +01:00
Jaime van Kessel
9d202b9e61 Remove unused monitor items from theme 2022-02-25 13:18:45 +01:00
Jaime van Kessel
2327a71642 Remove monitor margin 
No idea why it was even there as it's own size.
 2022-02-25 13:16:59 +01:00
Jaime van Kessel
f9e6135fca Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-24 13:44:21 +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
b14e29d214 Make general menu combox wider 
CURA-8688
 2022-02-23 15:13:36 +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