Browse Source

fixed too big dialogs and hidden checkboxes

Mark 7 years ago
parent
commit
7bc715a9bd

+ 6 - 11
plugins/3MFReader/WorkspaceDialog.qml

@@ -12,15 +12,12 @@ UM.Dialog
 {
     title: catalog.i18nc("@title:window", "Open Project")
 
-    width: 550 * Screen.devicePixelRatio
-    minimumWidth: 550 * Screen.devicePixelRatio
-    maximumWidth: minimumWidth
+    width: 500
+    height: 400
+
+    property int comboboxHeight: 15
+    property int spacerHeight: 10
 
-    height: 400 * Screen.devicePixelRatio
-    minimumHeight: 400 * Screen.devicePixelRatio
-    maximumHeight: minimumHeight
-    property int comboboxHeight: 15 * Screen.devicePixelRatio
-    property int spacerHeight: 10 * Screen.devicePixelRatio
     onClosing: manager.notifyClosed()
     onVisibleChanged:
     {
@@ -34,7 +31,7 @@ UM.Dialog
     Item
     {
         anchors.fill: parent
-        anchors.margins: 20 * Screen.devicePixelRatio
+        anchors.margins: 20
 
         UM.I18nCatalog
         {
@@ -376,7 +373,6 @@ UM.Dialog
             enabled: true
             anchors.bottom: parent.bottom
             anchors.right: ok_button.left
-            anchors.bottomMargin: - 0.5 * height
             anchors.rightMargin:2
         }
          Button
@@ -384,7 +380,6 @@ UM.Dialog
             id: ok_button
             text: catalog.i18nc("@action:button","Open");
             onClicked: { manager.closeBackend(); manager.onOkButtonClicked() }
-            anchors.bottomMargin: - 0.5 * height
             anchors.bottom: parent.bottom
             anchors.right: parent.right
         }

+ 2 - 2
resources/qml/AboutDialog.qml

@@ -14,8 +14,8 @@ UM.Dialog
     //: About dialog title
     title: catalog.i18nc("@title:window","About Cura")
 
-    minimumWidth: 450 * Screen.devicePixelRatio
-    minimumHeight: 550 * Screen.devicePixelRatio
+    minimumWidth: 500
+    minimumHeight: 650
     width: minimumWidth
     height: minimumHeight
 

+ 7 - 7
resources/qml/AskOpenAsProjectOrModelsDialog.qml

@@ -18,8 +18,8 @@ UM.Dialog
     id: base
 
     title: catalog.i18nc("@title:window", "Open project file")
-    width: 450 * Screen.devicePixelRatio
-    height: 150 * Screen.devicePixelRatio
+    width: 450
+    height: 150
 
     maximumHeight: height
     maximumWidth: width
@@ -61,10 +61,10 @@ UM.Dialog
     Column
     {
         anchors.fill: parent
-        anchors.leftMargin: 20 * Screen.devicePixelRatio
-        anchors.rightMargin: 20 * Screen.devicePixelRatio
-        anchors.bottomMargin: 20 * Screen.devicePixelRatio
-        spacing: 10 * Screen.devicePixelRatio
+        anchors.leftMargin: 20
+        anchors.rightMargin: 20
+        anchors.bottomMargin: 20
+        spacing: 10
 
         Label
         {
@@ -94,7 +94,7 @@ UM.Dialog
                 id: openAsProjectButton
                 text: catalog.i18nc("@action:button", "Open as project");
                 anchors.right: importModelsButton.left
-                anchors.rightMargin: UM.Theme.getSize("default_margin").width * Screen.devicePixelRatio
+                anchors.rightMargin: UM.Theme.getSize("default_margin").width
                 isDefault: true
                 onClicked:
                 {

+ 0 - 2
resources/qml/Menus/ContextMenu.qml

@@ -81,8 +81,6 @@ Menu
 
         title: catalog.i18ncp("@title:window", "Multiply Selected Model", "Multiply Selected Models", UM.Selection.selectionCount)
 
-        width: 400 * Screen.devicePixelRatio
-        height: 80 * Screen.devicePixelRatio
 
         onAccepted: CuraActions.multiplySelection(copiesField.value)
 

+ 6 - 6
resources/qml/OpenFilesIncludingProjectsDialog.qml

@@ -17,8 +17,8 @@ UM.Dialog
     id: base
 
     title: catalog.i18nc("@title:window", "Open file(s)")
-    width: 420 * Screen.devicePixelRatio
-    height: 170 * Screen.devicePixelRatio
+    width: 420
+    height: 170
 
     maximumHeight: height
     maximumWidth: width
@@ -52,12 +52,12 @@ UM.Dialog
     Column
     {
         anchors.fill: parent
-        anchors.leftMargin: 20 * Screen.devicePixelRatio
-        anchors.rightMargin: 20 * Screen.devicePixelRatio
-        anchors.bottomMargin: 20 * Screen.devicePixelRatio
+        anchors.leftMargin: 20
+        anchors.rightMargin: 20
+        anchors.bottomMargin: 20
         anchors.left: parent.left
         anchors.right: parent.right
-        spacing: 10 * Screen.devicePixelRatio
+        spacing: 10
 
         Text
         {

+ 2 - 2
resources/qml/Preferences/MachinesPage.qml

@@ -112,8 +112,8 @@ UM.ManagementPage
         {
             id: actionDialog
             property var content
-            minimumWidth: 350 * Screen.devicePixelRatio;
-            minimumHeight: 350 * Screen.devicePixelRatio;
+            minimumWidth: 350
+            minimumHeight: 350
             onContentChanged:
             {
                 contents = content;