Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -ra82ee4f326b26c4369f1306f867edc1bca6dabbe --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision a82ee4f326b26c4369f1306f867edc1bca6dabbe) @@ -19,40 +19,55 @@ // Project #include "GuiController.h" #include "MSettings.h" +#include "Settings.h" VIEW_DEF(VSettings, SettingsData) void VSettings::onActionReceive(const SettingsData &) { - QVariantMap mCategorys; - for (const auto &category : _Settings.categorys()) { - QVariantMap details; + QVariantMap mSettings; + QVariantMap mData; + QStringList mCategorys = _Settings.categorys(); + for (const auto &category : mCategorys) { QStringList groups = _Settings.groups(category); - // DEBUG: - // qDebug() << " ----- " << category << groups; - details["groups"] = groups; - mCategorys[category] = details; - } - category(mCategorys); + for (const auto &group : groups) { + QVariantMap details; + QStringList keys = _Settings.keys (group); + QVariantList values = _Settings.values (group); + QString location = _Settings.location (group); + // DEBUG : + // qDebug() << " ##### " + // << group + // << keys + // << values + // << location ; + details["location"] = location; + details["keys" ] = keys ; + details["values" ] = values ; - QVariantMap mSettings; - for (const auto &group : _Settings.groups()) { - QVariantMap details; - // DEBUG : - // qDebug() << " ##### " - // << _Settings.keys (group) - // << _Settings.values (group) - // << _Settings.location (group); - QStringList keys = _Settings.keys (group); - QVariantList values = _Settings.values (group); - QString location = _Settings.location (group); + mSettings[group] = details; + for (const auto &key : keys) { - details["location"] = location; - details["keys" ] = keys ; - details["values" ] = values ; + QVariantMap keyValue; + keyValue[key] = _Settings.value(group, key); - mSettings[group] = details; + QVariantMap groups; + groups [group] = keyValue; + mData [category] = groups; + } + } } + + categorys(mCategorys); settings(mSettings); + data(mData); + + adjustment(true); } + +void VSettings::doSave(const QString &vCategory, const QString &vGroup, const QString &vKey, const QString &vValue) +{ + Storage::Settings settings; + settings.save(vCategory, vGroup, vKey, vValue); +}