GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-04 07:26:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,969 Commits 295 Branches 268 Tags
Commit Graph

106 Commits

Author SHA1 Message Date
Max Heinekamp
b2f1e80cb3 Removed duplicate entry 
There were two entries defining "secondary_button_text".
Kept the one near other secondary_button etires and set it to the "text_secondary_button" base color.
 2024-06-01 20:47:52 +02:00
Saumya Jain
21e4f99b9d Add core compatibility check for Factor4 machine 
A new function has been added to the MachineManager class to check for core compatibility in the Factor4 machine. This function ensures the selected core is compatible for use with the Factor4 machine and if not, it displays a warning icon with an appropriate message.

CURA-11851
 2024-04-22 14:00:56 +02:00
c.lamboo
dd7e16d258 Revert "Apply suggestions from code review" 
This reverts commit cbdd5e434b5c29de1ea57e0dfda79a36ab4f1340.
 2023-05-23 15:21:45 +02:00
Casper Lamboo
cbdd5e434b
Apply suggestions from code review 2023-05-23 15:17:23 +02:00
MariMakes
4d32e4d75b Improve readability of printjob name in Darkmode 2023-05-15 16:28:22 +02:00
jspijker
b1ec8599d2 Use UltiMaker for themes 
Contributes to CURA-9808
 2022-11-28 11:39:07 +01:00
Ghostkeeper
fdd96b30a7
Fix dark theme primary colour 
The dark theme was overriding the primary colour with the wrong Ultimaker Blue colour. There is a newer blue, and it was applied as 'accent_1'. The dark theme had its own version of that one too. But the old Primary colour was still the wrong one.

Contributes to issue CURA-9465.
 2022-07-11 17:18:01 +02:00
Jaime van Kessel
461165ea39 Set the correct color for inactive text 
It used to be all back, which is just unreadable...

CURA-9465
 2022-07-11 16:16:08 +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
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
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
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
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
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
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
10r3n20
58137e4987 inverted y and z colors 2022-02-18 12:08:11 +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
818ef8e614 add dark theme checkbox square color 2022-01-24 14:13:03 +01:00
casper
02c81234d0 Remove references to the toolbox plugin from the themes.json 
Some other components were (incorrectly) using these theme variables.
Replaced them by another theme variable with the same value.

CURA 8588
 2021-12-30 13:38:16 +01:00
Ghostkeeper
73bb311293
Add dark theme entry for background of detail panels 
Otherwise it uses the very bright light theme which doesn't match with the light text colour in dark mode.

Contributes to issue CURA-8556. Found during issue CURA-8557.
 2021-10-29 15:47:22 +02:00
Konstantinos Karmas
d24d520db0 Change background of Premium plugins and materials 
Or else the link "Search materials" in the materials tab was very hard to see.

CURA-8380
 2021-08-24 13:32:25 +02:00
Ghostkeeper
14f0c30795
Give secondary buttons a background colour again 
This background colour is the same as the main background, on which these buttons almost always are situated. However in the cases where they are not, such as the post-processing scripts button, this makes the text easier to read than a completely transparent background colour.

Done as a 5 minute fix.
 2021-07-21 14:18:45 +02:00
Konstantinos Karmas
38bec36f6b Revert Tertiary button to its previous style 
The styling of the Tertiary button (to not look like a link anymore) and the introduction of the Quatertiary button (as the link button) will happen in a separate ticket in the future.

CURA-8012
 2021-07-06 13:45:24 +02:00
Remco Burema
acf3f2d02a
Let Tertiary button have its own hover entry. 
Secondary button entries should not be re-used here.

part of CURA-8012
 2021-07-06 09:37:48 +02:00
Remco Burema
a42fee4834
Put the dark-theme bg back the way it was. 
Not really part of this ticket. Also no buttons are directly on the background anyway.

part of CURA-8012
 2021-07-06 09:25:10 +02:00
Remco Burema
1c73077f7e
More dark theme tweaks. 
part of CURA-8012
 2021-07-02 13:54:34 +02:00
Remco Burema
952e02676f
Tweaks for restyling benefitting the dark theme. 
part of CURA-8012
 2021-07-02 13:24:02 +02:00
Jaime van Kessel
3e67d20890
Remove monitor_text_primary 
It's so close to the text one that it really doesn't make sense to keep it.
Boyscouting the code a bit here

CURA-7745
 2020-10-08 17:31:19 +02:00
Remco Burema
b394be3583
Remove superfluous theme entry. 
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
 2020-08-05 08:16:10 +02:00
Jaime van Kessel
b2ca6a9224
Add removed theme entries again 
Some plugins were using them.
 2020-08-03 10:38:33 +02:00
Jaime van Kessel
8b7b8b0118
Simplify the SettingCategory 2020-07-10 14:50:44 +02:00
Kostas Karmas
78bd5520bd Add theme color for sync state icon 
CURA-7418
 2020-06-16 14:41:23 +02:00
Jaime van Kessel
d01286a340
Remove all duplicate entries from dark theme 2020-03-10 11:57:30 +01:00