Simplified version for validation need to show user agreement

CURA-4501

3 files changed, 4 insertions, 13 deletions

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 96d8ced7a6..6c90e704e9 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -301,7 +301,6 @@ class CuraApplication(QtApplication):
         preferences.addPreference("view/invert_zoom", False)
 
         self._need_to_show_user_agreement = not Preferences.getInstance().getValue("general/accepted_user_agreement")
-        self._has_user_agreement_shown = False
 
         for key in [
             "dialog_load_path",  # dialog_save_path is in LocalFileOutputDevicePlugin
@@ -375,21 +374,13 @@ class CuraApplication(QtApplication):
     def _onEngineCreated(self):
         self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
 
-    onHasUserAgreementShownChanged = pyqtSignal()
-
     @pyqtProperty(bool)
     def needToShowUserAgreement(self):
         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):
-        emit_signal = self._has_user_agreement_shown != shown
-        self._has_user_agreement_shown = shown
-        if emit_signal:
-            self.onHasUserAgreementShownChanged.emit()
+    def setNeedToShowUserAgreement(self, set_value = True):
+        self._need_to_show_user_agreement = set_value
 
     ## The "Quit" button click event handler.
     @pyqtSlot()
diff --git a/plugins/UserAgreementPlugin/UserAgreement.py b/plugins/UserAgreementPlugin/UserAgreement.py
index 01788f7b57..f472b6fb13 100644
--- a/plugins/UserAgreementPlugin/UserAgreement.py
+++ b/plugins/UserAgreementPlugin/UserAgreement.py
@@ -42,7 +42,7 @@ class UserAgreement(QObject, Extension):
             Logger.log("i", "User did NOT agree to the user agreement")
             Preferences.getInstance().setValue("general/accepted_user_agreement", False)
             CuraApplication.getInstance().quit()
-        CuraApplication.getInstance().setHasShownUserAgreement(True)
+        CuraApplication.getInstance().setNeedToShowUserAgreement(False)
 
     def createUserAgreementWindow(self):
         path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "UserAgreement.qml"))
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 8439d79d21..2fd19a8a03 100755
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -897,7 +897,7 @@ UM.MainWindow
             }
 
             // check later if the user agreement dialog has been closed
-            if (CuraApplication.needToShowUserAgreement && !CuraApplication.hasUserAgreementShown)
+            if (CuraApplication.needToShowUserAgreement)
             {
                 restart();
             }