Index: sources/view/settings/VSettings.h =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -raacab152859bb82a439a0a01e951e0ced2aac76e --- sources/view/settings/VSettings.h (.../VSettings.h) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision aacab152859bb82a439a0a01e951e0ced2aac76e) @@ -23,13 +23,37 @@ #include "MSettings.h" #include "VView.h" #include "StorageGlobals.h" +#include "GuiController.h" namespace View { class VSettings : public QObject { Q_OBJECT + QString _location = QString(Storage::Settings_Category_InstructionsImagesLoc).arg(Storage::Settings_Path_Name); + typedef QList TKeysList; + typedef struct { + QString location; + TKeysList keys ; + QVariantList values ; + } TInstruction ; + QMap _instructionMap; + + typedef qint16 TID ; + typedef qint16 TParamIndex ; + typedef struct { + QString group ; + quint16 keyIndex; + quint16 locIndex; + quint16 prmIndex; + QString prmExtra; + quint16 prmRound; + } TLocation; + typedef QList TLocationList; + typedef QMap TReplacements; + TReplacements _replacements; + TRIGGER ( bool , adjustment , 0 ) // TODO: This view needs modification and it needs to isolate the settings and have its own specific properties, not the complete settings exposed to QML and let QML access it. @@ -45,6 +69,14 @@ VIEW_DEC(VSettings, SettingsData) +private: + TKeysList updateReplacements ( const QString &vGroup, const QStringList &vKeys ); + void updateInstructions ( const QString &vGroup, const TKeysList &vKeysList, const QVariantList &vValues ); + void updateInstructions ( const QString &vGroup ); + +private slots: + void onActionReceive (GuiActionType vAction, const QVariantList &vData); + }; }