GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 20:29:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.0'

Browse Source
This commit is contained in:
Ghostkeeper 2022-05-10 16:04:06 +02:00
commit fb8f50e6ef
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
10 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,12 +91,12 @@ UM.TooltipArea
{ {
anchors.fill: parent anchors.fill: parent
borderColor: (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent" borderColor: textFieldWithUnit.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent"
liningColor: liningColor:
{ {
if (!textFieldWithUnit.enabled) if (!textFieldWithUnit.enabled)
{ {
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("setting_control_disabled_border");
} }
switch (propertyProvider.properties.validationState) switch (propertyProvider.properties.validationState)
{ {
@ -109,11 +109,15 @@ UM.TooltipArea
return UM.Theme.getColor("setting_validation_warning") return UM.Theme.getColor("setting_validation_warning")
} }
// Validation is OK. // Validation is OK.
if (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus) if(textFieldWithUnit.activeFocus)
{ {
return UM.Theme.getColor("text_field_border_hovered") return UM.Theme.getColor("text_field_border_active");
} }
return UM.Theme.getColor("border_field_light") if(textFieldWithUnit.hovered)
{
return UM.Theme.getColor("text_field_border_hovered");
}
return UM.Theme.getColor("border_field_light");
} }
color: color:

2
resources/qml/Preferences/GeneralPage.qml
View File

@ -201,7 +201,6 @@ UM.PreferencesPage
append({ text: "Русский", code: "ru_RU" }) append({ text: "Русский", code: "ru_RU" })
append({ text: "Türkçe", code: "tr_TR" }) append({ text: "Türkçe", code: "tr_TR" })
append({ text: "简体中文", code: "zh_CN" }) append({ text: "简体中文", code: "zh_CN" })
append({ text: "正體字", code: "zh_TW" })
var date_object = new Date(); var date_object = new Date();
if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September. if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September.
@ -211,6 +210,7 @@ UM.PreferencesPage
// incomplete and/or abandoned // incomplete and/or abandoned
append({ text: catalog.i18nc("@heading", "-- incomplete --"), code: "" }) append({ text: catalog.i18nc("@heading", "-- incomplete --"), code: "" })
append({ text: "正體字", code: "zh_TW" })
append({ text: "Magyar", code: "hu_HU" }) append({ text: "Magyar", code: "hu_HU" })
append({ text: "Suomi", code: "fi_FI" }) append({ text: "Suomi", code: "fi_FI" })
append({ text: "Polski", code: "pl_PL" }) append({ text: "Polski", code: "pl_PL" })

2
resources/qml/Preferences/ProfilesPage.qml
View File

@ -59,7 +59,7 @@ UM.ManagementPage
scrollviewCaption: catalog.i18nc("@label", "Profiles compatible with active printer:") + "<br><b>" + Cura.MachineManager.activeMachine.name + "</b>" scrollviewCaption: catalog.i18nc("@label", "Profiles compatible with active printer:") + "<br><b>" + Cura.MachineManager.activeMachine.name + "</b>"
hamburgerButtonVisible: hasCurrentItem hamburgerButtonVisible: hasCurrentItem
onHamburgeButtonClicked: { onHamburgeButtonClicked: (hamburger_button) => {
const hamburerButtonHeight = hamburger_button.height; const hamburerButtonHeight = hamburger_button.height;
menu.popup(hamburger_button, -menu.width + hamburger_button.width / 2, hamburger_button.height); menu.popup(hamburger_button, -menu.width + hamburger_button.width / 2, hamburger_button.height);

1
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View File

@ -129,7 +129,6 @@ Item
background: UM.UnderlineBackground background: UM.UnderlineBackground
{ {
id: backgroundItem id: backgroundItem
borderColor: intentSelection.hovered ? UM.Theme.getColor("text_field_border_hovered") : "transparent"
liningColor: intentSelection.hovered ? UM.Theme.getColor("text_field_border_hovered") : UM.Theme.getColor("border_field_light") liningColor: intentSelection.hovered ? UM.Theme.getColor("text_field_border_hovered") : UM.Theme.getColor("border_field_light")
} }

16
resources/qml/Settings/SettingExtruder.qml
View File

@ -125,18 +125,22 @@ SettingItem
} }
return UM.Theme.getColor("setting_control") return UM.Theme.getColor("setting_control")
} }
borderColor: (base.hovered || control.activeFocus) ? UM.Theme.getSize("text_field_border_hovered") : "transparent" borderColor: control.activeFocus ? UM.Theme.getSize("text_field_border_active") : "transparent"
liningColor: liningColor:
{ {
if (!enabled) if(!enabled)
{ {
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("setting_control_disabled_border");
} }
if (base.hovered || control.activeFocus) if(control.activeFocus)
{ {
return UM.Theme.getColor("text_field_border_hovered") return UM.Theme.getColor("text_field_border_active");
} }
return UM.Theme.getColor("border_field_light") if(base.hovered)
{
return UM.Theme.getColor("text_field_border_hovered");
}
return UM.Theme.getColor("border_field_light");
} }
} }

16
resources/qml/Settings/SettingOptionalExtruder.qml
View File

@ -126,18 +126,22 @@ SettingItem
} }
return UM.Theme.getColor("setting_control") return UM.Theme.getColor("setting_control")
} }
borderColor: (base.hovered || control.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent" borderColor: control.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent"
liningColor: liningColor:
{ {
if (!enabled) if(!enabled)
{ {
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("setting_control_disabled_border");
} }
if (base.hovered || control.activeFocus) if(control.activeFocus)
{ {
return UM.Theme.getColor("text_field_border_hovered") return UM.Theme.getColor("text_field_border_active");
} }
return UM.Theme.getColor("border_field_light") if(base.hovered)
{
return UM.Theme.getColor("text_field_border_hovered");
}
return UM.Theme.getColor("border_field_light");
} }
} }

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

@ -32,12 +32,12 @@ SettingItem
anchors.fill: parent anchors.fill: parent
borderColor: (hovered || input.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent" borderColor: input.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent"
liningColor: liningColor:
{ {
if(!enabled) if(!enabled)
{ {
return UM.Theme.getColor("text_field_border_disabled") return UM.Theme.getColor("text_field_border_disabled");
} }
switch(propertyProvider.properties.validationState) switch(propertyProvider.properties.validationState)
{ {
@ -51,11 +51,15 @@ SettingItem
return UM.Theme.getColor("setting_validation_warning"); return UM.Theme.getColor("setting_validation_warning");
} }
//Validation is OK. //Validation is OK.
if(hovered || input.activeFocus) if(input.activeFocus)
{ {
return UM.Theme.getColor("text_field_border_hovered") return UM.Theme.getColor("text_field_border_active");
} }
return UM.Theme.getColor("text_field_border") if(hovered)
{
return UM.Theme.getColor("text_field_border_hovered");
}
return UM.Theme.getColor("text_field_border");
} }
color: { color: {

16
resources/qml/Widgets/ComboBox.qml
View File

@ -31,12 +31,22 @@ ComboBox
}, },
State State
{ {
name: "highlighted" name: "active"
when: base.hovered || control.hovered || control.activeFocus when: control.activeFocus
PropertyChanges
{
target: background
borderColor: UM.Theme.getColor("text_field_border_active")
liningColor: UM.Theme.getColor("text_field_border_active")
}
},
State
{
name: "highlighted"
when: (base.hovered || control.hovered) && !control.activeFocus
PropertyChanges PropertyChanges
{ {
target: background target: background
borderColor: UM.Theme.getColor("text_field_border_hovered")
liningColor: UM.Theme.getColor("text_field_border_hovered") liningColor: UM.Theme.getColor("text_field_border_hovered")
} }
} }

14
resources/qml/Widgets/TextField.qml
View File

@ -44,14 +44,24 @@ TextField
PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_validation_error_background")} PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_validation_error_background")}
}, },
State State
{
name: "active"
when: control.activeFocus
PropertyChanges
{
target: backgroundRectangle
liningColor: UM.Theme.getColor("text_field_border_active")
borderColor: UM.Theme.getColor("text_field_border_active")
}
},
State
{ {
name: "hovered" name: "hovered"
when: control.hovered || control.activeFocus when: control.hovered && !control.activeFocus
PropertyChanges PropertyChanges
{ {
target: backgroundRectangle target: backgroundRectangle
liningColor: UM.Theme.getColor("text_field_border_hovered") liningColor: UM.Theme.getColor("text_field_border_hovered")
borderColor: UM.Theme.getColor("text_field_border_hovered")
} }
} }
] ]

3
resources/themes/cura-light/theme.json
View File

@ -363,7 +363,8 @@
"text_field": "background_1", "text_field": "background_1",
"text_field_border": [180, 180, 180, 255], "text_field_border": [180, 180, 180, 255],
"text_field_border_hovered": "border_accent_2", "text_field_border_hovered": "border_main",
"text_field_border_active": "border_accent_2",
"text_field_border_disabled": "background_2", "text_field_border_disabled": "background_2",
"text_field_text": "text_default", "text_field_text": "text_default",
"text_field_text_disabled": "text_disabled", "text_field_text_disabled": "text_disabled",