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

Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2017-03-03 14:43:42 +01:00
commit 419396cc16
3 changed files with 71 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
resources/qml/DiscardOrKeepProfileChangesDialog.qml
View file

@ -101,7 +101,7 @@ UM.Dialog
TableViewColumn
{
role: "label"
title: catalog.i18nc("@title:column", "Settings")
title: catalog.i18nc("@title:column", "Profile settings")
delegate: labelDelegate
width: tableView.width * 0.5
}
@ -109,7 +109,7 @@ UM.Dialog
TableViewColumn
{
role: "original_value"
title: "Profile"
title: "Default"
width: tableView.width * 0.25
delegate: defaultDelegate
}
@ -129,6 +129,27 @@ UM.Dialog
model: base.changesModel
}
Item
{
anchors.right: parent.right
anchors.left: parent.left
anchors.margins: UM.Theme.getSize("default_margin").width
height:childrenRect.height
ComboBox
{
id: discardOrKeepProfileChangesDropDownButton
model: [
catalog.i18nc("@option:discardOrKeep", "Always ask me this"),
catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"),
catalog.i18nc("@option:discardOrKeep", "Keep and never ask again")
]
width: 300
currentIndex: UM.Preferences.getValue("cura/choice_on_profile_override")
onCurrentIndexChanged: UM.Preferences.setValue("cura/choice_on_profile_override", currentIndex)
}
}
Item
{
anchors.right: parent.right
@ -146,6 +167,7 @@ UM.Dialog
Printer.discardOrKeepProfileChangesClosed("discard")
base.hide()
}
isDefault: true
}
Button