From c6f42766c76c7179f7c3b2400da19418486f6a96 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Tue, 19 Nov 2019 12:59:39 +0100
Subject: [PATCH] Remove hardcoded sizes from dialogs & popups

Contributes to #6670
---
 plugins/3MFReader/WorkspaceDialog.qml                       | 4 ++--
 plugins/Toolbox/resources/qml/Toolbox.qml                   | 4 ++--
 resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml    | 4 ++--
 resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml | 4 ++--
 resources/qml/Preferences/MachinesPage.qml                  | 2 --
 resources/themes/cura-light/theme.json                      | 3 +++
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml
index a38c53457c..d0fd3d0846 100644
--- a/plugins/3MFReader/WorkspaceDialog.qml
+++ b/plugins/3MFReader/WorkspaceDialog.qml
@@ -13,8 +13,8 @@ UM.Dialog
     id: base
     title: catalog.i18nc("@title:window", "Open Project")
 
-    minimumWidth: 500 * screenScaleFactor
-    minimumHeight: 450 * screenScaleFactor
+    minimumWidth: UM.Theme.getSize("popup_dialog").width
+    minimumHeight: UM.Theme.getSize("popup_dialog").height
     width: minimumWidth
     height: minimumHeight
 
diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml
index 03fd3468f6..d6d862b5f6 100644
--- a/plugins/Toolbox/resources/qml/Toolbox.qml
+++ b/plugins/Toolbox/resources/qml/Toolbox.qml
@@ -20,8 +20,8 @@ Window
     modality: Qt.ApplicationModal
     flags: Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint
 
-    width: Math.floor(720 * screenScaleFactor)
-    height: Math.floor(640 * screenScaleFactor)
+    width: UM.Theme.getSize("large_popup_dialog").width
+    height:  UM.Theme.getSize("large_popup_dialog").height
     minimumWidth: width
     maximumWidth: minimumWidth
     minimumHeight: height
diff --git a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
index 2566a2d44c..8cdaeea5fa 100644
--- a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
+++ b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
@@ -18,8 +18,8 @@ UM.Dialog
     id: base
 
     title: catalog.i18nc("@title:window", "Open project file")
-    width: 450 * screenScaleFactor
-    height: 150 * screenScaleFactor
+    width: UM.Theme.getSize("small_popup_dialog").width
+    height: UM.Theme.getSize("small_popup_dialog").height
 
     maximumHeight: height
     maximumWidth: width
diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
index 316878a2bd..a7701cf059 100644
--- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
+++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
@@ -14,8 +14,8 @@ UM.Dialog
     id: base
     title: catalog.i18nc("@title:window", "Discard or Keep changes")
 
-    width: 800 * screenScaleFactor
-    height: 400 * screenScaleFactor
+    width: UM.Theme.getSize("popup_dialog").width
+    height: UM.Theme.getSize("popup_dialog").height
     property var changesModel: Cura.UserChangesModel{ id: userChangesModel}
     onVisibilityChanged:
     {
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index 39789cd192..8adcb65fcf 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -148,8 +148,6 @@ UM.ManagementPage
         UM.RenameDialog
         {
             id: renameDialog;
-            width: 300 * screenScaleFactor
-            height: 150 * screenScaleFactor
             object: base.currentItem && base.currentItem.name ? base.currentItem.name : "";
             property var machine_name_validator: Cura.MachineNameValidator { }
             validName: renameDialog.newName.match(renameDialog.machine_name_validator.machineNameRegex) != null;
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 055f176b33..e5009d8633 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -441,6 +441,9 @@
 
     "sizes": {
         "window_minimum_size": [80, 48],
+        "large_popup_dialog": [48, 40],
+        "popup_dialog": [40, 36],
+        "small_popup_dialog": [36, 12],
 
         "main_window_header": [0.0, 4.0],
         "main_window_header_button": [8, 2.35],