Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -13,51 +13,34 @@ * */ #include "VSettings.h" -#include "MSettings.h" // Qt -#include // Project -#include "ApplicationController.h" +#include "GuiController.h" #include "MSettings.h" -using namespace View; +VIEW_DEF(VSettings, SettingsData) -QVariantMap VSettings::settings() +void VSettings::onActionReceive(const SettingsData &) { - return _settings; -} - -QString VSettings::groupFormat() -{ - return "%1^%2"; -} - -VSettings::VSettings(QObject *parent) : QObject(parent) -{ - connect(&_ApplicationController, SIGNAL(didSettingsUpdate()), - this , SLOT( onSettingsUpdate())); -} - -void VSettings::onSettingsUpdate() -{ + QVariantMap mSettings; for (const auto &group : _SettingModel.groups()) { - QVariantMap variantMap; - // DEBUG : qDebug() << " ### " + QVariantMap details; + // DEBUG : + // qDebug() << " ##### " // << _SettingModel.keys (group) // << _SettingModel.values (group); - QStringList keys = _SettingModel.keys (group); - QVariantList values = _SettingModel.values (group); - QString location= _SettingModel.location (group); + QStringList keys = _SettingModel.keys (group); + QVariantList values = _SettingModel.values (group); + QString location = _SettingModel.location (group); - variantMap["location" ] = location; - variantMap["keys" ] = keys; - variantMap["values" ] = values; + details["location"] = location; + details["keys" ] = keys ; + details["values" ] = values ; - _settings[group] = variantMap; + mSettings[group] = details; } - qDebug() << "Data Ready"; - emit settingsChanged(); + settings(mSettings); }