3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent

Browse source
This commit is contained in:
Jaime van Kessel 2019-08-27 14:17:57 +02:00
commit 1d9d411732
52 changed files with 773 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Settings/SettingCheckBox.qml
View file

@ -112,7 +112,7 @@ SettingItem
return UM.Theme.getColor("setting_validation_warning");
}
// Validation is OK.
if (control.containsMouse || control.activeFocus)
if (control.containsMouse || control.activeFocus || hovered)
{
return UM.Theme.getColor("setting_control_border_highlight")
}

2
resources/qml/Settings/SettingComboBox.qml
View file

@ -12,7 +12,6 @@ SettingItem
{
id: base
property var focusItem: control
contents: Cura.ComboBox
{
id: control
@ -21,6 +20,7 @@ SettingItem
textRole: "value"
anchors.fill: parent
highlighted: base.hovered
onActivated:
{

2
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -99,7 +99,7 @@ Item
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
text: catalog.i18nc("@label", "Enter the IP address or hostname of your printer on the network.")
text: catalog.i18nc("@label", "Enter the IP address of your printer on the network.")
}
Item

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

@ -14,7 +14,7 @@ import Cura 1.1 as Cura
ComboBox
{
id: control
property bool highlighted: False
background: Rectangle
{
color:
@ -24,7 +24,7 @@ ComboBox
return UM.Theme.getColor("setting_control_disabled")
}
if (control.hovered || control.activeFocus)
if (control.hovered || control.activeFocus || control.highlighted)
{
return UM.Theme.getColor("setting_control_highlight")
}
@ -41,7 +41,7 @@ ComboBox
return UM.Theme.getColor("setting_control_disabled_border")
}
if (control.hovered || control.activeFocus)
if (control.hovered || control.activeFocus || control.highlighted)
{
return UM.Theme.getColor("setting_control_border_highlight")
}