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

Simplify UserAgreement

Browse source
This commit is contained in:
Lipu Fei 2018-05-31 14:29:56 +02:00
parent eb949472e8
commit b3ef1bfd51
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
plugins/UserAgreement/UserAgreement.py
View file

@ -1,27 +1,26 @@
# Copyright (c) 2017 Ultimaker B.V. # Copyright (c) 2017 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from UM.Extension import Extension import os
from UM.Application import Application
from UM.PluginRegistry import PluginRegistry
from UM.Logger import Logger
from cura.CuraApplication import CuraApplication
from PyQt5.QtCore import QObject, pyqtSlot from PyQt5.QtCore import QObject, pyqtSlot
import os.path from UM.Extension import Extension
from UM.Logger import Logger
class UserAgreement(QObject, Extension): class UserAgreement(QObject, Extension):
def __init__(self): def __init__(self, application):
super(UserAgreement, self).__init__() super(UserAgreement, self).__init__()
self._application = application
self._user_agreement_window = None self._user_agreement_window = None
self._user_agreement_context = None self._user_agreement_context = None
Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated) self._application.engineCreatedSignal.connect(self._onEngineCreated)
Application.getInstance().getPreferences().addPreference("general/accepted_user_agreement", False)
self._application.getPreferences().addPreference("general/accepted_user_agreement", False)
def _onEngineCreated(self): def _onEngineCreated(self):
if not Application.getInstance().getPreferences().getValue("general/accepted_user_agreement"): if not self._application.getPreferences().getValue("general/accepted_user_agreement"):
self.showUserAgreement() self.showUserAgreement()
def showUserAgreement(self): def showUserAgreement(self):
@ -34,14 +33,14 @@ class UserAgreement(QObject, Extension):
def didAgree(self, user_choice): def didAgree(self, user_choice):
if user_choice: if user_choice:
Logger.log("i", "User agreed to the user agreement") Logger.log("i", "User agreed to the user agreement")
Application.getInstance().getPreferences().setValue("general/accepted_user_agreement", True) self._application.getPreferences().setValue("general/accepted_user_agreement", True)
self._user_agreement_window.hide() self._user_agreement_window.hide()
else: else:
Logger.log("i", "User did NOT agree to the user agreement") Logger.log("i", "User did NOT agree to the user agreement")
Application.getInstance().getPreferences().setValue("general/accepted_user_agreement", False) self._application.getPreferences().setValue("general/accepted_user_agreement", False)
CuraApplication.getInstance().quit() self._application.quit()
CuraApplication.getInstance().setNeedToShowUserAgreement(False) self._application.setNeedToShowUserAgreement(False)
def createUserAgreementWindow(self): def createUserAgreementWindow(self):
path = os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "UserAgreement.qml") path = os.path.join(self._application.getPluginRegistry().getPluginPath(self.getPluginId()), "UserAgreement.qml")
self._user_agreement_window = Application.getInstance().createQmlComponent(path, {"manager": self}) self._user_agreement_window = self._application.createQmlComponent(path, {"manager": self})

2
plugins/UserAgreement/__init__.py
View file

@ -7,4 +7,4 @@ def getMetaData():
return {} return {}
def register(app): def register(app):
return {"extension": UserAgreement.UserAgreement()} return {"extension": UserAgreement.UserAgreement(app)}