Index: sources/view/settings/VSettings.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r6f2622be80fcaee8d71baf78404627381157970c --- sources/view/settings/VSettings.h (.../VSettings.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision 6f2622be80fcaee8d71baf78404627381157970c) @@ -22,19 +22,29 @@ #include "main.h" #include "MSettings.h" #include "VView.h" +#include "StorageGlobals.h" namespace View { class VSettings : public QObject { Q_OBJECT - CONSTANT(QString , groupFormat, "%1^%2" ) - PROPERTY(bool , initialized, false ) - PROPERTY(QVariantMap, category , {} ) - PROPERTY(QVariantMap, settings , {} ) + 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. + // Don't use QVariantHash, qml doesn't like it and won't show the values, *** and not even complains/errors ***. + CONSTANT(QString , groupFormat , "%1^%2" ) + PROPERTY(bool , initialized , false ) + PROPERTY(QStringList , categorys , {} ) + PROPERTY(QVariantMap , instructions , {} ) + + SETTINGS(QString , servicePass ,"123" , Storage::Settings_Category_SettingsSystem , "Service" , "Password" ) + SETTINGS(quint8 , alarmVolume , 100 , Storage::Settings_Category_SettingsSystem , "Alarm" , "Volume" ) + SETTINGS(bool , noCANBus , false , Storage::Settings_Category_NoCANBus , "Navigation" , "Create Treatment To Patient ID" ) + VIEW_DEC(VSettings, SettingsData) + }; }