3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 15:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jack Ha 2016-08-09 10:57:42 +02:00
commit fc462cdf6f
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Settings/SettingExtruder.qml
View file

@ -64,7 +64,7 @@ SettingItem
anchors.leftMargin: UM.Theme.getSize("default_lining").width
anchors.verticalCenter: parent.verticalCenter
color: extruders_model.getItem(control.currentIndex).colour
color: extruders_model.getItem(control.currentIndex).color
border.width: UM.Theme.getSize("default_lining").width
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : UM.Theme.getColor("setting_control_border")
}

2
resources/qml/SidebarHeader.qml
View file

@ -138,7 +138,7 @@ Column
anchors.leftMargin: (parent.height - height) / 2
anchors.verticalCenter: parent.verticalCenter
color: model.colour
color: model.color
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("toggle_checked")
}

2
resources/qml/SidebarSimple.qml
View file

@ -372,7 +372,7 @@ Item
for(var extruderNumber = 0; extruderNumber < extruders.model.rowCount() ; extruderNumber++) {
extruderModel.append({
text: catalog.i18nc("@label", "Print using %1").arg(extruders.model.getItem(extruderNumber).name),
color: extruders.model.getItem(extruderNumber).colour
color: extruders.model.getItem(extruderNumber).color
})
}
}