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

Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer

Browse source
This commit is contained in:
Kostas Karmas 2020-04-28 17:45:55 +02:00
commit e4a6fe954d
137 changed files with 1671 additions and 1449 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View file

@ -157,8 +157,9 @@ Item
const networkPrinterItem = addNetworkPrinterDropDown.contentItem.currentItem
CuraApplication.getDiscoveredPrintersModel().createMachineFromDiscoveredPrinter(networkPrinterItem)
// If we have created a machine, go to the last page, which is the "cloud" page.
base.goToPage("cloud")
// If we have created a machine, end the wizard (since this is the last page)
base.endWizard()
}
else
{