Refactor and cleanup

CURA-4501
This commit is contained in:
Mark 2017-10-28 20:29:26 +02:00
parent 910386eaf7
commit 8bfd10f9aa
2 changed files with 22 additions and 15 deletions

View file

@ -7,6 +7,8 @@ from UM.Application import Application
from UM.PluginRegistry import PluginRegistry
from UM.Logger import Logger
from cura.CuraApplication import CuraApplication
from PyQt5.QtQml import QQmlComponent, QQmlContext
from PyQt5.QtCore import QUrl, QObject, pyqtSlot
@ -31,15 +33,17 @@ class UserAgreement(Extension, QObject):
self._user_agreement_window.show()
@pyqtSlot()
def disagreed(self):
Logger.log("i", "User did NOT Accept the license")
@pyqtSlot(bool)
def didAgree(self, userChoice):
if userChoice:
Logger.log("i", 'User agreed to the user agreement')
Preferences.getInstance().setValue("general/accepted_user_agreement", True)
self._user_agreement_window.hide()
else:
Logger.log("i", 'User did NOT agree to the user agreement')
Preferences.getInstance().setValue("general/accepted_user_agreement", False)
CuraApplication.getInstance().quit()
@pyqtSlot()
def agreed(self):
Logger.log("i", "User Accepted the license")
Preferences.getInstance().setValue("general/accepted_user_agreement", True)
self._user_agreement_window.hide()
def createUserAgreementWindow(self):
path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "UserAgreement.qml"))
@ -47,4 +51,4 @@ class UserAgreement(Extension, QObject):
component = QQmlComponent(Application.getInstance()._engine, path)
self._user_agreement_context = QQmlContext(Application.getInstance()._engine.rootContext())
self._user_agreement_context.setContextProperty("manager", self)
self._user_agreement_window = component.create(self._user_agreement_context)
self._user_agreement_window = component.create(self._user_agreement_context)