3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use normal text colour instead of specialised configuration item text

Browse source 
They were the same anyway, and they should always be the same.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-11-27 11:53:17 +01:00
parent 6876c12106
commit a2b1f53979
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View file

@ -19,8 +19,6 @@ Button
rightPadding: 0 rightPadding: 0
leftPadding: 0 leftPadding: 0
property var textColor: checked ? UM.Theme.getColor("configuration_item_text_active") : UM.Theme.getColor("configuration_item_text")
contentItem: Rectangle contentItem: Rectangle
{ {
height: childrenRect.height height: childrenRect.height
@ -53,7 +51,7 @@ Button
{ {
width: Math.round(parent.width / 2) width: Math.round(parent.width / 2)
printCoreConfiguration: modelData printCoreConfiguration: modelData
mainColor: textColor mainColor: UM.Theme.getColor("text")
} }
} }
} }
@ -66,7 +64,7 @@ Button
visible: buildplateInformation.visible visible: buildplateInformation.visible
width: parent.width - 2 * parent.padding width: parent.width - 2 * parent.padding
height: visible ? Math.round(UM.Theme.getSize("thick_lining").height / 2) : 0 height: visible ? Math.round(UM.Theme.getSize("thick_lining").height / 2) : 0
color: textColor color: UM.Theme.getColor("text")
} }
Item Item
@ -85,7 +83,7 @@ Button
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
source: UM.Theme.getIcon("buildplate") source: UM.Theme.getIcon("buildplate")
color: textColor color: UM.Theme.getColor("text")
} }
Label Label
@ -96,7 +94,7 @@ Button
anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").height / 2) anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").height / 2)
text: configuration.buildplateConfiguration text: configuration.buildplateConfiguration
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: textColor color: UM.Theme.getColor("text")
} }
} }
} }

2
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -58,7 +58,7 @@ Column
{ {
text: section text: section
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
color: UM.Theme.getColor("configuration_item_text") color: UM.Theme.getColor("text")
padding: UM.Theme.getSize("narrow_margin").width padding: UM.Theme.getSize("narrow_margin").width
} }
} }

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

@ -319,8 +319,6 @@
"configuration_item": [255, 255, 255, 0], "configuration_item": [255, 255, 255, 0],
"configuration_item_active": [12, 169, 227, 32], "configuration_item_active": [12, 169, 227, 32],
"configuration_item_text": [0, 0, 0, 255],
"configuration_item_text_active": [0, 0, 0, 255],
"configuration_item_border": [127, 127, 127, 255], "configuration_item_border": [127, 127, 127, 255],
"configuration_item_border_active": [12, 169, 227, 32], "configuration_item_border_active": [12, 169, 227, 32],
"configuration_item_border_hover": [50, 130, 255, 255], "configuration_item_border_hover": [50, 130, 255, 255],