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

Change extruder button on the toolbar side

Browse source 
CURA-4211

Change the extruder button on the toolbar side according to the new
design.
This commit is contained in:
Lipu Fei 2017-08-31 12:29:44 +02:00
parent b174d04a9b
commit 7de9ccefaa
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
resources/qml/ExtruderButton.qml
View file

@ -16,7 +16,7 @@ Button
text: catalog.i18ncp("@label %1 is filled in with the name of an extruder", "Print Selected Model with %1", "Print Selected Models with %1", UM.Selection.selectionCount).arg(extruder.name) text: catalog.i18ncp("@label %1 is filled in with the name of an extruder", "Print Selected Model with %1", "Print Selected Models with %1", UM.Selection.selectionCount).arg(extruder.name)
style: UM.Theme.styles.tool_button; style: UM.Theme.styles.tool_button;
iconSource: checked ? UM.Theme.getIcon("material_selected") : UM.Theme.getIcon("material_not_selected"); iconSource: UM.Theme.getIcon("extruder_button")
checked: ExtruderManager.selectedObjectExtruders.indexOf(extruder.id) != -1 checked: ExtruderManager.selectedObjectExtruders.indexOf(extruder.id) != -1
enabled: UM.Selection.hasSelection enabled: UM.Selection.hasSelection
@ -36,12 +36,7 @@ Button
Item Item
{ {
anchors anchors.centerIn: parent
{
right: parent.right;
top: parent.top;
margins: UM.Theme.getSize("default_lining").width * 3
}
width: UM.Theme.getSize("default_margin").width width: UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("default_margin").height height: UM.Theme.getSize("default_margin").height
@ -54,22 +49,27 @@ Button
} }
} }
// Material colour circle
// Only draw the filling colour of the material inside the SVG border.
Rectangle Rectangle
{ {
anchors anchors
{ {
left: parent.left; right: parent.right
top: parent.top; top: parent.top
margins: UM.Theme.getSize("default_lining").width * 3 margins: UM.Theme.getSize("extruder_button_material_margin").width
} }
color: model.color color: model.color
width: UM.Theme.getSize("default_margin").width width: UM.Theme.getSize("extruder_button_material_size").width
height: UM.Theme.getSize("default_margin").height height: UM.Theme.getSize("extruder_button_material_size").height
radius: width / 2
border.width: UM.Theme.getSize("default_lining").width border.width: 0
border.color: UM.Theme.getColor("lining"); border.color: "transparent"
opacity: !base.enabled ? 0.2 : 1.0
} }
onClicked: onClicked:

3
resources/themes/cura/theme.json
View file

@ -259,6 +259,9 @@
"default_arrow": [0.8, 0.8], "default_arrow": [0.8, 0.8],
"logo": [9.5, 2.0], "logo": [9.5, 2.0],
"extruder_button_material_margin": [0.875, 0.875],
"extruder_button_material_size": [0.68, 0.68],
"sidebar": [35.0, 10.0], "sidebar": [35.0, 10.0],
"sidebar_header": [0.0, 4.0], "sidebar_header": [0.0, 4.0],
"sidebar_header_highlight": [0.25, 0.25], "sidebar_header_highlight": [0.25, 0.25],