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

Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite

Browse Source
This commit is contained in:
Jaime van Kessel 2018-01-08 10:08:41 +01:00
commit 4709691884
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/qml/PrinterOutput/OutputDeviceHeader.qml
View File

@ -19,6 +19,7 @@ Item
anchors.fill: parent anchors.fill: parent
color: UM.Theme.getColor("setting_category") color: UM.Theme.getColor("setting_category")
property var activePrinter: outputDevice != null ? outputDevice.activePrinter : null property var activePrinter: outputDevice != null ? outputDevice.activePrinter : null
Label Label
{ {
id: outputDeviceNameLabel id: outputDeviceNameLabel
@ -29,6 +30,7 @@ Item
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
text: outputDevice != null ? activePrinter.name : "" text: outputDevice != null ? activePrinter.name : ""
} }
Label Label
{ {
id: outputDeviceAddressLabel id: outputDeviceAddressLabel
@ -39,6 +41,7 @@ Item
anchors.right: parent.right anchors.right: parent.right
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
} }
Label Label
{ {
text: outputDevice != null ? outputDevice.connectionText : catalog.i18nc("@info:status", "The printer is not connected.") text: outputDevice != null ? outputDevice.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
@ -49,6 +52,8 @@ Item
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("default_margin").height
} }
} }
} }