diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 6d196facc7..1a8ace464d 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -12,15 +12,15 @@ UM.Dialog { title: catalog.i18nc("@title:window", "Open Project") - width: 550 - minimumWidth: 550 - maximumWidth: 550 + width: 550 * Screen.devicePixelRatio + minimumWidth: 550 * Screen.devicePixelRatio + maximumWidth: minimumWidth - height: 400 - minimumHeight: 400 - maximumHeight: 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: { @@ -33,20 +33,17 @@ UM.Dialog } Item { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: parent.right - - anchors.topMargin: 20 - anchors.bottomMargin: 20 - anchors.leftMargin:20 - anchors.rightMargin: 20 + anchors.fille: parent + anchors.margins: 20 * Screen.devicePixelRatio UM.I18nCatalog { - id: catalog; - name: "cura"; + id: catalog + name: "cura" + } + SystemPalette + { + id: palette } ListModel @@ -70,12 +67,12 @@ UM.Dialog { id: titleLabel text: catalog.i18nc("@action:title", "Summary - Cura Project") - font.pixelSize: 22 + font.pointSize: 18 } Rectangle { id: separator - color: "black" + color: palette.text width: parent.width height: 1 } @@ -93,7 +90,7 @@ UM.Dialog { text: catalog.i18nc("@action:label", "Printer settings") font.bold: true - width: parent.width /3 + width: parent.width / 3 } Item { @@ -360,7 +357,7 @@ UM.Dialog height: width source: UM.Theme.getIcon("notice") - color: "black" + color: palette.text } Label diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml index 51e26db2ce..4233bb9e18 100644 --- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml @@ -4,6 +4,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 import QtQuick.Dialogs 1.2 +import QtQuick.Window 2.1 import UM 1.2 as UM import Cura 1.1 as Cura @@ -13,8 +14,8 @@ UM.Dialog id: base title: catalog.i18nc("@title:window", "Discard or Keep changes") - width: 800 - height: 400 + width: 800 * Screen.devicePixelRatio + height: 400 * Screen.devicePixelRatio property var changesModel: Cura.UserChangesModel{ id: userChangesModel} onVisibilityChanged: { @@ -68,7 +69,7 @@ UM.Dialog anchors.margins: UM.Theme.getSize("default_margin").width anchors.left: parent.left anchors.right: parent.right - height: base.height - 150 + height: base.height - 150 * Screen.devicePixelRatio id: tableView Component { diff --git a/resources/qml/WorkspaceSummaryDialog.qml b/resources/qml/WorkspaceSummaryDialog.qml index 4c0a7bf86d..7da8495da0 100644 --- a/resources/qml/WorkspaceSummaryDialog.qml +++ b/resources/qml/WorkspaceSummaryDialog.qml @@ -13,13 +13,13 @@ UM.Dialog { title: catalog.i18nc("@title:window", "Save Project") - width: 550 - minimumWidth: 550 + width: 550 * Screen.devicePixelRatio + minimumWidth: 550 * Screen.devicePixelRatio - height: 350 - minimumHeight: 350 + height: 350 * Screen.devicePixelRatio + minimumHeight: 350 * Screen.devicePixelRatio - property int spacerHeight: 10 + property int spacerHeight: 10 * Screen.devicePixelRatio property bool dontShowAgain: true @@ -41,15 +41,8 @@ UM.Dialog Item { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: parent.right - - anchors.topMargin: 20 - anchors.bottomMargin: 20 - anchors.leftMargin:20 - anchors.rightMargin: 20 + anchors.fill: parent + anchors.margins: 20 * Screen.devicePixelRatio UM.SettingDefinitionsModel { @@ -63,8 +56,12 @@ UM.Dialog } UM.I18nCatalog { - id: catalog; - name: "cura"; + id: catalog + name: "cura" + } + SystemPalette + { + id: palette } Column @@ -75,12 +72,12 @@ UM.Dialog { id: titleLabel text: catalog.i18nc("@action:title", "Summary - Cura Project") - font.pixelSize: 22 + font.pointSize: 18 } Rectangle { id: separator - color: "black" + color: palette.text width: parent.width height: 1 } @@ -229,6 +226,13 @@ UM.Dialog width: parent.width / 3 } } + + Item // Spacer + { + height: spacerHeight + width: height + } + CheckBox { id: dontShowAgainCheckbox