From 1dd48c57288005aedc0fc3682f08d8c1da5fc3ba Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 26 Mar 2019 16:21:07 +0100 Subject: [PATCH 1/2] Show welcome page if no printer --- cura/CuraApplication.py | 7 ++++--- resources/qml/Cura.qml | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 2f73d88481..f6855aecdb 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -38,6 +38,7 @@ from UM.Settings.Validator import Validator from UM.Message import Message from UM.i18n import i18nCatalog from UM.Workspace.WorkspaceReader import WorkspaceReader +import UM.Util from UM.Operations.AddSceneNodeOperation import AddSceneNodeOperation from UM.Operations.GroupedOperation import GroupedOperation @@ -548,11 +549,11 @@ class CuraApplication(QtApplication): @pyqtProperty(bool) def needToShowUserAgreement(self) -> bool: - return not self.getPreferences().getValue("general/accepted_user_agreement") + return not UM.Util.parseBool(self.getPreferences().getValue("general/accepted_user_agreement")) @pyqtSlot(bool) - def setNeedToShowUserAgreement(self, set_value = True) -> None: - self.getPreferences().setValue("general/accepted_user_agreement", not set_value) + def setNeedToShowUserAgreement(self, set_value: bool = True) -> None: + self.getPreferences().setValue("general/accepted_user_agreement", str(not set_value)) @pyqtSlot(str, str) def writeToLog(self, severity: str, message: str) -> None: diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 3572d299bb..5a60f552f4 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -74,13 +74,13 @@ UM.MainWindow Cura.Actions.parent = backgroundItem CuraApplication.purgeWindows() - if (CuraApplication.needToShowUserAgreement) + if (CuraApplication.needToShowUserAgreement || Cura.MachineManager.activeMachine == null) { - welcomeDialog.show() + welcomeDialog.visible = true } else { - welcomeDialog.close() + welcomeDialog.visible = false } // TODO: While the new onboarding process contains the user-agreement, // it should probably not entirely rely on 'needToShowUserAgreement' for show/hide. From 6c7ae309a19c079fb38338ca28fc10db46189bc4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 26 Mar 2019 16:27:06 +0100 Subject: [PATCH 2/2] Add network troubleshooting url --- resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 0d37b2092b..33d36d07ea 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -200,7 +200,7 @@ Item onClicked: { // open the troubleshooting URL with web browser - var url = "https://ultimaker.com/incoming-links/cura/material-compatibilty" // TODO + const url = "https://ultimaker.com/en/resources/39129-network-troubleshooting-cura" Qt.openUrlExternally(url) } onEntered: