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

Resolve merge conflicts from master

Browse source 
CURA-4212
This commit is contained in:
Lipu Fei 2017-09-11 10:32:34 +02:00
commit b2eead7736
17 changed files with 176 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/LayerView/LayerView.qml
View file

@ -74,7 +74,7 @@ Item
font: UM.Theme.getFont("default");
visible: !UM.LayerView.compatibilityMode
Layout.fillWidth: true
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("setting_control_text")
}
ListModel // matches LayerView.py
@ -193,7 +193,7 @@ Item
{
text: model.name
elide: Text.ElideRight
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("button_text")
font: UM.Theme.getFont("default")
anchors.verticalCenter: parent.verticalCenter
anchors.left: extrudersModelCheckBox.left;
@ -262,7 +262,7 @@ Item
text: label
font: UM.Theme.getFont("default")
elide: Text.ElideRight
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("button_text")
anchors.verticalCenter: parent.verticalCenter
anchors.left: legendModelCheckBox.left;
anchors.right: legendModelCheckBox.right;
@ -325,7 +325,7 @@ Item
Layout.fillWidth: true
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("button_text")
font: UM.Theme.getFont("default")
}
}