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

Merge branch 'connection_rework'

Browse source
This commit is contained in:
Ghostkeeper 2016-04-26 11:51:09 +02:00
commit fe68be4f62
8 changed files with 498 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/WizardPages/UpgradeFirmware.qml
View file

@ -14,7 +14,7 @@ Item
SystemPalette{id: palette}
UM.I18nCatalog { id: catalog; name:"cura"}
property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.rowCount() != 0 ? UM.USBPrinterManager.connectedPrinterList.getItem(0).printer : null
property variant printer_connection: Cura.USBPrinterManager.connectedPrinterList.rowCount() != 0 ? Cura.USBPrinterManager.connectedPrinterList.getItem(0).printer : null
Label
{
id: pageTitle
@ -62,7 +62,7 @@ Item
anchors.top: parent.top
anchors.left: parent.left
text: catalog.i18nc("@action:button","Upgrade to Marlin Firmware");
onClicked: UM.USBPrinterManager.updateAllFirmware()
onClicked: Cura.USBPrinterManager.updateAllFirmware()
}
Button {
id: skipUpgradeButton