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

Make "show all settings" work

Browse Source 
CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
This commit is contained in:
Lipu Fei 2018-03-19 10:42:46 +01:00
parent 8f6f56a5e6
commit 2660d15857
3 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/qml/Menus/SettingVisibilityPresetsMenu.qml
View File

@ -13,11 +13,8 @@ Menu
title: catalog.i18nc("@action:inmenu", "Visible Settings") title: catalog.i18nc("@action:inmenu", "Visible Settings")
property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel() property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
property bool showingSearchResults
property bool showingAllSettings
signal showAllSettings() signal showAllSettings()
signal showSettingVisibilityProfile()
Instantiator Instantiator
{ {
@ -43,7 +40,7 @@ Menu
MenuSeparator {} MenuSeparator {}
MenuItem MenuItem
{ {
text: catalog.i18nc("@action:inmenu", "All Settings") text: catalog.i18nc("@action:inmenu", "Show All Settings")
checkable: true checkable: true
checked: showingAllSettings checked: showingAllSettings
exclusiveGroup: group exclusiveGroup: group

4
resources/qml/Preferences/SettingVisibilityPage.qml
View File

@ -72,11 +72,11 @@ UM.PreferencesPage
{ {
if(parent.checkedState == Qt.Unchecked || parent.checkedState == Qt.PartiallyChecked) if(parent.checkedState == Qt.Unchecked || parent.checkedState == Qt.PartiallyChecked)
{ {
definitionsModel.setAllVisible(true) definitionsModel.setAllExpandedVisible(true)
} }
else else
{ {
definitionsModel.setAllVisible(false) definitionsModel.setAllExpandedVisible(false)
} }
// After change set "Custom" option // After change set "Custom" option

29
resources/qml/Settings/SettingView.qml
View File

@ -18,7 +18,6 @@ Item
property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel() property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
property Action configureSettings property Action configureSettings
property bool findingSettings property bool findingSettings
property bool showingAllSettings
signal showTooltip(Item item, point location, string text) signal showTooltip(Item item, point location, string text)
signal hideTooltip() signal hideTooltip()
@ -140,21 +139,9 @@ Item
} }
menu: SettingVisibilityPresetsMenu menu: SettingVisibilityPresetsMenu
{ {
showingSearchResults: findingSettings
showingAllSettings: showingAllSettings
onShowAllSettings: onShowAllSettings:
{ {
base.showingAllSettings = true; definitionsModel.setAllVisible(true);
base.findingSettings = false;
filter.text = "";
filter.updateDefinitionModel();
}
onShowSettingVisibilityProfile:
{
base.showingAllSettings = false;
base.findingSettings = false;
filter.text = "";
filter.updateDefinitionModel(); filter.updateDefinitionModel();
} }
} }
@ -219,10 +206,6 @@ Item
findingSettings = (text.length > 0); findingSettings = (text.length > 0);
if(findingSettings != lastFindingSettings) if(findingSettings != lastFindingSettings)
{ {
if(findingSettings)
{
showingAllSettings = false;
}
updateDefinitionModel(); updateDefinitionModel();
lastFindingSettings = findingSettings; lastFindingSettings = findingSettings;
} }
@ -235,7 +218,7 @@ Item
function updateDefinitionModel() function updateDefinitionModel()
{ {
if(findingSettings || showingAllSettings) if(findingSettings)
{ {
expandedCategories = definitionsModel.expanded.slice(); expandedCategories = definitionsModel.expanded.slice();
definitionsModel.expanded = [""]; // keep categories closed while to prevent render while making settings visible one by one definitionsModel.expanded = [""]; // keep categories closed while to prevent render while making settings visible one by one
@ -558,13 +541,13 @@ Item
MenuItem MenuItem
{ {
//: Settings context menu action //: Settings context menu action
visible: !(findingSettings || showingAllSettings); visible: !findingSettings
text: catalog.i18nc("@action:menu", "Hide this setting"); text: catalog.i18nc("@action:menu", "Hide this setting");
onTriggered: onTriggered:
{ {
definitionsModel.hide(contextMenu.key); definitionsModel.hide(contextMenu.key);
// visible settings have changed, so we're no longer showing a preset // visible settings have changed, so we're no longer showing a preset
if (settingVisibilityPresetsModel.activePreset != "" && !showingAllSettings) if (settingVisibilityPresetsModel.activePreset != "")
{ {
settingVisibilityPresetsModel.setActivePreset("custom"); settingVisibilityPresetsModel.setActivePreset("custom");
} }
@ -584,7 +567,7 @@ Item
return catalog.i18nc("@action:menu", "Keep this setting visible"); return catalog.i18nc("@action:menu", "Keep this setting visible");
} }
} }
visible: (findingSettings || showingAllSettings); visible: findingSettings
onTriggered: onTriggered:
{ {
if (contextMenu.settingVisible) if (contextMenu.settingVisible)
@ -596,7 +579,7 @@ Item
definitionsModel.show(contextMenu.key); definitionsModel.show(contextMenu.key);
} }
// visible settings have changed, so we're no longer showing a preset // visible settings have changed, so we're no longer showing a preset
if (settingVisibilityPresetsModel.activePreset != "" && !showingAllSettings) if (settingVisibilityPresetsModel.activePreset != "")
{ {
settingVisibilityPresetsModel.setActivePreset("custom"); settingVisibilityPresetsModel.setActivePreset("custom");
} }