Browse Source

Do not restore add printer dialog size

CURA-10896
Erwan MATHIEU 1 year ago
parent
commit
9e5ad281d5
2 changed files with 21 additions and 15 deletions
  1. 21 10
      resources/qml/Cura.qml
  2. 0 5
      resources/qml/WelcomePages/WizardDialog.qml

+ 21 - 10
resources/qml/Cura.qml

@@ -822,14 +822,26 @@ UM.MainWindow
         }
     }
 
-    Cura.WizardDialog
+    property var wizardDialog
+    Component
     {
-        id: addMachineDialog
-        title: catalog.i18nc("@title:window", "Add Printer")
-        maximumWidth: Screen.width * 2
-        maximumHeight: Screen.height * 2
-        model: CuraApplication.getAddPrinterPagesModel()
-        progressBarVisible: false
+        id: addMachineDialogLoader
+
+        Cura.WizardDialog
+        {
+            title: catalog.i18nc("@title:window", "Add Printer")
+            maximumWidth: Screen.width * 2
+            maximumHeight: Screen.height * 2
+            model: CuraApplication.getAddPrinterPagesModel()
+            progressBarVisible: false
+            onVisibleChanged:
+            {
+                if(!visible)
+                {
+                    wizardDialog = null
+                }
+            }
+        }
     }
 
     Cura.WizardDialog
@@ -854,9 +866,8 @@ UM.MainWindow
         target: Cura.Actions.addMachine
         function onTriggered()
         {
-            // Make sure to show from the first page when the dialog shows up.
-            addMachineDialog.resetModelState()
-            addMachineDialog.show()
+            wizardDialog = addMachineDialogLoader.createObject()
+            wizardDialog.show()
         }
     }
 

+ 0 - 5
resources/qml/WelcomePages/WizardDialog.qml

@@ -32,11 +32,6 @@ Window
     property var model: null  // Needs to be set by whoever is using this dialog.
     property alias progressBarVisible: wizardPanel.progressBarVisible
 
-    function resetModelState()
-    {
-        model.resetState()
-    }
-
     WizardPanel
     {
         id: wizardPanel