Group folder-related options in JSON

This commit is contained in:
Eric Kotato 2020-03-30 09:22:43 +03:00
parent e8e0ce5864
commit efe2dad856

View file

@ -334,16 +334,18 @@ bool Manager::readCustomFile() {
} }
}); });
ReadIntOption(settings, "default_folder_id", [&](auto v) { ReadObjectOption(settings, "folders", [&](auto o) {
cSetDefaultFilterId(v); ReadIntOption(o, "default", [&](auto v) {
}); cSetDefaultFilterId(v);
});
ReadBoolOption(settings, "folder_counter_unmuted_only", [&](auto v) { ReadBoolOption(o, "count_unmuted_only", [&](auto v) {
cSetUnmutedFilterCounterOnly(v); cSetUnmutedFilterCounterOnly(v);
}); });
ReadBoolOption(settings, "folder_hide_edit", [&](auto v) { ReadBoolOption(o, "hide_edit_button", [&](auto v) {
cSetHideFilterEditButton(v); cSetHideFilterEditButton(v);
});
}); });
return true; return true;
} }
@ -389,9 +391,13 @@ void Manager::writeDefaultFile() {
settings.insert(qsl("userpic_corner_type"), cUserpicCornersType()); settings.insert(qsl("userpic_corner_type"), cUserpicCornersType());
settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic()); settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic());
settings.insert(qsl("custom_app_icon"), cCustomAppIcon()); settings.insert(qsl("custom_app_icon"), cCustomAppIcon());
settings.insert(qsl("default_folder_id"), cDefaultFilterId());
settings.insert(qsl("folder_counter_unmuted_only"), cUnmutedFilterCounterOnly()); auto settingsFolders = QJsonObject();
settings.insert(qsl("folder_hide_edit"), cHideFilterEditButton()); settingsFolders.insert(qsl("default"), cDefaultFilterId());
settingsFolders.insert(qsl("count_unmuted_only"), cUnmutedFilterCounterOnly());
settingsFolders.insert(qsl("hide_edit_button"), cHideFilterEditButton());
settings.insert(qsl("folders"), settingsFolders);
auto settingsScales = QJsonArray(); auto settingsScales = QJsonArray();
settings.insert(qsl("scales"), settingsScales); settings.insert(qsl("scales"), settingsScales);
@ -457,9 +463,13 @@ void Manager::writeCurrentSettings() {
settings.insert(qsl("userpic_corner_type"), cUserpicCornersType()); settings.insert(qsl("userpic_corner_type"), cUserpicCornersType());
settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic()); settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic());
settings.insert(qsl("custom_app_icon"), cCustomAppIcon()); settings.insert(qsl("custom_app_icon"), cCustomAppIcon());
settings.insert(qsl("default_folder_id"), cDefaultFilterId());
settings.insert(qsl("folder_counter_unmuted_only"), cUnmutedFilterCounterOnly()); auto settingsFolders = QJsonObject();
settings.insert(qsl("folder_hide_edit"), cHideFilterEditButton()); settingsFolders.insert(qsl("default"), cDefaultFilterId());
settingsFolders.insert(qsl("count_unmuted_only"), cUnmutedFilterCounterOnly());
settingsFolders.insert(qsl("hide_edit_button"), cHideFilterEditButton());
settings.insert(qsl("folders"), settingsFolders);
auto settingsScales = QJsonArray(); auto settingsScales = QJsonArray();
auto currentScales = cInterfaceScales(); auto currentScales = cInterfaceScales();