3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
Download patch file Download diff file Expand all files Collapse all files

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
{

1
resources/qml/ExtruderIcon.qml
View file

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

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
{

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

@ -144,6 +144,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
y: UM.Theme.getSize("thin_margin").height
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
{
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")
}