Index: sources/storage/Settings.h =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rdb12df03b8067e1ccc81f190cabfb03359c3d8cb --- sources/storage/Settings.h (.../Settings.h) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/storage/Settings.h (.../Settings.h) (revision db12df03b8067e1ccc81f190cabfb03359c3d8cb) @@ -75,24 +75,49 @@ eAlarms , eMessagesUnhandled , eSettingsSystem , + eGenericConfirm , }; + enum Key_Enum { + eKeyTitle , + eKeyMessage , + eKeyConfirm , + eKeyCancel , + }; + static QString category(Category_Enum vCategory) { switch (vCategory) { // NOTE: don't use default case eInstructions : return Storage::Settings_Category_Instructions ; case eConfigurationsDataList : return Storage::Settings_Category_ConfigurationsDataList ; case eAlarms : return Storage::Settings_Category_Alarms ; case eMessagesUnhandled : return Storage::Settings_Category_MessagesUnhandled ; case eSettingsSystem : return Storage::Settings_Category_SettingsSystem ; + case eGenericConfirm : return Storage::Settings_Category_GenericConfirm ; } return ""; } - static bool isCategoryInstructions (const QString &vCategory) { return vCategory == category(eInstructions ); } - static bool isCategoryConfigurationsDataList (const QString &vCategory) { return vCategory == category(eConfigurationsDataList ); } - static bool isCategoryAlarms (const QString &vCategory) { return vCategory == category(eAlarms ); } - static bool isCategoryMessagesUnhandled (const QString &vCategory) { return vCategory == category(eMessagesUnhandled ); } - static bool isCategorySettingsSystem (const QString &vCategory) { return vCategory == category(eSettingsSystem ); } + static QString key(Key_Enum vKey) { + switch (vKey) { // NOTE: don't use default + case eKeyTitle : return Storage::Settings_Key_Title ; + case eKeyMessage : return Storage::Settings_Key_Message ; + case eKeyConfirm : return Storage::Settings_Key_Confirm ; + case eKeyCancel : return Storage::Settings_Key_Cancel ; + } + return ""; + } + + static bool isCategoryInstructions (const QString &vCategory) { return vCategory == category( eInstructions ); } + static bool isCategoryConfigurationsDataList (const QString &vCategory) { return vCategory == category( eConfigurationsDataList ); } + static bool isCategoryAlarms (const QString &vCategory) { return vCategory == category( eAlarms ); } + static bool isCategoryMessagesUnhandled (const QString &vCategory) { return vCategory == category( eMessagesUnhandled ); } + static bool isCategorySettingsSystem (const QString &vCategory) { return vCategory == category( eSettingsSystem ); } + static bool isCategoryConfirm (const QString &vCategory) { return vCategory == category( eGenericConfirm ); } + static bool isKeyTitle (const QString &vKey ) { return vKey == key ( eKeyTitle ); } + static bool isKeyMessage (const QString &vKey ) { return vKey == key ( eKeyMessage ); } + static bool isKeyConfirm (const QString &vKey ) { return vKey == key ( eKeyConfirm ); } + static bool isKeyCancel (const QString &vKey ) { return vKey == key ( eKeyCancel ); } + }; }