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

Simplified version for validation need to show user agreement

Browse source 
CURA-4501
This commit is contained in:
Aleksei S 2017-10-30 14:42:46 +01:00
parent c0f1af94ab
commit 22aaf64b63
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cura/CuraApplication.py
View file

@ -306,7 +306,6 @@ class CuraApplication(QtApplication):
preferences.addPreference("view/invert_zoom", False) preferences.addPreference("view/invert_zoom", False)
self._need_to_show_user_agreement = not Preferences.getInstance().getValue("general/accepted_user_agreement") self._need_to_show_user_agreement = not Preferences.getInstance().getValue("general/accepted_user_agreement")
self._has_user_agreement_shown = False
for key in [ for key in [
"dialog_load_path", # dialog_save_path is in LocalFileOutputDevicePlugin "dialog_load_path", # dialog_save_path is in LocalFileOutputDevicePlugin
@ -380,21 +379,13 @@ class CuraApplication(QtApplication):
def _onEngineCreated(self): def _onEngineCreated(self):
self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider()) self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
onHasUserAgreementShownChanged = pyqtSignal()
@pyqtProperty(bool) @pyqtProperty(bool)
def needToShowUserAgreement(self): def needToShowUserAgreement(self):
return self._need_to_show_user_agreement return self._need_to_show_user_agreement
@pyqtProperty(bool, notify = onHasUserAgreementShownChanged)
def hasUserAgreementShown(self):
return self._has_user_agreement_shown
def setHasShownUserAgreement(self, shown = True): def setNeedToShowUserAgreement(self, set_value = True):
emit_signal = self._has_user_agreement_shown != shown self._need_to_show_user_agreement = set_value
self._has_user_agreement_shown = shown
if emit_signal:
self.onHasUserAgreementShownChanged.emit()
## The "Quit" button click event handler. ## The "Quit" button click event handler.
@pyqtSlot() @pyqtSlot()

2
plugins/UserAgreementPlugin/UserAgreement.py
View file

@ -42,7 +42,7 @@ class UserAgreement(QObject, Extension):
Logger.log("i", "User did NOT agree to the user agreement") Logger.log("i", "User did NOT agree to the user agreement")
Preferences.getInstance().setValue("general/accepted_user_agreement", False) Preferences.getInstance().setValue("general/accepted_user_agreement", False)
CuraApplication.getInstance().quit() CuraApplication.getInstance().quit()
CuraApplication.getInstance().setHasShownUserAgreement(True) CuraApplication.getInstance().setNeedToShowUserAgreement(False)
def createUserAgreementWindow(self): def createUserAgreementWindow(self):
path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "UserAgreement.qml")) path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "UserAgreement.qml"))

2
resources/qml/Cura.qml
View file

@ -897,7 +897,7 @@ UM.MainWindow
} }
// check later if the user agreement dialog has been closed // check later if the user agreement dialog has been closed
if (CuraApplication.needToShowUserAgreement && !CuraApplication.hasUserAgreementShown) if (CuraApplication.needToShowUserAgreement)
{ {
restart(); restart();
} }