Browse Source

Remove hardcoded narrow_margins

CURA-7745
Jaime van Kessel 4 years ago
parent
commit
ec5796400b

+ 4 - 4
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -130,7 +130,7 @@ Item
                     anchors
                     {
                         top: printerNameLabel.bottom
-                        topMargin: 6 * screenScaleFactor // TODO: Theme!
+                        topMargin: UM.Theme.getSize("narrow_margin").height
                         left: printerNameLabel.left
                     }
                     text: printer ? printer.type : ""
@@ -140,7 +140,7 @@ Item
                     id: managePrinterLink
                     anchors {
                         top: printerFamilyPill.bottom
-                        topMargin: 6 * screenScaleFactor
+                        topMargin: UM.Theme.getSize("narrow_margin").height
                     }
                     height: 18 * screenScaleFactor // TODO: Theme!
                     width: childrenRect.width
@@ -160,7 +160,7 @@ Item
                         anchors
                         {
                             left: managePrinterText.right
-                            leftMargin: 6 * screenScaleFactor
+                            leftMargin: UM.Theme.getSize("narrow_margin").width
                             verticalCenter: managePrinterText.verticalCenter
                         }
                         color: UM.Theme.getColor("text_link")
@@ -413,7 +413,7 @@ Item
                     anchors
                     {
                         top: printerJobNameLabel.bottom
-                        topMargin: 6 * screenScaleFactor // TODO: Theme!
+                        topMargin: UM.Theme.getSize("narrow_margin").height
                         left: printerJobNameLabel.left
                     }
                     color: printer && printer.activePrintJob && printer.activePrintJob.isActive ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_text_disabled")

+ 3 - 3
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml

@@ -58,7 +58,7 @@ Item
             anchors
             {
                 left: externalLinkIcon.right
-                leftMargin: 6 * screenScaleFactor // TODO: Theme!
+                leftMargin: UM.Theme.getSize("narrow_margin").width
                 verticalCenter: externalLinkIcon.verticalCenter
             }
             color: UM.Theme.getColor("text_link")
@@ -88,7 +88,7 @@ Item
         anchors
         {
             left: queuedPrintJobs.left
-            leftMargin: 6 * screenScaleFactor // TODO: Theme!
+            leftMargin: UM.Theme.getSize("narrow_margin").width
             top: queuedLabel.bottom
             topMargin: 24 * screenScaleFactor // TODO: Theme!
         }
@@ -99,7 +99,7 @@ Item
             text: catalog.i18nc("@label", "There are no print jobs in the queue. Slice and send a job to add one.")
             color: UM.Theme.getColor("text")
             elide: Text.ElideRight
-            font: UM.Theme.getFont("medium") // 14pt, regular
+            font: UM.Theme.getFont("medium")
             anchors.verticalCenter: parent.verticalCenter
 
             // FIXED-LINE-HEIGHT: