--- a/clock/clockui/clockalarmeditor/inc/clockalarmeditor.h	Mon May 03 12:30:32 2010 +0300
+++ b/clock/clockui/clockalarmeditor/inc/clockalarmeditor.h	Mon Jun 28 15:22:02 2010 +0530
@@ -36,20 +36,23 @@
 class HbAction;
 class HbDateTimePicker;
 class HbDialog;
+class HbTranslator;
 class XQSettingsManager;
 class XQSettingsKey;
 class AlarmClient;
 class TimezoneClient;
 class ClockAlarmCustomItem;
-class QTranslator;
+
 
-class ClockAlarmEditor : public HbView
+class ClockAlarmEditor : public QObject
 {
 	Q_OBJECT
 
 public:
 	CLOCKALARMEDITOR_EXPORT ClockAlarmEditor(
-			int alarmId = 0, QGraphicsWidget *parent = 0);
+			AlarmClient& alarmClient,
+			int alarmId = 0,
+			QObject *parent = 0);
 	CLOCKALARMEDITOR_EXPORT virtual ~ClockAlarmEditor();
 
 public:
@@ -61,10 +64,10 @@
 	void handleDiscardAction();
 	void handleTimeChange(const QString &text);
 	void handleOccurenceChanged(int index);
-	void handleCancelAction();
 	void handleOkAction();
 	void launchTimePicker();
-	void handleAlarmSoundChanged();
+	void handleAlarmSoundChanged(int checkedState);
+	void selectedAction(HbAction *action);
 
 signals:
 	void alarmSet();
@@ -73,7 +76,6 @@
 	void initModel();
 	void populateModelItems();
 	void initAlarmInfo();
-	void createMenu();
 	void createToolbar();
 	void setAlarm(
 			QString timeInfo, QString descInfo, int repeatType,
@@ -85,9 +87,12 @@
 	void displayRemainingTimeNote(AlarmInfo& alarmInfo);
 	void getDayText(int alarmDay,QString& dayText);
 	int getRemainingSeconds(QDateTime& alarmDateTime);
+	void launchDialog(QString title, QString text = 0);
+    void sortAlarmDaysList(QStringList& alarmDays);
 
 private:
 	int mAlarmId;
+	int mStartOfWeek;
 	bool mAlarmDayItemInserted;
 	QString mTimeFormat;
 
@@ -99,7 +104,7 @@
 	HbDataFormModelItem *mAlarmSoundItem;
 	HbDataFormModelItem *mAlarmDescription;
 
-	HbView *mPreviousView;
+	HbView *mAlarmEditorView;
 	HbAction *mDiscardAction;
 	HbAction *mDeleteAction;
 	HbAction *mDoneAction;
@@ -111,10 +116,10 @@
 	XQSettingsManager *mSettingsManager;
 	XQSettingsKey *mPreviosAlarmTime;
 
-	AlarmClient *mAlarmClient;
+	AlarmClient &mAlarmClient;
 	AlarmInfo mAlarmInfo;
 	TimezoneClient *mTimezoneClient;
-	QTranslator *mTranslator;
+	HbTranslator *mTranslator;
 };
 
 #endif // CLOCKALARMEDITOR_H