3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Remove hardcoded narrow_margins

Browse source 
CURA-7745
This commit is contained in:
Jaime van Kessel 2020-10-08 17:55:11 +02:00
parent 3e67d20890
commit ec5796400b
No known key found for this signature in database
GPG key ID: 3710727397403C91
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

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

6
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View file

@ -58,7 +58,7 @@ Item
anchors anchors
{ {
left: externalLinkIcon.right left: externalLinkIcon.right
leftMargin: 6 * screenScaleFactor // TODO: Theme! leftMargin: UM.Theme.getSize("narrow_margin").width
verticalCenter: externalLinkIcon.verticalCenter verticalCenter: externalLinkIcon.verticalCenter
} }
color: UM.Theme.getColor("text_link") color: UM.Theme.getColor("text_link")
@ -88,7 +88,7 @@ Item
anchors anchors
{ {
left: queuedPrintJobs.left left: queuedPrintJobs.left
leftMargin: 6 * screenScaleFactor // TODO: Theme! leftMargin: UM.Theme.getSize("narrow_margin").width
top: queuedLabel.bottom top: queuedLabel.bottom
topMargin: 24 * screenScaleFactor // TODO: Theme! 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.") 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") color: UM.Theme.getColor("text")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT: