3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Found some more margins that wouldnt be fixed numbers and made the code more consistent

Browse source
This commit is contained in:
Mark 2017-10-27 14:12:35 +02:00
parent 6c04a8be5d
commit 334283e893
8 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View file

@ -114,7 +114,7 @@ Cura.MachineAction
Column
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
spacing: UM.Theme.getSize("default_margin").height
ScrollView
@ -191,8 +191,6 @@ Cura.MachineAction
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
//: Tips label
//TODO: get actual link from webteam
text: catalog.i18nc("@label", "If your printer is not listed, read the <a href='%1'>network printing troubleshooting guide</a>").arg("https://ultimaker.com/en/troubleshooting");
onLinkActivated: Qt.openUrlExternally(link)
}
@ -200,7 +198,7 @@ Cura.MachineAction
}
Column
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
visible: base.selectedPrinter ? true : false
spacing: UM.Theme.getSize("default_margin").height
Label
@ -218,13 +216,13 @@ Cura.MachineAction
columns: 2
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Type")
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text:
{
@ -249,25 +247,25 @@ Cura.MachineAction
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Firmware version")
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: base.selectedPrinter ? base.selectedPrinter.firmwareVersion : ""
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Address")
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: base.selectedPrinter ? base.selectedPrinter.ipAddress : ""
}