GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 00:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1502 from LipuFei/feature_CURA-3221-improve-override-profile-dialog

Browse Source 
CURA-3221 improve override profile dialog
This commit is contained in:
jack 2017-03-08 09:52:32 +01:00 committed by GitHub
commit 4a68f25769
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
resources/qml/DiscardOrKeepProfileChangesDialog.qml
View File

@ -13,8 +13,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: 500 width: 800
height: 300 height: 400
property var changesModel: Cura.UserChangesModel{ id: userChangesModel} property var changesModel: Cura.UserChangesModel{ id: userChangesModel}
onVisibilityChanged: onVisibilityChanged:
{ {
@ -32,7 +32,7 @@ UM.Dialog
UM.I18nCatalog UM.I18nCatalog
{ {
id: catalog; id: catalog;
name:"cura" name: "cura"
} }
Row Row
@ -42,19 +42,12 @@ UM.Dialog
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
UM.RecolorImage
{
source: UM.Theme.getIcon("star")
width : 30
height: width
color: UM.Theme.getColor("setting_control_button")
}
Label Label
{ {
text: "You have customized some profile settings.\nWould you like to keep or discard those settings?" text: "You have customized some profile settings.\nWould you like to keep or discard those settings?"
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
} }
@ -74,11 +67,11 @@ UM.Dialog
property var extruder_name: userChangesModel.getItem(styleData.row).extruder property var extruder_name: userChangesModel.getItem(styleData.row).extruder
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default") font: UM.Theme.getFont("system")
text: text:
{ {
var result = styleData.value var result = styleData.value
if (extruder_name!= "") if (extruder_name != "")
{ {
result += " (" + extruder_name + ")" result += " (" + extruder_name + ")"
} }
@ -93,7 +86,7 @@ UM.Dialog
Label Label
{ {
text: styleData.value text: styleData.value
font: UM.Theme.getFont("default") font: UM.Theme.getFont("system")
color: UM.Theme.getColor("setting_control_disabled_text") color: UM.Theme.getColor("setting_control_disabled_text")
} }
} }
@ -103,21 +96,21 @@ UM.Dialog
role: "label" role: "label"
title: catalog.i18nc("@title:column", "Profile settings") title: catalog.i18nc("@title:column", "Profile settings")
delegate: labelDelegate delegate: labelDelegate
width: tableView.width * 0.5 width: tableView.width * 0.4
} }
TableViewColumn TableViewColumn
{ {
role: "original_value" role: "original_value"
title: "Default" title: "Default"
width: tableView.width * 0.25 width: tableView.width * 0.3
delegate: defaultDelegate delegate: defaultDelegate
} }
TableViewColumn TableViewColumn
{ {
role: "user_value" role: "user_value"
title: catalog.i18nc("@title:column", "Customized") title: catalog.i18nc("@title:column", "Customized")
width: tableView.width * 0.25 - 1 width: tableView.width * 0.3 - 1
} }
section.property: "category" section.property: "category"
section.delegate: Label section.delegate: Label