3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'CURA-8688_qt6_cleanup' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup

Browse source
This commit is contained in:
Jaime van Kessel 2022-02-28 15:24:40 +01:00
commit 24463fbd45
6 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/SecondaryButton.qml
View file

@ -11,7 +11,7 @@ Cura.ActionButton
{
color: UM.Theme.getColor("secondary_button")
textColor: UM.Theme.getColor("secondary_button_text")
outlineColor: UM.Theme.getColor("secondary_button_text")
outlineColor: UM.Theme.getColor("border_accent_1")
disabledColor: UM.Theme.getColor("action_button_disabled")
textDisabledColor: UM.Theme.getColor("action_button_disabled_text")
hoverColor: UM.Theme.getColor("secondary_button_hover")

9
resources/qml/Widgets/ComboBox.qml
View file

@ -26,21 +26,18 @@ ComboBox
{
name: "disabled"
when: !control.enabled
PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_control_disabled")}
PropertyChanges { target: background; color: UM.Theme.getColor("setting_control_disabled")}
PropertyChanges { target: contentLabel; color: UM.Theme.getColor("setting_control_disabled_text")}
},
State
{
name: "highlighted"
when: control.hovered || control.activeFocus
PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_control_highlight")}
PropertyChanges { target: background; liningColor: UM.Theme.getColor("border_main_light")}
}
]
background: UM.UnderlineBackground
{
id: backgroundRectangle
}
background: UM.UnderlineBackground{}
indicator: UM.RecolorImage
{

2
resources/qml/Widgets/RadioButton.qml
View file

@ -38,7 +38,7 @@ RadioButton
{
name: "highlighted"
when: radioButton.hovered || radioButton.activeFocus
PropertyChanges { target: indicator; border.color: UM.Theme.getColor("accent_1")}
PropertyChanges { target: indicator; border.color: UM.Theme.getColor("border_main_light")}
}
]

1
resources/qml/Widgets/TextField.qml
View file

@ -44,6 +44,7 @@ TextField
{
name: "hovered"
when: textField.hovered || textField.activeFocus
PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("border_main_light")}
}
]

4
resources/themes/cura-dark/theme.json
View file

@ -56,6 +56,8 @@
"main_window_header_background_gradient": "background_4",
"main_window_header_button_background_hovered": [46, 46, 46, 255],
"secondary_button_text": "text_secondary_button",
"account_sync_state_icon": [255, 255, 255, 204],
"machine_selector_printer_icon": [204, 204, 204, 255],
@ -155,7 +157,7 @@
"checkbox": "background_1",
"checkbox_hover": [43, 48, 52, 255],
"checkbox_border": "text_disabled",
"checkbox_border_hover": [255, 255, 255, 38],
"checkbox_border_hover": "border_main",
"checkbox_mark": "text_default",
"checkbox_square": "text_disabled",
"checkbox_text": "text_default",

10
resources/themes/cura-light/theme.json
View file

@ -210,12 +210,11 @@
"icon": [8, 7, 63, 255],
"primary_button": [25, 110, 240, 255],
"primary_button": "accent_1",
"primary_button_hover": [16, 70, 156, 255],
"primary_button_text": [255, 255, 255, 255],
"secondary_button": "text_default",
"secondary_button": "background_1",
"secondary_button_shadow": [216, 216, 216, 255],
"secondary_button_hover": [232, 240, 253, 255],
"secondary_button_text": "accent_1",
@ -323,7 +322,7 @@
"quality_slider_available": [0, 0, 0, 255],
"checkbox": [255, 255, 255, 255],
"checkbox_hover": [255, 255, 255, 255],
"checkbox_hover": "border_main",
"checkbox_border": [180, 180, 180, 255],
"checkbox_border_hover": [25, 110, 240, 255],
"checkbox_mark": [35, 35, 35, 255],
@ -423,7 +422,10 @@
"cloud_unavailable": [153, 153, 153, 255],
"connection_badge_background": [255, 255, 255, 255],
"warning_badge_background": [0, 0, 0, 255],
"error_badge_background": [255, 255, 255, 255]
"error_badge_background": [255, 255, 255, 255],
"border_field_light": [180, 180, 180, 255],
"border_main_light": [212, 212, 212, 255]
},
"sizes": {