diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index 45cb1fdb41..6ab8dc6fbb 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -112,6 +112,8 @@ Column
id: previewStageShortcut
height: UM.Theme.getSize("action_panel_button").height
+ leftPadding: UM.Theme.getSize("default_margin").width
+ rightPadding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Preview")
onClicked: UM.Controller.setActiveStage("PreviewStage")
diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml
index 82707576e0..25e380dea8 100644
--- a/resources/qml/ActionPanel/PrintInformationWidget.qml
+++ b/resources/qml/ActionPanel/PrintInformationWidget.qml
@@ -11,9 +11,6 @@ UM.RecolorImage
{
id: widget
- //implicitHeight: UM.Theme.getSize("section_icon").height
- //implicitWidth: UM.Theme.getSize("section_icon").width
-
source: UM.Theme.getIcon("info")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 07522dd535..5fbddea9ac 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -115,6 +115,7 @@ Item
}
radius: UM.Theme.getSize("default_radius").width
color: UM.Theme.getColor("lining")
+ visible: extrudersModel.items.length > 1
}
Column
@@ -131,8 +132,7 @@ Item
id: extruders
width: childrenRect.width
height: childrenRect.height
- property var _model: Cura.ExtrudersModel { id: extrudersModel }
- model: _model.items.length > 1 ? _model : 0
+ model: extrudersModel.items.length > 1 ? extrudersModel : 0
delegate: ExtruderButton
{
@@ -144,13 +144,18 @@ Item
}
}
+ Cura.ExtrudersModel
+ {
+ id: extrudersModel
+ }
+
UM.PointingRectangle
{
- id: panelBorder;
+ id: panelBorder
- anchors.left: parent.right;
- anchors.leftMargin: UM.Theme.getSize("default_margin").width;
- anchors.top: base.top;
+ anchors.left: parent.right
+ anchors.leftMargin: UM.Theme.getSize("default_margin").width
+ anchors.top: base.top
anchors.topMargin: base.activeY
z: buttons.z - 1
@@ -161,14 +166,14 @@ Item
{
if (panel.item && panel.width > 0)
{
- return Math.max(panel.width + 2 * UM.Theme.getSize("default_margin").width);
+ return Math.max(panel.width + 2 * UM.Theme.getSize("default_margin").width)
}
else
{
return 0;
}
}
- height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0;
+ height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0
opacity: panel.item && panel.width > 0 ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }
@@ -186,11 +191,11 @@ Item
{
id: panel
- x: UM.Theme.getSize("default_margin").width;
- y: UM.Theme.getSize("default_margin").height;
+ x: UM.Theme.getSize("default_margin").width
+ y: UM.Theme.getSize("default_margin").height
source: UM.ActiveTool.valid ? UM.ActiveTool.activeToolPanel : ""
- enabled: UM.Controller.toolsEnabled;
+ enabled: UM.Controller.toolsEnabled
}
}
diff --git a/resources/themes/cura-light/icons/info.svg b/resources/themes/cura-light/icons/info.svg
index 97e4fc4f35..9896b3dac8 100644
--- a/resources/themes/cura-light/icons/info.svg
+++ b/resources/themes/cura-light/icons/info.svg
@@ -1,48 +1,13 @@
-
-
-
+
+
\ No newline at end of file