From a6d05aa3bb69ba2fc6c6f4bd8de274919220166f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 26 Mar 2019 11:47:04 +0100 Subject: [PATCH 1/3] Fix misc issues --- cura/UI/WelcomePagesModel.py | 1 + resources/qml/WelcomePages/WizardPanel.qml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/UI/WelcomePagesModel.py b/cura/UI/WelcomePagesModel.py index 25765bf777..61329090e0 100644 --- a/cura/UI/WelcomePagesModel.py +++ b/cura/UI/WelcomePagesModel.py @@ -76,6 +76,7 @@ class WelcomePagesModel(ListModel): if next_page_index == len(self._items): self.allFinished.emit() self.resetState() + return # Move to the next page self._setCurrentPageIndex(next_page_index) diff --git a/resources/qml/WelcomePages/WizardPanel.qml b/resources/qml/WelcomePages/WizardPanel.qml index 57f2873e80..39e9116c8c 100644 --- a/resources/qml/WelcomePages/WizardPanel.qml +++ b/resources/qml/WelcomePages/WizardPanel.qml @@ -25,7 +25,7 @@ Item // Convenience properties property var progressValue: model == null ? 0 : model.currentProgress - property string pageUrl: currentItem == null ? null : currentItem.page_url + property string pageUrl: currentItem == null ? "" : currentItem.page_url signal showNextPage() signal showPreviousPage() From f6d212dc8839161430481b7de4c59fca147e0b10 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 26 Mar 2019 11:59:44 +0100 Subject: [PATCH 2/3] Use screenScaleFactor for WelcomeDialog size --- resources/qml/WelcomePages/WelcomeDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/WelcomePages/WelcomeDialog.qml b/resources/qml/WelcomePages/WelcomeDialog.qml index 9704a318b6..3d9c8d42f0 100644 --- a/resources/qml/WelcomePages/WelcomeDialog.qml +++ b/resources/qml/WelcomePages/WelcomeDialog.qml @@ -19,8 +19,8 @@ Window modality: Qt.ApplicationModal flags: Qt.Window | Qt.FramelessWindowHint - width: 580 // TODO - height: 600 // TODO + width: 580 * screenScaleFactor + height: 600 * screenScaleFactor color: "transparent" property int shadowOffset: 1 * screenScaleFactor From e5646877223137fbea51da9eca6491d7916eb5d4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 26 Mar 2019 12:06:46 +0100 Subject: [PATCH 3/3] Use themed margins --- .../qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml index 3004a563f4..4e7e5dfcad 100644 --- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml +++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml @@ -35,7 +35,7 @@ Item anchors.top: titleLabel.bottom anchors.left: parent.left anchors.right: parent.right - anchors.margins: 20 + anchors.margins: UM.Theme.getSize("wide_margin").width title: catalog.i18nc("@label", "Add a networked printer") contentShown: true // by default expand the network printer list @@ -80,7 +80,7 @@ Item anchors.top: addNetworkPrinterDropDown.bottom anchors.left: parent.left anchors.right: parent.right - anchors.margins: 20 + anchors.margins: UM.Theme.getSize("wide_margin").width title: catalog.i18nc("@label", "Add a non-networked printer")