GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-04 05:45:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace old User-Agreement-page with new Welcome-Pages. [CURA-6057]

Browse Source
This commit is contained in:
Remco Burema 2019-03-14 14:59:04 +01:00
parent 2693eecd33
commit 0f116fa3f4
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/CuraApplication.py
View File

@ -555,11 +555,18 @@ class CuraApplication(QtApplication):
def needToShowUserAgreement(self) -> bool: def needToShowUserAgreement(self) -> bool:
return self._need_to_show_user_agreement return self._need_to_show_user_agreement
@pyqtSlot(bool)
def setNeedToShowUserAgreement(self, set_value = True) -> None: def setNeedToShowUserAgreement(self, set_value = True) -> None:
self._need_to_show_user_agreement = set_value self._need_to_show_user_agreement = set_value
@pyqtSlot(str, str)
def writeToLog(self, severity: str, message: str) -> None:
Logger.log(severity, message)
# DO NOT call this function to close the application, use checkAndExitApplication() instead which will perform # DO NOT call this function to close the application, use checkAndExitApplication() instead which will perform
# pre-exit checks such as checking for in-progress USB printing, etc. # pre-exit checks such as checking for in-progress USB printing, etc.
# Except for the 'Decline and close' in the 'User Agreement'-step in the Welcome-pages, that should be a hard exit.
@pyqtSlot()
def closeApplication(self) -> None: def closeApplication(self) -> None:
Logger.log("i", "Close application") Logger.log("i", "Close application")
main_window = self.getMainWindow() main_window = self.getMainWindow()

9
plugins/UserAgreement/UserAgreement.py
View File

@ -24,10 +24,11 @@ class UserAgreement(QObject, Extension):
self.showUserAgreement() self.showUserAgreement()
def showUserAgreement(self): def showUserAgreement(self):
if not self._user_agreement_window: # if not self._user_agreement_window:
self.createUserAgreementWindow() # self.createUserAgreementWindow()
#
self._user_agreement_window.show() # self._user_agreement_window.show()
pass
@pyqtSlot(bool) @pyqtSlot(bool)
def didAgree(self, user_choice): def didAgree(self, user_choice):

2
resources/qml/Cura.qml
View File

@ -45,7 +45,7 @@ UM.MainWindow
WelcomeDialog WelcomeDialog
{ {
id: welcomeDialog id: welcomeDialog
visible: false visible: CuraApplication.needToShowUserAgreement
} }
Rectangle Rectangle

14
resources/qml/WelcomePages/UserAgreementContent.qml
View File

@ -62,7 +62,12 @@ Item
text: catalog.i18nc("@button", "Agree") text: catalog.i18nc("@button", "Agree")
width: 140 width: 140
fixedWidthMode: true fixedWidthMode: true
onClicked: base.showNextPage() onClicked:
{
CuraApplication.writeToLog("i", "User accepted the User-Agreement.")
CuraApplication.setNeedToShowUserAgreement(false)
base.showNextPage()
}
} }
Cura.SecondaryButton Cura.SecondaryButton
@ -74,6 +79,11 @@ Item
text: catalog.i18nc("@button", "Decline and close") text: catalog.i18nc("@button", "Decline and close")
width: 140 width: 140
fixedWidthMode: true fixedWidthMode: true
onClicked: base.showNextPage() // TODO: quit onClicked:
{
CuraApplication.writeToLog("i", "User declined the User Agreement.")
base.passLastPage()
CuraApplication.closeApplication() // NOTE: Hard exit, don't use if anything needs to be saved!
}
} }
} }