diff -r fd30d51f876b -r b6db4fd4947b calendarui/settings/inc/calensettings.h --- a/calendarui/settings/inc/calensettings.h Mon May 03 12:30:32 2010 +0300 +++ b/calendarui/settings/inc/calensettings.h Mon Jun 28 15:22:02 2010 +0530 @@ -19,6 +19,7 @@ #define CALENSETTINGS_H #include +#include class QPersistentModelIndex; class QModelIndex; @@ -31,6 +32,8 @@ class HbLineEdit; class XQSettingsManager; class XQSettingsKey; +class MCalenServices; + #ifdef CALENSETTINGS_DLL #define CALENSETTINGS_EXPORT Q_DECL_EXPORT @@ -43,31 +46,44 @@ Q_OBJECT public: - CalenSettings(HbDataForm *form, QObject *parent = 0); + CalenSettings(MCalenServices& services, HbDataForm *form, QObject *parent = 0); ~CalenSettings(); void createModel(); void populateSettingList(); + void addWeekNumberItem(); + bool isPluginEnabled(); + +private: + void updateShowWeekItem(); + void addRegionalInfoItem(); + void removeRegionalInfoItem(); + void populateRegionalInfo(); public slots: void handleAlarmSnoozeTimeChange(int index); void handleWeekNumberChange(); void handleRegionalInfoChange(); + //set the start day of the week to the locale + void setStartDayOfWeek(const int index); private: + MCalenServices &mServices; HbDataForm *mSettingsForm; HbDataFormModel *mSettingsModel; HbDataFormModelItem *mAlarmSnoozeTimeItem; HbDataFormModelItem* mShowWeekNumberItem; HbDataFormModelItem* mShowRegionalInfoItem; - + HbDataFormModelItem* mShowWeekStartOnInfoItem; + HbComboBox* mStartOfWeekItem; + QHash mAlarmSnoozeTimeHash; XQSettingsManager *mSettingsManager; XQSettingsKey *mAlarmSnoozeCenrepKey; XQSettingsKey *mWeekNumberCenrepKey; XQSettingsKey *mShowRegionalInfoKey; - uint mAlarmSnoozeTime; - uint mShowWeekNumber; - uint mShowRegionalInfo; + int mStartOfWeek; + bool mWeekNumberItemAdded; + bool mRegionalpluginActive; }; #endif // CALENSETTINGS_H