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

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-22 10:25:07 +01:00
commit 77720c9039
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
View file

@ -67,7 +67,7 @@ Item
onAddByIpButtonClicked:
{
base.gotoPage("add_printer_by_ip")
base.goToPage("add_printer_by_ip")
}
}
}
@ -139,7 +139,7 @@ Item
CuraApplication.getDiscoveredPrintersModel().createMachineFromDiscoveredPrinter(networkPrinterItem)
// If we have created a machine, go to the last page, which is the "cloud" page.
base.gotoPage("cloud")
base.goToPage("cloud")
}
else
{
@ -147,7 +147,7 @@ Item
const localPrinterItem = addLocalPrinterDropDown.contentItem.currentItem
Cura.MachineManager.addMachine(localPrinterItem.id)
base.gotoPage("machine_actions")
base.goToPage("machine_actions")
}
}
}