diff --git a/plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml b/plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml index d2c88e148b..c71d0d1f79 100644 --- a/plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml +++ b/plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml @@ -13,6 +13,27 @@ Item width: Math.round(parent.width / 2) height: childrenRect.height + Item + { + id: extruderCircle + width: 30 + height: 30 + Rectangle + { + anchors.fill: parent + radius: Math.round(width / 2) + border.width: 1 + border.color: "black" + } + + Label + { + anchors.centerIn: parent + font: UM.Theme.getFont("default_bold") + text: printCoreConfiguration.position + 1 + } + } + Label { id: materialLabel @@ -20,6 +41,8 @@ Item elide: Text.ElideRight width: parent.width font: UM.Theme.getFont("default_bold") + anchors.left: extruderCircle.right + anchors.leftMargin: UM.Theme.getSize("default_margin").height } Label @@ -29,5 +52,7 @@ Item anchors.top: materialLabel.bottom elide: Text.ElideRight width: parent.width + anchors.left: extruderCircle.right + anchors.leftMargin: UM.Theme.getSize("default_margin").height } } diff --git a/plugins/UM3NetworkPrinting/PrintJobInfoBlock.qml b/plugins/UM3NetworkPrinting/PrintJobInfoBlock.qml index a1123d29fc..d581d774b7 100644 --- a/plugins/UM3NetworkPrinting/PrintJobInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrintJobInfoBlock.qml @@ -110,7 +110,7 @@ Item { popup.visible ? popup.close() : popup.open() } - + Button { id: contextButton @@ -191,22 +191,14 @@ Item PrintCoreConfiguration { id: leftExtruderInfo - width: Math.round((parent.width - extruderSeperator.width) / 2) + width: Math.round(parent.width / 2) printCoreConfiguration: printJob.configuration.extruderConfigurations[0] } - Rectangle - { - id: extruderSeperator - width: UM.Theme.getSize("default_lining").width - height: parent.height - color: lineColor - } - PrintCoreConfiguration { id: rightExtruderInfo - width: Math.round((parent.width - extruderSeperator.width) / 2) + width: Math.round(parent.width / 2) printCoreConfiguration: printJob.configuration.extruderConfigurations[1] } } diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 6ee33dd2f2..3a041ae499 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -274,7 +274,7 @@ Column elide: Text.ElideRight } - // Everthing for the extruder icon + // Everything for the extruder icon Item { id: extruderIconItem