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

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-26 11:46:35 +01:00
commit af9f9fc857
5 changed files with 100 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/UI/WelcomePagesModel.py
View file

@ -76,6 +76,7 @@ class WelcomePagesModel(ListModel):
if next_page_index == len(self._items):
self.allFinished.emit()
self.resetState()
return
# Move to the next page
self._setCurrentPageIndex(next_page_index)
@ -152,6 +153,7 @@ class WelcomePagesModel(ListModel):
})
self._pages.append({"id": "machine_actions",
"page_url": self._getBuiltinWelcomePagePath("FirstStartMachineActionsContent.qml"),
"next_page_id": "cloud",
})
self._pages.append({"id": "cloud",
"page_url": self._getBuiltinWelcomePagePath("CloudContent.qml"),