Index: sources/view/settings/VSettings.h =================================================================== diff -u -r30d7e9993624feb138e7532ad2feaefc592f6a63 -raacab152859bb82a439a0a01e951e0ced2aac76e --- sources/view/settings/VSettings.h (.../VSettings.h) (revision 30d7e9993624feb138e7532ad2feaefc592f6a63) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision aacab152859bb82a439a0a01e951e0ced2aac76e) @@ -31,6 +31,29 @@ { 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,22 +68,11 @@ SETTINGS(bool , noCANBus , false , Storage::Settings_Category_NoCANBus , "Navigation" , "Create Treatment To Patient ID" ) VIEW_DEC(VSettings, SettingsData) -private: - typedef qint16 TID ; - typedef qint16 TParamIndex ; - typedef struct { - QString group ; - quint16 keyIndex; - quint16 locIndex; - quint16 prmIndex; - } TLocation; - typedef QList TLocationList; - typedef QMap TReplacements; - TReplacements _replacements; private: - void updateInstructions (const QString &vGroup, QStringList &vKeys, const QVariantList &vValues); - void updateReplacements (const QString &vGroup, QStringList &vKeys); + 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);