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

Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2017-07-26 16:49:28 +02:00
commit 021425ee06
15 changed files with 92 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View file

@ -114,7 +114,7 @@ Cura.MachineAction
Column
{
width: parent.width * 0.5
width: (parent.width * 0.5) | 0
spacing: UM.Theme.getSize("default_margin").height
ScrollView
@ -200,7 +200,7 @@ Cura.MachineAction
}
Column
{
width: parent.width * 0.5
width: (parent.width * 0.5) | 0
visible: base.selectedPrinter ? true : false
spacing: UM.Theme.getSize("default_margin").height
Label
@ -218,13 +218,13 @@ Cura.MachineAction
columns: 2
Label
{
width: parent.width * 0.5
width: (parent.width * 0.5) | 0
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Type")
}
Label
{
width: parent.width * 0.5
width: (parent.width * 0.5) | 0
wrapMode: Text.WordWrap
text:
{
@ -249,25 +249,25 @@ Cura.MachineAction
}
Label
{
width: parent.width * 0.5
width: (parent.width * 0.5) | 0
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Firmware version")
}
Label
{
width: parent.width * 0.5
width: (parent.width * 0.5) | 0
wrapMode: Text.WordWrap
text: base.selectedPrinter ? base.selectedPrinter.firmwareVersion : ""
}
Label
{
width: parent.width * 0.5
width: (parent.width * 0.5) | 0
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Address")
}
Label
{
width: parent.width * 0.5
width: (parent.width * 0.5) | 0
wrapMode: Text.WordWrap
text: base.selectedPrinter ? base.selectedPrinter.ipAddress : ""
}