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

Make User-Agreement work with new 'WizadPanel'. [CURA-6057]

Browse source
This commit is contained in:
Remco Burema 2019-03-29 09:23:10 +01:00
parent d34b3b8585
commit 1cebf145f5
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/UI/WelcomePagesModel.py
View file

@ -76,6 +76,12 @@ class WelcomePagesModel(ListModel):
self._current_page_index = page_index self._current_page_index = page_index
self.currentPageIndexChanged.emit() self.currentPageIndexChanged.emit()
# Ends the Welcome-Pages. Put as a separate function for cases like the 'decline' in the User-Agreement.
@pyqtSlot()
def atEnd(self) -> None:
self.allFinished.emit()
self.resetState()
# Goes to the next page. # Goes to the next page.
# If "from_index" is given, it will look for the next page to show starting from the "from_index" page instead of # If "from_index" is given, it will look for the next page to show starting from the "from_index" page instead of
# the "self._current_page_index". # the "self._current_page_index".
@ -100,8 +106,7 @@ class WelcomePagesModel(ListModel):
# If we have reached the last page, emit allFinished signal and reset. # If we have reached the last page, emit allFinished signal and reset.
if next_page_index == len(self._items): if next_page_index == len(self._items):
self.allFinished.emit() self.atEnd()
self.resetState()
return return
# Check if the this page should be shown (default yes), if not, keep looking for the next one. # Check if the this page should be shown (default yes), if not, keep looking for the next one.

2
resources/qml/WelcomePages/UserAgreementContent.qml
View file

@ -83,7 +83,7 @@ Item
onClicked: onClicked:
{ {
CuraApplication.writeToLog("i", "User declined the User Agreement.") CuraApplication.writeToLog("i", "User declined the User Agreement.")
base.passLastPage() base.endWizard()
CuraApplication.closeApplication() // NOTE: Hard exit, don't use if anything needs to be saved! CuraApplication.closeApplication() // NOTE: Hard exit, don't use if anything needs to be saved!
} }
} }

2
resources/qml/WelcomePages/WizardPanel.qml
View file

@ -28,11 +28,13 @@ Item
signal showNextPage() signal showNextPage()
signal showPreviousPage() signal showPreviousPage()
signal goToPage(string page_id) // Go to a specific page by the given page_id. signal goToPage(string page_id) // Go to a specific page by the given page_id.
signal endWizard()
// Call the corresponding functions in the model // Call the corresponding functions in the model
onShowNextPage: model.goToNextPage() onShowNextPage: model.goToNextPage()
onShowPreviousPage: model.goToPreviousPage() onShowPreviousPage: model.goToPreviousPage()
onGoToPage: model.goToPage(page_id) onGoToPage: model.goToPage(page_id)
onEndWizard: model.atEnd()
Rectangle // Panel background Rectangle // Panel background
{ {