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

Update extruderIcon to be more in line with the design

Browse source 
CURA-5785
This commit is contained in:
Jaime van Kessel 2018-11-21 13:46:50 +01:00
parent c7dbaa3a00
commit a9672458fd
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/qml/ExtruderIcon.qml
View file

@ -9,8 +9,8 @@ Item
{ {
id: extruderIconItem id: extruderIconItem
implicitWidth: UM.Theme.getSize("button").width implicitWidth: UM.Theme.getSize("extruder_icon").width
implicitHeight: implicitWidth implicitHeight: UM.Theme.getSize("extruder_icon").height
property bool checked: true property bool checked: true
property color materialColor property color materialColor
@ -22,7 +22,7 @@ Item
anchors.fill: parent anchors.fill: parent
sourceSize.width: parent.width sourceSize.width: parent.width
sourceSize.height: parent.width sourceSize.height: parent.height
source: UM.Theme.getIcon("extruder_button") source: UM.Theme.getIcon("extruder_button")
color: extruderEnabled ? materialColor: "gray" color: extruderEnabled ? materialColor: "gray"
} }
@ -49,11 +49,13 @@ Item
id: extruderNumberText id: extruderNumberText
anchors.centerIn: parent anchors.centerIn: parent
text: index + 1 text: index + 1
font: UM.Theme.getFont("default") font: UM.Theme.getFont("extruder_icon")
width: contentWidth width: contentWidth
height: contentHeight height: contentHeight
visible: extruderEnabled visible: extruderEnabled
renderType: Text.NativeRendering renderType: Text.NativeRendering
horizontalAlignment: Text.alignHCenter
verticalAlignment: Text.alignVCenter
} }
UM.RecolorImage UM.RecolorImage

3
resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
View file

@ -50,8 +50,7 @@ Cura.ExpandableComponent
id: extruderIcon id: extruderIcon
materialColor: model.color materialColor: model.color
extruderEnabled: model.enabled extruderEnabled: model.enabled
height: parent.height anchors.verticalCenter: parent.verticalCenter
width: height
} }
// Label for the brand of the material // Label for the brand of the material

9
resources/themes/cura-light/theme.json
View file

@ -64,6 +64,12 @@
"size": 1.15, "size": 1.15,
"weight": 50, "weight": 50,
"family": "Noto Sans" "family": "Noto Sans"
},
"extruder_icon":
{
"size": 0.7,
"weight": 50,
"family": "Noto Sans"
} }
}, },
@ -406,8 +412,7 @@
"thin_margin": [0.71, 0.71], "thin_margin": [0.71, 0.71],
"narrow_margin": [0.5, 0.5], "narrow_margin": [0.5, 0.5],
"extruder_button_material_margin": [0.70, 0.9], "extruder_icon": [1.8, 1.8],
"extruder_button_material": [0.75, 0.75],
"simple_mode_infill_caption": [0.0, 5.0], "simple_mode_infill_caption": [0.0, 5.0],
"simple_mode_infill_height": [0.0, 8.0], "simple_mode_infill_height": [0.0, 8.0],