GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 18:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' into STAR-322_cloud-connection

Browse Source
This commit is contained in:
ChrisTerBeke 2018-12-14 12:04:31 +01:00
commit 53eae3ee92
8 changed files with 15 additions and 5 deletions
Show Stats 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") source: UM.Theme.getIcon("load")
width: UM.Theme.getSize("button_icon").width width: UM.Theme.getSize("button_icon").width
height: UM.Theme.getSize("button_icon").height height: UM.Theme.getSize("button_icon").height
color: UM.Theme.getColor("toolbar_button_text") color: UM.Theme.getColor("icon")
sourceSize.height: height sourceSize.height: height
} }

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

@ -15,7 +15,7 @@ UM.RecolorImage
width: UM.Theme.getSize("section_icon").width width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height 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 MouseArea
{ {

1
resources/qml/ExtruderIcon.qml
View File

@ -49,6 +49,7 @@ Item
anchors.centerIn: parent anchors.centerIn: parent
text: index + 1 text: index + 1
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("very_small")
color: UM.Theme.getColor("text")
width: contentWidth width: contentWidth
height: contentHeight height: contentHeight
visible: extruderEnabled visible: extruderEnabled

4
resources/qml/IconWithText.qml
View File

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

1
resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
View File

@ -144,6 +144,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
y: UM.Theme.getSize("thin_margin").height y: UM.Theme.getSize("thin_margin").height
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: UM.Theme.getColor("quality_slider_available")
} }
} }
} }

2
resources/qml/Toolbar.qml
View File

@ -67,7 +67,7 @@ Item
toolItem: UM.RecolorImage toolItem: UM.RecolorImage
{ {
source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon 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") sourceSize: UM.Theme.getSize("button_icon")
} }

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

@ -17,6 +17,12 @@
"border": [127, 127, 127, 255], "border": [127, 127, 127, 255],
"secondary": [95, 95, 95, 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_inactive": [128, 128, 128, 255],
"main_window_header_button_text_hovered": [255, 255, 255, 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": [240, 240, 240, 255],
"secondary_shadow": [216, 216, 216, 255], "secondary_shadow": [216, 216, 216, 255],
"icon": [8, 7, 63, 255],
"primary_button": [38, 113, 231, 255], "primary_button": [38, 113, 231, 255],
"primary_button_shadow": [27, 95, 202, 255], "primary_button_shadow": [27, 95, 202, 255],
"primary_button_hover": [81, 145, 247, 255], "primary_button_hover": [81, 145, 247, 255],