3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #1636 from fieldOfView/fix_recent_dialogs

Browse source 
Fix issues with Workspace and Profile Changes dialogs
This commit is contained in:
Lipu Fei 2017-04-04 14:35:12 +02:00 • committed by GitHub
commit 6b9d3e8041
3 changed files with 46 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

43
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -12,15 +12,15 @@ UM.Dialog
{ {
title: catalog.i18nc("@title:window", "Open Project") title: catalog.i18nc("@title:window", "Open Project")
width: 550 width: 550 * Screen.devicePixelRatio
minimumWidth: 550 minimumWidth: 550 * Screen.devicePixelRatio
maximumWidth: 550 maximumWidth: minimumWidth
height: 400 height: 400 * Screen.devicePixelRatio
minimumHeight: 400 minimumHeight: 400 * Screen.devicePixelRatio
maximumHeight: 400 maximumHeight: minimumHeight
property int comboboxHeight: 15 property int comboboxHeight: 15 * Screen.devicePixelRatio
property int spacerHeight: 10 property int spacerHeight: 10 * Screen.devicePixelRatio
onClosing: manager.notifyClosed() onClosing: manager.notifyClosed()
onVisibleChanged: onVisibleChanged:
{ {
@ -33,20 +33,17 @@ UM.Dialog
} }
Item Item
{ {
anchors.top: parent.top anchors.fille: parent
anchors.bottom: parent.bottom anchors.margins: 20 * Screen.devicePixelRatio
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: 20
anchors.bottomMargin: 20
anchors.leftMargin:20
anchors.rightMargin: 20
UM.I18nCatalog UM.I18nCatalog
{ {
id: catalog; id: catalog
name: "cura"; name: "cura"
}
SystemPalette
{
id: palette
} }
ListModel ListModel
@ -70,12 +67,12 @@ UM.Dialog
{ {
id: titleLabel id: titleLabel
text: catalog.i18nc("@action:title", "Summary - Cura Project") text: catalog.i18nc("@action:title", "Summary - Cura Project")
font.pixelSize: 22 font.pointSize: 18
} }
Rectangle Rectangle
{ {
id: separator id: separator
color: "black" color: palette.text
width: parent.width width: parent.width
height: 1 height: 1
} }
@ -93,7 +90,7 @@ UM.Dialog
{ {
text: catalog.i18nc("@action:label", "Printer settings") text: catalog.i18nc("@action:label", "Printer settings")
font.bold: true font.bold: true
width: parent.width /3 width: parent.width / 3
} }
Item Item
{ {
@ -360,7 +357,7 @@ UM.Dialog
height: width height: width
source: UM.Theme.getIcon("notice") source: UM.Theme.getIcon("notice")
color: "black" color: palette.text
} }
Label Label

7
resources/qml/DiscardOrKeepProfileChangesDialog.qml
View file

@ -4,6 +4,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Window 2.1
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura
@ -13,8 +14,8 @@ UM.Dialog
id: base id: base
title: catalog.i18nc("@title:window", "Discard or Keep changes") title: catalog.i18nc("@title:window", "Discard or Keep changes")
width: 800 width: 800 * Screen.devicePixelRatio
height: 400 height: 400 * Screen.devicePixelRatio
property var changesModel: Cura.UserChangesModel{ id: userChangesModel} property var changesModel: Cura.UserChangesModel{ id: userChangesModel}
onVisibilityChanged: onVisibilityChanged:
{ {
@ -68,7 +69,7 @@ UM.Dialog
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: base.height - 150 height: base.height - 150 * Screen.devicePixelRatio
id: tableView id: tableView
Component Component
{ {

40
resources/qml/WorkspaceSummaryDialog.qml
View file

@ -13,13 +13,13 @@ UM.Dialog
{ {
title: catalog.i18nc("@title:window", "Save Project") title: catalog.i18nc("@title:window", "Save Project")
width: 550 width: 550 * Screen.devicePixelRatio
minimumWidth: 550 minimumWidth: 550 * Screen.devicePixelRatio
height: 350 height: 350 * Screen.devicePixelRatio
minimumHeight: 350 minimumHeight: 350 * Screen.devicePixelRatio
property int spacerHeight: 10 property int spacerHeight: 10 * Screen.devicePixelRatio
property bool dontShowAgain: true property bool dontShowAgain: true
@ -41,15 +41,8 @@ UM.Dialog
Item Item
{ {
anchors.top: parent.top anchors.fill: parent
anchors.bottom: parent.bottom anchors.margins: 20 * Screen.devicePixelRatio
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: 20
anchors.bottomMargin: 20
anchors.leftMargin:20
anchors.rightMargin: 20
UM.SettingDefinitionsModel UM.SettingDefinitionsModel
{ {
@ -63,8 +56,12 @@ UM.Dialog
} }
UM.I18nCatalog UM.I18nCatalog
{ {
id: catalog; id: catalog
name: "cura"; name: "cura"
}
SystemPalette
{
id: palette
} }
Column Column
@ -75,12 +72,12 @@ UM.Dialog
{ {
id: titleLabel id: titleLabel
text: catalog.i18nc("@action:title", "Summary - Cura Project") text: catalog.i18nc("@action:title", "Summary - Cura Project")
font.pixelSize: 22 font.pointSize: 18
} }
Rectangle Rectangle
{ {
id: separator id: separator
color: "black" color: palette.text
width: parent.width width: parent.width
height: 1 height: 1
} }
@ -229,6 +226,13 @@ UM.Dialog
width: parent.width / 3 width: parent.width / 3
} }
} }
Item // Spacer
{
height: spacerHeight
width: height
}
CheckBox CheckBox
{ {
id: dontShowAgainCheckbox id: dontShowAgainCheckbox