Add cancel-button and fix window-size (add printer). [CURA-6435]

resources/qml/Cura.qml

@@ -794,6 +794,7 @@ UM.MainWindow
         title: catalog.i18nc("@title:window", "Add Printer")
         model: CuraApplication.getAddPrinterPagesModel()
         progressBarVisible: false
+        hasCancelButton: true
     }
 
     Cura.WizardDialog
@@ -802,6 +803,7 @@ UM.MainWindow
         title: catalog.i18nc("@title:window", "What's New")
         model: CuraApplication.getWhatsNewPagesModel()
         progressBarVisible: false
+        hasCancelButton: false
     }
 
     Connections

resources/qml/WelcomePages/DropDownWidget.qml

@@ -49,7 +49,7 @@ Item
         anchors.left: parent.left
         anchors.right: parent.right
         height: UM.Theme.getSize("expandable_component_content_header").height
-        rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right")
+        rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
         contentShown: base.contentShown
     }
 

resources/qml/WelcomePages/WizardDialog.qml

@@ -24,11 +24,14 @@ Window
 
     minimumWidth: 580 * screenScaleFactor
     minimumHeight: 600 * screenScaleFactor
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
 
     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
+    property alias hasCancelButton: cancelButton.visible
 
     onVisibilityChanged:
     {
@@ -51,4 +54,20 @@ Window
         target: model
         onAllFinished: dialog.hide()
     }
+
+    Cura.SecondaryButton
+    {
+        id: cancelButton
+
+        text: catalog.i18nc("@button", "Cancel")
+
+        visible: false
+
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.margins: UM.Theme.getSize("default_margin").width
+
+        enabled: true
+        onClicked: dialog.visible = false
+    }
 }