GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 19:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4997 from Ultimaker/prevent_monitor_stage_overlap

Browse Source 
Quick fix to prevent monitor stage from overlapping header
This commit is contained in:
Ian Paschal 2018-12-14 16:29:39 +01:00 committed by GitHub
commit 38ca23a22f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
View File

@ -97,6 +97,7 @@ Item
return "" return ""
} }
visible: printJob visible: printJob
width: 120 * screenScaleFactor // TODO: Theme!
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!

16
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml
View File

@ -12,7 +12,19 @@ import UM 1.2 as UM
Item Item
{ {
// The printer name // The printer name
property alias text: printerNameLabel.text; property var text: ""
property var tagText: {
switch(text) {
case "Ultimaker 3":
return "UM 3"
case "Ultimaker 3 Extended":
return "UM 3 EXT"
case "Ultimaker S5":
return "UM S5"
default:
return text
}
}
implicitHeight: 18 * screenScaleFactor // TODO: Theme! implicitHeight: 18 * screenScaleFactor // TODO: Theme!
implicitWidth: printerNameLabel.contentWidth + 12 // TODO: Theme! implicitWidth: printerNameLabel.contentWidth + 12 // TODO: Theme!
@ -28,7 +40,7 @@ Item
id: printerNameLabel id: printerNameLabel
anchors.centerIn: parent anchors.centerIn: parent
color: "#535369" // TODO: Theme! color: "#535369" // TODO: Theme!
text: "" text: tagText
font.pointSize: 10 font.pointSize: 10
} }
} }

2
resources/qml/Cura.qml
View File

@ -252,7 +252,7 @@ UM.MainWindow
anchors anchors
{ {
// Align to the top of the stageMenu since the stageMenu may not exist // Align to the top of the stageMenu since the stageMenu may not exist
top: parent.top top: stageMenu.source ? stageMenu.verticalCenter : parent.top
left: parent.left left: parent.left
right: parent.right right: parent.right
bottom: parent.bottom bottom: parent.bottom