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

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
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
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:
{
if (!textFieldWithUnit.enabled)
{
return UM.Theme.getColor("setting_control_disabled_border")
return UM.Theme.getColor("setting_control_disabled_border");
}
switch (propertyProvider.properties.validationState)
{
@ -109,11 +109,15 @@ UM.TooltipArea
return UM.Theme.getColor("setting_validation_warning")
}
// 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:

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

@ -201,7 +201,6 @@ UM.PreferencesPage
append({ text: "Русский", code: "ru_RU" })
append({ text: "Türkçe", code: "tr_TR" })
append({ text: "简体中文", code: "zh_CN" })
append({ text: "正體字", code: "zh_TW" })
var date_object = new Date();
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
append({ text: catalog.i18nc("@heading", "-- incomplete --"), code: "" })
append({ text: "正體字", code: "zh_TW" })
append({ text: "Magyar", code: "hu_HU" })
append({ text: "Suomi", code: "fi_FI" })
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>"
hamburgerButtonVisible: hasCurrentItem
onHamburgeButtonClicked: {
onHamburgeButtonClicked: (hamburger_button) => {
const hamburerButtonHeight = 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
{
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")
}

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

@ -125,18 +125,22 @@ SettingItem
}
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:
{
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")
}
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:
{
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
borderColor: (hovered || input.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent"
borderColor: input.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent"
liningColor:
{
if(!enabled)
{
return UM.Theme.getColor("text_field_border_disabled")
return UM.Theme.getColor("text_field_border_disabled");
}
switch(propertyProvider.properties.validationState)
{
@ -51,11 +51,15 @@ SettingItem
return UM.Theme.getColor("setting_validation_warning");
}
//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: {

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

@ -31,12 +31,22 @@ ComboBox
},
State
{
name: "highlighted"
when: base.hovered || control.hovered || control.activeFocus
name: "active"
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
{
target: background
borderColor: 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")}
},
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"
when: control.hovered || control.activeFocus
when: control.hovered && !control.activeFocus
PropertyChanges
{
target: backgroundRectangle
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_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_text": "text_default",
"text_field_text_disabled": "text_disabled",