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

Ensure that all icons use the same color from theme.

Browse source 
Also added some fixes for the dark theme
This commit is contained in:
Jaime van Kessel 2018-12-14 11:59:22 +01:00
parent 15cd2a9269
commit 6a3ac99551
6 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PrepareStage/PrepareMenu.qml
View file

@ -100,7 +100,7 @@ Item
source: UM.Theme.getIcon("load")
width: UM.Theme.getSize("button_icon").width
height: UM.Theme.getSize("button_icon").height
color: UM.Theme.getColor("toolbar_button_text")
color: UM.Theme.getColor("icon")
sourceSize.height: height
}

2
resources/qml/ActionPanel/PrintInformationWidget.qml
View file

@ -15,7 +15,7 @@ UM.RecolorImage
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
color: popup.opened ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium")
color: UM.Theme.getColor("icon")
MouseArea
{

4
resources/qml/IconWithText.qml
View file

@ -18,7 +18,7 @@ Item
property alias color: label.color
property alias text: label.text
property alias font: label.font
property alias iconColor: icon.color
property real margin: UM.Theme.getSize("narrow_margin").width
// These properties can be used in combination with layouts.
@ -39,7 +39,7 @@ Item
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
color: label.color
color: UM.Theme.getColor("icon")
anchors
{

2
resources/qml/Toolbar.qml
View file

@ -67,7 +67,7 @@ Item
toolItem: UM.RecolorImage
{
source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
color: UM.Theme.getColor("toolbar_button_text")
color: UM.Theme.getColor("icon")
sourceSize: UM.Theme.getSize("button_icon")
}

6
resources/themes/cura-dark/theme.json
View file

@ -17,6 +17,12 @@
"border": [127, 127, 127, 255],
"secondary": [95, 95, 95, 255],
"icon": [204, 204, 204, 255],
"toolbar_background": [39, 44, 48, 255],
"toolbar_button_active": [95, 95, 95, 255],
"toolbar_button_hover": [95, 95, 95, 255],
"toolbar_button_active_hover": [95, 95, 95, 255],
"main_window_header_button_text_inactive": [128, 128, 128, 255],
"main_window_header_button_text_hovered": [255, 255, 255, 255],

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

@ -83,6 +83,8 @@
"secondary": [240, 240, 240, 255],
"secondary_shadow": [216, 216, 216, 255],
"icon": [8, 7, 63, 255],
"primary_button": [38, 113, 231, 255],
"primary_button_shadow": [27, 95, 202, 255],
"primary_button_hover": [81, 145, 247, 255],