3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
29960 commits 307 branches 272 tags 787 MiB
Commit graph

1025 commits

Author SHA1 Message Date
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
Jaime van Kessel
4e880709a7 Remove styles.qml 
We no longer need / have styles due to upgrade to qt 6.2
 2022-02-22 12:03:53 +01:00
Jaime van Kessel
40a4d617cc Remove unused style 2022-02-22 11:40:23 +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
beae4f28f7 Change default sizes of menu 
CURA-8928
 2022-02-21 11:58:21 +01:00
10r3n20
58137e4987 inverted y and z colors 2022-02-18 12:08:11 +01:00
casper
ab17df15b5 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-18 10:08:12 +01:00
casper
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars 
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
 2022-02-18 09:07:25 +01:00
j.delarago
b2811b1125 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-17 15:21:19 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Jaime van Kessel
c528616d12 Set selection color of textfields 
CURA-8947
 2022-02-17 14:39:11 +01:00
Jaime van Kessel
821581bc65 Remove ProgressBar style and use UM.ProgressBar instead 
CURA-8685
 2022-02-15 17:07:22 +01:00
10r3n20
4383f2ddf2 adjusted colors and size of origin gizmo 2022-02-15 16:45:57 +01:00
10r3n20
a9e3acb623 adjusted buildplate grid color 2022-02-15 16:26:27 +01:00
Ghostkeeper
52ff67c1eb
Use separate context menu size for menus 
Instead of re-using the setting controls. It's not a setting.

Contributes to issue CURA-8688.
 2022-02-15 16:09:18 +01:00
Evangelos Trantos
d7c3495509
Merge pull request #11328 from Ultimaker/CURA-8378_improve_checkbox_visibility 
Cura 8378 improve checkbox visibility
 2022-02-02 19:54:34 +02:00
j.delarago
7f81a2aa8c Rename low quality CheckMark.svg -> Check.svg 
Rename low quality Check.svg -> CheckThin.svg
 2022-01-25 11:32:41 +01:00
j.delarago
0f4a49ac6d Remove unused CheckBoxBorder.svg, the checkbox is defined using styling instead of an svg. 2022-01-25 11:09:27 +01:00
j.delarago
4eb61af579 Update colors to match designs 2022-01-24 16:15:41 +01:00
j.delarago
f6c48fdf07 Rename EmptyCheck -> CheckMark 2022-01-24 14:20:28 +01:00
j.delarago
818ef8e614 add dark theme checkbox square color 2022-01-24 14:13:03 +01:00
j.delarago
171da643d5 I'm replacing all CheckBox in Cura with this CheckBox except ones that use the old "style" tag (Not in scope). This should make the design consistent everywhere and easier to update. 
Moved set width and height from top level into "indicator" since this was causing the label to be cut off.

Swapped out setting_control_radius for checkbox_radius since these are different now.

Updated the UM.RecolorImage to work with tri state checkboxes so this can replace the Checkbox in SettingVisiblityPage.qml.
 2022-01-21 18:06:31 +01:00
casper
8cc1604b2f Update Buttons to QtControls 2.0 in the simulation view expend menu bar 
CURA-8684
 2022-01-21 14:07:41 +01:00
casper
bcd1689680 Update buttons in per object settings plugin to QtControls 2 
CURA-8684
 2022-01-20 22:58:43 +01:00
casper
07095a5802 Update Material selection and variant selection buttons to QtControls 2 
CURA-8684
 2022-01-20 22:38:00 +01:00
casper
204d965df2 Use SecondaryButton in the usb print panel inplace of tye style prop 
The Jog buttons are not changed yet as these button make use of the
`checked` property this is not yet implemented for Cura's `Action` and
by extension Cura's `Secondary` button.

CURA-8684
 2022-01-20 22:15:22 +01:00
j.delarago
25fa71b056 Update checkbox style to reflect new design. 
Add checkbox_mark size for icons inside checkbox instead of dynamically assigning size. This is related to previous commit about Math.round(parent.width/2.5) always resolving to 1
 2022-01-19 18:06:47 +01:00
j.delarago
c54c375a7c Update check box icons name to new icon name 
Change checkbox check icon to have set height and width in theme.json. Math.round(parent.width/2.5) would always evaluate to 1 since the width of the check icons parent is fixed.
 2022-01-19 17:56:56 +01:00
j.delarago
cac27770ce Add new design checkbox svg icons. 2022-01-19 10:46:31 +01:00
Jaime van Kessel
752cf2d5aa Remove unused styles 2022-01-03 16:44:42 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00