3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch '3.0'

Browse source
This commit is contained in:
Ghostkeeper 2017-09-29 13:38:50 +02:00
commit ffe3e16b56
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
16 changed files with 84 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View file

@ -61,7 +61,7 @@ Rectangle
anchors.fill:parent
onClicked: OutputDevice.selectPrinter(printer.unique_name, printer.friendly_name)
hoverEnabled: true;
// Only clickable if no printer is selected
enabled: OutputDevice.selectedPrinterName == ""
}
@ -256,10 +256,10 @@ Rectangle
}
else if (printJob.Status == "aborted")
{
return catalog.i18nc("@label:status", "Aborted")
return catalog.i18nc("@label:status", "Print aborted")
}
else
{
{
return "";
}
}