Index: sources/view/settings/VSettings.h =================================================================== diff -u -redb8ee3edc41b1d324cd8a53e8e27a2a58289563 -r0dfba44fb7172b9458d161b3ed5f54527f93b698 --- sources/view/settings/VSettings.h (.../VSettings.h) (revision edb8ee3edc41b1d324cd8a53e8e27a2a58289563) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision 0dfba44fb7172b9458d161b3ed5f54527f93b698) @@ -34,7 +34,7 @@ QString _location = QString(Storage::Settings_Category_InstructionsImagesLoc).arg(Storage::Settings_Path()); typedef QList TKeysList; typedef struct { - QString location; + QString title ; TKeysList keys ; QVariantList values ; } TInstruction ; @@ -65,10 +65,13 @@ PROPERTY(bool , isDefaultServicePassword , false ) - SETTINGS(QString , servicePass , "" , Storage::Settings_Category_SettingsSystem , "Service" , "Password" ) - SETTINGS(quint8 , alarmVolume , 5 , Storage::Settings_Category_SettingsSystem , "Alarm" , "Volume" ) - SETTINGS(bool , roWaterMode , false , Storage::Settings_Category_SettingsSystem , "RoWaterMode" , "RoWaterMode" ) - SETTINGS(bool , userMode , false , Storage::Settings_Category_SettingsSystem , "UserMode" , "UserMode" ) + SETTINGS(QString , servicePass , "" , Storage::Settings_Category_SettingsSystem , "Service" , "Password" ) + SETTINGS(quint8 , alarmVolume , 5 , Storage::Settings_Category_SettingsSystem , "Alarm" , "Volume" ) + SETTINGS(bool , roWaterMode , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "RoWaterMode" ) + SETTINGS(bool , integratedBPCuff , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "IntegratedBPCuff" ) + SETTINGS(bool , heparinSyringePump , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "HeparinSyringePump" ) + SETTINGS(bool , chemicalDisinfection , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "ChemicalDisinfection" ) + SETTINGS(bool , advancedMode , false , Storage::Settings_Category_SettingsSystem , "AdvancedMode", "AdvancedMode" ) TRIGGER (bool , encryptionPass, false ) @@ -77,8 +80,8 @@ private: void initConnectionsSettings(); - TKeysList updateReplacements ( const QString &vGroup, const QStringList &vKeys ); - void updateInstructions ( const QString &vGroup, const TKeysList &vKeysList, const QVariantList &vValues ); + TKeysList updateReplacements ( const QString &vGroup, const QStringList &vKeys ); + void updateInstructions ( const QString &vGroup, const TKeysList &vKeysList, const QVariantList &vValues, const QString &vTitle ); void updateInstructions ( const QString &vGroup ); QString defaultPassword ();