GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 04:19:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup

Browse Source
This commit is contained in:
casper 2022-03-01 11:16:45 +01:00
commit e131c596df
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/PerObjectSettingsTool/PerObjectCategory.qml
View File

@ -11,7 +11,9 @@ import ".."
Button { Button {
id: base; id: base;
background: Item {} background: Rectangle {
color: UM.Theme.getColor("background_3")
}
contentItem: Row contentItem: Row
{ {

6
plugins/PerObjectSettingsTool/SettingPickDialog.qml
View File

@ -14,6 +14,7 @@ UM.Dialog
title: catalog.i18nc("@title:window", "Select Settings to Customize for this model") title: catalog.i18nc("@title:window", "Select Settings to Customize for this model")
width: UM.Theme.getSize("small_popup_dialog").width width: UM.Theme.getSize("small_popup_dialog").width
backgroundColor: UM.Theme.getColor("background_1")
property var additional_excluded_settings property var additional_excluded_settings
@ -78,12 +79,13 @@ UM.Dialog
anchors anchors
{ {
top: filterInput.bottom top: filterInput.bottom
topMargin: UM.Theme.getSize("default_margin").height
left: parent.left left: parent.left
right: parent.right right: parent.right
bottom: parent.bottom bottom: parent.bottom
} }
ScrollBar.vertical: UM.ScrollBar {} ScrollBar.vertical: UM.ScrollBar { id: scrollBar }
clip: true clip: true
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
@ -104,7 +106,7 @@ UM.Dialog
{ {
id: loader id: loader
width: listview.width width: listview.width - scrollBar.width
height: model.type != undefined ? UM.Theme.getSize("section").height : 0 height: model.type != undefined ? UM.Theme.getSize("section").height : 0
property var definition: model property var definition: model

9
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View File

@ -83,13 +83,12 @@ UM.TooltipArea
height: numericTextFieldWithUnit.controlHeight height: numericTextFieldWithUnit.controlHeight
// Background is a rounded-cornered box with filled color as state indication (normal, warning, error, etc.) // Background is a rounded-cornered box with filled color as state indication (normal, warning, error, etc.)
background: Rectangle background: UM.UnderlineBackground
{ {
anchors.fill: parent anchors.fill: parent
anchors.margins: Math.round(UM.Theme.getSize("default_lining").width) anchors.margins: Math.round(UM.Theme.getSize("default_lining").width)
radius: UM.Theme.getSize("setting_control_radius").width
border.color: liningColor:
{ {
if (!textFieldWithUnit.enabled) if (!textFieldWithUnit.enabled)
{ {
@ -108,9 +107,9 @@ UM.TooltipArea
// Validation is OK. // Validation is OK.
if (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus) if (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus)
{ {
return UM.Theme.getColor("setting_control_border_highlight") return UM.Theme.getColor("border_main_light")
} }
return UM.Theme.getColor("setting_control_border") return UM.Theme.getColor("border_field_light")
} }
color: color:

10
resources/qml/Settings/SettingTextField.qml
View File

@ -26,15 +26,13 @@ SettingItem
} }
} }
contents: Rectangle contents: UM.UnderlineBackground
{ {
id: control id: control
anchors.fill: parent anchors.fill: parent
radius: UM.Theme.getSize("setting_control_radius").width liningColor:
border.width: UM.Theme.getSize("default_lining").width
border.color:
{ {
if(!enabled) if(!enabled)
{ {
@ -54,9 +52,9 @@ SettingItem
//Validation is OK. //Validation is OK.
if(hovered || input.activeFocus) if(hovered || input.activeFocus)
{ {
return UM.Theme.getColor("setting_control_border_highlight") return UM.Theme.getColor("border_main_light")
} }
return UM.Theme.getColor("setting_control_border") return UM.Theme.getColor("border_field_light")
} }
color: { color: {

2
resources/themes/cura-dark/theme.json
View File

@ -29,7 +29,7 @@
"colors": { "colors": {
"main_background": "background_1", "main_background": "background_1",
"detail_background": [63, 63, 63, 255], "detail_background": [63, 63, 63, 255],
"message_background": [39, 44, 48, 255], "message_background": "background_1",
"wide_lining": [31, 36, 39, 255], "wide_lining": [31, 36, 39, 255],
"thick_lining": [255, 255, 255, 60], "thick_lining": [255, 255, 255, 60],
"lining": "border_main", "lining": "border_main",