From a5259ce22ec2d17195598d30987c7915aa792daf Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 5 Apr 2019 08:25:08 +0200 Subject: [PATCH] Make progressBar optional in Wizard CURA-6435 --- resources/qml/Cura.qml | 1 + resources/qml/WelcomePages/WizardDialog.qml | 1 + resources/qml/WelcomePages/WizardPanel.qml | 2 ++ 3 files changed, 4 insertions(+) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index ff26655530..3a43c5647f 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -779,6 +779,7 @@ UM.MainWindow id: addMachineDialog title: catalog.i18nc("@title:window", "Add Printer") model: CuraApplication.getAddPrinterPagesModel() + progressBarVisible: false } Connections diff --git a/resources/qml/WelcomePages/WizardDialog.qml b/resources/qml/WelcomePages/WizardDialog.qml index 1e4abd6e50..4f664165c3 100644 --- a/resources/qml/WelcomePages/WizardDialog.qml +++ b/resources/qml/WelcomePages/WizardDialog.qml @@ -27,6 +27,7 @@ Window color: UM.Theme.getColor("main_background") property var model: null // Needs to be set by whoever is using this dialog. + property alias progressBarVisible: wizardPanel.progressBarVisible onVisibilityChanged: { diff --git a/resources/qml/WelcomePages/WizardPanel.qml b/resources/qml/WelcomePages/WizardPanel.qml index 91f351810c..d4ec116d65 100644 --- a/resources/qml/WelcomePages/WizardPanel.qml +++ b/resources/qml/WelcomePages/WizardPanel.qml @@ -25,6 +25,7 @@ Item property var progressValue: model == null ? 0 : model.currentProgress property string pageUrl: currentItem == null ? "" : currentItem.page_url + property alias progressBarVisible: progressBar.visible property alias backgroundColor: panelBackground.color signal showNextPage() @@ -44,6 +45,7 @@ Item anchors.fill: parent radius: UM.Theme.getSize("default_radius").width color: UM.Theme.getColor("main_background") + UM.ProgressBar { id: progressBar