diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml index 606286ab1c..be95efa009 100644 --- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml +++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml @@ -45,81 +45,13 @@ Window font: UM.Theme.getFont("medium") color: UM.Theme.getColor("text") wrapMode: Text.WordWrap - width: parent.width - parent.anchors.margins * 2 - } - Row - { - /* - This is a row with 3 images, and a dashed line between each of them. - The images have various sizes, scaled to the window size: - - The computer screen and 3D printer have 1/3rd of the window size each. - - The remaining space is 2/3rds filled with the material spool image (so 2/9th in total). - - The remaining remaining space is divided equally over the two dashed lines (so 1/9th in total, or 1/18th per line). - */ width: parent.width - height: parent.height * 2 / 3 - Item - { - width: Math.round(parent.width * 2 / 9) - height: parent.height - Image - { - id: spool_image - source: UM.Theme.getImage("material_spool") - width: parent.width - UM.Theme.getSize("default_margin").width - anchors.bottom: parent.bottom - fillMode: Image.PreserveAspectFit - sourceSize.width: width - } - } - Canvas - { - width: Math.round(parent.width / 18) - height: UM.Theme.getSize("thick_lining").width - onPaint: { - var ctx = getContext("2d"); - ctx.setLineDash([2, 2]); - ctx.lineWidth = UM.Theme.getSize("thick_lining").width; - ctx.beginPath(); - ctx.moveTo(0, height / 2); - ctx.lineTo(width, height / 2); - ctx.stroke(); - } - anchors.bottom: parent.bottom - anchors.bottomMargin: spool_image.paintedHeight / 2 - height / 2 //Align to the vertical center of spool_image's real size. - } - Image - { - source: UM.Theme.getImage("connected_cura") - width: Math.round(parent.width / 3) - anchors.bottom: parent.bottom - fillMode: Image.PreserveAspectFit - sourceSize.width: width - } - Canvas - { - width: Math.round(parent.width / 18) - height: UM.Theme.getSize("thick_lining").width - onPaint: { - var ctx = getContext("2d"); - ctx.setLineDash([2, 2]); - ctx.lineWidth = UM.Theme.getSize("thick_lining").width; - ctx.beginPath(); - ctx.moveTo(0, height / 2); - ctx.lineTo(width, height / 2); - ctx.stroke(); - } - anchors.bottom: parent.bottom - anchors.bottomMargin: spool_image.paintedHeight / 2 - height / 2 //Align to the vertical center of spool_image's real size. - } - Image - { - source: UM.Theme.getImage("3d_printer") - width: Math.round(parent.width / 3) - anchors.bottom: parent.bottom - fillMode: Image.PreserveAspectFit - sourceSize.width: width - } + } + Image + { + source: UM.Theme.getImage("material_ecosystem") + width: parent.width + sourceSize.width: width } } } diff --git a/resources/themes/cura-light/images/3d_printer.svg b/resources/themes/cura-light/images/3d_printer.svg deleted file mode 100644 index 76651472ec..0000000000 --- a/resources/themes/cura-light/images/3d_printer.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/images/connected_cura.svg b/resources/themes/cura-light/images/connected_cura.svg deleted file mode 100644 index ea6f0935c9..0000000000 --- a/resources/themes/cura-light/images/connected_cura.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/images/material_ecosystem.svg b/resources/themes/cura-light/images/material_ecosystem.svg new file mode 100644 index 0000000000..30cf7a6473 --- /dev/null +++ b/resources/themes/cura-light/images/material_ecosystem.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/images/material_spool.svg b/resources/themes/cura-light/images/material_spool.svg deleted file mode 100644 index 80abb2c75c..0000000000 --- a/resources/themes/cura-light/images/material_spool.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -