3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Use screen pixel ratio for OpenFilesIncludingProjectsDialog

Browse source 
CURA-3642
This commit is contained in:
Lipu Fei 2017-04-12 08:43:46 +02:00
parent 2b8e6eb5c8
commit f4e1212005
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/qml/OpenFilesIncludingProjectsDialog.qml
View file

@ -6,6 +6,7 @@ import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.1
import QtQuick.Window 2.1
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
@ -16,8 +17,8 @@ UM.Dialog
id: base id: base
title: catalog.i18nc("@title:window", "Open file(s)") title: catalog.i18nc("@title:window", "Open file(s)")
width: 420 width: 420 * Screen.devicePixelRatio
height: 170 height: 170 * Screen.devicePixelRatio
maximumHeight: height maximumHeight: height
maximumWidth: width maximumWidth: width
@ -51,15 +52,18 @@ UM.Dialog
Column Column
{ {
anchors.fill: parent anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_margin").width anchors.leftMargin: 20 * Screen.devicePixelRatio
anchors.rightMargin: 20 * Screen.devicePixelRatio
anchors.bottomMargin: 20 * Screen.devicePixelRatio
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
spacing: UM.Theme.getSize("default_margin").width spacing: 10 * Screen.devicePixelRatio
Text Text
{ {
text: catalog.i18nc("@text:window", "We have found one or more project file(s) within the files you\nhave selected. You can open only one project file at a time. We\nsuggest to only import models from those files. Would you like\nto proceed?") text: catalog.i18nc("@text:window", "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?")
anchors.margins: UM.Theme.getSize("default_margin").width anchors.left: parent.left
anchors.right: parent.right
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
@ -75,14 +79,13 @@ UM.Dialog
{ {
anchors.right: parent.right anchors.right: parent.right
anchors.left: parent.left anchors.left: parent.left
height: childrenRect.height height: childrenRect.height * Screen.devicePixelRatio
Button Button
{ {
id: cancelButton id: cancelButton
text: catalog.i18nc("@action:button", "Cancel"); text: catalog.i18nc("@action:button", "Cancel");
anchors.right: importAllAsModelsButton.left anchors.right: importAllAsModelsButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
onClicked: onClicked:
{ {
// cancel // cancel