3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 03:37:48 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix selecting presets from menu

Browse source 
Switching back to Custom is not yet implemented, and the menu selection does not yet change if the preset is changed in the preferences
This commit is contained in:
fieldOfView 2018-02-08 17:13:59 +01:00
parent 69d7bf4130
commit 872efd16b2
2 changed files with 53 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

52
resources/qml/Menus/SettingVisibilityProfilesMenu.qml
View file

@ -16,7 +16,7 @@ Menu
property bool showingAllSettings
signal showAllSettings()
signal showSettingVisibilityProfile()
signal showSettingVisibilityProfile(string profileName)
MenuItem
{
@ -27,19 +27,56 @@ Menu
exclusiveGroup: group
}
MenuSeparator { visible: showingSearchResults }
MenuItem
{
text: catalog.i18nc("@action:inmenu", "Normal Set")
text: catalog.i18nc("@action:inmenu", "Custom selection")
checkable: true
checked: !showingSearchResults && !showingAllSettings
exclusiveGroup: group
onTriggered: showSettingVisibilityProfile()
onTriggered: showSettingVisibilityProfile("Custom")
}
MenuSeparator {}
MenuSeparator { }
Instantiator
{
model: ListModel
{
id: presetNamesList
Component.onCompleted:
{
// returned value is Dictionary (Ex: {1:"Basic"}, The number 1 is the weight and sort by weight)
var itemsDict = UM.Preferences.getValue("general/visible_settings_preset")
var sorted = [];
for(var key in itemsDict) {
sorted[sorted.length] = key;
}
sorted.sort();
for(var i = 0; i < sorted.length; i++) {
presetNamesList.append({text: itemsDict[sorted[i]], value: i});
}
}
}
MenuItem
{
text: model.text
checkable: true
checked: false
exclusiveGroup: group
onTriggered: showSettingVisibilityProfile(model.text)
}
onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object)
}
MenuSeparator { visible: false }
MenuItem
{
text: catalog.i18nc("@action:inmenu", "Changed settings")
enabled: false
visible: false
enabled: true
checkable: true
checked: showingAllSettings
exclusiveGroup: group
@ -48,7 +85,8 @@ Menu
MenuItem
{
text: catalog.i18nc("@action:inmenu", "Settings in profile")
enabled: false
visible: false
enabled: true
checkable: true
checked: showingAllSettings
exclusiveGroup: group
@ -66,7 +104,7 @@ Menu
MenuSeparator {}
MenuItem
{
text: catalog.i18nc("@action:inmenu", "Manage Visibility Profiles...")
text: catalog.i18nc("@action:inmenu", "Manage Setting Visibility...")
iconName: "configure"
onTriggered: Cura.Actions.configureSettingVisibility.trigger()
}

7
resources/qml/Settings/SettingView.qml
View file

@ -151,6 +151,10 @@ Item
}
onShowSettingVisibilityProfile:
{
var newVisibleSettings = CuraApplication.getVisibilitySettingPreset(profileName)
UM.Preferences.setValue("general/visible_settings", newVisibleSettings)
UM.Preferences.setValue("general/preset_setting_visibility_choice", profileName)
base.showingAllSettings = false;
base.findingSettings = false;
filter.text = "";
@ -242,8 +246,11 @@ Item
definitionsModel.showAll = true;
}
else
{
if(expandedCategories)
{
definitionsModel.expanded = expandedCategories;
}
definitionsModel.showAncestors = false;
definitionsModel.showAll = false;
}