diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 8be83f1a58..72f1f950f0 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/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 } diff --git a/resources/qml/AboutDialog.qml b/resources/qml/AboutDialog.qml index c1e441e4ca..8c2d982b1d 100644 --- a/resources/qml/AboutDialog.qml +++ b/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 diff --git a/resources/qml/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/AskOpenAsProjectOrModelsDialog.qml index a3879bb8ac..df451a58cf 100644 --- a/resources/qml/AskOpenAsProjectOrModelsDialog.qml +++ b/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: { diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml index 0c0dbc39ca..915d320f41 100755 --- a/resources/qml/Menus/ContextMenu.qml +++ b/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) diff --git a/resources/qml/OpenFilesIncludingProjectsDialog.qml b/resources/qml/OpenFilesIncludingProjectsDialog.qml index 38160522e3..c817b03541 100644 --- a/resources/qml/OpenFilesIncludingProjectsDialog.qml +++ b/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 { diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 8568acc4ce..11e82ea054 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/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; @@ -257,6 +257,8 @@ UM.ManagementPage UM.RenameDialog { id: renameDialog; + width: 300 + height: 150 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/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 1e4a715095..c8febad85d 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -53,7 +53,7 @@ Item id: infillCellRight height: childrenRect.height; - width: base.width * .5 + width: base.width * .55 spacing: UM.Theme.getSize("default_margin").width @@ -169,6 +169,10 @@ Item Text { id: infillLabel + width: (infillCellRight.width - ((infillModel.count - 1) * UM.Theme.getSize("default_margin").width)) / (infillModel.count); + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + wrapMode: Text.WordWrap font: UM.Theme.getFont("default") anchors.top: infillIconLining.bottom anchors.horizontalCenter: infillIconLining.horizontalCenter