# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274953875 -10800
# Node ID ea672fcb0ea0b804cdbac5a1da3e1b2a33cde93f
# Parent  a949c2543c150849615484c2e0b3a15408604fcc
Revision: 201019
Kit: 2010121

diff -r a949c2543c15 -r ea672fcb0ea0 agendainterface/agendautil/src/agendautil_p.cpp
--- a/agendainterface/agendautil/src/agendautil_p.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/agendainterface/agendautil/src/agendautil_p.cpp	Thu May 27 12:51:15 2010 +0300
@@ -1175,17 +1175,6 @@
 				// create new (child) entry
 				// Use original instance time for recurrenceID as this entry hasn't got one.
 				TCalTime originalCalTime = calEntry->StartTimeL();
-				TDateTime origDateTime = originalCalTime.TimeLocalL().DateTime();
-				// set the instance date to this
-				QDate date = entry.startTime().date();
-				QTime time =entry.startTime().time();
-				origDateTime.Set(date.year(),
-								 static_cast<TMonth> (date.month() - 1),
-								 date.day() - 1,
-								 time.hour(),
-								 time.minute(),time.second(), 0);
-				TTime originalTime(origDateTime);
-				originalCalTime.SetTimeLocalL(originalTime);
 				// create the new child now
 				CCalEntry* newEntry = CCalEntry::NewL( calEntry->EntryTypeL(), 
 													   guid,
@@ -1252,19 +1241,6 @@
 				// create new (child) entry
 				// Use original instance time for recurrenceID as this entry hasn't got one.
 				TCalTime originalCalTime = calEntry->StartTimeL();
-				TDateTime origDateTime = originalCalTime.TimeLocalL().DateTime();
-				// set only the instance date but not the time to this
-				QDate date = entry.startTime().date();
-				QTime time =entry.startTime().time();
-				origDateTime.Set(date.year(),
-				                 static_cast<TMonth> (date.month() - 1),
-								 date.day() - 1,
-                                 origDateTime.Hour(),
-                                 origDateTime.Minute(),
-                                 origDateTime.Second(), 
-                                 origDateTime.MicroSecond());
-				TTime originalTime(origDateTime);
-				originalCalTime.SetTimeLocalL(originalTime);
 				// create the new child now
 				CCalEntry* newEntry = CCalEntry::NewL( calEntry->EntryTypeL(), 
 													   guid,
@@ -1666,8 +1642,11 @@
 		TCalTime startCalTime = instanceList[i]->StartTimeL();
 		TCalTime endCalTime = instanceList[i]->EndTimeL();
 		TDateTime startDateTime = startCalTime.TimeLocalL().DateTime();
+    TDateTime endDateTime = endCalTime.TimeLocalL().DateTime();
 		QDate startDate(startDateTime.Year(), startDateTime.Month()+1,
 						startDateTime.Day() + 1);
+    QDate endDate(endDateTime.Year(), endDateTime.Month()+1,
+                    endDateTime.Day() + 1);
 		if (type == CCalEntry::EEvent || type == CCalEntry::EAppt ||
 				type == CCalEntry::EReminder) {
 			if(endsAtStartOfDay(instanceList[i], endCalTime.TimeLocalL())) {
@@ -1680,31 +1659,65 @@
 					continue;
 				}
 			}
-			
-			// Mark the required dates frm start date to end date
-			TTimeIntervalDays days = endCalTime.TimeLocalL().DaysFrom(startCalTime.TimeLocalL());
-			for (int j = -1; j < days.Int(); j++) {
-				QDate date = startDate.addDays(j+1);
-				if (date <= rangeEnd.date()) {
-					dates.append(date);
-				} else {
-					break;
-				}
-			}
-		} else if (type == CCalEntry::EAnniv) {
-			if (startDate <= rangeEnd.date()) {
-				dates.append(startDate);
-			}
-		} else if (type == CCalEntry::ETodo) {
-			// if start time is less that today, then mark it for today
-			if (startDate < QDate::currentDate()) {
-				dates.append(QDate::currentDate());
-			} else {
-				dates.append(startDate);
-			}
-		}
-	}
-	CleanupStack::PopAndDestroy();
+        // Mark the required dates frm start date to end date
+        TTimeIntervalDays days ;
+        //check if the start date of the entry is before the start day of the grid
+        if(startDate < rangeStart.date()){
+            if(endDate<=rangeEnd.date()){
+                //if the end date of entry is lying in the grid ,
+                //then mark the entry from start day of the grid to the end date of the entry
+                days = endCalTime.TimeLocalL().DaysFrom(startDateForInstanceSearch.TimeLocalL());
+            }
+            else{
+                //if end date of the entry is greater then the last date of grid, 
+                //then mark all the date of the grid with the entry 
+                days = endDateForInstanceSearch.TimeLocalL().DaysFrom(startDateForInstanceSearch.TimeLocalL()) ;
+            }
+            //start the entries from the first day of the grid
+            for (int j = 0; j <= days.Int(); j++) {
+                QDate date = rangeStart.date().addDays(j);
+                if (date <= rangeEnd.date()) {
+                    dates.append(date);
+                } else {
+                    break;
+                }
+            }
+        }
+        //if the start date of the entry is lying inside the grid
+        else{
+            if(endDate<=rangeEnd.date()){
+                //if the end date of entry is lying in the grid ,
+                //then mark the entry from start date of the entry to the end date of the entry
+                days = endCalTime.TimeLocalL().DaysFrom(startCalTime.TimeLocalL()) ;
+            }
+            else{
+                //if end date of the entry is greater then the last date of grid, 
+                //then mark all the date from start date of the entry to the end date of the grid 
+                days = endDateForInstanceSearch.TimeLocalL().DaysFrom(startCalTime.TimeLocalL()) ;
+            }
+            for (int j = 0; j <= days.Int(); j++) {
+                QDate date = startDate.addDays(j);
+                if (date <= rangeEnd.date()) {
+                    dates.append(date);
+                } else {
+                    break;
+                }
+            }   
+        }
+    } else if (type == CCalEntry::EAnniv) {
+        if (startDate <= rangeEnd.date()) {
+            dates.append(startDate);
+        }
+    } else if (type == CCalEntry::ETodo) {
+            // if start time is less that today, then mark it for today
+            if (startDate < QDate::currentDate()) {
+                dates.append(QDate::currentDate());
+            } else {
+                dates.append(startDate);
+            }
+        }
+    }
+    CleanupStack::PopAndDestroy();
 }
 
 QList<AgendaEntry> AgendaUtilPrivate::createEntryIdListForDay( QDateTime day,
diff -r a949c2543c15 -r ea672fcb0ea0 alarmui/src/alarmutils.cpp
--- a/alarmui/src/alarmutils.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/alarmui/src/alarmutils.cpp	Thu May 27 12:51:15 2010 +0300
@@ -56,6 +56,8 @@
 #endif // SYMBIAN_CALENDAR_V2
 #include <calsession.h>
 #include <calentryview.h>
+#include <clockdomaincrkeys.h>
+#include <calendardomaincrkeys.h>
 // #include <calenlauncher.h>  // for launching calendar entry view
 
 
@@ -76,14 +78,8 @@
 const TInt KMaxProfileVolume( 10 );
 const TInt KVolumeRampPeriod( 3000000 );  // 3 seconds
 _LIT( KRngMimeType, "application/vnd.nokia.ringing-tone" );
-const TUid KCRUidCalendar = {0x101F874B};
 //const TUint32 KCalendarSoundFile = 0x00000004;
-const TUint32 KCalendarDefaultSoundFile = 0x00000005;
-const TUint32 KCalendarSnoozeTime = 0x00000007;
-const TUid KCRUidClockApp = {0x101F874D};
 //const TUint32 KClockAppSoundFile = 0x00000000;
-const TUint32 KClockAppDefaultSoundFile = 0x00000001;
-const TUint32 KClockAppSnoozeTime = 0x00000002;
 const TUid KAlarmClockOne = { 0x101F793A };
 
 const TUid KCRUidProfileEngine = {0x101F8798};
@@ -440,7 +436,7 @@
 
 	if( IsClockAlarm() )
 	{
-		PIM_TRAPD_ASSERT( repository = CRepository::NewL( KCRUidClockApp ); ) 
+		PIM_TRAPD_ASSERT( repository = CRepository::NewL( TUid::Uid(KCRUidClockApp) ); ) 
 		PIM_TRAPD_ASSERT( profileRepository = CRepository::NewL( 
 														KCRUidProfileEngine ); )
 
@@ -459,8 +455,10 @@
 	}
 	else
 	{
-		PIM_TRAPD_ASSERT( repository = CRepository::NewL( KCRUidCalendar ); )
-		PIM_TRAPD_ASSERT( profileRepository = CRepository::NewL( KCRUidProfileEngine ); )
+		PIM_TRAPD_ASSERT( repository =
+				CRepository::NewL( TUid::Uid(KCRUidCalendar) ); )
+		PIM_TRAPD_ASSERT( profileRepository =
+				CRepository::NewL( KCRUidProfileEngine ); )
 
 		if( repository )
 		{
@@ -660,7 +658,7 @@
         case EAlarmTypeClock:
             {
             CRepository* repository = NULL;
-            PIM_TRAPD_ASSERT( repository = CRepository::NewL( KCRUidClockApp ); )
+            PIM_TRAPD_ASSERT( repository = CRepository::NewL( TUid::Uid(KCRUidClockApp) ); )
 
             if( repository )
                 {
@@ -673,7 +671,8 @@
         case EAlarmTypeCalendar:
             {
             CRepository* repository = NULL;
-            PIM_TRAPD_ASSERT( repository = CRepository::NewL( KCRUidCalendar ); )
+            PIM_TRAPD_ASSERT( repository =
+            		CRepository::NewL( TUid::Uid(KCRUidCalendar) ); )
 
             if( repository )
                 {
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/agendaeventviewer/data/agendaeventviewer.docml
--- a/calendarui/agendaeventviewer/data/agendaeventviewer.docml	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/agendaeventviewer/data/agendaeventviewer.docml	Thu May 27 12:51:15 2010 +0300
@@ -5,7 +5,7 @@
 			<widget name="groupBox" type="HbGroupBox">
                 <real name="z" value="1"/>
                 <bool name="collapsable" value="FALSE"/>
-                <string locid="txt_calendar_subhead_event" name="titleText" value="Event"/>
+                <string locid="txt_calendar_subhead_event" name="heading" value="Event"/>
             </widget>
             <widget name="scrollArea" type="HbScrollArea">
                 <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget">
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/agendaeventviewer/src/agendaeventview.cpp
--- a/calendarui/agendaeventviewer/src/agendaeventview.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp	Thu May 27 12:51:15 2010 +0300
@@ -608,7 +608,7 @@
 	QStringList itemData;
 	itemData.append(QString::null);
     itemData.append(QString::null);
-    itemData.append("qtg_mono_repeat.svg");
+    itemData.append("qtg_small_repeat");
     mRepeatWidget->setProperty(primaryLeftIconItem, false);
 	mRepeatWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
@@ -1261,7 +1261,7 @@
             break;
         case AgendaEntry::TypeEvent:
             {
-            subjectIcon.append("qtg_small_allday");//@ TODO add proper icon
+            subjectIcon.append("qtg_small_day");
             }
             break;
         case AgendaEntry::TypeAnniversary:
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/application/application.pro
--- a/calendarui/application/application.pro	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/application/application.pro	Thu May 27 12:51:15 2010 +0300
@@ -35,6 +35,7 @@
 	"../rom/calenlunarchinese_variant.iby	CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(calenlunarchinese_variant.iby)" \
 	# Generic configuration interface for component cenrep settings  
 	"../conf/calendarUI.confml				APP_LAYER_CONFML(calendarUI.confml)" \
+	"../conf/CI_calendarUI.confml			APP_LAYER_CONFML(CI_calendarUI.confml)" \
 	"../conf/calendarUI_101F874B.crml		APP_LAYER_CRML(calendarUI_101F874B.crml)" 	
 
 	LIBS += -lcalencontroller \
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/bwins/calenviewsu.def
--- a/calendarui/bwins/calenviewsu.def	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/bwins/calenviewsu.def	Thu May 27 12:51:15 2010 +0300
@@ -12,143 +12,143 @@
 	?handleAppendingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 11 NONAME ; void CalenMonthGrid::handleAppendingRows(class QList<class CalenMonthData> &)
 	?handleChangeOrientation@CalenMonthView@@AAEXXZ @ 12 NONAME ; void CalenMonthView::handleChangeOrientation(void)
 	?staticMetaObject@CalenSettingsView@@2UQMetaObject@@B @ 13 NONAME ; struct QMetaObject const CalenSettingsView::staticMetaObject
-	?upGesture@CalenMonthGrid@@MAEXH@Z @ 14 NONAME ; void CalenMonthGrid::upGesture(int)
-	?getStaticMetaObject@CalenSettingsView@@SAABUQMetaObject@@XZ @ 15 NONAME ; struct QMetaObject const & CalenSettingsView::getStaticMetaObject(void)
-	?updateMonthDataArrayWithActiveDates@CalenMonthView@@AAEXXZ @ 16 NONAME ; void CalenMonthView::updateMonthDataArrayWithActiveDates(void)
-	?scrollingFinished@CalenMonthGrid@@QAEXXZ @ 17 NONAME ; void CalenMonthGrid::scrollingFinished(void)
-	?setCurrentIdex@CalenMonthGrid@@QAEXH@Z @ 18 NONAME ; void CalenMonthGrid::setCurrentIdex(int)
-	??_ECalenMonthGrid@@UAE@I@Z @ 19 NONAME ; CalenMonthGrid::~CalenMonthGrid(unsigned int)
-	?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 20 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *)
-	?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 21 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *)
-	?populatePrevMonth@CalenMonthView@@QAEXXZ @ 22 NONAME ; void CalenMonthView::populatePrevMonth(void)
-	?qt_metacall@CalenSettingsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 23 NONAME ; int CalenSettingsView::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 24 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &)
-	?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 25 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void)
-	?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 26 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int)
-	?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 27 NONAME ; void * CalenMonthView::qt_metacast(char const *)
-	?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 28 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject
-	?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 29 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *)
-	?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 30 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const
-	?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 31 NONAME ; void CalenPreviewPane::startAutoScroll(void)
-	?doLazyLoading@CalenMonthView@@QAEXXZ @ 32 NONAME ; void CalenMonthView::doLazyLoading(void)
-	?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 33 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *)
-	?HandleNotification@CalenDayView@@UAEXW4TCalenNotification@@@Z @ 34 NONAME ; void CalenDayView::HandleNotification(enum TCalenNotification)
-	?panGesture@CalenMonthGrid@@MAEXABVQPointF@@@Z @ 35 NONAME ; void CalenMonthGrid::panGesture(class QPointF const &)
-	?mousePressEvent@CalenPreviewPane@@UAEXPAVQGraphicsSceneMouseEvent@@@Z @ 36 NONAME ; void CalenPreviewPane::mousePressEvent(class QGraphicsSceneMouseEvent *)
-	??1CalenSettingsView@@UAE@XZ @ 37 NONAME ; CalenSettingsView::~CalenSettingsView(void)
-	?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 38 NONAME ; class QDateTime CalenPreviewPane::Date(void)
-	?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int)
-	?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 40 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const
-	??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 41 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *)
-	?mouseReleaseEvent@CalenPreviewPane@@UAEXPAVQGraphicsSceneMouseEvent@@@Z @ 42 NONAME ; void CalenPreviewPane::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
-	?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 43 NONAME ; int CalenMonthView::rowsInPrevMonth(void)
-	?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 44 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList<class CalenMonthData> &)
-	?mouseMoveEvent@CalenPreviewPane@@UAEXPAVQGraphicsSceneMouseEvent@@@Z @ 45 NONAME ; void CalenPreviewPane::mouseMoveEvent(class QGraphicsSceneMouseEvent *)
-	?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 46 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const
-	??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 47 NONAME ; CalenDayView::CalenDayView(class MCalenServices &)
-	?populateNextMonth@CalenMonthView@@QAEXXZ @ 48 NONAME ; void CalenMonthView::populateNextMonth(void)
-	?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 49 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &)
-	?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 50 NONAME ; void * CalenMonthGrid::qt_metacast(char const *)
-	?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 51 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void)
-	?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 52 NONAME ; int CalenMonthView::rowsInFutMonth(void)
-	?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 53 NONAME ; int CalenMonthView::getCurrGridIndex(void)
-	?launchDayView@CalenMonthView@@QAEXXZ @ 54 NONAME ; void CalenMonthView::launchDayView(void)
-	??1CalenDayViewWidget@@UAE@XZ @ 55 NONAME ; CalenDayViewWidget::~CalenDayViewWidget(void)
-	??0CalenDayViewWidget@@QAE@AAVMCalenServices@@PAVCalenDocLoader@@@Z @ 56 NONAME ; CalenDayViewWidget::CalenDayViewWidget(class MCalenServices &, class CalenDocLoader *)
-	?prependRows@CalenMonthGrid@@QAEXXZ @ 57 NONAME ; void CalenMonthGrid::prependRows(void)
-	?orientationChanged@CalenMonthGrid@@MAEXW4Orientation@Qt@@@Z @ 58 NONAME ; void CalenMonthGrid::orientationChanged(enum Qt::Orientation)
-	?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 59 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 60 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int)
-	??1CalenThickLinesDrawer@@UAE@XZ @ 61 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void)
-	?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 62 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *)
-	??_ECalenMonthView@@UAE@I@Z @ 63 NONAME ; CalenMonthView::~CalenMonthView(unsigned int)
-	?changeOrientation@CalenMonthView@@UAEXW4Orientation@Qt@@@Z @ 64 NONAME ; void CalenMonthView::changeOrientation(enum Qt::Orientation)
-	?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 65 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &)
-	??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 66 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *)
-	?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 67 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void)
-	?stopScrolling@CalenPreviewPane@@QAEXXZ @ 68 NONAME ; void CalenPreviewPane::stopScrolling(void)
-	?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 69 NONAME ; void CalenMonthView::addBackgroundFrame(void)
-	?createGrid@CalenMonthView@@AAEXXZ @ 70 NONAME ; void CalenMonthView::createGrid(void)
-	?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *)
-	?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 72 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void)
-	?launchPreviousView@CalenSettingsView@@AAEXXZ @ 73 NONAME ; void CalenSettingsView::launchPreviousView(void)
-	?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 74 NONAME ; void CalenMonthView::setCurrGridIndex(int)
-	?setDateToLabel@CalenMonthView@@AAEXXZ @ 75 NONAME ; void CalenMonthView::setDateToLabel(void)
-	?addWeekNumbers@CalenMonthView@@AAEXXZ @ 76 NONAME ; void CalenMonthView::addWeekNumbers(void)
-	?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 78 NONAME ; void CalenDayView::setupView(class CalenDocLoader *)
-	??1CalenMonthView@@UAE@XZ @ 79 NONAME ; CalenMonthView::~CalenMonthView(void)
-	?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 80 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &)
-	?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 81 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject
-	?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 82 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int)
-	?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 83 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
-	?initializeForm@CalenSettingsView@@QAEXXZ @ 84 NONAME ; void CalenSettingsView::initializeForm(void)
-	?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 85 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void)
-	?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 86 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int)
-	?goToToday@CalenMonthView@@AAEXXZ @ 87 NONAME ; void CalenMonthView::goToToday(void)
-	?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 88 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int)
-	?onContextChanged@CalenMonthView@@EAEXXZ @ 89 NONAME ; void CalenMonthView::onContextChanged(void)
-	?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 90 NONAME ; void * CalenPreviewPane::qt_metacast(char const *)
-	?docLoader@CalenDayView@@QAEPAVCalenDocLoader@@XZ @ 91 NONAME ; class CalenDocLoader * CalenDayView::docLoader(void)
-	?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 92 NONAME ; int CalenMonthGrid::getCurrentIndex(void)
-	?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 93 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int)
-	?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 94 NONAME ; void CalenMonthView::removeWeekNumbers(void)
-	?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int)
-	??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 96 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &)
-	?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 97 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void)
-	?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 98 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *)
-	?clearListModel@CalenDayView@@QAEXXZ @ 99 NONAME ; void CalenDayView::clearListModel(void)
-	??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 100 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *)
-	?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 101 NONAME ; void CalenMonthView::onLocaleChanged(int)
-	?doPopulation@CalenMonthView@@UAEXXZ @ 102 NONAME ; void CalenMonthView::doPopulation(void)
-	?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 103 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int)
-	?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 104 NONAME ; void CalenPreviewPane::GetInstanceListL(void)
-	?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 105 NONAME ; void CalenMonthView::getInstanceList(class QList<class QDate> &, class QDateTime, class QDateTime)
-	?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 106 NONAME ; class QString CalenMonthView::tr(char const *, char const *)
-	??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 107 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *)
-	?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 108 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void)
-	?appendRows@CalenMonthGrid@@QAEXXZ @ 109 NONAME ; void CalenMonthGrid::appendRows(void)
-	?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 110 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int)
-	?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 111 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
-	?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 112 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList<class CalenMonthData> &)
-	?getCurrentDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 113 NONAME ; class QDateTime CalenMonthView::getCurrentDay(void)
-	?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 114 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject
-	?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 115 NONAME ; class QString CalenSettingsView::tr(char const *, char const *)
-	?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 116 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void)
-	?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 117 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *)
-	?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 118 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject
-	?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 119 NONAME ; void CalenMonthView::populateWithInstanceView(void)
-	?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 120 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *)
-	?downGesture@CalenMonthGrid@@MAEXH@Z @ 121 NONAME ; void CalenMonthGrid::downGesture(int)
-	?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 122 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime)
-	?doPopulation@CalenDayView@@UAEXXZ @ 123 NONAME ; void CalenDayView::doPopulation(void)
-	??1CalenDayView@@UAE@XZ @ 124 NONAME ; CalenDayView::~CalenDayView(void)
-	?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 125 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void)
-	?monthDataList@CalenMonthView@@QAE?AV?$QList@VCalenMonthData@@@@XZ @ 126 NONAME ; class QList<class CalenMonthData> CalenMonthView::monthDataList(void)
-	?updateMonthGridModel@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@H_N@Z @ 127 NONAME ; void CalenMonthGrid::updateMonthGridModel(class QList<class CalenMonthData> &, int, bool)
-	??1CalenMonthGrid@@UAE@XZ @ 128 NONAME ; CalenMonthGrid::~CalenMonthGrid(void)
-	?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 129 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const
-	?updateWeekNumGridModel@CalenMonthView@@AAEXXZ @ 130 NONAME ; void CalenMonthView::updateWeekNumGridModel(void)
-	?qt_metacast@CalenThickLinesDrawer@@UAEPAXPBD@Z @ 131 NONAME ; void * CalenThickLinesDrawer::qt_metacast(char const *)
-	?prepareForPopulation@CalenMonthView@@AAEXXZ @ 132 NONAME ; void CalenMonthView::prepareForPopulation(void)
-	?handlePreviewPaneGesture@CalenMonthView@@QAEX_N@Z @ 133 NONAME ; void CalenMonthView::handlePreviewPaneGesture(bool)
-	?setActiveDates@CalenMonthGrid@@AAEXVQDate@@@Z @ 134 NONAME ; void CalenMonthGrid::setActiveDates(class QDate)
-	?trUtf8@CalenMonthView@@SA?AVQString@@PBD0@Z @ 135 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *)
-	?setContextForActiveDay@CalenMonthView@@QAEXH@Z @ 136 NONAME ; void CalenMonthView::setContextForActiveDay(int)
-	?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 137 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *)
-	??_ECalenSettingsView@@UAE@I@Z @ 138 NONAME ; CalenSettingsView::~CalenSettingsView(unsigned int)
-	??_ECalenThickLinesDrawer@@UAE@I@Z @ 139 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(unsigned int)
-	?metaObject@CalenSettingsView@@UBEPBUQMetaObject@@XZ @ 140 NONAME ; struct QMetaObject const * CalenSettingsView::metaObject(void) const
-	?getStaticMetaObject@CalenMonthView@@SAABUQMetaObject@@XZ @ 141 NONAME ; struct QMetaObject const & CalenMonthView::getStaticMetaObject(void)
-	?paint@CalenMonthGrid@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 142 NONAME ; void CalenMonthGrid::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
-	?qt_metacast@CalenSettingsView@@UAEPAXPBD@Z @ 143 NONAME ; void * CalenSettingsView::qt_metacast(char const *)
-	?tr@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 144 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *)
-	?qt_metacall@CalenMonthView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 145 NONAME ; int CalenMonthView::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setActiveDay@CalenMonthView@@AAEXVQDateTime@@@Z @ 146 NONAME ; void CalenMonthView::setActiveDay(class QDateTime)
-	?itemActivated@CalenMonthGrid@@QAEXABVQModelIndex@@@Z @ 147 NONAME ; void CalenMonthGrid::itemActivated(class QModelIndex const &)
-	?qt_metacall@CalenMonthGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 148 NONAME ; int CalenMonthGrid::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??_ECalenPreviewPane@@UAE@I@Z @ 149 NONAME ; CalenPreviewPane::~CalenPreviewPane(unsigned int)
-	?createEditor@CalenMonthView@@AAEXXZ @ 150 NONAME ; void CalenMonthView::createEditor(void)
-	?getActiveDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 151 NONAME ; class QDateTime CalenMonthView::getActiveDay(void)
-	?addRemoveActionsInMenu@CalenMonthView@@AAEXXZ @ 152 NONAME ; void CalenMonthView::addRemoveActionsInMenu(void)
+	?getStaticMetaObject@CalenSettingsView@@SAABUQMetaObject@@XZ @ 14 NONAME ; struct QMetaObject const & CalenSettingsView::getStaticMetaObject(void)
+	?updateMonthDataArrayWithActiveDates@CalenMonthView@@AAEXXZ @ 15 NONAME ; void CalenMonthView::updateMonthDataArrayWithActiveDates(void)
+	?scrollingFinished@CalenMonthGrid@@QAEXXZ @ 16 NONAME ; void CalenMonthGrid::scrollingFinished(void)
+	?setCurrentIdex@CalenMonthGrid@@QAEXH@Z @ 17 NONAME ; void CalenMonthGrid::setCurrentIdex(int)
+	??_ECalenMonthGrid@@UAE@I@Z @ 18 NONAME ; CalenMonthGrid::~CalenMonthGrid(unsigned int)
+	?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 19 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *)
+	?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 20 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *)
+	?populatePrevMonth@CalenMonthView@@QAEXXZ @ 21 NONAME ; void CalenMonthView::populatePrevMonth(void)
+	?qt_metacall@CalenSettingsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 22 NONAME ; int CalenSettingsView::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 23 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &)
+	?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 24 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void)
+	?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 25 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int)
+	?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 26 NONAME ; void * CalenMonthView::qt_metacast(char const *)
+	?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 27 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject
+	?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 28 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *)
+	?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 29 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const
+	?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 30 NONAME ; void CalenPreviewPane::startAutoScroll(void)
+	?doLazyLoading@CalenMonthView@@QAEXXZ @ 31 NONAME ; void CalenMonthView::doLazyLoading(void)
+	?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 32 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *)
+	?HandleNotification@CalenDayView@@UAEXW4TCalenNotification@@@Z @ 33 NONAME ; void CalenDayView::HandleNotification(enum TCalenNotification)
+	??1CalenSettingsView@@UAE@XZ @ 34 NONAME ; CalenSettingsView::~CalenSettingsView(void)
+	?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 35 NONAME ; class QDateTime CalenPreviewPane::Date(void)
+	?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 36 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int)
+	?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 37 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const
+	??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 38 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *)
+	?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 39 NONAME ; int CalenMonthView::rowsInPrevMonth(void)
+	?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 40 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList<class CalenMonthData> &)
+	?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const
+	?gestureEvent@CalenMonthGrid@@MAEXPAVQGestureEvent@@@Z @ 42 NONAME ; void CalenMonthGrid::gestureEvent(class QGestureEvent *)
+	??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 43 NONAME ; CalenDayView::CalenDayView(class MCalenServices &)
+	?populateNextMonth@CalenMonthView@@QAEXXZ @ 44 NONAME ; void CalenMonthView::populateNextMonth(void)
+	?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 45 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &)
+	?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 46 NONAME ; void * CalenMonthGrid::qt_metacast(char const *)
+	?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 47 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void)
+	?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 48 NONAME ; int CalenMonthView::rowsInFutMonth(void)
+	?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 49 NONAME ; int CalenMonthView::getCurrGridIndex(void)
+	?launchDayView@CalenMonthView@@QAEXXZ @ 50 NONAME ; void CalenMonthView::launchDayView(void)
+	??1CalenDayViewWidget@@UAE@XZ @ 51 NONAME ; CalenDayViewWidget::~CalenDayViewWidget(void)
+	?gestureEvent@CalenPreviewPane@@MAEXPAVQGestureEvent@@@Z @ 52 NONAME ; void CalenPreviewPane::gestureEvent(class QGestureEvent *)
+	??0CalenDayViewWidget@@QAE@AAVMCalenServices@@PAVCalenDocLoader@@@Z @ 53 NONAME ; CalenDayViewWidget::CalenDayViewWidget(class MCalenServices &, class CalenDocLoader *)
+	?prependRows@CalenMonthGrid@@QAEXXZ @ 54 NONAME ; void CalenMonthGrid::prependRows(void)
+	?orientationChanged@CalenMonthGrid@@MAEXW4Orientation@Qt@@@Z @ 55 NONAME ; void CalenMonthGrid::orientationChanged(enum Qt::Orientation)
+	?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 56 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 57 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int)
+	??1CalenThickLinesDrawer@@UAE@XZ @ 58 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void)
+	?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 59 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *)
+	??_ECalenMonthView@@UAE@I@Z @ 60 NONAME ; CalenMonthView::~CalenMonthView(unsigned int)
+	?changeOrientation@CalenMonthView@@UAEXW4Orientation@Qt@@@Z @ 61 NONAME ; void CalenMonthView::changeOrientation(enum Qt::Orientation)
+	?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 62 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &)
+	??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 63 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *)
+	?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 64 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void)
+	?stopScrolling@CalenPreviewPane@@QAEXXZ @ 65 NONAME ; void CalenPreviewPane::stopScrolling(void)
+	?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 66 NONAME ; void CalenMonthView::addBackgroundFrame(void)
+	?createGrid@CalenMonthView@@AAEXXZ @ 67 NONAME ; void CalenMonthView::createGrid(void)
+	?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 68 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *)
+	?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 69 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void)
+	?launchPreviousView@CalenSettingsView@@AAEXXZ @ 70 NONAME ; void CalenSettingsView::launchPreviousView(void)
+	?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 71 NONAME ; void CalenMonthView::setCurrGridIndex(int)
+	?setDateToLabel@CalenMonthView@@AAEXXZ @ 72 NONAME ; void CalenMonthView::setDateToLabel(void)
+	?addWeekNumbers@CalenMonthView@@AAEXXZ @ 73 NONAME ; void CalenMonthView::addWeekNumbers(void)
+	?downGesture@CalenMonthGrid@@AAEXXZ @ 74 NONAME ; void CalenMonthGrid::downGesture(void)
+	?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 75 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 76 NONAME ; void CalenDayView::setupView(class CalenDocLoader *)
+	?upGesture@CalenMonthGrid@@AAEXXZ @ 77 NONAME ; void CalenMonthGrid::upGesture(void)
+	??1CalenMonthView@@UAE@XZ @ 78 NONAME ; CalenMonthView::~CalenMonthView(void)
+	?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 79 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &)
+	?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 80 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject
+	?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 81 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int)
+	?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 82 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
+	?initializeForm@CalenSettingsView@@QAEXXZ @ 83 NONAME ; void CalenSettingsView::initializeForm(void)
+	?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 84 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void)
+	?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 85 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int)
+	?goToToday@CalenMonthView@@AAEXXZ @ 86 NONAME ; void CalenMonthView::goToToday(void)
+	?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 87 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int)
+	?onContextChanged@CalenMonthView@@EAEXXZ @ 88 NONAME ; void CalenMonthView::onContextChanged(void)
+	?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 89 NONAME ; void * CalenPreviewPane::qt_metacast(char const *)
+	?docLoader@CalenDayView@@QAEPAVCalenDocLoader@@XZ @ 90 NONAME ; class CalenDocLoader * CalenDayView::docLoader(void)
+	?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 91 NONAME ; int CalenMonthGrid::getCurrentIndex(void)
+	?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int)
+	?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 93 NONAME ; void CalenMonthView::removeWeekNumbers(void)
+	?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 94 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int)
+	??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 95 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &)
+	?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 96 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void)
+	?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 97 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *)
+	?clearListModel@CalenDayView@@QAEXXZ @ 98 NONAME ; void CalenDayView::clearListModel(void)
+	??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 99 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *)
+	?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 100 NONAME ; void CalenMonthView::onLocaleChanged(int)
+	?doPopulation@CalenMonthView@@UAEXXZ @ 101 NONAME ; void CalenMonthView::doPopulation(void)
+	?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 102 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int)
+	?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 103 NONAME ; void CalenPreviewPane::GetInstanceListL(void)
+	?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 104 NONAME ; void CalenMonthView::getInstanceList(class QList<class QDate> &, class QDateTime, class QDateTime)
+	?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 105 NONAME ; class QString CalenMonthView::tr(char const *, char const *)
+	??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 106 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *)
+	?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 107 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void)
+	?appendRows@CalenMonthGrid@@QAEXXZ @ 108 NONAME ; void CalenMonthGrid::appendRows(void)
+	?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 109 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int)
+	?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 110 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
+	?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 111 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList<class CalenMonthData> &)
+	?getCurrentDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 112 NONAME ; class QDateTime CalenMonthView::getCurrentDay(void)
+	?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 113 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject
+	?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 114 NONAME ; class QString CalenSettingsView::tr(char const *, char const *)
+	?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 115 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void)
+	?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 116 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *)
+	?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 117 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject
+	?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 118 NONAME ; void CalenMonthView::populateWithInstanceView(void)
+	?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 119 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *)
+	?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 120 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime)
+	?doPopulation@CalenDayView@@UAEXXZ @ 121 NONAME ; void CalenDayView::doPopulation(void)
+	??1CalenDayView@@UAE@XZ @ 122 NONAME ; CalenDayView::~CalenDayView(void)
+	?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 123 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void)
+	?monthDataList@CalenMonthView@@QAE?AV?$QList@VCalenMonthData@@@@XZ @ 124 NONAME ; class QList<class CalenMonthData> CalenMonthView::monthDataList(void)
+	?updateMonthGridModel@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@H_N@Z @ 125 NONAME ; void CalenMonthGrid::updateMonthGridModel(class QList<class CalenMonthData> &, int, bool)
+	??1CalenMonthGrid@@UAE@XZ @ 126 NONAME ; CalenMonthGrid::~CalenMonthGrid(void)
+	?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 127 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const
+	?updateWeekNumGridModel@CalenMonthView@@AAEXXZ @ 128 NONAME ; void CalenMonthView::updateWeekNumGridModel(void)
+	?qt_metacast@CalenThickLinesDrawer@@UAEPAXPBD@Z @ 129 NONAME ; void * CalenThickLinesDrawer::qt_metacast(char const *)
+	?prepareForPopulation@CalenMonthView@@AAEXXZ @ 130 NONAME ; void CalenMonthView::prepareForPopulation(void)
+	?handlePreviewPaneGesture@CalenMonthView@@QAEX_N@Z @ 131 NONAME ; void CalenMonthView::handlePreviewPaneGesture(bool)
+	?setActiveDates@CalenMonthGrid@@AAEXVQDate@@@Z @ 132 NONAME ; void CalenMonthGrid::setActiveDates(class QDate)
+	?trUtf8@CalenMonthView@@SA?AVQString@@PBD0@Z @ 133 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *)
+	?setContextForActiveDay@CalenMonthView@@QAEXH@Z @ 134 NONAME ; void CalenMonthView::setContextForActiveDay(int)
+	?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 135 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *)
+	??_ECalenSettingsView@@UAE@I@Z @ 136 NONAME ; CalenSettingsView::~CalenSettingsView(unsigned int)
+	??_ECalenThickLinesDrawer@@UAE@I@Z @ 137 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(unsigned int)
+	?metaObject@CalenSettingsView@@UBEPBUQMetaObject@@XZ @ 138 NONAME ; struct QMetaObject const * CalenSettingsView::metaObject(void) const
+	?getStaticMetaObject@CalenMonthView@@SAABUQMetaObject@@XZ @ 139 NONAME ; struct QMetaObject const & CalenMonthView::getStaticMetaObject(void)
+	?paint@CalenMonthGrid@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 140 NONAME ; void CalenMonthGrid::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
+	?qt_metacast@CalenSettingsView@@UAEPAXPBD@Z @ 141 NONAME ; void * CalenSettingsView::qt_metacast(char const *)
+	?tr@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 142 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *)
+	?qt_metacall@CalenMonthView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 143 NONAME ; int CalenMonthView::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setActiveDay@CalenMonthView@@AAEXVQDateTime@@@Z @ 144 NONAME ; void CalenMonthView::setActiveDay(class QDateTime)
+	?itemActivated@CalenMonthGrid@@QAEXABVQModelIndex@@@Z @ 145 NONAME ; void CalenMonthGrid::itemActivated(class QModelIndex const &)
+	?qt_metacall@CalenMonthGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 146 NONAME ; int CalenMonthGrid::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_ECalenPreviewPane@@UAE@I@Z @ 147 NONAME ; CalenPreviewPane::~CalenPreviewPane(unsigned int)
+	?createEditor@CalenMonthView@@AAEXXZ @ 148 NONAME ; void CalenMonthView::createEditor(void)
+	?getActiveDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 149 NONAME ; class QDateTime CalenMonthView::getActiveDay(void)
+	?addRemoveActionsInMenu@CalenMonthView@@AAEXXZ @ 150 NONAME ; void CalenMonthView::addRemoveActionsInMenu(void)
+	??1CalenPluginLabel@@UAE@XZ @ 151 NONAME ; CalenPluginLabel::~CalenPluginLabel(void)
+	??0CalenPluginLabel@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 152 NONAME ; CalenPluginLabel::CalenPluginLabel(class MCalenServices &, class QGraphicsItem *)
 
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/caleneditor/data/caleneditor_en_GB.qm
Binary file calendarui/caleneditor/data/caleneditor_en_GB.qm has changed
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/caleneditor/data/caleneditorview.docml
--- a/calendarui/caleneditor/data/caleneditorview.docml	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/caleneditor/data/caleneditorview.docml	Thu May 27 12:51:15 2010 +0300
@@ -4,12 +4,12 @@
         <string locid="txt_calendar_opt_add_description" name="text" value="Add description"/>
     </object>
     <object name="deleteEventAction" type="HbAction">
-        <string locid="txt_calendar_opt_delete_event" name="text" value="Delete event"/>
+        <string locid="txt_common_menu_delete" name="text" value="Delete"/>
     </object>
     <widget name="calenEditorview" type="HbView">
         <widget name="calenEditorcontent" role="HbView:widget" type="HbWidget">
             <widget name="calenEditorHeadingWidget" type="HbGroupBox">
-                <string locid="txt_calendar_subhead_new_event" name="titleText" value="New event"/>
+                <string locid="txt_calendar_subhead_new_event" name="heading" value="New event"/>
                 <bool name="collapsable" value="FALSE"/>
             </widget>
             <widget name="calenEditorDataFormWidget" type="HbDataForm">
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/caleneditor/src/caleneditor_p.cpp
--- a/calendarui/caleneditor/src/caleneditor_p.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/caleneditor/src/caleneditor_p.cpp	Thu May 27 12:51:15 2010 +0300
@@ -383,9 +383,9 @@
 	HbAction *cancelAction =
 	        new HbAction(hbTrId("txt_calendar_button_softkey1_cancel"));
 	popUp->addAction(cancelAction);
+	connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
 	connect(editButtonList, SIGNAL(itemSelected(int)), this,
 	        SLOT(handleEditOccurence(int)));
-	connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
 	connect(cancelAction, SIGNAL(triggered()), this, SLOT(handleCancel()));
 
 	// Show the popup
@@ -519,6 +519,7 @@
 	HbAction *deleteEventAction = qobject_cast<HbAction *> (
 							mEditorDocLoader->findObject(
 										CALEN_EDITOR_DELETE_EVENT_ACTION));
+	deleteEventAction->setText(hbTrId("txt_common_menu_delete"));
 	connect(deleteEventAction, SIGNAL(triggered()), this,
 							SLOT(showDeleteConfirmationQuery()));
 
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/caleneditor/src/caleneditorreminderfield.cpp
--- a/calendarui/caleneditor/src/caleneditorreminderfield.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/caleneditor/src/caleneditorreminderfield.cpp	Thu May 27 12:51:15 2010 +0300
@@ -58,7 +58,7 @@
 	mReminderItem = new HbDataFormModelItem();
 	mReminderItem->setType(HbDataFormModelItem::ComboBoxItem);
 	mReminderItem->setData(HbDataFormModelItem::LabelRole,
-						   hbTrId("txt_calendar_setlabel_alarm"));	
+						   hbTrId("txt_calendar_setlabel_reminder"));	
 	// Add it to the model
 	mCalenEditorModel->appendDataFormItem(mReminderItem,
 										mCalenEditorModel->invisibleRootItem());
@@ -79,25 +79,20 @@
 {
 	// Create the reminder choices
 	QStringList reminderChoices;
-	reminderChoices << hbTrId("txt_calendar_setlabel_alarm_val_off")
-			<< hbTrId("txt_calendar_setlabel_alarm_val_before_ln_minutes", 5)
-			<< hbTrId("txt_calendar_setlabel_alarm_val_before_ln_minutes", 10)
-			<< hbTrId("txt_calendar_setlabel_alarm_val_before_ln_minutes", 15)
-			<< hbTrId("txt_calendar_setlabel_alarm_val_before_ln_minutes", 30)
-			<< hbTrId("txt_calendar_setlabel_alarm_val_before_ln_hours", 1)
-			<< hbTrId("txt_calendar_setlabel_alarm_val_before_ln_hours", 2);
+	reminderChoices << hbTrId("txt_calendar_setlabel_reminder_val_off")
+				<< hbTrId("txt_calendar_setlabel_reminder_val_at_the_start")
+				<< hbTrId("txt_calendar_setlabel_reminder_val_15_minutes_befo")
+				<< hbTrId("txt_calendar_setlabel_reminder_val_30_minutes_befo")
+				<< hbTrId("txt_calendar_setlabel_reminder_val_1_hour_before");
 
 	mReminderItem->setContentWidgetData(QString("items"), reminderChoices);
 
 	// Build the hash map for the reminder.
-	mReminderHash[0] = 0; // OFF.
-	mReminderHash[1] = 5;
-	mReminderHash[2] = 10;
-	mReminderHash[3] = 15;
-	mReminderHash[4] = 30;
-	mReminderHash[5] = 60;
-	mReminderHash[6] = 120;
-
+	mReminderHash[0] = -1; // OFF.
+	mReminderHash[1] = 0;
+	mReminderHash[2] = 15;
+	mReminderHash[3] = 30;
+	mReminderHash[4] = 60;
 	mReminderItem->setEnabled(true);
 }
 
@@ -153,9 +148,9 @@
 	// Set the default reminder value to 15 minutes 
 	if (newEntry) {
 		if (!pastEvent) {
-			mReminderItem->setContentWidgetData("currentIndex", 3);
+			mReminderItem->setContentWidgetData("currentIndex", 2);
 			// Save the reminder alarm for the entry
-			reminder.setTimeOffset(mReminderHash.value(3));
+			reminder.setTimeOffset(mReminderHash.value(2));
 			reminder.setAlarmSoundName(QString(" "));
 			// Set the reminder to the entry as well as original entry.
 			mCalenEditor->editedEntry()->setAlarm(reminder);
@@ -240,10 +235,10 @@
 	}
 	// Check whether all day event or not and store appropriately.
 	if (!mCalenEditor->isAllDayEvent()) {
-		// If value for the index in hash table is 0 i.e reminder is "OFF",
+		// If value for the index in hash table is -1 i.e reminder is "OFF",
 		// then set the default constructed reminder to
 		// the entry which is Null.
-		if (!mReminderHash.value(index)) {
+		if (mReminderHash.value(index) < 0) {
 			// Construct the default alarm which is NULL
 			reminder = AgendaAlarm();
 		} else {
@@ -312,7 +307,7 @@
 {
 	// Create the remindar choices
 	QStringList reminderChoices;
-	reminderChoices << hbTrId("txt_calendar_setlabel_alarm_val_off");
+	reminderChoices << hbTrId("txt_calendar_setlabel_reminder_val_off");
 	mReminderItem->setContentWidgetData(QString("items"), reminderChoices);
 	mReminderItem->setEnabled(false); 
 }
@@ -361,23 +356,25 @@
 	if (referenceDate < QDate::currentDate() || 
 			referenceDate == QDate::currentDate()) {
 		// Set reminder off for past event.
-		reminderChoicesForAllDay << hbTrId("off");
+		reminderChoicesForAllDay << hbTrId("txt_calendar_setlabel_reminder_val_off");
 		mReminderItem->setContentWidgetData(QString("items"), 
 													reminderChoicesForAllDay);
 		mReminderItem->setEnabled(false); 
 		removeReminderTimeField();
 	} else if (theDayAfterTomorrow < referenceDate || 
 			theDayAfterTomorrow == referenceDate) {
-		reminderChoicesForAllDay << hbTrId("off")
-								 << hbTrId("On event day")
-								 << hbTrId("1 day before")
-								 << hbTrId("2 days before");
+		reminderChoicesForAllDay 
+				<< hbTrId("txt_calendar_setlabel_reminder_val_off")
+				<< hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
+				<< hbTrId("txt_calendar_setlabel_reminder_val_1_day_before")
+				<< hbTrId("txt_calendar_setlabel_reminder_val_2_days_before");
 		mReminderItem->setEnabled(true);
 		mCustomReminderTimeItem->setEnabled(true);
 	} else {
-		reminderChoicesForAllDay << hbTrId("off")
-								 << hbTrId("On event day")
-								 << hbTrId("1 day before");
+		reminderChoicesForAllDay 
+					<< hbTrId("txt_calendar_setlabel_reminder_val_off")
+					<< hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
+					<< hbTrId("txt_calendar_setlabel_reminder_val_1_day_before");
 		mReminderItem->setEnabled(true);
 		mCustomReminderTimeItem->setEnabled(true);
 	}
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/cenrep/101F874B.cre
Binary file calendarui/cenrep/101F874B.cre has changed
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/cenrep/101F874B.txt
Binary file calendarui/cenrep/101F874B.txt has changed
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/cenrep/CalendarDomainCRKeys.h
--- a/calendarui/cenrep/CalendarDomainCRKeys.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Calendar Domain Cenrep Keys.
-*
-*/
-
-#ifndef CALENDARDOMAINCRKEYS_H
-#define CALENDARDOMAINCRKEYS_H
-
-//#include <CalendarSDKCRKeys.h>
-
-/** Calendar UI Settings API */
-/** Provides access to the Calendar application's settings */
-
-const TUid KCRUidCalendar = {0x101F874B};
-
-/**
-* Calendar alarm sound file, string.
-* Default value : "z:\data\sounds\digital\alarm.aac"
-**/
-const TUint32 KCalendarSoundFile = 0x00000004;
-
-/** 
-* Default Calendar alarm sound file.
-* Default value : "z:\data\sounds\digital\alarm.aac"
-**/
-const TUint32 KCalendarDefaultSoundFile = 0x00000005;
-
-#endif
\ No newline at end of file
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/cenrep/CalendarInternalCRKeys.h
--- a/calendarui/cenrep/CalendarInternalCRKeys.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Calendar Internal Cenrep Keys.
-*
-*/
-
-
-
-#ifndef CALENDARINTERNALCRKEYS_H
-#define CALENDARINTERNALCRKEYS_H
-
-//#include <CalendarSDKCRKeys.h>
-
-/** Calendar UI Settings API */
-/** Provides access to the Calendar application's settings */
-
-const TUint32 KCRUidCalendar = {0x101F874B};
-
-
-/**
-* Default alarm time in minutes before event starting time.
-* Value is an integer between 0 and 60. Default: 15.
-**/
-const TUint32 KCalendarDefaultAlarmTime = 0x00000000;
-
-/**
-* Default starting view for Calendar. Value is an integer between 0 and 2.
-* 0 = Month view (default)
-* 1 = Week view
-* 2 = Day view
-**/
-const TUint32 KCalendarDefaultStartView = 0x00000001;
-
-/**
-* Week view title in Calendar application.
-* Value is eihter integer 0 or 1
-* 0 = Week number (default)
-* 1 = Week dates
-**/
-const TUint32 KCalendarWeekViewTitle = 0x00000002;
-
-/**
-* Is Chinese Lunar calendar information shown in Calendar
-* (only available if feature is included in ROM image).
-* Value is either integer 0 or 1
-* 0 = Off
-* 1 = On (default)
-* This key value is deprecated and has been replaced by the KCRUidCalenLunarPlugin key.
-**/
-const TUint32 KCalendarLunarCalendar = 0x00000003;
-
-/**
-* Calendar alarm sound file, string.
-* Default value : "z:\data\sounds\digital\alarm.aac"
-**/
-const TUint32 KCalendarSoundFile = 0x00000004;
-
-/**
-* Default Calendar alarm sound file.
-* Default value : "z:\data\sounds\digital\alarm.aac"
-**/
-const TUint32 KCalendarDefaultSoundFile = 0x00000005;
-
-/**
-* A flag that is set when a Calendar alarm was lost due to time change.
-* Default value: 0
-*/
-const TUint32 KCalendarLostAlarm = 0x00000006;
-
-/**
-* Calendar alarm snooze time interval in minutes.
-* Default value: 5
-*/
-const TUint32 KCalendarSnoozeTime = 0x00000007;
-
-//Added as an addition to the Symbian fix
-/**
-* Calendar Persistent Time to store the last time the System Time updated.
-* Default Value : 0
-*/
-const TReal KCalendarPersistentTime  = 0x00000009;
-
-/**
-* Text string containing UIDs and enabled/disabled flag (separated
-* by commas) for Calendar plugins.
-* Default value: Empty
-*/
-const TUint32 KCalendarPluginAvailability = 0x0000000A;
-
-/**
-* Defines whether regional information must be shown in the Calendar or not
-* Default value: 1
-*/
-const TUint32 KShowRegionalInformation = 0x0000000B;
-
-#endif  // CALENDARINTERNALCRKEYS_H
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/cenrep/CalendarPrivateCRKeys.h
--- a/calendarui/cenrep/CalendarPrivateCRKeys.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Calendar Private Cenrep Keys.
-*
-*/
-
-
-
-#ifndef CALENDARPRIVATECRKEYS_H
-#define CALENDARPRIVATECRKEYS_H
-
-#include <CalendarInternalCRKeys.h>
-
-/** Calendar UI Local Variation API */
-/** Provides access to the Calendar application's local variation setting */
-
-const TUid KCRUidCalendarLV = {0x101F874C};
-
-
-/**
-* Local variation bitmask for Caledar configuration.
-* For values refer to CalendarVariant.hrh.
-*
-**/
-const TUint32 KCalenLVFlags = 0x00000007;
-
-
-/** Calendar Thai Plugin  Settings API */
-/** Provides access to the Calendar Thai Plugin's settings */
-const TUid KCRUidCalenThaiPlugin = {0x102823D2};
-
-/**
-* User modifiable setting
-* Is Thai regional Calendar information shown in Calendar
-* (only available if feature is included in phone,
-*  currnet display language is Thai)
-* Value is either integer 0 or 1 
-* 0 = Off 
-* 1 = On (default)
-**/
-const TUint32 KCalenThaiPluginEnabled = 0x00000000;
-
-
-/** Calendar Lunar Calendar Plugin Settings API */
-/** Provides access to the Calendar Lunar Plugin's settings */
-const TUid KCRUidCalenLunarPlugin = { 0x102823D1 };
-
-/**
-* User modifiable setting
-* Is Chinese Lunar Calendar information shown in Calendar
-* (only available if feature is included in phone,
-*  currnet display language is some of Chinese languages)
-* Value is either integer 0 or 1 
-* 0 = Off 
-* 1 = On (default)
-**/
-const TUint32 KCalenChineseLunarEnabled = 0x00000000;
-
-
-/**
-* User modifiable setting
-* Is Vietnamese Lunar Calendar information shown in Calendar
-* (only available if feature is included in phone,
-*  currnet display language is Vietnamese languages)
-* Value is either integer 0 or 1 
-* 0 = Off 
-* 1 = On (default)
-**/
-const TUint32 KCalenVietnameseLunarEnabled = 0x00000001;
-
-
-/** Calendar UI Extensions Settings API */
-/** Provides access to user settings that enable Calendar UI extensions and customizations */
-const TUid KCRUidCalenUIExtensions = { 0x10282ED7 };
-
-/**
-* User modifiable setting to enable the AIW External Calendar.
-* (only available if an AIW provider is included in phone)
-* Value is either integer 0 or 1 
-* 0 = Off 
-* 1 = On (default)
-**/
-const TUint32 KCalenExternalCalendarEnabled = 0x00000000;
-
-
-#endif  // CALENDARPRIVATECRKEYS_H
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/cenrep/README.txt
--- a/calendarui/cenrep/README.txt	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-Put 101F874B.cre in epoc32/winscw/c/private/10202be9/persists.
-
-This is a temporary solution until the calendar central repository data gets updated in the platform to include the new plugin setting item.
-
-Once the platform change has been made, 101F874B.cre and 101F874B.txt can be deleted from this directory.
\ No newline at end of file
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/cenrep/keys_calendarUI.xls
Binary file calendarui/cenrep/keys_calendarUI.xls has changed
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/conf/CI_calendarUI.confml
Binary file calendarui/conf/CI_calendarUI.confml has changed
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/conf/calendarUI.confml
Binary file calendarui/conf/calendarUI.confml has changed
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/conf/calendarUI_101F874B.crml
Binary file calendarui/conf/calendarUI_101F874B.crml has changed
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/controller/data/xml/calendayview.docml
--- a/calendarui/controller/data/xml/calendayview.docml	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/controller/data/xml/calendayview.docml	Thu May 27 12:51:15 2010 +0300
@@ -16,7 +16,7 @@
         <widget name="dayViewWidget" role="HbView:widget" type="HbWidget">
 			<widget name="headingRegionalPluginWidget" type="HbWidget">
 	            <widget name="headingWidget" type="HbGroupBox">
-	                <string name="titleText" value=""/>
+	                <string name="heading" value=""/>
 	                <real name="z" value="1"/>
 	                <sizehint type="PREFERRED" width="53.43284un"/>
 	                <bool name="collapsable" value="FALSE"/>
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/controller/data/xml/calenmonthview.docml
--- a/calendarui/controller/data/xml/calenmonthview.docml	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/controller/data/xml/calenmonthview.docml	Thu May 27 12:51:15 2010 +0300
@@ -221,6 +221,12 @@
                     </layout>
                 </widget>
 				<widget name="prevPaneWidget" type="HbWidget">
+					<widget name="prevRegionalInfo" type="HbLabel">
+					<enums name="alignment" value="AlignCenter"/>
+					<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+					<string name="textColor" value="qtc_cal_day_preview_heading"/>
+					<contentsmargins bottom="0.75un" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="0.75un"/>
+					</widget>
 	                <widget name="prevPaneLayout" type="HbWidget">
 	                    <widget name="prevPaneContainer" type="HbWidget">
 	                        <widget name="prevPreviewPane" type="HbScrollArea">
@@ -235,7 +241,7 @@
 	                            <enums name="horizontalScrollBarPolicy" value="ScrollBarAlwaysOff"/>
 	                            <enums name="clampingStyle" value="StrictClamping"/>
 								<enums name="scrollingStyle" value="PanOrFlick"/>
-								<bool name="frictionEnabled" value="FALSE"/>
+								<bool name="frictionEnabled" value="TRUE"/>
 	                        </widget>
 	                        <widget name="NoEntriesLabelPrev" type="HbLabel">
 	                            <string locid="txt_calendar_empty_list_no_entries" name="plainText"/>
@@ -270,6 +276,12 @@
 	                </layout>
 	            </widget>
                 <widget name="currPaneWidget" type="HbWidget">
+					<widget name="currRegionalInfo" type="HbLabel">
+					<enums name="alignment" value="AlignCenter"/>
+					<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+					<string name="textColor" value="qtc_cal_day_preview_heading"/>
+					<contentsmargins bottom="0.75un" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="0.75un"/>
+					</widget>
                     <widget name="currPaneLayout" type="HbWidget">
                         <widget name="currPaneContainer" type="HbWidget">
                             <widget name="currPreviewPane" type="HbScrollArea">
@@ -284,7 +296,7 @@
 	                            <enums name="horizontalScrollBarPolicy" value="ScrollBarAlwaysOff"/>
 	                            <enums name="clampingStyle" value="StrictClamping"/>
 								<enums name="scrollingStyle" value="PanOrFlick"/>
-								<bool name="frictionEnabled" value="FALSE"/>
+								<bool name="frictionEnabled" value="TRUE"/>
                             </widget>
                             <widget name="NoEntriesLabelCurr" type="HbLabel">
                                 <string locid="txt_calendar_empty_list_no_entries" name="plainText"/>
@@ -319,6 +331,12 @@
                     </layout>
                 </widget>
                 <widget name="nextPaneWidget" type="HbWidget">
+					<widget name="nextRegionalInfo" type="HbLabel">
+					<enums name="alignment" value="AlignCenter"/>
+					<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+					<string name="textColor" value="qtc_cal_day_preview_heading"/>
+					<contentsmargins bottom="0.75un" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="0.75un"/>
+					</widget>
                     <widget name="nextPaneLayout" type="HbWidget">
                         <widget name="nextPaneContainer" type="HbWidget">
                             <widget name="nextPreviewPane" type="HbScrollArea">
@@ -333,7 +351,7 @@
 	                            <enums name="horizontalScrollBarPolicy" value="ScrollBarAlwaysOff"/>
 	                            <enums name="clampingStyle" value="StrictClamping"/>
 								<enums name="scrollingStyle" value="PanOrFlick"/>
-								<bool name="frictionEnabled" value="FALSE"/>
+								<bool name="frictionEnabled" value="TRUE"/>
                             </widget>
                             <widget name="NoEntriesLabelNext" type="HbLabel">
                                 <string locid="txt_calendar_empty_list_no_entries" name="plainText"/>
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/controller/src/calendeleteui.cpp
--- a/calendarui/controller/src/calendeleteui.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/controller/src/calendeleteui.cpp	Thu May 27 12:51:15 2010 +0300
@@ -35,7 +35,6 @@
 #include "CleanupResetAndDestroy.h"
 #include "caleninstanceid.h"
 #include "calenactionuiutils.h"
-#include "CalendarPrivateCRKeys.h"  // includes CalendarInternalCRKeys.h
 #include "calendateutils.h"
 #include "calenagendautils.h"
 
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/controller/src/calendocloader.cpp
--- a/calendarui/controller/src/calendocloader.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/controller/src/calendocloader.cpp	Thu May 27 12:51:15 2010 +0300
@@ -26,6 +26,7 @@
 #include "calencontroller.h"
 #include "calenthicklinesdrawer.h"
 #include "calencommon.h"
+#include "calenpluginlabel.h"
 
 // ----------------------------------------------------------------------------
 // CalenDocLoader::CalenDocLoader
@@ -80,17 +81,17 @@
         return calenMonthGrid;
 	} else if(name == QString(CALEN_PREVPREVIEWPANE)) {
         QObject *prevPreviewPane =
-        new CalenPreviewPane(mController.Services());
+        new CalenPreviewPane(services);
         prevPreviewPane->setObjectName(name);
         return prevPreviewPane;
     } else if(name == QString(CALEN_CURRPREVIEWPANE)) {
         QObject *currPreviewPane =
-        new CalenPreviewPane(mController.Services());
+        new CalenPreviewPane(services);
         currPreviewPane->setObjectName(name);
         return currPreviewPane;
     } else if(name == QString(CALEN_NEXTPREVIEWPANE)) {
         QObject *nextPreviewPane =
-        new CalenPreviewPane(mController.Services());
+        new CalenPreviewPane(services);
         nextPreviewPane->setObjectName(name);
         return nextPreviewPane;
     } else if (name == QString(CALEN_DAYNAMES_WIDGET)) {
@@ -103,7 +104,19 @@
         new CalenThickLinesDrawer(CalendarNamespace::CalenWeekNumWidget);
 	    calenSWeekNumWidget->setObjectName(name);
 	    return calenSWeekNumWidget;
-    } else {
+	} else if (name == QString(CALEN_PREVREGIONALINFO)) {
+		QObject *calenPrevRegionalLabel = new CalenPluginLabel(services);
+		calenPrevRegionalLabel->setObjectName(name);
+		return calenPrevRegionalLabel;
+	} else if (name == QString(CALEN_CURRREGIONALINFO)) {
+		QObject *calencurrRegionalLabel = new CalenPluginLabel(services);
+		calencurrRegionalLabel->setObjectName(name);
+		return calencurrRegionalLabel;
+	} else if (name == QString(CALEN_NEXTREGIONALINFO)) {
+		QObject *calenNextRegionalLabel = new CalenPluginLabel(services);
+		calenNextRegionalLabel->setObjectName(name);
+		return calenNextRegionalLabel;
+	} else {
 		return HbDocumentLoader::createObject(type, name);
 	}
 }
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/controller/src/calenviewmanager.cpp
--- a/calendarui/controller/src/calenviewmanager.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/controller/src/calenviewmanager.cpp	Thu May 27 12:51:15 2010 +0300
@@ -396,9 +396,11 @@
 		        // This happens when settings view or event viewer is opened
 		        // from the agenda view. Simply repopulate the view
 		    	if (mCalenDayView) {
+		    		// Remove month view from mainwindow.
+		    		mController.MainWindow().removeView(mCalenMonthView);
 					mCalenDayView->doPopulation();
 					mController.MainWindow().setCurrentView(mCalenDayView);
-		    	}
+		    	} 
 		    } else if (mController.MainWindow().currentView() == mCalenDayViewAlt){
 		        // This happens when settings view or event viewer is opened
 		        // from the agenda view. Simply repopulate the view
@@ -502,14 +504,12 @@
 	switch (command.Command()) {
 		case ECalenMonthView:
 		    removeDayViews();
-			// Add month view to mainwindow.
+		    // Add month view to mainwindow.
 			mController.MainWindow().addView(mCalenMonthView);
 			mCurrentViewId = ECalenMonthView;
 			activateCurrentView();
 			break;
 		case ECalenDayView:
-			// Remove month view from mainwindow.
-			mController.MainWindow().removeView(mCalenMonthView);
 			mCurrentViewId = ECalenDayView;
 			activateCurrentView();
 			break;
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/eabi/calenviewsu.def
--- a/calendarui/eabi/calenviewsu.def	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/eabi/calenviewsu.def	Thu May 27 12:51:15 2010 +0300
@@ -10,11 +10,11 @@
 	_ZN12CalenDayViewD1Ev @ 9 NONAME
 	_ZN12CalenDayViewD2Ev @ 10 NONAME
 	_ZN14CalenMonthGrid10appendRowsEv @ 11 NONAME
-	_ZN14CalenMonthGrid10panGestureERK7QPointF @ 12 NONAME
-	_ZN14CalenMonthGrid11downGestureEi @ 13 NONAME
-	_ZN14CalenMonthGrid11prependRowsEv @ 14 NONAME
-	_ZN14CalenMonthGrid11qt_metacallEN11QMetaObject4CallEiPPv @ 15 NONAME
-	_ZN14CalenMonthGrid11qt_metacastEPKc @ 16 NONAME
+	_ZN14CalenMonthGrid11downGestureEv @ 12 NONAME
+	_ZN14CalenMonthGrid11prependRowsEv @ 13 NONAME
+	_ZN14CalenMonthGrid11qt_metacallEN11QMetaObject4CallEiPPv @ 14 NONAME
+	_ZN14CalenMonthGrid11qt_metacastEPKc @ 15 NONAME
+	_ZN14CalenMonthGrid12gestureEventEP13QGestureEvent @ 16 NONAME
 	_ZN14CalenMonthGrid13itemActivatedERK11QModelIndex @ 17 NONAME
 	_ZN14CalenMonthGrid14setActiveDatesE5QDate @ 18 NONAME
 	_ZN14CalenMonthGrid14setCurrentIdexEi @ 19 NONAME
@@ -34,7 +34,7 @@
 	_ZN14CalenMonthGrid34updateMonthGridWithEventIndicatorsER5QListI14CalenMonthDataE @ 33 NONAME
 	_ZN14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 34 NONAME
 	_ZN14CalenMonthGrid7setViewEP14CalenMonthView @ 35 NONAME
-	_ZN14CalenMonthGrid9upGestureEi @ 36 NONAME
+	_ZN14CalenMonthGrid9upGestureEv @ 36 NONAME
 	_ZN14CalenMonthGridC1EP13QGraphicsItem @ 37 NONAME
 	_ZN14CalenMonthGridC2EP13QGraphicsItem @ 38 NONAME
 	_ZN14CalenMonthGridD0Ev @ 39 NONAME
@@ -97,100 +97,104 @@
 	_ZN14CalenMonthViewD2Ev @ 96 NONAME
 	_ZN16CalenPreviewPane11qt_metacallEN11QMetaObject4CallEiPPv @ 97 NONAME
 	_ZN16CalenPreviewPane11qt_metacastEPKc @ 98 NONAME
-	_ZN16CalenPreviewPane13populateLabelE9QDateTime @ 99 NONAME
-	_ZN16CalenPreviewPane13stopScrollingEv @ 100 NONAME
-	_ZN16CalenPreviewPane14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 101 NONAME
-	_ZN16CalenPreviewPane15mousePressEventEP24QGraphicsSceneMouseEvent @ 102 NONAME
-	_ZN16CalenPreviewPane15startAutoScrollEv @ 103 NONAME
-	_ZN16CalenPreviewPane16GetInstanceListLEv @ 104 NONAME
-	_ZN16CalenPreviewPane16staticMetaObjectE @ 105 NONAME DATA 16
-	_ZN16CalenPreviewPane17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 106 NONAME
-	_ZN16CalenPreviewPane17scrollingFinishedEv @ 107 NONAME
-	_ZN16CalenPreviewPane17setNoEntriesLabelEP7HbLabel @ 108 NONAME
-	_ZN16CalenPreviewPane19getStaticMetaObjectEv @ 109 NONAME
-	_ZN16CalenPreviewPane19onTwoSecondsTimeoutEv @ 110 NONAME
-	_ZN16CalenPreviewPane4DateEv @ 111 NONAME
-	_ZN16CalenPreviewPane7setViewEP14CalenMonthView @ 112 NONAME
-	_ZN16CalenPreviewPaneC1ER14MCalenServicesP13QGraphicsItem @ 113 NONAME
-	_ZN16CalenPreviewPaneC2ER14MCalenServicesP13QGraphicsItem @ 114 NONAME
-	_ZN16CalenPreviewPaneD0Ev @ 115 NONAME
-	_ZN16CalenPreviewPaneD1Ev @ 116 NONAME
-	_ZN16CalenPreviewPaneD2Ev @ 117 NONAME
-	_ZN17CalenSettingsView11qt_metacallEN11QMetaObject4CallEiPPv @ 118 NONAME
-	_ZN17CalenSettingsView11qt_metacastEPKc @ 119 NONAME
-	_ZN17CalenSettingsView14initializeFormEv @ 120 NONAME
-	_ZN17CalenSettingsView16staticMetaObjectE @ 121 NONAME DATA 16
-	_ZN17CalenSettingsView18launchPreviousViewEv @ 122 NONAME
-	_ZN17CalenSettingsView19getStaticMetaObjectEv @ 123 NONAME
-	_ZN17CalenSettingsViewC1ER14MCalenServicesP13QGraphicsItem @ 124 NONAME
-	_ZN17CalenSettingsViewC2ER14MCalenServicesP13QGraphicsItem @ 125 NONAME
-	_ZN17CalenSettingsViewD0Ev @ 126 NONAME
-	_ZN17CalenSettingsViewD1Ev @ 127 NONAME
-	_ZN17CalenSettingsViewD2Ev @ 128 NONAME
-	_ZN18CalenDayViewWidgetC1ER14MCalenServicesP14CalenDocLoader @ 129 NONAME
-	_ZN18CalenDayViewWidgetC2ER14MCalenServicesP14CalenDocLoader @ 130 NONAME
-	_ZN18CalenDayViewWidgetD0Ev @ 131 NONAME
-	_ZN18CalenDayViewWidgetD1Ev @ 132 NONAME
-	_ZN18CalenDayViewWidgetD2Ev @ 133 NONAME
-	_ZN21CalenThickLinesDrawer11qt_metacallEN11QMetaObject4CallEiPPv @ 134 NONAME
-	_ZN21CalenThickLinesDrawer11qt_metacastEPKc @ 135 NONAME
-	_ZN21CalenThickLinesDrawer16staticMetaObjectE @ 136 NONAME DATA 16
-	_ZN21CalenThickLinesDrawer19getStaticMetaObjectEv @ 137 NONAME
-	_ZN21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 138 NONAME
-	_ZN21CalenThickLinesDrawerC1EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 139 NONAME
-	_ZN21CalenThickLinesDrawerC2EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 140 NONAME
-	_ZN21CalenThickLinesDrawerD0Ev @ 141 NONAME
-	_ZN21CalenThickLinesDrawerD1Ev @ 142 NONAME
-	_ZN21CalenThickLinesDrawerD2Ev @ 143 NONAME
-	_ZNK14CalenMonthGrid10metaObjectEv @ 144 NONAME
-	_ZNK14CalenMonthView10metaObjectEv @ 145 NONAME
-	_ZNK16CalenPreviewPane10metaObjectEv @ 146 NONAME
-	_ZNK17CalenSettingsView10metaObjectEv @ 147 NONAME
-	_ZNK21CalenThickLinesDrawer10metaObjectEv @ 148 NONAME
-	_ZTI14CalenMonthGrid @ 149 NONAME
-	_ZTI14CalenMonthView @ 150 NONAME
-	_ZTI16CalenPreviewPane @ 151 NONAME
-	_ZTI17CalenSettingsView @ 152 NONAME
-	_ZTI21CalenThickLinesDrawer @ 153 NONAME
-	_ZTV14CalenMonthGrid @ 154 NONAME
-	_ZTV14CalenMonthView @ 155 NONAME
-	_ZTV16CalenPreviewPane @ 156 NONAME
-	_ZTV17CalenSettingsView @ 157 NONAME
-	_ZTV21CalenThickLinesDrawer @ 158 NONAME
-	_ZThn16_N12CalenDayViewD0Ev @ 159 NONAME
-	_ZThn16_N12CalenDayViewD1Ev @ 160 NONAME
-	_ZThn16_N14CalenMonthGridD0Ev @ 161 NONAME
-	_ZThn16_N14CalenMonthGridD1Ev @ 162 NONAME
-	_ZThn16_N14CalenMonthViewD0Ev @ 163 NONAME
-	_ZThn16_N14CalenMonthViewD1Ev @ 164 NONAME
-	_ZThn16_N16CalenPreviewPaneD0Ev @ 165 NONAME
-	_ZThn16_N16CalenPreviewPaneD1Ev @ 166 NONAME
-	_ZThn16_N17CalenSettingsViewD0Ev @ 167 NONAME
-	_ZThn16_N17CalenSettingsViewD1Ev @ 168 NONAME
-	_ZThn16_N18CalenDayViewWidgetD0Ev @ 169 NONAME
-	_ZThn16_N18CalenDayViewWidgetD1Ev @ 170 NONAME
-	_ZThn16_N21CalenThickLinesDrawerD0Ev @ 171 NONAME
-	_ZThn16_N21CalenThickLinesDrawerD1Ev @ 172 NONAME
-	_ZThn28_N12CalenDayView18HandleNotificationE18TCalenNotification @ 173 NONAME
-	_ZThn8_N12CalenDayViewD0Ev @ 174 NONAME
-	_ZThn8_N12CalenDayViewD1Ev @ 175 NONAME
-	_ZThn8_N14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 176 NONAME
-	_ZThn8_N14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 177 NONAME
-	_ZThn8_N14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 178 NONAME
-	_ZThn8_N14CalenMonthGridD0Ev @ 179 NONAME
-	_ZThn8_N14CalenMonthGridD1Ev @ 180 NONAME
-	_ZThn8_N14CalenMonthViewD0Ev @ 181 NONAME
-	_ZThn8_N14CalenMonthViewD1Ev @ 182 NONAME
-	_ZThn8_N16CalenPreviewPane14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 183 NONAME
-	_ZThn8_N16CalenPreviewPane15mousePressEventEP24QGraphicsSceneMouseEvent @ 184 NONAME
-	_ZThn8_N16CalenPreviewPane17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 185 NONAME
-	_ZThn8_N16CalenPreviewPaneD0Ev @ 186 NONAME
-	_ZThn8_N16CalenPreviewPaneD1Ev @ 187 NONAME
-	_ZThn8_N17CalenSettingsViewD0Ev @ 188 NONAME
-	_ZThn8_N17CalenSettingsViewD1Ev @ 189 NONAME
-	_ZThn8_N18CalenDayViewWidgetD0Ev @ 190 NONAME
-	_ZThn8_N18CalenDayViewWidgetD1Ev @ 191 NONAME
-	_ZThn8_N21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 192 NONAME
-	_ZThn8_N21CalenThickLinesDrawerD0Ev @ 193 NONAME
-	_ZThn8_N21CalenThickLinesDrawerD1Ev @ 194 NONAME
+	_ZN16CalenPreviewPane12gestureEventEP13QGestureEvent @ 99 NONAME
+	_ZN16CalenPreviewPane13populateLabelE9QDateTime @ 100 NONAME
+	_ZN16CalenPreviewPane13stopScrollingEv @ 101 NONAME
+	_ZN16CalenPreviewPane15startAutoScrollEv @ 102 NONAME
+	_ZN16CalenPreviewPane16GetInstanceListLEv @ 103 NONAME
+	_ZN16CalenPreviewPane16staticMetaObjectE @ 104 NONAME DATA 16
+	_ZN16CalenPreviewPane17scrollingFinishedEv @ 105 NONAME
+	_ZN16CalenPreviewPane17setNoEntriesLabelEP7HbLabel @ 106 NONAME
+	_ZN16CalenPreviewPane19getStaticMetaObjectEv @ 107 NONAME
+	_ZN16CalenPreviewPane19onTwoSecondsTimeoutEv @ 108 NONAME
+	_ZN16CalenPreviewPane4DateEv @ 109 NONAME
+	_ZN16CalenPreviewPane7setViewEP14CalenMonthView @ 110 NONAME
+	_ZN16CalenPreviewPaneC1ER14MCalenServicesP13QGraphicsItem @ 111 NONAME
+	_ZN16CalenPreviewPaneC2ER14MCalenServicesP13QGraphicsItem @ 112 NONAME
+	_ZN16CalenPreviewPaneD0Ev @ 113 NONAME
+	_ZN16CalenPreviewPaneD1Ev @ 114 NONAME
+	_ZN16CalenPreviewPaneD2Ev @ 115 NONAME
+	_ZN17CalenSettingsView11qt_metacallEN11QMetaObject4CallEiPPv @ 116 NONAME
+	_ZN17CalenSettingsView11qt_metacastEPKc @ 117 NONAME
+	_ZN17CalenSettingsView14initializeFormEv @ 118 NONAME
+	_ZN17CalenSettingsView16staticMetaObjectE @ 119 NONAME DATA 16
+	_ZN17CalenSettingsView18launchPreviousViewEv @ 120 NONAME
+	_ZN17CalenSettingsView19getStaticMetaObjectEv @ 121 NONAME
+	_ZN17CalenSettingsViewC1ER14MCalenServicesP13QGraphicsItem @ 122 NONAME
+	_ZN17CalenSettingsViewC2ER14MCalenServicesP13QGraphicsItem @ 123 NONAME
+	_ZN17CalenSettingsViewD0Ev @ 124 NONAME
+	_ZN17CalenSettingsViewD1Ev @ 125 NONAME
+	_ZN17CalenSettingsViewD2Ev @ 126 NONAME
+	_ZN18CalenDayViewWidgetC1ER14MCalenServicesP14CalenDocLoader @ 127 NONAME
+	_ZN18CalenDayViewWidgetC2ER14MCalenServicesP14CalenDocLoader @ 128 NONAME
+	_ZN18CalenDayViewWidgetD0Ev @ 129 NONAME
+	_ZN18CalenDayViewWidgetD1Ev @ 130 NONAME
+	_ZN18CalenDayViewWidgetD2Ev @ 131 NONAME
+	_ZN21CalenThickLinesDrawer11qt_metacallEN11QMetaObject4CallEiPPv @ 132 NONAME
+	_ZN21CalenThickLinesDrawer11qt_metacastEPKc @ 133 NONAME
+	_ZN21CalenThickLinesDrawer16staticMetaObjectE @ 134 NONAME DATA 16
+	_ZN21CalenThickLinesDrawer19getStaticMetaObjectEv @ 135 NONAME
+	_ZN21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 136 NONAME
+	_ZN21CalenThickLinesDrawerC1EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 137 NONAME
+	_ZN21CalenThickLinesDrawerC2EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 138 NONAME
+	_ZN21CalenThickLinesDrawerD0Ev @ 139 NONAME
+	_ZN21CalenThickLinesDrawerD1Ev @ 140 NONAME
+	_ZN21CalenThickLinesDrawerD2Ev @ 141 NONAME
+	_ZNK14CalenMonthGrid10metaObjectEv @ 142 NONAME
+	_ZNK14CalenMonthView10metaObjectEv @ 143 NONAME
+	_ZNK16CalenPreviewPane10metaObjectEv @ 144 NONAME
+	_ZNK17CalenSettingsView10metaObjectEv @ 145 NONAME
+	_ZNK21CalenThickLinesDrawer10metaObjectEv @ 146 NONAME
+	_ZTI14CalenMonthGrid @ 147 NONAME
+	_ZTI14CalenMonthView @ 148 NONAME
+	_ZTI16CalenPreviewPane @ 149 NONAME
+	_ZTI17CalenSettingsView @ 150 NONAME
+	_ZTI21CalenThickLinesDrawer @ 151 NONAME
+	_ZTV14CalenMonthGrid @ 152 NONAME
+	_ZTV14CalenMonthView @ 153 NONAME
+	_ZTV16CalenPreviewPane @ 154 NONAME
+	_ZTV17CalenSettingsView @ 155 NONAME
+	_ZTV21CalenThickLinesDrawer @ 156 NONAME
+	_ZThn16_N12CalenDayViewD0Ev @ 157 NONAME
+	_ZThn16_N12CalenDayViewD1Ev @ 158 NONAME
+	_ZThn16_N14CalenMonthGridD0Ev @ 159 NONAME
+	_ZThn16_N14CalenMonthGridD1Ev @ 160 NONAME
+	_ZThn16_N14CalenMonthViewD0Ev @ 161 NONAME
+	_ZThn16_N14CalenMonthViewD1Ev @ 162 NONAME
+	_ZThn16_N16CalenPreviewPaneD0Ev @ 163 NONAME
+	_ZThn16_N16CalenPreviewPaneD1Ev @ 164 NONAME
+	_ZThn16_N17CalenSettingsViewD0Ev @ 165 NONAME
+	_ZThn16_N17CalenSettingsViewD1Ev @ 166 NONAME
+	_ZThn16_N18CalenDayViewWidgetD0Ev @ 167 NONAME
+	_ZThn16_N18CalenDayViewWidgetD1Ev @ 168 NONAME
+	_ZThn16_N21CalenThickLinesDrawerD0Ev @ 169 NONAME
+	_ZThn16_N21CalenThickLinesDrawerD1Ev @ 170 NONAME
+	_ZThn28_N12CalenDayView18HandleNotificationE18TCalenNotification @ 171 NONAME
+	_ZThn8_N12CalenDayViewD0Ev @ 172 NONAME
+	_ZThn8_N12CalenDayViewD1Ev @ 173 NONAME
+	_ZThn8_N14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 174 NONAME
+	_ZThn8_N14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 175 NONAME
+	_ZThn8_N14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 176 NONAME
+	_ZThn8_N14CalenMonthGridD0Ev @ 177 NONAME
+	_ZThn8_N14CalenMonthGridD1Ev @ 178 NONAME
+	_ZThn8_N14CalenMonthViewD0Ev @ 179 NONAME
+	_ZThn8_N14CalenMonthViewD1Ev @ 180 NONAME
+	_ZThn8_N16CalenPreviewPaneD0Ev @ 181 NONAME
+	_ZThn8_N16CalenPreviewPaneD1Ev @ 182 NONAME
+	_ZThn8_N17CalenSettingsViewD0Ev @ 183 NONAME
+	_ZThn8_N17CalenSettingsViewD1Ev @ 184 NONAME
+	_ZThn8_N18CalenDayViewWidgetD0Ev @ 185 NONAME
+	_ZThn8_N18CalenDayViewWidgetD1Ev @ 186 NONAME
+	_ZThn8_N21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 187 NONAME
+	_ZThn8_N21CalenThickLinesDrawerD0Ev @ 188 NONAME
+	_ZThn8_N21CalenThickLinesDrawerD1Ev @ 189 NONAME
+	_ZN16CalenPluginLabelC1ER14MCalenServicesP13QGraphicsItem @ 190 NONAME
+	_ZN16CalenPluginLabelC2ER14MCalenServicesP13QGraphicsItem @ 191 NONAME
+	_ZN16CalenPluginLabelD0Ev @ 192 NONAME
+	_ZN16CalenPluginLabelD1Ev @ 193 NONAME
+	_ZN16CalenPluginLabelD2Ev @ 194 NONAME
+	_ZThn16_N16CalenPluginLabelD0Ev @ 195 NONAME
+	_ZThn16_N16CalenPluginLabelD1Ev @ 196 NONAME
+	_ZThn8_N16CalenPluginLabelD0Ev @ 197 NONAME
+	_ZThn8_N16CalenPluginLabelD1Ev @ 198 NONAME
 
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/inc/CalendarInternalCRKeys.h
--- a/calendarui/inc/CalendarInternalCRKeys.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  ?Description
-*
-*/
-
-
-#ifndef CALENDARINTERNALCRKEYS_H
-#define CALENDARINTERNALCRKEYS_H
-
-//#include <CalendarSDKCRKeys.h>
-
-/** Calendar UI Settings API */
-/** Provides access to the Calendar application's settings */
-
-const TUid KCRUidCalendar = {0x101F874B};
-
-
-/**
-* Default alarm time in minutes before event starting time.
-* Value is an integer between 0 and 60. Default: 15.
-**/
-const TUint32 KCalendarDefaultAlarmTime = 0x00000000;
-
-/**
-* Default starting view for Calendar. Value is an integer between 0 and 2.
-* 0 = Month view (default)
-* 1 = Week view
-* 2 = Day view
-**/
-const TUint32 KCalendarDefaultStartView = 0x00000001;
-
-/**
-* Week view title in Calendar application.
-* Value is eihter integer 0 or 1
-* 0 = Week number (default)
-* 1 = Week dates
-**/
-const TUint32 KCalendarWeekViewTitle = 0x00000002;
-
-/**
-* Is Chinese Lunar calendar information shown in Calendar
-* (only available if feature is included in ROM image).
-* Value is either integer 0 or 1
-* 0 = Off
-* 1 = On (default)
-* This key value is deprecated and has been replaced by the KCRUidCalenLunarPlugin key.
-**/
-const TUint32 KCalendarLunarCalendar = 0x00000003;
-
-/**
-* Calendar alarm sound file, string.
-* Default value : "z:\data\sounds\digital\alarm.aac"
-**/
-const TUint32 KCalendarSoundFile = 0x00000004;
-
-/**
-* Default Calendar alarm sound file.
-* Default value : "z:\data\sounds\digital\alarm.aac"
-**/
-const TUint32 KCalendarDefaultSoundFile = 0x00000005;
-
-/**
-* A flag that is set when a Calendar alarm was lost due to time change.
-* Default value: 0
-*/
-const TUint32 KCalendarLostAlarm = 0x00000006;
-
-/**
-* Calendar alarm snooze time interval in minutes.
-* Default value: 5
-*/
-const TUint32 KCalendarSnoozeTime = 0x00000007;
-
-//Added as an addition to the Symbian fix
-/**
-* Calendar Persistent Time to store the last time the System Time updated.
-* Default Value : 0
-*/
-const TReal KCalendarPersistentTime  = 0x00000009;
-
-/**
-* Text string containing UIDs and enabled/disabled flag (separated
-* by commas) for Calendar plugins.
-* Default value: Empty
-*/
-const TUint32 KCalendarPluginAvailability = 0x0000000A;
-
-/**
-* Defines whether regional information must be shown in the Calendar or not
-* Default value: 1
-*/
-const TUint32 KShowRegionalInformation = 0x0000000B;
-
-
-#endif  // CALENDARINTERNALCRKEYS_H
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/inc/CalendarPrivateCRKeys.h
--- a/calendarui/inc/CalendarPrivateCRKeys.h	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/inc/CalendarPrivateCRKeys.h	Thu May 27 12:51:15 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -11,86 +11,28 @@
 *
 * Contributors:
 *
-* Description:  ?Description
+* Description:  The file contains the uid of keys used by application.
+*
 *
 */
 
-
 #ifndef CALENDARPRIVATECRKEYS_H
 #define CALENDARPRIVATECRKEYS_H
 
-#include <CalendarInternalCRKeys.h>
-
-/** Calendar UI Local Variation API */
-/** Provides access to the Calendar application's local variation setting */
-
-const TUid KCRUidCalendarLV = {0x101F874C};
-
+#include <calendardomaincrkeys.h>
 
 /**
-* Local variation bitmask for Caledar configuration.
-* For values refer to CalendarVariant.hrh.
-*
+* Defines whether week number must be shown in month view of the calendar.
+* Default value: 0
 **/
-const TUint32 KCalenLVFlags = 0x00000007;
-
-
-/** Calendar Thai Plugin  Settings API */
-/** Provides access to the Calendar Thai Plugin's settings */
-const TUid KCRUidCalenThaiPlugin = {0x102823D2};
-
-/**
-* User modifiable setting
-* Is Thai regional Calendar information shown in Calendar
-* (only available if feature is included in phone,
-*  currnet display language is Thai)
-* Value is either integer 0 or 1 
-* 0 = Off 
-* 1 = On (default)
-**/
-const TUint32 KCalenThaiPluginEnabled = 0x00000000;
-
-
-/** Calendar Lunar Calendar Plugin Settings API */
-/** Provides access to the Calendar Lunar Plugin's settings */
-const TUid KCRUidCalenLunarPlugin = { 0x102823D1 };
+const long int KCalendarShowWeekNum = 0x00000000;
 
 /**
-* User modifiable setting
-* Is Chinese Lunar Calendar information shown in Calendar
-* (only available if feature is included in phone,
-*  currnet display language is some of Chinese languages)
-* Value is either integer 0 or 1 
-* 0 = Off 
-* 1 = On (default)
-**/
-const TUint32 KCalenChineseLunarEnabled = 0x00000000;
-
-
-/**
-* User modifiable setting
-* Is Vietnamese Lunar Calendar information shown in Calendar
-* (only available if feature is included in phone,
-*  currnet display language is Vietnamese languages)
-* Value is either integer 0 or 1 
-* 0 = Off 
-* 1 = On (default)
-**/
-const TUint32 KCalenVietnameseLunarEnabled = 0x00000001;
-
-
-/** Calendar UI Extensions Settings API */
-/** Provides access to user settings that enable Calendar UI extensions and customizations */
-const TUid KCRUidCalenUIExtensions = { 0x10282ED7 };
-
-/**
-* User modifiable setting to enable the AIW External Calendar.
-* (only available if an AIW provider is included in phone)
-* Value is either integer 0 or 1 
-* 0 = Off 
-* 1 = On (default)
-**/
-const TUint32 KCalenExternalCalendarEnabled = 0x00000000;
-
+* Defines whether regional information must be shown in the Calendar.
+* Default value: 1
+*/
+const long int KCalendarShowRegionalInfo = 0x00000002;
 
 #endif  // CALENDARPRIVATECRKEYS_H
+
+// End of file	--Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/inc/calencommon.h
--- a/calendarui/inc/calencommon.h	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/inc/calencommon.h	Thu May 27 12:51:15 2010 +0300
@@ -41,6 +41,9 @@
 #define CALEN_PREVPREVIEWPARENT "prevPaneWidget"
 #define CALEN_CURRPREVIEWPARENT "currPaneWidget"
 #define CALEN_NEXTPREVIEWPARENT "nextPaneWidget"
+#define CALEN_PREVREGIONALINFO "prevRegionalInfo"
+#define CALEN_CURRREGIONALINFO "currRegionalInfo"
+#define CALEN_NEXTREGIONALINFO "nextRegionalInfo"
 #define CALEN_NEXTPANELAYOUT "nextPaneLayout"
 #define CALEN_CURRPANELAYOUT "currPaneLayout"
 #define CALEN_PREVPREVIEWPANE "prevPreviewPane"
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp
--- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp	Thu May 27 12:51:15 2010 +0300
@@ -35,7 +35,6 @@
 #include "CalenLunarLocalizedInfo.h"
 #include "CalenLunarLocalizer.h"
 #include "CalenLunarInfoProvider.h"
-#include "CalendarPrivateCRKeys.h"
 #include "hb_calencommands.hrh"
 
 //CONSTANTS
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/settings/settings.pro
--- a/calendarui/settings/settings.pro	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/settings/settings.pro	Thu May 27 12:51:15 2010 +0300
@@ -19,9 +19,10 @@
 CONFIG += hb
 DEPENDPATH += . \
               ../../inc
+			  
 INCLUDEPATH += . \
                ../../inc \
-               ../cenrep
+	       ../inc
 
 DEFINES += CALENSETTINGS_DLL
 
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/settings/src/calensettings.cpp
--- a/calendarui/settings/src/calensettings.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/settings/src/calensettings.cpp	Thu May 27 12:51:15 2010 +0300
@@ -25,7 +25,7 @@
 #include <xqsettingskey.h>
 
 #include "calensettings.h"
-#include <calendarinternalcrkeys.h>  // includes CalendarInternalCRKeys.h
+#include "calendarprivatecrkeys.h"
 
 CalenSettings::CalenSettings(HbDataForm *form, QObject *parent)
 :QObject(parent),
@@ -35,13 +35,14 @@
 {   
     mSettingsManager = new XQSettingsManager(this);
 	mAlarmSnoozeCenrepKey = new XQSettingsKey(
-										XQSettingsKey::TargetCentralRepository, 
-										KCRUidCalendar, KCalendarSnoozeTime);
+			XQSettingsKey::TargetCentralRepository,
+			KCRUidCalendar, KCalendarSnoozeTime);
 	mWeekNumberCenrepKey = new XQSettingsKey(
-										XQSettingsKey::TargetCentralRepository, 
-										KCRUidCalendar, KCalendarWeekViewTitle);
-	mShowRegionalInfoKey = new XQSettingsKey(XQSettingsKey::TargetCentralRepository,
-	                                         KCRUidCalendar, KShowRegionalInformation);
+			XQSettingsKey::TargetCentralRepository,
+			KCRUidCalendar, KCalendarShowWeekNum);
+	mShowRegionalInfoKey = new XQSettingsKey(
+			XQSettingsKey::TargetCentralRepository,
+			KCRUidCalendar, KCalendarShowRegionalInfo);
 	
 	// Read the initial values from the cenrep
 	QVariant value = mSettingsManager->readItemValue(*mAlarmSnoozeCenrepKey);
@@ -99,32 +100,35 @@
 	QStringList values;
 	values << hbTrId("txt_calendar_button_no")
             << hbTrId("txt_calendar_button_yes");
-	mShowWeekNumberItem->setData(HbDataFormModelItem::LabelRole, 
-								QString(hbTrId("txt_calendar_setlabel_show_week_numbers")));     
+	mShowWeekNumberItem->setData(
+			HbDataFormModelItem::LabelRole, QString(
+					hbTrId("txt_calendar_setlabel_show_week_numbers")));
 	
 	
 	// For HbPushButton type properties -- to be used for toggle value item
-	mShowWeekNumberItem->setContentWidgetData(QString("text"), 
-										QString(hbTrId("txt_calendar_button_no")));
-	mShowWeekNumberItem->setContentWidgetData(QString("additionalText"), 
-										QString(hbTrId("txt_calendar_button_yes")));
+	mShowWeekNumberItem->setContentWidgetData(
+			QString("text"), QString(hbTrId("txt_calendar_button_no")));
+	mShowWeekNumberItem->setContentWidgetData(
+			QString("additionalText"), QString(
+					hbTrId("txt_calendar_button_yes")));
 	
 	mSettingsForm->addConnection(mShowWeekNumberItem, SIGNAL(clicked()), 
 	                             this, SLOT(handleWeekNumberChange()));
 	mSettingsModel->appendDataFormItem(mShowWeekNumberItem);
 	
-	// TODO: Append the regional information setting only if any regional plugins have been
-	// loaded by the customisation manager
+	// TODO: Append the regional information setting only if any regional
+	// plugins have been loaded by the customisation manager
 	mShowRegionalInfoItem = new HbDataFormModelItem();
 	mShowRegionalInfoItem->setType(HbDataFormModelItem::ToggleValueItem);
 	mShowRegionalInfoItem->setData(HbDataFormModelItem::LabelRole, 
 	                               QString("Show regional info"));     
 
 	// For HbPushButton type properties -- to be used for toggle value item
-	mShowRegionalInfoItem->setContentWidgetData(QString("text"), 
-	                                            QString(hbTrId("txt_calendar_button_no")));
-	mShowRegionalInfoItem->setContentWidgetData(QString("additionalText"), 
-	                                            QString(hbTrId("txt_calendar_button_yes")));
+	mShowRegionalInfoItem->setContentWidgetData(
+			QString("text"), QString(hbTrId("txt_calendar_button_no")));
+	mShowRegionalInfoItem->setContentWidgetData(
+			QString("additionalText"), QString(
+					hbTrId("txt_calendar_button_yes")));
 	mSettingsForm->addConnection(mShowRegionalInfoItem, SIGNAL(clicked()),
 	                             this, SLOT(handleRegionalInfoChange()));
 	mSettingsModel->appendDataFormItem(mShowRegionalInfoItem);
@@ -228,32 +232,36 @@
 												choiceIndex);
     if(mShowWeekNumber)
         {
-        mShowWeekNumberItem->setContentWidgetData(QString("text"), 
-												QString(hbTrId("txt_calendar_button_yes")));
-        mShowWeekNumberItem->setContentWidgetData(QString("additionalText"), 
-												QString(hbTrId("txt_calendar_button_no")));
+        mShowWeekNumberItem->setContentWidgetData(
+        		QString("text"), QString(hbTrId("txt_calendar_button_yes")));
+        mShowWeekNumberItem->setContentWidgetData(
+        		QString("additionalText"), QString(
+        				hbTrId("txt_calendar_button_no")));
         }
     else
         {
-        mShowWeekNumberItem->setContentWidgetData(QString("text"), 
-												QString(hbTrId("txt_calendar_button_no")));
-        mShowWeekNumberItem->setContentWidgetData(QString("additionalText"), 
-												QString(hbTrId("txt_calendar_button_yes")));
+        mShowWeekNumberItem->setContentWidgetData(
+        		QString("text"), QString(hbTrId("txt_calendar_button_no")));
+        mShowWeekNumberItem->setContentWidgetData(
+        		QString("additionalText"), QString(
+        				hbTrId("txt_calendar_button_yes")));
         }
     
     value = mSettingsManager->readItemValue(*mShowRegionalInfoKey);
     mShowRegionalInfo = value.toUInt();
     
     if (mShowRegionalInfo) {
-        mShowRegionalInfoItem->setContentWidgetData(QString("text"), 
-                                                    QString(hbTrId("txt_calendar_button_yes")));
-        mShowRegionalInfoItem->setContentWidgetData(QString("additionalText"), 
-                                                  QString(hbTrId("txt_calendar_button_no")));
+        mShowRegionalInfoItem->setContentWidgetData(
+        		QString("text"), QString(hbTrId("txt_calendar_button_yes")));
+        mShowRegionalInfoItem->setContentWidgetData(
+        		QString("additionalText"), QString(
+        				hbTrId("txt_calendar_button_no")));
     } else {
-        mShowRegionalInfoItem->setContentWidgetData(QString("text"), 
-                                                    QString(hbTrId("txt_calendar_button_no")));
-        mShowRegionalInfoItem->setContentWidgetData(QString("additionalText"), 
-                                                    QString(hbTrId("txt_calendar_button_yes")));
+        mShowRegionalInfoItem->setContentWidgetData(
+        		QString("text"), QString(hbTrId("txt_calendar_button_no")));
+        mShowRegionalInfoItem->setContentWidgetData(
+        		QString("additionalText"), QString(
+        				hbTrId("txt_calendar_button_yes")));
     }
     
     mSettingsForm->setModel(mSettingsModel);
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/inc/calendayview.h
--- a/calendarui/views/inc/calendayview.h	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/inc/calendayview.h	Thu May 27 12:51:15 2010 +0300
@@ -98,11 +98,7 @@
     void refreshViewOnGoToDate();
     
 protected:
-    
-    // TODO: Remove these after gestures are available
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    bool eventFilter(QObject *source, QEvent *event);
+    void gestureEvent(QGestureEvent *event);
 
 private:
     
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/inc/caleneventlistviewitem.h
--- a/calendarui/views/inc/caleneventlistviewitem.h	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/inc/caleneventlistviewitem.h	Thu May 27 12:51:15 2010 +0300
@@ -24,17 +24,12 @@
 class CalenEventListViewItem : public HbListViewItem
 {
     Q_OBJECT
-    Q_PROPERTY(bool timeFormat12 READ timeFormat12Hr WRITE setTimeFormat12Hr)
 public:
     CalenEventListViewItem(QGraphicsItem *parent = 0);
     ~CalenEventListViewItem();
 
     HbAbstractViewItem * createItem();
     void updateChildItems();
-    bool timeFormat12Hr();
-    void setTimeFormat12Hr(bool format);
-private:
-    bool timeFormat12;
 };
 
 #endif      // __CALEN_EVENT_LIST_VIEW_ITEM_H__
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/inc/calenmonthgrid.h
--- a/calendarui/views/inc/calenmonthgrid.h	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/inc/calenmonthgrid.h	Thu May 27 12:51:15 2010 +0300
@@ -66,8 +66,11 @@
 
 protected:
 	void orientationChanged(Qt::Orientation newOrientation);
+	void gestureEvent(QGestureEvent *event);
 		
 private:
+	void downGesture();
+    void upGesture();
 	void handlePrependingRows(QList<CalenMonthData > &monthDataList);
 	void handleAppendingRows(QList<CalenMonthData > &monthDataList);
 	void handlePanGestureFinished();
@@ -84,11 +87,6 @@
 	void appendRows();
 	void itemActivated(const QModelIndex &index);
 
-protected slots:
-	void downGesture(int value);
-	void upGesture(int value);
-	void panGesture(const QPointF &delta);
-
 private:
 	QStandardItemModel *mModel;
 	QList<CalenMonthData> mMonthDataArray;
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/inc/calenmonthview.h
--- a/calendarui/views/inc/calenmonthview.h	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/inc/calenmonthview.h	Thu May 27 12:51:15 2010 +0300
@@ -23,6 +23,7 @@
 #include <qdatetime.h>
 #include <hblabel.h>
 #include <hbextendedlocale.h>
+#include <hbframeitem.h>
 
 // User includes
 #include "calennativeview.h"
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/inc/calenpluginlabel.h
--- a/calendarui/views/inc/calenpluginlabel.h	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/inc/calenpluginlabel.h	Thu May 27 12:51:15 2010 +0300
@@ -27,11 +27,12 @@
 	Q_OBJECT
 
 public:
-	CalenPluginLabel(MCalenServices &services, QGraphicsItem *parent = 0);
-	~CalenPluginLabel();
+	IMPORT_C CalenPluginLabel(MCalenServices &services, QGraphicsItem *parent = 0);
+	IMPORT_C ~CalenPluginLabel();
 
-private:
-	void mousePressEvent(QGraphicsSceneMouseEvent *event);
+protected:
+	void gestureEvent(QGestureEvent *event);
+
 	
 private:
 	MCalenServices	&mServices;
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/inc/calenpreviewpane.h
--- a/calendarui/views/inc/calenpreviewpane.h	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/inc/calenpreviewpane.h	Thu May 27 12:51:15 2010 +0300
@@ -23,7 +23,6 @@
 // System includes
 #include <qdatetime.h>
 #include <hbscrollarea.h>
-#include <hbgridviewitem.h>
 
 // Forward declarations
 class HbLabel;
@@ -50,12 +49,12 @@
 	void populateLabel( QDateTime date);
 	QDateTime Date();
 	void startAutoScroll();
-	void mousePressEvent(QGraphicsSceneMouseEvent* event);
-	void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
-	void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
 	void setView(CalenMonthView* view);
 	void stopScrolling();
 	
+protected:
+	void gestureEvent(QGestureEvent *event);
+	
 private:
 	void GetInstanceListL();
 
@@ -82,6 +81,8 @@
 	HbLabel* mNoEntriesLabel;
 	bool mIsNoEntriesAdded;
 	bool mIsGestureHandled;
+	qreal mHtDiff;
+	int mScrollDuration;
 };
 
 #endif /* CALENPREVIEWPANE_H_ */
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/resources/caleneventlistviewitem.css
--- a/calendarui/views/resources/caleneventlistviewitem.css	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/resources/caleneventlistviewitem.css	Thu May 27 12:51:15 2010 +0300
@@ -6,72 +6,90 @@
     layout: custom-stretch;
 }
 
-CalenEventListViewItem[timeFormat12="true"]::text-1{
-	fixed-width: 13.5un;
-	text-height: var(hb-param-text-height-secondary);
-	text-align: left;
-	top: -var(hb-param-margin-gene-top);
-	left: -var(hb-param-margin-gene-left);
-	right: var(hb-param-margin-gene-right);
-	text-line-count-max: 2;
-	text-line-count-min: 2;
+CalenEventListViewItem::icon-1[layoutName="custom"]{
+    top: -var(hb-param-margin-gene-top);
+    left: -var(hb-param-margin-gene-left);
+    right: var(hb-param-margin-gene-middle-horizontal);
+    fixed-width: var(hb-param-graphic-size-secondary);
+    fixed-height: var(hb-param-graphic-size-secondary);
 }
 
-CalenEventListViewItem[timeFormat12="false"]::text-1{
-	fixed-width: 9.5un;
-	text-height: var(hb-param-text-height-secondary);
-	text-align: right;
-	top: -var(hb-param-margin-gene-top);
-	left: -var(hb-param-margin-gene-left);
-	right: var(hb-param-margin-gene-right);
-	text-line-count-max: 2;
-	text-line-count-min: 2;
+CalenEventListViewItem::icon-2{
+    top: -var(hb-param-margin-gene-top);
+    right: var(hb-param-margin-gene-middle-horizontal);
+    fixed-width: var(hb-param-graphic-size-secondary);
+    fixed-height: var(hb-param-graphic-size-secondary);
 }
 
-CalenEventListViewItem::text-2[layoutName="custom"]{
-	font-variant: primary;
-	text-align: left;
-	top: -var(hb-param-margin-gene-top);
-	right: var(hb-param-margin-gene-middle-horizontal);
-	min-width: 29un;
+CalenEventListViewItem::icon-3{
+    top: -var(hb-param-margin-gene-top);
+    right: var(hb-param-margin-gene-right);
+    fixed-width: var(hb-param-graphic-size-secondary);
+    fixed-height: var(hb-param-graphic-size-secondary);
 }
 
-CalenEventListViewItem::text-3[layoutName="custom"]{
-	font-variant: secondary;
-	text-align: left;
-	top: -var(hb-param-margin-gene-middle-vertical);
-	bottom: var(hb-param-margin-gene-bottom);
-	right: var(hb-param-margin-gene-middle-horizontal);
-	min-width: 34un;
-}
-
-CalenEventListViewItem::icon-1[layoutName="custom"]{
-	top: -var(hb-param-margin-gene-top);
-	left: -var(hb-param-margin-gene-top);
-	right: var(hb-param-margin-gene-middle-horizontal);
+CalenEventListViewItem::icon-4{
+    top: -var(hb-param-margin-gene-middle-vertical);
+    right: var(hb-param-margin-gene-right);
+    bottom: var(hb-param-margin-gene-bottom);
+    fixed-width: var(hb-param-graphic-size-secondary);
+    fixed-height: var(hb-param-graphic-size-secondary);
 }
 
-CalenEventListViewItem::icon-2[layoutName="custom"]{
-	top: -var(hb-param-margin-gene-top);
-	right: var(hb-param-margin-gene-middle-horizontal);
-	text-align: right;
-	fixed-width: var(hb-param-graphic-size-secondary);
-	fixed-height: var(hb-param-graphic-size-secondary);
+CalenEventListViewItem::text-1{
+		left: -var(hb-param-margin-gene-left);
+		top: -var(hb-param-margin-gene-top);
+    right: var(hb-param-margin-gene-middle-horizontal);
+    font-variant: secondary;
+		text-height: var(hb-param-text-height-secondary);
+    text-align: right;
 }
 
-CalenEventListViewItem::icon-3[layoutName="custom"]{
-	top: -var(hb-param-margin-gene-top);
-	right: var(hb-param-margin-gene-right);
-	fixed-width: var(hb-param-graphic-size-secondary);
-	fixed-height: var(hb-param-graphic-size-secondary);
-}
-
-CalenEventListViewItem::icon-4[layoutName="custom"]{
-	top: -var(hb-param-margin-gene-middle-vertical);
-	right: var(hb-param-margin-gene-right);
-	bottom: var(hb-param-margin-gene-bottom);
-	fixed-width: var(hb-param-graphic-size-secondary);
-	fixed-height: var(hb-param-graphic-size-secondary);
+CalenEventListViewItem::text-2{
+    top: -var(hb-param-margin-gene-top);
+    right: var(hb-param-margin-gene-middle-horizontal);
+    bottom: var(hb-param-margin-gene-middle-vertical);
+    font-variant: primary;
+    text-height: var(hb-param-text-height-secondary);
+    text-align: left;
+    fixed-width: 29un;
 }
 
 
+CalenEventListViewItem::text-3{
+    text-height: var(hb-param-text-height-primary);
+    top: -var(hb-param-margin-gene-middle-vertical);
+    right: var(hb-param-margin-gene-right);
+    bottom: var(hb-param-margin-gene-bottom);
+    font-variant: secondary;
+    text-height: var(hb-param-text-height-secondary);
+    text-align: left;
+    fixed-width: 29un;
+}
+
+CalenEventListViewItem::text-2:landscape[stretchItem="false"]{
+    fixed-width: 70un;
+}
+
+
+CalenEventListViewItem::text-3:landscape[stretchItem="false"]{
+    fixed-width: 70un;
+}
+
+CalenEventListViewItem::text-2:landscape[stretchItem="true"]{
+    fixed-width: 35un;
+}
+
+CalenEventListViewItem::text-3:landscape[stretchItem="true"]{
+    fixed-width: 40un;
+}
+
+CalenEventListViewItem::text-4{
+    font-variant: secondary;
+    text-height: var(hb-param-text-height-secondary);
+    left: -var(hb-param-margin-gene-left);
+    top: -var(hb-param-margin-gene-middle-vertical);
+    bottom: var(hb-param-margin-gene-bottom);
+    right: var(hb-param-margin-gene-middle-horizontal);
+    text-align: right;
+}
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/resources/caleneventlistviewitem.widgetml
--- a/calendarui/views/resources/caleneventlistviewitem.widgetml	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/resources/caleneventlistviewitem.widgetml	Thu May 27 12:51:15 2010 +0300
@@ -2,18 +2,20 @@
 	<layout name="custom" type="mesh">
 		<meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP"/>
 		<meshitem src="text-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
-		<meshitem src="text-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
+    		<meshitem src="text-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
 		
 		<meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
-		<meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
 		<meshitem src="text-2" srcEdge="BOTTOM" dst="text-3" dstEdge="TOP"/>
 		
 		<meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
 		<meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
+
+    		<meshitem src="text-4" srcEdge="TOP" dst="text-1" dstEdge="BOTTOM"/>
+    		<meshitem src="text-4" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
 		
-		<meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP"/>
 		<meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
 		<meshitem src="icon-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
+    		<meshitem src="icon-1" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
 		
 		<meshitem src="icon-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
 		<meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
@@ -21,22 +23,20 @@
 		<meshitem src="icon-3" srcEdge="TOP" dst="" dstEdge="TOP"/>
 		<meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
 		
-		<meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-		<meshitem src="icon-4" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+    		<meshitem src="icon-4" srcEdge="TOP" dst="text-2" dstEdge="BOTTOM"/>
+    		<meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
 	</layout>
 
 	<layout name="custom-stretch" type="mesh">
 		<meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP"/>
 		<meshitem src="text-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
-		<meshitem src="text-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
-		
-		<meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+
 		<meshitem src="text-2" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV"/>
-		
-		<meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
+		<meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+
 		<meshitem src="text-3" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV"/>
-		
-		<meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP"/>
+
+		<meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)"/>
 		<meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
 		<meshitem src="icon-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
 		<meshitem src="icon-1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)"/>
@@ -50,6 +50,5 @@
 		<meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
 		<meshitem src="icon-4" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV"/>
 	</layout>
-
-  
+ 
 </hbwidget>
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/src/calendayview.cpp
--- a/calendarui/views/src/calendayview.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/src/calendayview.cpp	Thu May 27 12:51:15 2010 +0300
@@ -19,6 +19,8 @@
 #include <QGraphicsSceneEvent>
 #include <hbmainwindow.h>
 #include <hbaction.h>
+#include <hbpangesture.h>
+#include <hbswipegesture.h>
 
 // User includes
 #include "calendayview.h"
@@ -41,6 +43,7 @@
 mActionTaken(false)
 {
     // No implementation yet
+    grabGesture(Qt::SwipeGesture);
 }
 
 // ----------------------------------------------------------------------------
@@ -168,66 +171,22 @@
     return mDocLoader;
 }
 
-// ----------------------------------------------------------------------------
-// CalenDayView::handleLocaleChange
-// Rest of the details are commented in the header
-// ----------------------------------------------------------------------------
-//
-void CalenDayView::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    // TODO: Remove these after gestures are available
-    mTapPoint = event->pos();
-    event->accept();
-}
-
-// ----------------------------------------------------------------------------
-// CalenDayView::handleLocaleChange
-// Rest of the details are commented in the header
-// ----------------------------------------------------------------------------
-//
-void CalenDayView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+/*
+	Function to listen for gestures
+*/
+void CalenDayView::gestureEvent(QGestureEvent *event)
 {
-    // TODO: Remove these after gestures are available
-    QPointF curPos = event->pos();
-    if (abs(curPos.y() - mTapPoint.y()) > 20) {
-        event->accept();
-        return;
-    }
-    if (curPos.x() - mTapPoint.x() > 50) {
-        mTapPoint = QPointF(0, 0);
-        mServices.IssueCommandL(ECalenShowPrevDay);
-        mActionTaken = true;
-    } else if (curPos.x() - mTapPoint.x() < -50) {
-        mTapPoint = QPointF(0, 0);
-        mServices.IssueCommandL(ECalenShowNextDay);
-        mActionTaken = true;
-    }
-    event->accept();
-}
-
-// ----------------------------------------------------------------------------
-// CCalenDayView::eventFilter
-// Rest of the details are commented in the header
-// ----------------------------------------------------------------------------
-//
-bool CalenDayView::eventFilter(QObject *source, QEvent *event)
-{
-    // TODO : remove this line after gestures are available
-    mActionTaken = false;
-    Q_UNUSED(source)
-    if (event->type() == QEvent::GraphicsSceneMousePress) {
-        QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
-        mousePressEvent(mouseEvent);
-    } else if (event->type() == QEvent::GraphicsSceneMouseMove) {
-        QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
-        mouseMoveEvent(mouseEvent);
-    }
-    if (mActionTaken) {
-        // Swipe gesture has been enforced.
-        // Do not pass the event to the source
-        return true;
-    }
-    return false;
+    if(HbSwipeGesture *gesture = qobject_cast<HbSwipeGesture *>(event->gesture(Qt::SwipeGesture))) {
+        if (gesture->state() == Qt::GestureStarted) {
+            if(QSwipeGesture::Left == gesture->horizontalDirection()) {
+                mServices.IssueCommandL(ECalenShowNextDay);
+                event->accept(Qt::SwipeGesture);
+            } else if(QSwipeGesture::Right == gesture->horizontalDirection()) {
+                mServices.IssueCommandL(ECalenShowPrevDay);
+               event->accept(Qt::SwipeGesture);
+            }
+        }
+    } 
 }
 
 // ----------------------------------------------------------------------------
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/src/calendayviewwidget.cpp
--- a/calendarui/views/src/calendayviewwidget.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/src/calendayviewwidget.cpp	Thu May 27 12:51:15 2010 +0300
@@ -42,7 +42,7 @@
 #include "CalenUid.h"
 #include "caleneventlistviewitem.h"
 #include "calenpluginlabel.h"
-#include "CalendarInternalCRKeys.h"
+#include "calendarprivatecrkeys.h"
 
 // Constants
 static const QString singleSpace(" ");
@@ -230,16 +230,7 @@
 //
 void CalenDayViewWidget::handleLocaleChange()
 {
-    if(mListViewPrototype) {
-        HbExtendedLocale locale = HbExtendedLocale::system();
-        HbExtendedLocale::TimeStyle timeStyle = locale.timeStyle();
-        if (HbExtendedLocale::Time12 == timeStyle) {
-            mListViewPrototype->setTimeFormat12Hr(true);
-        } else {
-            mListViewPrototype->setTimeFormat12Hr(false);
-        }
-        
-    }
+
 }
 
 // ----------------------------------------------------------------------------
@@ -518,17 +509,15 @@
         // Raise the flag to indicate that the list item
         // would wrap to two lines
         twoLines = true;
+        // Append space
+        eventTime.append(" ");
         // Append '-' to indicate an end time is present
         eventTime.append("-");
-        // Append new line to wrap to next line
-        eventTime.append(newLine);
-        // Event is a not a zero duration meeting
-        // Only in this case, append the end time
-        eventTime.append(locale.format(eventEndTime, r_qtn_time_usual_with_zero));
     } else {
-        // Append new line to wrap to next line
-        eventTime.append(newLine);
+    	// To align the subject properly if the start and endtime are same
+    	eventTime.append("  ");
     }
+    
     // Add the event time to the text list
     // This MUST be the first item to be added to the list 
     textData << eventTime;
@@ -573,7 +562,17 @@
         // iconData << HbIcon(locationIcon);
         textData << entry.location();
     }
-    
+    // Add the end time to the list item	
+    if (eventStartTime < eventEndTime) {
+    	QString endtime = locale.format(eventEndTime, r_qtn_time_usual_with_zero);
+    	textData << endtime;
+    }else {
+    	if (entry.location().isEmpty()) {
+    		textData << QVariant();
+    	}else {
+    		textData << singleSpace;
+    	}
+    }
     // Get the list model index and set the text and icon data
     QModelIndex listIndex = mListModel->index(index, 0);
     mListModel->setData(listIndex, textData, Qt::DisplayRole);
@@ -637,12 +636,16 @@
         // Append the all-day icon
         iconData << HbIcon(allDayIcon);
         
-        // Check if alarm is enabled for the entry       
+        // Check if alarm is enabled for the entry
         if (entry.alarm().isNull()) {
-            // Insert a blank icon. Else the next icon
-            // will get replaced in this icon's position
-            iconData << QVariant();
+            // Insert a blank icon. Else next text item will get shifted to left
+            iconData << HbIcon();
         } else {
+        	// if entry is not repeating in place of reminder icon put a blank 
+        	// icon and move reminder icon to the place of repeating icon 
+        	 if (!entry.isRepeating()) {
+        		 iconData << HbIcon();
+        	 }
             iconData << HbIcon(reminderIcon);
         }
 
@@ -650,9 +653,11 @@
         if (entry.isRepeating()) {
             iconData << HbIcon(repeatIcon);
         } else {
-            // Insert a blank icon. Else the next icon
-            // will get replaced in this icon's position
-            iconData << QVariant();
+        	// put the blank icon only when both reminder and repeating icons 
+        	// are not there
+        	if (entry.alarm().isNull()) {
+        	iconData << HbIcon();
+        	}
         }
         
         // Append the location
@@ -662,8 +667,10 @@
             // only if valid geo-coordinates are present
             // iconData << HbIcon(locationIcon);
         } else {
-            textData << singleSpace;
+            textData << QVariant();
         }
+        // The fourth text item has to be empty
+        textData << QVariant();
         
     } else if (entryType == AgendaEntry::TypeTodo) {
         // Append the to-do icon
@@ -691,22 +698,31 @@
         
         textData << dueDateString.arg(dueText);
         
-        // Check if alarm is enabled for the entry       
+        // The fourth text item has to be empty
+        textData << QVariant();
+       
+        // Check if alarm is enabled for the entry
         if (entry.alarm().isNull()) {
-            // Insert a blank icon. Else the next icon
-            // will get replaced in this icon's position
-            iconData << QVariant();
+        	// Insert a blank icon. Else next text item will get shifted to left
+        	iconData << HbIcon();
         } else {
-            iconData << HbIcon(reminderIcon);
+        	// if entry is not repeating in place of reminder icon put a blank 
+        	// icon and move reminder icon to the place of repeating icon 
+        	if (!entry.isRepeating()) {
+        		iconData << HbIcon();
+        	}
+        	iconData << HbIcon(reminderIcon);
         }
-        
+
         // Check if the entry is recurring
         if (entry.isRepeating()) {
-            iconData << HbIcon(repeatIcon);
+        	iconData << HbIcon(repeatIcon);
         } else {
-            // Insert a blank icon. Else the next icon
-            // will get replaced in this icon's position
-            iconData << QVariant();
+        	// Insert the blank icon only when both reminder and repeating icons 
+        	// are not there
+        	if (entry.alarm().isNull()) {
+        		iconData << HbIcon();
+        	}
         }
     }
     
@@ -812,7 +828,7 @@
 void CalenDayViewWidget::showHideRegionalInformation()
 {
     XQSettingsKey regionalInfo(XQSettingsKey::TargetCentralRepository,
-                               KCRUidCalendar.iUid, KShowRegionalInformation);
+                               KCRUidCalendar, KCalendarShowRegionalInfo);
     
     int showRegionalInfo = mSettingsManager->readItemValue(regionalInfo).toUInt();
     if (showRegionalInfo) {
@@ -821,6 +837,7 @@
         	mRegionalInfoGroupBox = new HbGroupBox();
         	CalenPluginLabel *regionalInfo = new CalenPluginLabel(
 															mServices, this);
+            regionalInfo->setFontSpec(HbFontSpec(HbFontSpec::Primary));
             mRegionalInfoGroupBox->setContentWidget(regionalInfo);
             mRegionalPluginLayout->insertItem(1, mRegionalInfoGroupBox);
         }
@@ -940,9 +957,7 @@
         entry.setCompletedDateTime(mDate);
         
         // Update the entry in the database
-        AgendaUtil agendaUtil;
-        agendaUtil.setCompleted(entry, true, mDate);
-
+        mServices.agendaInterface()->setCompleted(entry, true, mDate);
 		mServices.IssueCommandL(ECalenStartActiveStep);
     }
 }
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/src/caleneventlistviewitem.cpp
--- a/calendarui/views/src/caleneventlistviewitem.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/src/caleneventlistviewitem.cpp	Thu May 27 12:51:15 2010 +0300
@@ -24,8 +24,6 @@
 CalenEventListViewItem::CalenEventListViewItem(QGraphicsItem *parent) :
 HbListViewItem(parent)
 {
-	HbExtendedLocale locale = HbExtendedLocale::system();
-    timeFormat12 = (HbExtendedLocale::Time12 == locale.timeStyle()) ? true : false;
 }
 
 CalenEventListViewItem::~CalenEventListViewItem()
@@ -43,15 +41,4 @@
     HbListViewItem::updateChildItems();
 }
 
-bool CalenEventListViewItem::timeFormat12Hr()
-{
-    return timeFormat12;
-}
-
-void CalenEventListViewItem::setTimeFormat12Hr(bool format)
-{
-    timeFormat12 = format;
-}
-
-
 // End of file
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/src/calengriditemprototype.cpp
--- a/calendarui/views/src/calengriditemprototype.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/src/calengriditemprototype.cpp	Thu May 27 12:51:15 2010 +0300
@@ -92,6 +92,13 @@
 {
 	CalenGridItemPrototype* item = new CalenGridItemPrototype(*this);
 	item->createPrimitives();
+	
+	// Set the default frame to NULL so that HbGridView does not add its 
+	// default frame for items
+	HbFrameBackground frame;
+	frame.setFrameGraphicsName(QString(""));
+	item->setDefaultFrame(frame);
+	
 	return item;
 }
 
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/src/calenmonthgrid.cpp
--- a/calendarui/views/src/calenmonthgrid.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/src/calenmonthgrid.cpp	Thu May 27 12:51:15 2010 +0300
@@ -20,6 +20,8 @@
 #include <hbabstractviewitem.h>
 #include <hbstyleloader.h>
 #include <hbcolorscheme.h>
+#include <hbpangesture.h>
+#include <hbswipegesture.h>
 
 // User includes
 #include "calenmonthgrid.h"
@@ -30,7 +32,7 @@
 #include "calencommon.h"
 
 // Constants
-#define SCROLL_SPEEED 2000 
+#define SCROLL_SPEEED 3000 
 #define GRIDLINE_WIDTH 0.075 //units
 
 /*!
@@ -49,7 +51,7 @@
 	mIsPanGesture(false),
 	mIsAtomicScroll(true),
 	mView(NULL),
-	mCurrentRow(0),
+	mCurrentRow(-100),
 	mIsNonActiveDayFocused(false),
 	mIgnoreItemActivated(false),
 	mGridBorderColor(Qt::gray)
@@ -64,6 +66,7 @@
 	setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
 	setClampingStyle(HbScrollArea::StrictClamping);
 	setEnabledAnimations(HbAbstractItemView::None);
+	setFrictionEnabled(false);
 	resetTransform();
 	
 	// Get the content widget of the scroll area to draw the grid lines
@@ -84,10 +87,6 @@
 	// Connect to scrolling finished signal
 	connect(this, SIGNAL(scrollingEnded()), this,
 			SLOT(scrollingFinished()));
-	
-	// Connect to item activated signal
-	connect(this, SIGNAL(activated(const QModelIndex &)), this,
-				SLOT(itemActivated(const QModelIndex &)));
 }
 
 /*!
@@ -270,6 +269,14 @@
 	indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
 	mIsAtomicScroll = true;
 	scrollTo(indexToBeScrolled);
+	
+	// Update the sart position of the content widget
+	mStartPos = mContentWidget->pos();
+	
+	// Now connect to the signal which gets emitted when any item on the grid 
+	// is tapped.
+	connect(this, SIGNAL(activated(const QModelIndex &)), this,
+						SLOT(itemActivated(const QModelIndex &)));
 }
 
 /*!
@@ -292,31 +299,27 @@
 }
 
 /*!
- Listens for down gesture
+ Scrolls the content dowmwards
  */
-void CalenMonthGrid::downGesture (int value)
+void CalenMonthGrid::downGesture()
 {
-	Q_UNUSED(value)	
-	mDirection = down;
-	mIsAtomicScroll = false;
-	setAttribute(Hb::InteractionDisabled);
-	
-	// pass it to parent
-	HbScrollArea::downGesture(value);
+    mDirection = down;
+    mIsAtomicScroll = false;
+    setAttribute(Hb::InteractionDisabled);
+    QPointF targetPos(0.0, 0.0);
+    scrollContentsTo(targetPos,500);
 }
 
 /*!
- Listens for Up gesture
+ Scrolls the content upwards
  */
-void CalenMonthGrid::upGesture (int value)
+void CalenMonthGrid::upGesture()
 {
-	Q_UNUSED(value)	
-	mDirection = up;
-	mIsAtomicScroll = false;
-	setAttribute(Hb::InteractionDisabled);
-	
-	// pass it to parent
-	HbScrollArea::upGesture(value);
+    mDirection = up;
+    mIsAtomicScroll = false;
+    setAttribute(Hb::InteractionDisabled);
+    QPointF targetPos(0.0, mStartPos.y() - size().height());
+    scrollContentsTo(-targetPos,500);
 	
 }
 
@@ -325,7 +328,6 @@
  */
 void CalenMonthGrid::mousePressEvent(QGraphicsSceneMouseEvent* event)
 {
-	mPressedPos = event->pos();
 	// Pass it to parent
 	HbGridView::mousePressEvent(event);
 }
@@ -335,38 +337,59 @@
  */
 void CalenMonthGrid::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
 {
-	int posDiff = mPressedPos.y() - event->pos().y();
-	if (posDiff < -50) {
-		mDirection = down;
-	} else if (posDiff > 50){
-		mDirection = up;
+	// Pass it grid view if pan gesture is not in progress else pass it to
+	// scrollarea. Problem here is, if we pass to gridview when panning, then 
+	// its emitting item activated signal simply becasue of which focus item
+	// is getting changed when you finish the pan / shake
+	if (!mIsPanGesture) {
+		HbGridView::mouseReleaseEvent(event);
+	} else {
+		HbScrollArea::mouseReleaseEvent(event);
 	}
-	// Pass it to parent
-	HbGridView::mouseReleaseEvent(event);
 }
 
 /*!
- Listens for pan gesture
+    Function to list for all the gesture events
  */
-void  CalenMonthGrid::panGesture(const QPointF &  delta)
+void CalenMonthGrid::gestureEvent(QGestureEvent *event)
 {
-	setAttribute(Hb::InteractionDisabled);
-	mIsAtomicScroll = false;
-	if (!mIsPanGesture) {
-		mIsPanGesture = true;
-		mIgnoreItemActivated = true;
-		mStartPos = mContentWidget->pos();
-		// Get to know the direction of the gesture
-		if (delta.y() > 0) {
-			mDirection = down;
-		} else {
-			mDirection = up;
-		}
-	}
-	
-	// Call the parent class to perform the pan gesture
-	// When scrolling finished, month grid will adjust to show the proper month
-	HbScrollArea::panGesture(delta);
+   if(HbPanGesture *gesture = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))) {
+        if (gesture->state() == Qt::GestureStarted) {
+            setAttribute(Hb::InteractionDisabled);
+            mIsAtomicScroll = false;
+            if (!mIsPanGesture) {
+                mIsPanGesture = true;
+                mIgnoreItemActivated = true;
+                mStartPos = mContentWidget->pos();
+                // Get to know the direction of the gesture
+                QPointF velocity = gesture->velocity();
+                if (velocity.y() > 0) {
+                    mDirection = down;
+                } else {
+                    mDirection = up;
+                }
+            }
+        } else if(gesture->state() == Qt::GestureFinished) {
+		// TODO: Need to handle here to avoid followOn animation
+        }
+    } else if(HbSwipeGesture *gesture = qobject_cast<HbSwipeGesture *>(event->gesture(Qt::SwipeGesture))) {
+        if (gesture->state() == Qt::GestureStarted) {
+            setAttribute(Hb::InteractionDisabled);
+            mIsAtomicScroll = false;
+            if (gesture->swipeAngle() > 250 && gesture->swipeAngle() < 290 && 
+                    gesture->verticalDirection() == QSwipeGesture::Down) {
+                mDirection = down;
+            } else if (gesture->swipeAngle() > 70 && gesture->swipeAngle() < 110 && 
+                    gesture->verticalDirection() == QSwipeGesture::Up) {
+                mDirection = up;
+            }
+        }
+        gesture->setSpeed(SCROLL_SPEEED);
+    }
+   
+    // Call the parent class to perform the pan gesture
+    // When scrolling finished, month grid will adjust to show the proper month
+    HbScrollArea::gestureEvent(event);
 }
 
 /*!
@@ -374,7 +397,6 @@
  */
 void CalenMonthGrid::scrollingFinished()
 {
-	
 	if (mIsPanGesture) {
 		handlePanGestureFinished();
 	} else if(!mIsAtomicScroll) {
@@ -426,11 +448,12 @@
 				date.addDays(KNumOfVisibleRows*KCalenDaysInWeek).date().day() >=
 				(prevMonth.date().daysInMonth()) / 2) {
 			// up gesture to bring the next month
-			upGesture(SCROLL_SPEEED);
+			upGesture();
 		} else {
 			// we should again show the current month by scrolling downwards
 			mDirection = down;
 			mIsAtomicScroll = true;
+			setAttribute(Hb::InteractionDisabled);
 			scrollContentsTo(-mStartPos,500);
 		}
 	} else if (month == prevMonth.date().month()) {
@@ -440,22 +463,32 @@
 			// we should again show the current month by scrolling upwards
 			mDirection = up;
 			mIsAtomicScroll = true;
+			setAttribute(Hb::InteractionDisabled);
 			scrollContentsTo(-mStartPos,500);
 		} else {
 			// down gesture to show the previous month
-			downGesture(SCROLL_SPEEED);
+			downGesture();
 		}
+	} else if (month == prevMonth.addMonths(-1).date().month()) {
+		// first visible date belong to previous to previous month
+		// hence, scroll down to bring the previous month
+		downGesture();
 	} else if (month == nextMonth.date().month()) {
 		// first visible item belongs to next month
 		// Check if the date is more than half of the next month
 		if (date.date().day() > (nextMonth.date().daysInMonth()) / 2) {
 			// up gesture to bring the next month
-			upGesture(SCROLL_SPEEED);
+			upGesture();
 		} else {
 			// we should again show the current month by scrolling upwards
 			mDirection = invalid;
+			setAttribute(Hb::InteractionDisabled);
 			scrollContentsTo(-mStartPos,500);
 		}
+	} else if (month == nextMonth.addMonths(1).date().month()) {
+		// first visible date belongs to next to next month
+		// hence, scroll up to show the next month
+		upGesture();
 	}
 }
 
@@ -521,6 +554,9 @@
 	scrollTo(indexToBeScrolled);
 	// Update the mCurrentRow
 	mCurrentRow += countToBeAdded;
+	
+	// Update the sart position of the content widget
+	mStartPos = mContentWidget->pos();
 }
 
 /*!
@@ -641,6 +677,9 @@
 	indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
 	mIsAtomicScroll = true;
 	scrollTo(indexToBeScrolled);
+	
+	// Update the sart position of the content widget
+    mStartPos = mContentWidget->pos();
 }
 
 /*!
@@ -713,6 +752,10 @@
 	} else {
 		// Reset the focus attribute to this item		
 		QModelIndex itemIndex = mModel->index(mCurrentRow,0);
+		if(itemIndex.row() < 0 || itemIndex.row() >= mModel->rowCount() ||
+				itemIndex.column() < 0 || itemIndex.column() > mModel->columnCount()) {
+			return;
+		}
 		QVariant itemData = itemIndex.data(Qt::UserRole + 1);
 		QVariantList list = itemData.toList();
 		list.replace(CalendarNamespace::CalendarMonthFocusRole, false);
@@ -740,12 +783,12 @@
 				mNonActiveFocusedDay.date().month()) {
 				mDirection = up;
 				// up gesture
-				upGesture(SCROLL_SPEEED);
+				upGesture();
 				setActiveDates(activeMonth.date());
 			} else {
 				mDirection = down;
 				// down gesture
-				downGesture(SCROLL_SPEEED);
+				downGesture();
 				setActiveDates(activeMonth.addMonths(-2).date());
 			}
 		} 
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/src/calenmonthview.cpp
--- a/calendarui/views/src/calenmonthview.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/src/calenmonthview.cpp	Thu May 27 12:51:15 2010 +0300
@@ -46,7 +46,7 @@
 #include "calendocloader.h"
 #include "calenthicklinesdrawer.h"
 #include "calencommon.h"
-#include "CalendarInternalCRKeys.h"
+#include "calendarprivatecrkeys.h"
 #include "calenpluginlabel.h"
 /*!
  \class CalenMonthView
@@ -74,7 +74,7 @@
 	mSettingsManager = new XQSettingsManager(this);
 	mWeekNumberCenrepKey
 	        = new XQSettingsKey(XQSettingsKey::TargetCentralRepository,
-	                            KCRUidCalendar.iUid, KCalendarWeekViewTitle);
+	                            KCRUidCalendar, KCalendarShowWeekNum);
 
 	mLocale = HbExtendedLocale::system();
 	mFirstWeekLabel = NULL;
@@ -322,7 +322,15 @@
 			= qobject_cast<HbLabel *> (
 					mDocLoader->findWidget(CALEN_MONTVIEW_SIXTH_WEEK_LABEL));
 	}
-
+	
+	// Set the text colors well before instead of setting it again and again
+	mFirstWeekLabel->setTextColor(mWeekDaysColor);
+	mSecondWeekLabel->setTextColor(mWeekDaysColor);
+	mThirdWeekLabel->setTextColor(mWeekDaysColor);
+	mFourthWeekLabel->setTextColor(mWeekDaysColor);
+	mFifthWeekLabel->setTextColor(mWeekDaysColor);
+	mSixthWeekLabel->setTextColor(mWeekDaysColor);
+	
 	// Calculate the week numbers and set them to the week labels
 	updateWeekNumGridModel();
 
@@ -411,58 +419,51 @@
 {
     // Set the background items for all the widgets
     HbFrameItem* frame = NULL;
+    HbFrameDrawer *drawer = NULL;
     HbWidget* monthViewExceptPreviewPane = qobject_cast<HbWidget *> (
 						 mDocLoader->findWidget(CALEN_MONTHVIEW_EXCEPT_PANE));
     if (monthViewExceptPreviewPane) {
+        drawer = new HbFrameDrawer("qtg_fr_cal_monthgrid_bg", HbFrameDrawer::NinePieces);
         // The grid background
-        frame = new HbFrameItem(this);
-        frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-
-        frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_monthgrid_bg");
+        frame = new HbFrameItem(drawer, this);
         monthViewExceptPreviewPane->setBackgroundItem(frame->graphicsItem(), -2);
     }
     if (mTitleLabel) {
         // The month title
-        frame = new HbFrameItem(this);
-        frame->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-
-        frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_monthgrid_title_bg");
+        drawer = new HbFrameDrawer("qtg_fr_cal_monthgrid_title_bg", HbFrameDrawer::ThreePiecesHorizontal);
+        frame = new HbFrameItem(drawer, this);
         mTitleLabel->setBackgroundItem(frame->graphicsItem(), -2);
     }
     
     // Set the frame to the preview pane
-    frame = new HbFrameItem(this);
-    frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-
-    frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_bg");
+    drawer = new HbFrameDrawer("qtg_fr_cal_preview_bg", HbFrameDrawer::NinePieces);
+    frame = new HbFrameItem(drawer, this);
     mPrevPaneLayoutWidget->setBackgroundItem(frame->graphicsItem(), -5);
     
     // Set the frame to the preview pane
-    frame = new HbFrameItem(this);
-    frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-
-    frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_bg");
+    drawer = new HbFrameDrawer("qtg_fr_cal_preview_bg", HbFrameDrawer::NinePieces);
+       frame = new HbFrameItem(drawer, this);
     mCurrPaneLayoutWidget->setBackgroundItem(frame->graphicsItem(), -5);
     
     // Set the frame to the preview pane
-    frame = new HbFrameItem(this);
-    frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-
-    frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_bg");
+    drawer = new HbFrameDrawer("qtg_fr_cal_preview_bg", HbFrameDrawer::NinePieces);
+           frame = new HbFrameItem(drawer, this);
     mNextPaneLayoutWidget->setBackgroundItem(frame->graphicsItem(), -5);
 }
 
 void CalenMonthView::showHideRegionalInformation()
 {
     XQSettingsKey regionalInfo(XQSettingsKey::TargetCentralRepository,
-                               KCRUidCalendar.iUid, KShowRegionalInformation);
+                               KCRUidCalendar, KCalendarShowRegionalInfo);
     
     int showRegionalInfo = mSettingsManager->readItemValue(regionalInfo).toUInt();
     if (showRegionalInfo) {
 		
         // Add the regional information to the preview panes
         if (!mPrevRegionalInfo) {
-            mPrevRegionalInfo = new CalenPluginLabel(mServices, this);
+            mPrevRegionalInfo = qobject_cast<CalenPluginLabel *> 
+							(mDocLoader->findWidget(CALEN_PREVREGIONALINFO));
+            mPrevRegionalInfo->show();
             mPrevPaneLayout->insertItem(0, mPrevRegionalInfo);
 
             HbFrameItem *frameCurr = new HbFrameItem(this);
@@ -471,7 +472,9 @@
             mPrevRegionalInfo->setBackgroundItem(frameCurr->graphicsItem(), -2);
         }
         if (!mCurrRegionalInfo) {
-            mCurrRegionalInfo = new CalenPluginLabel(mServices, this);
+            mCurrRegionalInfo = qobject_cast<CalenPluginLabel *> 
+							(mDocLoader->findWidget(CALEN_CURRREGIONALINFO));
+            mCurrRegionalInfo->show();
             mCurrPaneLayout->insertItem(0, mCurrRegionalInfo);
             
             HbFrameItem *frameCurr = new HbFrameItem(this);
@@ -480,7 +483,9 @@
             mCurrRegionalInfo->setBackgroundItem(frameCurr->graphicsItem(), -2);
         }
         if (!mNextRegionalInfo) {
-            mNextRegionalInfo = new CalenPluginLabel(mServices, this);
+            mNextRegionalInfo = qobject_cast<CalenPluginLabel *> 
+							(mDocLoader->findWidget(CALEN_NEXTREGIONALINFO));
+            mNextRegionalInfo->show();
             mNextPaneLayout->insertItem(0, mNextRegionalInfo);
 
             HbFrameItem *frameCurr = new HbFrameItem(this);
@@ -498,17 +503,17 @@
     } else {
         if (mPrevRegionalInfo) {
             mPrevPaneLayout->removeItem(mPrevRegionalInfo);
-            delete mPrevRegionalInfo;
+            mPrevRegionalInfo->hide();
             mPrevRegionalInfo = NULL;
         }
         if (mCurrRegionalInfo) {
             mPrevPaneLayout->removeItem(mCurrRegionalInfo);
-            delete mCurrRegionalInfo;
+            mCurrRegionalInfo->hide();
             mCurrRegionalInfo = NULL;
         }
         if (mNextRegionalInfo) {
             mPrevPaneLayout->removeItem(mNextRegionalInfo);
-            delete mNextRegionalInfo;
+            mNextRegionalInfo->hide();
             mNextRegionalInfo = NULL;
         }
     }
@@ -552,22 +557,16 @@
 	// Update the week labels text
 	QString text = QString::number(mWeekNumbers.at(0));
 	mFirstWeekLabel->setPlainText(text);
-	mFirstWeekLabel->setTextColor(mWeekDaysColor);
 	text = QString::number(mWeekNumbers.at(1));
 	mSecondWeekLabel->setPlainText(text);
-	mSecondWeekLabel->setTextColor(mWeekDaysColor);
 	text = QString::number(mWeekNumbers.at(2));
 	mThirdWeekLabel->setPlainText(text);
-	mThirdWeekLabel->setTextColor(mWeekDaysColor);
 	text = QString::number(mWeekNumbers.at(3));
 	mFourthWeekLabel->setPlainText(text);
-	mFourthWeekLabel->setTextColor(mWeekDaysColor);
 	text = QString::number(mWeekNumbers.at(4));
 	mFifthWeekLabel->setPlainText(text);
-	mFifthWeekLabel->setTextColor(mWeekDaysColor);
 	text = QString::number(mWeekNumbers.at(5));
 	mSixthWeekLabel->setPlainText(text);
-	mSixthWeekLabel->setTextColor(mWeekDaysColor);
 }
 
 /*!
@@ -626,12 +625,13 @@
  */
 void CalenMonthView::doPopulation()
 {
-	if (!mIsFirstTimeLoad) {
-		Qt::Orientation orientation = mServices.MainWindow().orientation();
-		if (mOrientation != orientation) {
-			mOrientation = orientation;
-			handleChangeOrientation();
-		}
+	// Get the layout and add the preview pane layout.
+	QGraphicsLinearLayout* viewLayout = static_cast<QGraphicsLinearLayout *>
+														(widget()->layout());
+	if (viewLayout->count() == 1) {
+		// Count is 1 implies view has only month grid.
+		// Add the preview pane at corresponding position.
+		viewLayout->addItem(mCurrPaneParent);
 	}
 	
 	// prepare for the population like reading the date frm the context 
@@ -656,9 +656,6 @@
 	// Population is complete, inform it
 	populationComplete();
 	
-	// Start the auto scroll on current preview pane
-	mCurrPreviewPane->startAutoScroll();
-	
 	// Handle regional data here if we are not populating the month view for
 	// the first time
 	if (!mIsFirstTimeLoad) {
@@ -694,9 +691,10 @@
 	
 	mMonthGrid->updateMonthGridModel(mMonthDataArray, mIndexToBeScrolled, 
 	                                 mIsFirstTimeLoad);
-	
-	// Start the auto scroll on current preview pane
-	mCurrPreviewPane->startAutoScroll();
+	// Update the week Numbers model
+	if (mIsWeekNumbersShown) {
+		updateWeekNumGridModel();
+	}
 }
 
 /*!
@@ -1157,6 +1155,9 @@
 	mPrevPreviewPane->populateLabel(dateTime.addDays(-1));
 	mCurrPreviewPane->populateLabel(dateTime);
 	mNextPreviewPane->populateLabel(dateTime.addDays(1));
+	
+	// Start the auto scroll on current preview pane
+    mCurrPreviewPane->startAutoScroll();
 }
 
 /*!
@@ -1189,8 +1190,6 @@
 	
 	if(!mIsPrevPaneGesture) {
 		populatePreviewPane(mDate);
-		// Start the auto scroll on current preview pane
-		mCurrPreviewPane->startAutoScroll();
 	} else {
 		// reset flag
 		mIsPrevPaneGesture = false;
@@ -1219,13 +1218,11 @@
  */
 void CalenMonthView::changeOrientation(Qt::Orientation orientation)
 {
-	if (this == mServices.MainWindow().currentView()) {
 		if (mOrientation != orientation) {
 			// change the orientation here
 			mOrientation = orientation;
 			handleChangeOrientation();
 		}
-	}
 }
 
 /*!
@@ -1251,16 +1248,11 @@
 	QGraphicsLinearLayout* viewLayout = static_cast<QGraphicsLinearLayout *>
 													(widget()->layout());
 	viewLayout->removeAt(1);
-	viewLayout->addItem(mCurrPaneParent);
-	
-
-	// Check the weeknumber setting and update it accordingly
-	if (mIsWeekNumbersShown) {
-		// Add week numbers to week grid
-		addWeekNumbers();
-	} else {
-		// remove the weeknumbergrid from the layout
-		removeWeekNumbers();
+	// Add this item only when orientaion is changed on month view
+	// if it is changed in other views, adding the preview pane here was
+	// overlapping with the month grid, hence, its been added in dopopulation()
+	if (this == mServices.MainWindow().currentView()) {
+		viewLayout->addItem(mCurrPaneParent);
 	}
 }
 
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/src/calenpluginlabel.cpp
--- a/calendarui/views/src/calenpluginlabel.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/src/calenpluginlabel.cpp	Thu May 27 12:51:15 2010 +0300
@@ -16,6 +16,7 @@
 */
 
 // System includes
+#include <hbtapgesture.h>
 
 // User includes
 #include "calenservices.h"
@@ -29,31 +30,37 @@
 /*!
  constructor
  */
-CalenPluginLabel::CalenPluginLabel(MCalenServices& services, 
+EXPORT_C CalenPluginLabel::CalenPluginLabel(MCalenServices& services, 
                                    QGraphicsItem* parent) :
 	HbLabel(parent),mServices(services)
 {
 	setAlignment(Qt::AlignCenter);
-	setFontSpec(HbFontSpec(HbFontSpec::Secondary));
-	setPlainText("Reg plugin");
+	grabGesture(Qt::TapGesture);
 }
 
 /*!
  Destructor
  */
-CalenPluginLabel::~CalenPluginLabel()
+EXPORT_C CalenPluginLabel::~CalenPluginLabel()
 {
 }
 
+
 /*!
- To handle mouse press event.
- \sa QGraphicsItem
- */
-void CalenPluginLabel::mousePressEvent(QGraphicsSceneMouseEvent* event)
+	Functo listen for all gestures
+*/
+void CalenPluginLabel::gestureEvent(QGestureEvent *event)
 {
-	Q_UNUSED(event);
-	
-	mServices.IssueCommandL(ECalenRegionalPluginTapEvent);
+    if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        if (gesture->state() == Qt::GestureFinished) {
+            if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+                // Regional label is tapped
+                mServices.IssueCommandL(ECalenRegionalPluginTapEvent);
+                event->accept(Qt::TapGesture);
+            }
+        }
+    }
 }
 
+
 // End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 calendarui/views/src/calenpreviewpane.cpp
--- a/calendarui/views/src/calenpreviewpane.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/views/src/calenpreviewpane.cpp	Thu May 27 12:51:15 2010 +0300
@@ -27,6 +27,8 @@
 #include <hbframedrawer.h>
 #include <hbfontspec.h>
 #include <hbcolorscheme.h>
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
 #include <agendautil.h>
 #include <agendaentry.h>
 
@@ -42,7 +44,7 @@
 
 // Macros
 #define TWO_SECONDS_TIMER 2000 // millseconds
-#define SCROLLING_SPEED 50
+#define SCROLLING_SPEED 10
 
 static const QString EMPTYSTRING(" ");
 
@@ -59,6 +61,8 @@
 	mIsNoEntriesAdded = true;
 	mIsGestureHandled = false;
 	mNoEntriesLabel = 0;
+	mHtDiff = 0.0;
+	mScrollDuration = 0;
 	setAcceptDrops(true);
 	setScrollDirections(Qt::Vertical);
 	setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
@@ -101,7 +105,7 @@
 	GetInstanceListL();
 	
 	// Get the content of the scroll area
-	QGraphicsWidget* content = this->contentWidget();
+	QGraphicsWidget* content = contentWidget();
 	// Adjust the layout
 	QGraphicsLinearLayout* layout = static_cast<QGraphicsLinearLayout *>
 															(content->layout());
@@ -154,11 +158,16 @@
 				// No summary display "No subject"
 				summary.append(hbTrId("txt_calendar_dblist_unnamed"));
 			}
-			QDateTime startTime = mInstanceArray[i].startTime();
-			HbExtendedLocale systemLocale =HbExtendedLocale::system();
-			QString start = systemLocale.format(startTime.time(), 
-			                                    r_qtn_time_usual_with_zero);
-			start.append(EMPTYSTRING);
+			// Chcek the entry type, based on the type display time field in
+			// preview pane.
+			QString start;
+			if(mInstanceArray[i].type() != AgendaEntry::TypeTodo ) {
+				QDateTime startTime = mInstanceArray[i].startTime();
+				HbExtendedLocale systemLocale =HbExtendedLocale::system();
+				start = systemLocale.format(startTime.time(), 
+				                                    r_qtn_time_usual_with_zero);
+				start.append(EMPTYSTRING);	
+			}
 			// Append summary to start time
 			QString text = start.append(summary);
 			label->setPlainText(text);
@@ -259,17 +268,30 @@
 	mTwoSecTimer->stop();
 	disconnect(mTwoSecTimer, SIGNAL(timeout()), 
 										   this, SLOT(onTwoSecondsTimeout()));
-	// Start the scrolling in the proper direction
+	
+	// Calculate the timer and the height difference of pane and its content
+	if (!mScrollDuration) {
+        qreal contentHeight = contentWidget()->size().height();
+        qreal paneHeight = size().height();
+        mHtDiff = contentHeight - paneHeight;
+        if (mHtDiff > 0) { // content is more than widget height, we need to scroll
+            mScrollDuration = mHtDiff / SCROLLING_SPEED;
+        }
+	}
+	
+    // Start the scrolling in the proper direction
 	if (mScrollDirection == up) {
 		// Start scrolling upwards
 		mScrollDirection = down;
 		mNumOfScrolls++;
-		upGesture(SCROLLING_SPEED);
+		QPointF targetPos(0.0, -mHtDiff);
+        scrollContentsTo(-targetPos, mScrollDuration * 1000);
 	} else if (mScrollDirection == down) {
 		mScrollDirection = up;
 		mNumOfScrolls++;
 		// Start scrolling downwards
-		downGesture(SCROLLING_SPEED);
+		QPointF targetPos(0.0, 0.0);
+        scrollContentsTo(targetPos, mScrollDuration * 1000);
 	}
 }
 
@@ -290,44 +312,35 @@
 }
 
 /*!
- Function to listen mouse press events
+    Function to listen for all gestures
  */
-void CalenPreviewPane::mousePressEvent(QGraphicsSceneMouseEvent* event)
-{
-	mIsGestureHandled = false;
-	mPressedPos = event->pos();
-	event->accept();
-}
-
-/*!
- Function to listen mouse release events
- */
-void CalenPreviewPane::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+void CalenPreviewPane::gestureEvent(QGestureEvent *event)
 {
-	qreal posDiff = mPressedPos.x()-event->pos().x();
-	if (abs(posDiff) < 50 && !mIsGestureHandled) {
-		// Preview pane tapped
-		mServices.IssueCommandL(ECalenDayView);
-	}
-	event->accept();
-}
-
-/*!
- Function to listen mouse move events
- */
-void CalenPreviewPane::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
-{
-	qreal posDiff = mPressedPos.x()-event->pos().x();
-	if (posDiff < -50) {
-		mIsGestureHandled = true;
-		// right gesture
-		mView->handlePreviewPaneGesture(true);
-	} else if (posDiff > 50) {
-		mIsGestureHandled = true;
-		// left gesture
-		mView->handlePreviewPaneGesture(false);
-	}
-	event->accept();
+    if(HbPanGesture *gesture = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))) {
+        if (gesture->state() == Qt::GestureStarted) {
+            // Get to know the direction of the gesture
+        	QPointF delta = gesture->sceneDelta();
+            if (delta.x() > 20) {
+                mIsGestureHandled = true;
+                // right gesture
+                mView->handlePreviewPaneGesture(true);
+                event->accept(Qt::PanGesture);
+            } else if (delta.x() < -20){
+                mIsGestureHandled = true;
+                // left gesture
+                mView->handlePreviewPaneGesture(false);
+                event->accept(Qt::PanGesture);
+            }
+        }
+    } else if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        if (gesture->state() == Qt::GestureFinished) {
+            if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+                // Preview pane tapped
+                mServices.IssueCommandL(ECalenDayView);
+                event->accept(Qt::TapGesture);
+            }
+        }
+    }
 }
 
 /*!
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clock.pro
--- a/clock/clock.pro	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clock.pro	Thu May 27 12:51:15 2010 +0300
@@ -19,21 +19,20 @@
 SUBDIRS += \
 		clockengines \
 		clockmw \
-		clockui \
-		ftudatetimewizard
+		clockui
 		
 CONFIG += ordered
 
 symbian: {
     BLD_INF_RULES.prj_exports += \
     "./rom/clock.iby                    CORE_APP_LAYER_IBY_EXPORT_PATH(clock.iby)" \
-    "./rom/clockengines.iby             CORE_APP_LAYER_IBY_EXPORT_PATH(clockengines.iby)" \
-    "./rom/ftudatetimewizard.iby        CORE_APP_LAYER_IBY_EXPORT_PATH(ftudatetimewizard.iby)" \
+    "./rom/clockengines.iby             CORE_APP_LAYER_IBY_EXPORT_PATH(clockengines.iby)" \    
 	"./rom/clockresources.iby           LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(clockresources.iby)" \
 	\
     "./conf/clockapp.confml             APP_LAYER_CONFML(clockapp.confml)" \
+	"./conf/CI_clockapp.confml			APP_LAYER_CONFML(CI_clockapp.confml)" \
     "./conf/clockapp_101F874D.crml      APP_LAYER_CRML(clockapp_101F874D.crml)" \
-    "./conf/clockapp_101F8876.crml      APP_LAYER_CRML(clockapp_101F8876.crml)" \
+    "./conf/clockapp_101F8876.crml      APP_LAYER_CRML(clockapp_101F8876.crml)"
 }
 
 # End of file   --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockengines/clockserver/server/inc/clockprivatecrkeys.h
--- a/clock/clockengines/clockserver/server/inc/clockprivatecrkeys.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   The file contains the uid of keys used by cenrep sheet
-*
-*/
-
-#ifndef __CLOCKPRIVATECRKEYS_H__
-#define __CLOCKPRIVATECRKEYS_H__
-
-/** Nitz Settings API */
-/** Provides access to the Nitz status.*/
-const TUid KCRUidNitz = { 0x101F8876 };
-
-/** Nitz state key */
-const TUint32 KNitzState = 0x00000000;
-
-/** Active Protocol key */
-const TUint32 KActiveProtocol = 0x00000001;
-
-/** Previous alarm time high */
-const TUint32 KPreviousAlarmTime = 0x00000002;
-
-/** CountDownTimer  alert file */
-const TUint32 KCountDownSoundFile = 0x00000003;
-
-/** Valid Nitz Info key */
-const TUint32 KValidNitz = 0x00000004;
-
-/** FTU date time plugin edited date */
-const TUint32 KFtuPluginDate = 0x00000005;
-#endif  // __CLOCKPRIVATECRKEYS_H__
-
-// End of file
-
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockengines/clockserver/server/src/clockserver.cpp
--- a/clock/clockengines/clockserver/server/src/clockserver.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockengines/clockserver/server/src/clockserver.cpp	Thu May 27 12:51:15 2010 +0300
@@ -216,7 +216,7 @@
 	CRepository* cenRep( NULL );
 	
 	// Open the repository.
-	TRAPD( errVal, cenRep = CRepository::NewL( KCRUidNitz ) );
+	TRAPD( errVal, cenRep = CRepository::NewL( TUid::Uid(KCRUidNitz ) ) );
 	if( KErrNone == errVal ) 
 		{
 		// Read the key.
@@ -248,7 +248,7 @@
     CRepository* cenRep( NULL );
     
     // Open the repository.
-    TRAPD( errVal, cenRep = CRepository::NewL( KCRUidNitz ) );
+    TRAPD( errVal, cenRep = CRepository::NewL( TUid::Uid(KCRUidNitz ) ) );
     if( KErrNone == errVal ) 
         {
         // Update the key.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockengines/clockserver/server/src/clockserverimpl.cpp
--- a/clock/clockengines/clockserver/server/src/clockserverimpl.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockengines/clockserver/server/src/clockserverimpl.cpp	Thu May 27 12:51:15 2010 +0300
@@ -571,7 +571,8 @@
                     TInt validNitz( KSetValidNitz );
                     CRepository* cenRep( NULL );
     
-                    TRAPD( errorVal, cenRep = CRepository::NewL( KCRUidNitz ) );
+                    TRAPD( errorVal, cenRep =
+                    		CRepository::NewL( TUid::Uid(KCRUidNitz) ) );
                     if( errorVal == KErrNone )
                         {
                         errorVal = cenRep->Set( KValidNitz, validNitz );
@@ -656,7 +657,8 @@
                     TInt validNitz( KSetValidNitz );
                     CRepository* cenRep( NULL );
     
-                    TRAPD( errorVal, cenRep = CRepository::NewL( KCRUidNitz ) );
+                    TRAPD( errorVal, cenRep =
+                    		CRepository::NewL( TUid::Uid(KCRUidNitz) ) );
                     if( errorVal == KErrNone )
                         {
                         errorVal = cenRep->Set( KValidNitz, validNitz );
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockmw/clocktimezone/src/timezoneclient.cpp
--- a/clock/clockmw/clocktimezone/src/timezoneclient.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockmw/clocktimezone/src/timezoneclient.cpp	Thu May 27 12:51:15 2010 +0300
@@ -31,6 +31,7 @@
 #include "timezoneclient.h"
 #include "clockcommon.h"
 #include "clockserverclt.h"
+#include "clockprivatecrkeys.h"
 
 const int KDaysInWeek(7);
 const int KZerothRule(0);
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp
--- a/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp	Thu May 27 12:51:15 2010 +0300
@@ -38,7 +38,7 @@
 #include <QTranslator>
 
 // User includes
-#include "clockcommon.h"
+#include "clockprivatecrkeys.h"
 #include "clockalarmeditor.h"
 #include "alarmclient.h"
 #include "settingsutility.h"
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockui/clockcityselectionlist/data/xml/clockcityselectionlist.docml
--- a/clock/clockui/clockcityselectionlist/data/xml/clockcityselectionlist.docml	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockui/clockcityselectionlist/data/xml/clockcityselectionlist.docml	Thu May 27 12:51:15 2010 +0300
@@ -6,7 +6,7 @@
     <widget name="clockCitySelectionView" type="HbView">
         <widget name="clockCitySelectionWidget" role="HbView:widget" type="HbWidget">
             <widget name="subtitleGroupBox" type="HbGroupBox">
-                <string locid="txt_clock_subhead_city_list" name="titleText" value="City list"/>
+                <string locid="txt_clock_subhead_city_list" name="heading" value="City list"/>
                 <real name="z" value="1"/>
                 <bool name="collapsable" value="FALSE"/>
             </widget>
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockui/clocksettingsview/data/xml/clockregionalsettingsview.docml
--- a/clock/clockui/clocksettingsview/data/xml/clockregionalsettingsview.docml	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockui/clocksettingsview/data/xml/clockregionalsettingsview.docml	Thu May 27 12:51:15 2010 +0300
@@ -3,7 +3,7 @@
     <widget name="regionalSettingsView" type="HbView">
         <widget name="regionalSettingsWidget" role="HbView:widget" type="HbWidget">
             <widget name="subtitleGroupBox" type="HbGroupBox">
-                <string locid="txt_clock_subhead_regional_date_time_settings" name="titleText" value="Regional date &amp; time setting"/>
+                <string locid="txt_clock_subhead_regional_date_time_settings" name="heading" value="Regional date &amp; time setting"/>
                 <real name="z" value="1"/>
                 <bool name="collapsable" value="FALSE"/>
             </widget>
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml
--- a/clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml	Thu May 27 12:51:15 2010 +0300
@@ -3,7 +3,7 @@
     <widget name="clockSettingsView" type="HbView">
         <widget name="clockSettingsViewWidget" role="HbView:widget" type="HbWidget">
             <widget name="subtitleGroupBox" type="HbGroupBox">
-                <string locid="txt_clock_subhead_settings" name="titleText" value="Settings"/>
+                <string locid="txt_clock_subhead_settings" name="heading" value="Settings"/>
                 <real name="z" value="1"/>
                 <bool name="collapsable" value="FALSE"/>
             </widget>
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockui/clocksettingsview/src/clocksettingsview.cpp
--- a/clock/clockui/clocksettingsview/src/clocksettingsview.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockui/clocksettingsview/src/clocksettingsview.cpp	Thu May 27 12:51:15 2010 +0300
@@ -29,6 +29,7 @@
 #include <QTranslator>
 #include <xqsettingsmanager.h>
 #include <xqsettingskey.h>
+#include <clockdomaincrkeys.h>
 
 // User includes
 #include "clocksettingsview.h"
@@ -38,7 +39,6 @@
 #include "timezoneclient.h"
 #include "settingsdatatypes.h"
 #include "settingscustomitem.h"
-#include "clockcommon.h"
 
 /*!
 	\class ClockSettingsView
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockui/clockviews/data/style/clockalarmlistitemprototype.css
--- a/clock/clockui/clockviews/data/style/clockalarmlistitemprototype.css	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockui/clockviews/data/style/clockalarmlistitemprototype.css	Thu May 27 12:51:15 2010 +0300
@@ -18,25 +18,46 @@
 	text-line-count-min: 2;
     text-line-count-max: 2;
 }
-ClockAlarmListItemPrototype::text-2{
+ClockAlarmListItemPrototype::text-2:portrait{
     top: -var(hb-param-margin-gene-top);
     right: var(hb-param-margin-gene-right);
     text-height: var(hb-param-text-height-tiny);
 	fixed-width: 28.7un;
     text-align: left;
 }
-ClockAlarmListItemPrototype::text-3{
+ClockAlarmListItemPrototype::text-3:portrait{
     text-height: var(hb-param-text-height-primary);
     top: -var(hb-param-margin-gene-middle-vertical);
     right: var(hb-param-margin-gene-right);
     fixed-width: 28.7un;
     text-align: left;
 }
-ClockAlarmListItemPrototype::text-4{
+ClockAlarmListItemPrototype::text-4:portrait{
     text-height: var(hb-param-text-height-primary-small);
     top: -var(hb-param-margin-gene-middle-vertical);
     bottom: var(hb-param-margin-gene-bottom);
-	fixed-width: 28.7un;
+    fixed-width: 28.7un;
+    text-align: left;
+}
+ClockAlarmListItemPrototype::text-2:landscape{
+    top: -var(hb-param-margin-gene-top);
+    right: var(hb-param-margin-gene-right);
+    text-height: var(hb-param-text-height-tiny);
+    fixed-width: 21un;
+    text-align: left;
+}
+ClockAlarmListItemPrototype::text-3:landscape{
+    text-height: var(hb-param-text-height-primary);
+    top: -var(hb-param-margin-gene-middle-vertical);
+    right: var(hb-param-margin-gene-right);
+    fixed-width: 21un;
+    text-align: left;
+}
+ClockAlarmListItemPrototype::text-4:landscape{
+    text-height: var(hb-param-text-height-primary-small);
+    top: -var(hb-param-margin-gene-middle-vertical);
+    bottom: var(hb-param-margin-gene-bottom);
+    fixed-width: 21un;
     text-align: left;
 }
 ClockAlarmListItemPrototype::alarmIconItem{
diff -r a949c2543c15 -r ea672fcb0ea0 clock/clockui/clockviews/src/clockworldview.cpp
--- a/clock/clockui/clockviews/src/clockworldview.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/clock/clockui/clockviews/src/clockworldview.cpp	Thu May 27 12:51:15 2010 +0300
@@ -244,13 +244,13 @@
 				mSettingsUtility->timeFormatString());
 		itemList.insert(value.setNum(ClockHomeCityItem::Time), timeInfo);
 
-		// TODO: Use the home city specific icons.
+		// Use the home city specific icons.
 		// Display day/night indicators.
 		QString dayNightIconPath = "";
 		if (isDay(dateTime)) {
-			dayNightIconPath = "qtg_large_clock";
+			dayNightIconPath = "qtg_large_clock_home";
 		} else {
-			dayNightIconPath = "qtg_large_clock";
+			dayNightIconPath = "qtg_large_clock_night_home";
 		}
 		itemList.insert(value.setNum(
 				ClockHomeCityItem::DayNightIndicator), dayNightIconPath);
@@ -660,7 +660,7 @@
 	if (isDay(dateTime)) {
 		dayNightIconPath = "qtg_large_clock";
 	} else {
-		dayNightIconPath = "qtg_large_clock";
+		dayNightIconPath = "qtg_large_clock_night";
 	}
 	decorationString.append(HbIcon(dayNightIconPath));
 
diff -r a949c2543c15 -r ea672fcb0ea0 clock/conf/CI_clockapp.confml
Binary file clock/conf/CI_clockapp.confml has changed
diff -r a949c2543c15 -r ea672fcb0ea0 clock/conf/clockapp.confml
Binary file clock/conf/clockapp.confml has changed
diff -r a949c2543c15 -r ea672fcb0ea0 clock/conf/clockapp_101F874D.crml
Binary file clock/conf/clockapp_101F874D.crml has changed
diff -r a949c2543c15 -r ea672fcb0ea0 clock/conf/clockapp_101F8876.crml
Binary file clock/conf/clockapp_101F8876.crml has changed
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/ftudatetimewizard.pro
--- a/clock/ftudatetimewizard/ftudatetimewizard.pro	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:  FTU datetime wizard project file
-#
-
-TEMPLATE      	= lib
-
-CONFIG       	+= plugin hb
-TARGET        	= ftudatetimewizard
-
-HEADERS += ./inc/*.h
-SOURCES += ./src/*.cpp
-
-RESOURCES += resources/ftudatetimewizard.qrc
-
-plugin.sources 	= ftudatetimewizard.dll
-plugin.path 	= \resource\qt\plugins\FTU
- 
-pluginstub.sources = resource/*.manifest
-pluginstub.path = /fturesources/plugins/wizardproviders 
-
-DEPLOYMENT 	+= plugin pluginstub
-
-CONFIG(debug, debug|release) {
-    DESTDIR = debug
-    LIBS += -lftuwizardmodel
-} else {
-    DESTDIR = release
-    LIBS += -lftuwizardmodel
-}
-
-CONFIG += plugin debug_and_release
-
-QT += xml sql
-
-DEFINES += FTUDATETIMEWIZARD_LIB
-
-coverage:DEFINES += COVERAGE_MEASUREMENT
-
-DEPENDPATH +=   ./inc \
-                ./src
-
-INCLUDEPATH +=  ./inc/ \
-	  	../clockmw/clocksettingsutility/inc \
-	  	../clockmw/clocktimezone/inc \
-	  	../clockengines/inc \
-	  	../clockengines/clockserver/server/inc \
-	  	../clockui/clockcityselectionlist/inc \
-	    ../inc   
-symbian: {
-    TARGET.UID3 = 0x2002C30C
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = ALL -TCB
-    TARGET.CAPABILITY = CAP_GENERAL_DLL
-    INCLUDEPATH +=  $$MW_LAYER_SYSTEMINCLUDE
-	
-	LIBS += -leuser \
-			-lclocksettingsutility \
-			-lclockserverclient \
-			-ltimezoneclient \
-			-lxqsettingsmanager \
-			-lclockcityselectionlist
-
-}    
-
-# End of file	--Don't remove this.
\ No newline at end of file
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/inc/ftudatetimecustomitem.h
--- a/clock/ftudatetimewizard/inc/ftudatetimecustomitem.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Definition for the FtuDateTimeCustomItem class
- *
- */
-
-#ifndef FTUDATETIMECUSTOMITEM_H_
-#define FTUDATETIMECUSTOMITEM_H_
-
-// System includes
-#include <QObject>
-#include <hbdataformviewitem.h>
-
-// Forward declarations
-class HbDataFormModel;
-class HbPushButton;
-
-class FtuDateTimeCustomItem : public HbDataFormViewItem
-{
-	Q_OBJECT
-
-public:
-	FtuDateTimeCustomItem(QGraphicsItem *parent);
-	~FtuDateTimeCustomItem();
-	virtual HbAbstractViewItem* createItem();
-	bool canSetModelIndex(const QModelIndex &index) const;
-	void restore();
-
-protected:
-	virtual HbWidget* createCustomWidget();
-	HbPushButton* mPushButton;
-};
-
-#endif /* FTUDATETIMECUSTOMITEM_H_ */
-
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/inc/ftudatetimeprivatecrkeys.h
--- a/clock/ftudatetimewizard/inc/ftudatetimeprivatecrkeys.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: The file contains the uid of keys used by cenrep sheet
- *
- */
-
-#ifndef FTUDATETIMEPRIVATECRKEYS_H_
-#define FTUDATETIMEPRIVATECRKEYS_H_
-
-/*!
-    Clock App Settings
-    Provides access to the plugin completed date.
- */
-const long int KCRUidClockApp = { 0x101F874D };
-
-/*!
-    FTU date time plugin edited date
- */
-const long int KFtuPluginDate = 0x00000003;
-
-
-/*!
-    Nitz Settings API
-    Provides access to the Nitz status.
- */
-const long int KCRUidNitz = { 0x101F8876 };
-
-/*!
-    Valid Nitz Info key
- */
-const long int KValidNitz = 0x00000004;
-
-#endif /* FTUDATETIMEPRIVATECRKEYS_H_ */
-
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/inc/ftudatetimeview.h
--- a/clock/ftudatetimewizard/inc/ftudatetimeview.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: The view class for the FTU wizard plugin
- *
- */
-
-#ifndef FTUDATETIMEVIEW_H
-#define FTUDATETIMEVIEW_H
-
-// System includes
-#include <QPointer>
-#include <QDateTime>
-#include <HbWidget>
-#include <HbView>
-#include <HbDialog>
-#include "clockcityselectionlist.h"
-
-// Forward declarations.
-class HbDataForm;
-class HbDataFormModel;
-class HbDataFormModelItem;
-class HbDateTimePicker;
-class HbPushButton;
-class SettingsUtility;
-class QDate;
-class TimezoneClient;
-
-class FtuDateTimeView : public HbView
-{
-	Q_OBJECT
-
-public:
-	FtuDateTimeView();
-	~FtuDateTimeView();
-	void constructView();
-	QDate getWizardCompletedDate();
-	void setAutomaticTimeUpdateOff(bool value);
-
-public slots:
-	void populateDatePicker();
-	void populateTimePicker();
-	void setAutoTimeupDate();
-	void populateCitySelectionList();
-
-private slots:
-	void updateDate();
-	void updateTime();
-	void HandleLocationChange(LocationInfo);
-	void selectedAction(HbAction *action);
-
-private:
-	void createMainLayout();
-	void setItemDisplayed();
-	void populateDateTimeGroup();
-	void populatePlaceGroup();
-	void wizardEditedDate(const QDate &date);
-
-private:
-	HbDataForm* mDateTimePlaceForm;
-	HbDataFormModel* mDateTimePlaceModel;
-
-	HbDataFormModelItem *mDateItem;
-	HbDataFormModelItem *mTimeItem;
-	HbDataFormModelItem *mAutoTimeUpdateItem;
-	HbDataFormModelItem *mPlaceGroup;
-	HbDataFormModelItem *mCountryItem;
-	HbDataFormModelItem *mCityItem;
-
-	HbDateTimePicker* mDatePicker;
-	HbDateTimePicker* mTimePicker;
-	QPointer<HbDialog> mDatePickerDialog;
-	QPointer<HbDialog> mTimePickerDialog;
-
-	HbAction *mOkAction;
-	HbAction *mCancelAction;
-	SettingsUtility *mSettingsUtility;
-
-	TimezoneClient *mTimeZoneClient;
-	ClockCitySelectionList* mCitySelectionList;
-	bool mTimeAutoUpdate;
-};
-
-#endif // FTUDATETIMEVIEW_H
-
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/inc/ftudatetimewizard.h
--- a/clock/ftudatetimewizard/inc/ftudatetimewizard.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Implementation of the plugin wizard class FtuDateTimeWizard
- *
- */
-
-#ifndef FTUDATETIMEWIZARD_H
-#define FTUDATETIMEWIZARD_H
-
-// System includes
-#include <QPointer>
-#include <QDate>
-
-// User includes
-#include "ftuwizard.h"
-
-// Forward declarations
-class FtuDateTimeView;
-
-class FtuDateTimeWizard : public FtuWizard
-{
-	Q_OBJECT
-
-public:
-	FtuDateTimeWizard();
-	~FtuDateTimeWizard();
-
-protected:
-	void initializeWizard(qint32 cenrepOwnerId, int wizardIdx);
-	void activateWizard();
-	void deactivateWizard();
-	bool shutdownWizard(ShutdownReason reason);
-	void resizeWizard(const QRectF& geometry);
-	const FtuWizardSetting& wizardSettings();
-	bool handleBackEvent();
-	QDate wizardCompletedDate();
-
-private:
-	QPointer<FtuDateTimeView> mFtuDateTimeView;
-	FtuWizardSetting mWizardSettings;
-};
-
-#endif // FTUDATETIMEWIZARD_H
-
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/inc/ftudatetimewizardfactory.h
--- a/clock/ftudatetimewizard/inc/ftudatetimewizardfactory.h	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Definition file for FtuDateTimeWizardFactory class
- *
- */
-
-#ifndef FTUDATETIMEWIZARDFACTORY_H
-#define FTUDATETIMEWIZARDFACTORY_H
-
-// System includes
-#include <QObject>
-
-// User includes
-#include "ftuwizardfactory.h"
-
-class FtuWizard;
-
-class FtuDateTimeWizardFactory : public QObject, public FtuWizardFactory
-{
-	Q_OBJECT
-	Q_INTERFACES(FtuWizardFactory)
-
-public:
-	FtuWizard* createWizard() const;
-};
-
-#endif // FTUDATETIMEWIZARDFACTORY_H
-
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/resource/ftudatetimewizard.manifest
--- a/clock/ftudatetimewizard/resource/ftudatetimewizard.manifest	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<plugin>
-    <runtime library="ftudatetimewizard.dll"
-             uri="ftu.nokia.com/plugin/ftudatetimewizard"/>
-</plugin>
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/resources/ftudatetimewizard.qrc
--- a/clock/ftudatetimewizard/resources/ftudatetimewizard.qrc	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/images" >
-        <file>ftudatetimewizard_toc_icon.svg</file>
-        <file>ftudatetimewizard_menustrip_icon.svg</file>                
-    </qresource>
-</RCC>
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/resources/ftudatetimewizard_menustrip_icon.svg
--- a/clock/ftudatetimewizard/resources/ftudatetimewizard_menustrip_icon.svg	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="98px" height="98px" viewBox="0 0 98 98" enable-background="new 0 0 98 98" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="48.9995" y1="12.501" x2="48.9995" y2="83.6684">
-	<stop  offset="0" style="stop-color:#BDC2C4"/>
-	<stop  offset="1" style="stop-color:#454B4D"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M48.999,84C29.148,84,13,67.852,13,48c0-19.85,16.148-36,35.999-36C68.852,12,85,28.15,85,48
-	C85,67.852,68.852,84,48.999,84L48.999,84z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="48.9995" y1="13.501" x2="48.9995" y2="82.8443">
-	<stop  offset="0" style="stop-color:#D1D7D9"/>
-	<stop  offset="0.2364" style="stop-color:#BDC2C4"/>
-	<stop  offset="1" style="stop-color:#697173"/>
-</linearGradient>
-<circle fill="url(#SVGID_2_)" cx="49" cy="48" r="35"/>
-<path opacity="0.35" fill="#F1F1F2" d="M50.22,49.221c11.722,0,23.042-0.732,33.759-2.079C83.521,28.211,68.043,13,48.999,13
-	c-18.932,0-34.345,15.035-34.97,33.816C25.461,48.368,37.606,49.221,50.22,49.221z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="14.3335" y1="30.75" x2="84.1678" y2="30.75">
-	<stop  offset="0" style="stop-color:#C0C5C7"/>
-	<stop  offset="0.2" style="stop-color:#F7FDFF"/>
-	<stop  offset="0.8" style="stop-color:#F7FDFF"/>
-	<stop  offset="1" style="stop-color:#CDD3D5"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" d="M48.999,14c19.163,0,34.72,15.402,34.989,34.5C83.99,48.334,84,48.168,84,48
-	c0-19.33-15.67-35-35.001-35C29.669,13,14,28.67,14,48c0,0.168,0.01,0.334,0.012,0.5C14.281,29.402,29.837,14,48.999,14z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="49.0005" y1="79.5" x2="49.0005" y2="17.1192">
-	<stop  offset="0" style="stop-color:#BDC2C4"/>
-	<stop  offset="1" style="stop-color:#454B4D"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" d="M48.999,79C31.905,79,18,65.094,18,48s13.905-31,30.999-31C66.094,17,80,30.906,80,48
-	S66.094,79,48.999,79L48.999,79z"/>
-<radialGradient id="SVGID_5_" cx="49" cy="102" r="109.0004" gradientUnits="userSpaceOnUse">
-	<stop  offset="0.4" style="stop-color:#FAF9F9"/>
-	<stop  offset="1" style="stop-color:#808184"/>
-</radialGradient>
-<path fill="url(#SVGID_5_)" d="M48.999,78C32.458,78,19,64.543,19,48c0-16.541,13.458-30,29.999-30C65.543,18,79,31.459,79,48
-	C79,64.543,65.543,78,48.999,78L48.999,78z"/>
-<path opacity="0.7" fill="#FFFFFF" d="M48.999,50.143c9.896,0,19.341-0.832,27.997-2.332C76.893,32.459,64.377,20,48.999,20
-	c-15.375,0-27.892,12.459-27.995,27.811C29.661,49.311,39.104,50.143,48.999,50.143z"/>
-<rect x="47.999" y="20.736" fill="#404041" width="2" height="6"/>
-<rect x="47.999" y="70.736" fill="#404041" width="2" height="6"/>
-<rect x="71" y="47.736" fill="#404041" width="6" height="2"/>
-<rect x="21" y="47.736" fill="#404041" width="6" height="2"/>
-<rect x="69.844" y="33.817" transform="matrix(0.5006 0.8657 -0.8657 0.5006 66.6569 -43.0647)" fill="#404041" width="1.615" height="4.842"/>
-<rect x="26.542" y="58.817" transform="matrix(0.4997 0.8662 -0.8662 0.4997 66.7294 6.9494)" fill="#404041" width="1.614" height="4.841"/>
-<rect x="60.694" y="24.665" transform="matrix(0.8659 0.5002 -0.5002 0.8659 21.7935 -27.1293)" fill="#404041" width="1.613" height="4.842"/>
-<rect x="35.693" y="67.966" transform="matrix(0.8659 0.5002 -0.5002 0.8659 40.0995 -8.8187)" fill="#404041" width="1.613" height="4.842"/>
-<rect x="35.693" y="24.665" transform="matrix(0.8662 -0.4997 0.4997 0.8662 -8.6508 21.8607)" fill="#404041" width="1.614" height="4.842"/>
-<rect x="60.694" y="67.966" transform="matrix(0.8662 -0.4997 0.4997 0.8662 -26.9417 40.1451)" fill="#404041" width="1.614" height="4.842"/>
-<rect x="26.542" y="33.815" transform="matrix(0.4992 -0.8665 0.8665 0.4992 -17.7019 41.8449)" fill="#404041" width="1.614" height="4.842"/>
-<rect x="69.843" y="58.815" transform="matrix(0.4997 -0.8662 0.8662 0.4997 -17.6948 91.8386)" fill="#404041" width="1.614" height="4.842"/>
-<path opacity="0.2" fill="#231F20" d="M51.449,49.418c-0.098-0.48-0.339-0.906-0.669-1.242l3.445-11.358l-2.87-0.871l-3.579,11.791
-	c-0.622,0.352-1.08,0.958-1.226,1.68H40v1h6.551c0.026,0.131,0.066,0.26,0.113,0.383L31.232,66.232l1.297,1.299l15.376-15.375
-	c0.331,0.162,0.7,0.262,1.095,0.262c1.209,0,2.217-0.857,2.449-2H75v-1H51.449z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-237.3208" y1="41.0786" x2="-237.3208" y2="56.5028" gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 291.9271 64.1554)">
-	<stop  offset="0" style="stop-color:#58595B"/>
-	<stop  offset="1" style="stop-color:#231F20"/>
-</linearGradient>
-<polygon fill="url(#SVGID_6_)" points="54.226,35.402 51.355,34.531 46.999,48.885 49.871,49.756 "/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="31.9766" y1="65.3701" x2="49.5665" y2="47.7802">
-	<stop  offset="0" style="stop-color:#58595B"/>
-	<stop  offset="1" style="stop-color:#231F20"/>
-</linearGradient>
-<polygon fill="url(#SVGID_7_)" points="50.232,48.413 48.934,47.113 31.232,64.814 32.529,66.113 "/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="57.5" y1="47.8579" x2="57.5" y2="49.318">
-	<stop  offset="0" style="stop-color:#FF0000"/>
-	<stop  offset="1" style="stop-color:#A8000B"/>
-</linearGradient>
-<path fill="url(#SVGID_8_)" d="M75,48H51.449c-0.232-1.141-1.24-2-2.449-2c-1.211,0-2.219,0.859-2.449,2H40v1h6.551
-	c0.23,1.142,1.238,2,2.449,2c1.209,0,2.217-0.857,2.449-2H75V48z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="48.9995" y1="46.917" x2="48.9995" y2="50.0016">
-	<stop  offset="0" style="stop-color:#FFE2D9"/>
-	<stop  offset="1" style="stop-color:#F23D3D"/>
-</linearGradient>
-<circle fill="url(#SVGID_9_)" cx="49" cy="48.5" r="1.5"/>
-<rect fill="none" width="98" height="98"/>
-</svg>
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/resources/ftudatetimewizard_toc_icon.svg
--- a/clock/ftudatetimewizard/resources/ftudatetimewizard_toc_icon.svg	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="98px" height="98px" viewBox="0 0 98 98" enable-background="new 0 0 98 98" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="48.9995" y1="12.501" x2="48.9995" y2="83.6684">
-	<stop  offset="0" style="stop-color:#BDC2C4"/>
-	<stop  offset="1" style="stop-color:#454B4D"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M48.999,84C29.148,84,13,67.852,13,48c0-19.85,16.148-36,35.999-36C68.852,12,85,28.15,85,48
-	C85,67.852,68.852,84,48.999,84L48.999,84z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="48.9995" y1="13.501" x2="48.9995" y2="82.8443">
-	<stop  offset="0" style="stop-color:#D1D7D9"/>
-	<stop  offset="0.2364" style="stop-color:#BDC2C4"/>
-	<stop  offset="1" style="stop-color:#697173"/>
-</linearGradient>
-<circle fill="url(#SVGID_2_)" cx="49" cy="48" r="35"/>
-<path opacity="0.35" fill="#F1F1F2" d="M50.22,49.221c11.722,0,23.042-0.732,33.759-2.079C83.521,28.211,68.043,13,48.999,13
-	c-18.932,0-34.345,15.035-34.97,33.816C25.461,48.368,37.606,49.221,50.22,49.221z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="14.3335" y1="30.75" x2="84.1678" y2="30.75">
-	<stop  offset="0" style="stop-color:#C0C5C7"/>
-	<stop  offset="0.2" style="stop-color:#F7FDFF"/>
-	<stop  offset="0.8" style="stop-color:#F7FDFF"/>
-	<stop  offset="1" style="stop-color:#CDD3D5"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" d="M48.999,14c19.163,0,34.72,15.402,34.989,34.5C83.99,48.334,84,48.168,84,48
-	c0-19.33-15.67-35-35.001-35C29.669,13,14,28.67,14,48c0,0.168,0.01,0.334,0.012,0.5C14.281,29.402,29.837,14,48.999,14z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="49.0005" y1="79.5" x2="49.0005" y2="17.1192">
-	<stop  offset="0" style="stop-color:#BDC2C4"/>
-	<stop  offset="1" style="stop-color:#454B4D"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" d="M48.999,79C31.905,79,18,65.094,18,48s13.905-31,30.999-31C66.094,17,80,30.906,80,48
-	S66.094,79,48.999,79L48.999,79z"/>
-<radialGradient id="SVGID_5_" cx="49" cy="102" r="109.0004" gradientUnits="userSpaceOnUse">
-	<stop  offset="0.4" style="stop-color:#FAF9F9"/>
-	<stop  offset="1" style="stop-color:#808184"/>
-</radialGradient>
-<path fill="url(#SVGID_5_)" d="M48.999,78C32.458,78,19,64.543,19,48c0-16.541,13.458-30,29.999-30C65.543,18,79,31.459,79,48
-	C79,64.543,65.543,78,48.999,78L48.999,78z"/>
-<path opacity="0.7" fill="#FFFFFF" d="M48.999,50.143c9.896,0,19.341-0.832,27.997-2.332C76.893,32.459,64.377,20,48.999,20
-	c-15.375,0-27.892,12.459-27.995,27.811C29.661,49.311,39.104,50.143,48.999,50.143z"/>
-<rect x="47.999" y="20.736" fill="#404041" width="2" height="6"/>
-<rect x="47.999" y="70.736" fill="#404041" width="2" height="6"/>
-<rect x="71" y="47.736" fill="#404041" width="6" height="2"/>
-<rect x="21" y="47.736" fill="#404041" width="6" height="2"/>
-<rect x="69.844" y="33.817" transform="matrix(0.5006 0.8657 -0.8657 0.5006 66.6569 -43.0647)" fill="#404041" width="1.615" height="4.842"/>
-<rect x="26.542" y="58.817" transform="matrix(0.4997 0.8662 -0.8662 0.4997 66.7294 6.9494)" fill="#404041" width="1.614" height="4.841"/>
-<rect x="60.694" y="24.665" transform="matrix(0.8659 0.5002 -0.5002 0.8659 21.7935 -27.1293)" fill="#404041" width="1.613" height="4.842"/>
-<rect x="35.693" y="67.966" transform="matrix(0.8659 0.5002 -0.5002 0.8659 40.0995 -8.8187)" fill="#404041" width="1.613" height="4.842"/>
-<rect x="35.693" y="24.665" transform="matrix(0.8662 -0.4997 0.4997 0.8662 -8.6508 21.8607)" fill="#404041" width="1.614" height="4.842"/>
-<rect x="60.694" y="67.966" transform="matrix(0.8662 -0.4997 0.4997 0.8662 -26.9417 40.1451)" fill="#404041" width="1.614" height="4.842"/>
-<rect x="26.542" y="33.815" transform="matrix(0.4992 -0.8665 0.8665 0.4992 -17.7019 41.8449)" fill="#404041" width="1.614" height="4.842"/>
-<rect x="69.843" y="58.815" transform="matrix(0.4997 -0.8662 0.8662 0.4997 -17.6948 91.8386)" fill="#404041" width="1.614" height="4.842"/>
-<path opacity="0.2" fill="#231F20" d="M51.449,49.418c-0.098-0.48-0.339-0.906-0.669-1.242l3.445-11.358l-2.87-0.871l-3.579,11.791
-	c-0.622,0.352-1.08,0.958-1.226,1.68H40v1h6.551c0.026,0.131,0.066,0.26,0.113,0.383L31.232,66.232l1.297,1.299l15.376-15.375
-	c0.331,0.162,0.7,0.262,1.095,0.262c1.209,0,2.217-0.857,2.449-2H75v-1H51.449z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-237.3208" y1="41.0786" x2="-237.3208" y2="56.5028" gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 291.9271 64.1554)">
-	<stop  offset="0" style="stop-color:#58595B"/>
-	<stop  offset="1" style="stop-color:#231F20"/>
-</linearGradient>
-<polygon fill="url(#SVGID_6_)" points="54.226,35.402 51.355,34.531 46.999,48.885 49.871,49.756 "/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="31.9766" y1="65.3701" x2="49.5665" y2="47.7802">
-	<stop  offset="0" style="stop-color:#58595B"/>
-	<stop  offset="1" style="stop-color:#231F20"/>
-</linearGradient>
-<polygon fill="url(#SVGID_7_)" points="50.232,48.413 48.934,47.113 31.232,64.814 32.529,66.113 "/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="57.5" y1="47.8579" x2="57.5" y2="49.318">
-	<stop  offset="0" style="stop-color:#FF0000"/>
-	<stop  offset="1" style="stop-color:#A8000B"/>
-</linearGradient>
-<path fill="url(#SVGID_8_)" d="M75,48H51.449c-0.232-1.141-1.24-2-2.449-2c-1.211,0-2.219,0.859-2.449,2H40v1h6.551
-	c0.23,1.142,1.238,2,2.449,2c1.209,0,2.217-0.857,2.449-2H75V48z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="48.9995" y1="46.917" x2="48.9995" y2="50.0016">
-	<stop  offset="0" style="stop-color:#FFE2D9"/>
-	<stop  offset="1" style="stop-color:#F23D3D"/>
-</linearGradient>
-<circle fill="url(#SVGID_9_)" cx="49" cy="48.5" r="1.5"/>
-<rect fill="none" width="98" height="98"/>
-</svg>
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/src/ftudatetimecustomitem.cpp
--- a/clock/ftudatetimewizard/src/ftudatetimecustomitem.cpp	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Implementation for the FtuDateTimeCustomItem class
- *
- */
-
-// System includes
-#include <QObject>
-#include <hblistwidget.h>
-#include <hblistwidgetitem.h>
-#include <hbpushbutton.h>
-#include <hbdataformmodelitem.h>
-#include <hbdataformmodel.h>
-
-
-// User includes
-#include "ftudatetimecustomitem.h"
-
-/*!
-    \class FtuDateTimeCustomItem
-    This object creates the Custom item
- */
-
-/*!
-    Constructor.
- */
-FtuDateTimeCustomItem::FtuDateTimeCustomItem(QGraphicsItem *parent) :
-HbDataFormViewItem(parent)
-{
-}
-
-/*!
-    Destructor.
- */
-FtuDateTimeCustomItem::~FtuDateTimeCustomItem()
-{
-	// Nothing yet.
-}
-
-/*!
-    Creates the custom item.
- */
-HbAbstractViewItem* FtuDateTimeCustomItem::createItem()
-{
-	return new FtuDateTimeCustomItem(*this);
-}
-
-/*!
-    Checks if model index can be set or not
- */
-bool FtuDateTimeCustomItem::canSetModelIndex(const QModelIndex &index) const
-{
-	HbDataFormModelItem::DataItemType itemType = 
-			static_cast<HbDataFormModelItem::DataItemType>(
-			index.data(HbDataFormModelItem::ItemTypeRole).toInt());
-
-	if(itemType == (HbDataFormModelItem::CustomItemBase)) {
-		return true;
-	} else {
-		return false;
-	}
-
-}
-
-/*!
-    
- */
-void FtuDateTimeCustomItem::restore()
-{
-    HbDataFormModelItem::DataItemType itemType =
-            static_cast<HbDataFormModelItem::DataItemType>(
-				modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
-    if(itemType == (HbDataFormModelItem::CustomItemBase)) {
-    	HbDataFormModel* model = static_cast<HbDataFormModel*>(
-    			static_cast<HbAbstractViewItem*>(this)->itemView()->model());
-    	HbDataFormModelItem* modlItem = model->itemFromIndex(modelIndex()); 
-    	mPushButton->setProperty("text", modlItem->contentWidgetData("text"));
-    }
-}
-/*!
-    Creates and returns the custom item.
- */
-HbWidget* FtuDateTimeCustomItem::createCustomWidget()
-{
-	/*HbPushButton* pushButton = new HbPushButton(this);
-	return pushButton;*/
-	mPushButton = new HbPushButton(this);
-	return mPushButton;
-}
-
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/src/ftudatetimeview.cpp
--- a/clock/ftudatetimewizard/src/ftudatetimeview.cpp	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: FTU wizard plugin view implementaion
- *
- */
-
-// System includes
-#include <QObject>
-#include <QDate>
-#include <QTime>
-#include <qabstractitemmodel.h>
-#include <hbdataform.h>
-#include <hbview.h>
-#include <hbdataformmodel.h>
-#include <hbpushbutton.h>
-#include <hbdataformviewitem.h>
-#include <hbdatetimepicker.h>
-#include <hbaction.h>
-#include <xqsettingsmanager.h>
-#include <xqsettingskey.h>
-
-// User includes
-#include "settingsutility.h"
-#include "timezoneclient.h"
-#include "ftudatetimeview.h"
-#include "ftudatetimecustomitem.h"
-#include "ftudatetimeprivatecrkeys.h"
-
-/*!
-    \class FtuDateTimeView
-    This is the view class for the FTU plugin
- */
-/*!
-    \enum FtuDateTimeView::dateTimePicker
-    This enum defines different pickers to be launched(date picker/time picker)
- */
-/*!
-    \var FtuDateTimeView::datePicker
-    Date picker.
- */
-/*!
-    \var FtuDateTimeView::timePicker
-    Time picker.
- */
-
-/*!
-    Constructor.
- */
-FtuDateTimeView::FtuDateTimeView() :
-HbView(),
-mDatePicker(NULL),
-mTimePicker(NULL)
-{
-	//TODO: Localisation has to be done
-	// set title for wizard
-	setTitle("Date and Time");
-	mDateTimePlaceForm = new HbDataForm();
-
-	QList <HbAbstractViewItem*> prototypes = mDateTimePlaceForm->itemPrototypes();
-	FtuDateTimeCustomItem *customItem =
-			new FtuDateTimeCustomItem(mDateTimePlaceForm);
-	prototypes.append(customItem);
-	mDateTimePlaceForm->setItemPrototypes(prototypes);
-
-	// Construct the settings utility.
-	mSettingsUtility = new SettingsUtility();
-	mTimeZoneClient = TimezoneClient::getInstance();
-	mTimeAutoUpdate = mTimeZoneClient->timeUpdateOn();
-}
-
-/*!
-    Destructor.
- */
-FtuDateTimeView::~FtuDateTimeView()
-{
-	delete mDateTimePlaceForm;
-	delete mDateTimePlaceModel;
-	delete mSettingsUtility;
-
-	if (!mTimeZoneClient->isNull()) {
-		mTimeZoneClient->deleteInstance();
-	}
-}
-/*!
-    Creates the main view.
- */
-void FtuDateTimeView::constructView()
-{
-	createMainLayout();
-	setWidget(mDateTimePlaceForm);
-}
-
-/*!
-    Implemantation to create the main layout using the dataform.
- */
-void FtuDateTimeView::createMainLayout()
-{
-	if (mDateTimePlaceForm->model()) {
-		delete mDateTimePlaceForm->model();
-		mDateTimePlaceForm->setModel(0);
-	}
-
-	mDateTimePlaceModel = new HbDataFormModel();
-
-	// Populates the datetime and place groups
-	populateDateTimeGroup();
-	populatePlaceGroup();
-
-	setItemDisplayed();
-	mDateTimePlaceForm->setModel(mDateTimePlaceModel);
-}
-
-/*!
-    Populates the Date and Time Group.
- */
-void FtuDateTimeView::populateDateTimeGroup()
-{
-	HbDataFormModelItem *dateTimeGroup =
-			mDateTimePlaceModel->appendDataFormGroup
-			(QString(tr("Date and Time")),
-			 mDateTimePlaceModel->invisibleRootItem());
-
-	//Custom Date item
-	mDateItem = mDateTimePlaceModel->appendDataFormItem(
-								HbDataFormModelItem::CustomItemBase,
-								QString(tr("Date")), dateTimeGroup);
-	// Custom Time item
-	mTimeItem = mDateTimePlaceModel->appendDataFormItem(
-								HbDataFormModelItem::CustomItemBase,
-								QString(tr("Time")), dateTimeGroup);
-	// Auto TimeUpdate item
-	mAutoTimeUpdateItem = mDateTimePlaceModel->appendDataFormItem(
-								HbDataFormModelItem::CustomItemBase,
-								QString(tr("Time Autoupdate")), dateTimeGroup);
-
-	// Connect the items to the proper slots
-	mDateTimePlaceForm->addConnection(mDateItem, SIGNAL(clicked()), this,
-								SLOT(populateDatePicker()));
-	mDateTimePlaceForm->addConnection(mTimeItem, SIGNAL(clicked()), this,
-								SLOT(populateTimePicker()));
-	mDateTimePlaceForm->addConnection(mAutoTimeUpdateItem, SIGNAL(clicked()),
-								this, SLOT(setAutoTimeupDate()));
-}
-
-/*!
-    Populates the Place Group.
- */
-void FtuDateTimeView::populatePlaceGroup()
-{
-	mPlaceGroup = mDateTimePlaceModel->appendDataFormGroup(QString(tr("Place")),
-									mDateTimePlaceModel->invisibleRootItem());
-	// Custom country item
-	mCountryItem = mDateTimePlaceModel->appendDataFormItem(
-									HbDataFormModelItem::CustomItemBase,
-									QString(tr("Country")), mPlaceGroup);
-	// Custom city item
-	mCityItem = mDateTimePlaceModel->appendDataFormItem(
-									HbDataFormModelItem::CustomItemBase,
-									QString(tr("City")), mPlaceGroup);
-
-	// Connect the items to the proper slots
-	mDateTimePlaceForm->addConnection(mCountryItem, SIGNAL(clicked()), this,
-									SLOT(populateCitySelectionList()));
-	mDateTimePlaceForm->addConnection(mCityItem, SIGNAL(clicked()), this,
-									SLOT(populateCitySelectionList()));
-
-
-}
-
-/*!
-    Sets the item index.
- */
-void FtuDateTimeView::setItemDisplayed()
-{
-	// Display the items with proper data
-	mDateItem->setContentWidgetData("text", mSettingsUtility->date());
-	mTimeItem->setContentWidgetData("text", mSettingsUtility->time());
-
-	if (mTimeAutoUpdate) {
-		mAutoTimeUpdateItem->setContentWidgetData("text", tr("ON"));
-	} else {
-		mAutoTimeUpdateItem->setContentWidgetData("text", tr("OFF"));
-	}
-	mCountryItem->setContentWidgetData("text",
-							mTimeZoneClient->getCurrentZoneInfoL().countryName);
-	mCityItem->setContentWidgetData("text",
-							mTimeZoneClient->getCurrentZoneInfoL().cityName);
-
-	// Set the date,time,country and city fields disable
-	// if auto time update is ON
-	if (mTimeAutoUpdate) {
-		mDateItem->setEnabled(false);
-		mTimeItem->setEnabled(false);
-		mCountryItem->setEnabled(false);
-		mCityItem->setEnabled(false);
-	}
-}
-
-/*!
-    Populates the Date Picker.
- */
-void FtuDateTimeView::populateDatePicker()
-{
-	if (mDatePickerDialog) {
-		delete mDatePickerDialog;
-	}
-	mDatePickerDialog = new HbDialog();
-
-	mDatePickerDialog->setDismissPolicy(HbDialog::NoDismiss);
-	mDatePickerDialog->setTimeout(HbDialog::NoDismiss);
-
-	if(mDatePicker) {
-		mDatePicker = NULL;
-	}
-	mDatePicker = new HbDateTimePicker(QDate::currentDate(),
-	                                   this);
-	mDatePicker->setMinimumDate(QDate::fromString("01/01/1900", "dd/MM/yyyy"));
-	mDatePicker->setMaximumDate(QDate::fromString("31/12/2100", "dd/MM/yyyy"));
-
-	mDatePickerDialog->setContentWidget(mDatePicker);
-
-	// Add ok and cancel actions.
-	mOkAction = new HbAction(
-			hbTrId("txt_common_button_ok"), mDatePickerDialog);
-	mCancelAction =  new HbAction(
-			hbTrId("txt_common_button_cancel"), mDatePickerDialog);
-
-	mDatePickerDialog->addAction(mOkAction);
-	mDatePickerDialog->addAction(mCancelAction);
-
-	mDatePickerDialog->open(this, SLOT(selectedAction(HbAction *)));
-}
-
-/*!
-    Populates the Time Picker.
- */
-void FtuDateTimeView::populateTimePicker()
-{
-	if (mTimePickerDialog) {
-		delete mTimePickerDialog;
-	}
-	mTimePickerDialog = new HbDialog();
-	mTimePickerDialog->setDismissPolicy(HbDialog::NoDismiss);
-	mTimePickerDialog->setTimeout(HbDialog::NoDismiss);
-
-	if(mTimePicker) {
-		mTimePicker = NULL;
-	}
-	mTimePicker = new HbDateTimePicker(
-			QTime().currentTime(), this);
-	mTimePicker->setDisplayFormat(mSettingsUtility->timeFormatString());
-
-	mTimePickerDialog->setContentWidget(mTimePicker);
-
-	// Add ok and cancel actions.
-	mOkAction = new HbAction(
-			hbTrId("txt_common_button_ok"), mTimePickerDialog);
-
-	mCancelAction = new HbAction(
-			hbTrId("txt_common_button_cancel"), mTimePickerDialog);
-
-	mTimePickerDialog->addAction(mOkAction);
-	mTimePickerDialog->addAction(mCancelAction);
-
-	mTimePickerDialog->open(this, SLOT(selectedAction(HbAction*)));
-}
-
-/*!
-    Sets the Auto Time update.
- */
-void FtuDateTimeView::setAutoTimeupDate()
-{
-	if (mTimeAutoUpdate) {
-		mAutoTimeUpdateItem->setContentWidgetData("text", "OFF");
-		// Set the fields enabled if auto time update is OFF
-		mDateItem->setEnabled(true);
-		mTimeItem->setEnabled(true);
-		mCountryItem->setEnabled(true);
-		mCityItem->setEnabled(true);
-		// SetAutomaticTimeUpdate OFF, UnLoad the Plugins
-		setAutomaticTimeUpdateOff(false);
-	} else {
-		mAutoTimeUpdateItem->setContentWidgetData("text", "ON");
-		// Set the fields disabled if auto time update is ON
-		mDateItem->setEnabled(false);
-		mTimeItem->setEnabled(false);
-		mCountryItem->setEnabled(false);
-		mCityItem->setEnabled(false);
-		// SetAutomaticTimeUpdate ON, Load the Plugins
-		setAutomaticTimeUpdateOff(true);
-	}
-	wizardEditedDate(QDate::currentDate());
-}
-
-/*!
-    Populates the City Selection List.
- */
-void FtuDateTimeView::populateCitySelectionList()
-{
-	if(mCitySelectionList) {
-		mCitySelectionList = NULL;
-	}
-	mCitySelectionList = new ClockCitySelectionList(mTimeZoneClient, this);
-	connect(mCitySelectionList,SIGNAL(citySelected(LocationInfo)),
-	        SLOT(HandleLocationChange(LocationInfo)));
-	mCitySelectionList->showCityList();
-}
-
-/*!
-	Slot to handle the case when a city has been selected from the city.
-	\param info of type LocationInfo which contains the city selected.
- */
-void FtuDateTimeView::HandleLocationChange(LocationInfo location)
-{
-	// Check if the location is valid. If its not valid the timezoneId will be -1
-	if(location.timezoneId != -1) {
-		// Set the location
-		mTimeZoneClient->setAsCurrentLocationL(location);
-		mCountryItem->setContentWidgetData("text", location.countryName);
-		mCityItem->setContentWidgetData("text", location.cityName);
-	}
-	// Cleanup
-	mCitySelectionList->deleteLater();
-}
-
-/*!
-	Slot to handle the selected action.
- */
-void FtuDateTimeView::selectedAction(HbAction *action)
-{
-	// Update time/date based on the picker selected.
-	if (action == mOkAction) {
-		if (mTimePickerDialog) {
-			updateTime();
-		} else if(mDatePickerDialog) {
-			updateDate();
-		}
-	}else {
-		if(mTimePickerDialog) {
-			mTimePickerDialog->deleteLater();
-		} else if(mDatePickerDialog) {
-			mDatePickerDialog->deleteLater();
-		}
-	}
-}
-
-/*!
-    Sets the device date.
- */
-void FtuDateTimeView::updateDate()
-{
-	QDate date = mDatePicker->date();
-	// Set device Date
-	if (date.isValid()) {
-		mDateItem->setContentWidgetData("text",
-						date.toString(mSettingsUtility->dateFormatString()));
-		mTimeZoneClient->setDateTime(QDateTime(date, QTime::currentTime()));
-		wizardEditedDate(date);
-	}
-}
-
-/*!
-    Sets the device time.
- */
-void FtuDateTimeView::updateTime()
-{
-	QTime time = mTimePicker->time();
-	// Set device Time
-	if (time.isValid()) {
-		mTimeItem->setContentWidgetData("text",
-						time.toString(mSettingsUtility->timeFormatString()));
-		mTimeZoneClient->setDateTime(QDateTime(QDate::currentDate(), time));
-		wizardEditedDate(QDate::currentDate());
-	}
-
-}
-
-/*!
-    Gets the wizard completed status.
- */
-QDate FtuDateTimeView::getWizardCompletedDate()
-{
-	XQSettingsManager *settingsManager = new XQSettingsManager();
-	XQSettingsKey *ftuPluginDateCenrepKey =
-			new XQSettingsKey(XQSettingsKey::TargetCentralRepository,
-			                  KCRUidClockApp, KFtuPluginDate);
-	// Read the initial values from the cenrep
-	QString dateString = settingsManager->readItemValue(*ftuPluginDateCenrepKey,
-	                                                    XQSettingsManager::TypeString).toString();
-	QDate completedDate = QDate::fromString(dateString,
-	                                        mSettingsUtility->dateFormatString());
-
-	// Cleanup.
-	delete ftuPluginDateCenrepKey;
-	delete settingsManager;
-
-	return completedDate;
-}
-
-/*!
-    Gets the wizard Edited date.
- */
-void FtuDateTimeView::wizardEditedDate(const QDate &date)
-{
-	XQSettingsManager *settingsManager = new XQSettingsManager();
-	XQSettingsKey *ftuPluginDateCenrepKey =
-			new XQSettingsKey(XQSettingsKey::TargetCentralRepository,
-			                  KCRUidClockApp, KFtuPluginDate);
-	QString dateString = date.toString(mSettingsUtility->dateFormatString());
-	settingsManager->writeItemValue(*ftuPluginDateCenrepKey,dateString);
-
-	// Cleanup.
-	delete ftuPluginDateCenrepKey;
-	delete settingsManager;
-}
-
-/*!
-    To set AutomaticTimeUpdate
- */
-void FtuDateTimeView::setAutomaticTimeUpdateOff(bool value)
-{
-	mTimeZoneClient->setTimeUpdateOn(value);
-	mTimeAutoUpdate = value;
-}
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/src/ftudatetimewizard.cpp
--- a/clock/ftudatetimewizard/src/ftudatetimewizard.cpp	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-// System includes
-#include <QGraphicsLayout>
-#include <centralrepository.h>
-#include <xqsettingsmanager.h>
-#include <xqsettingskey.h>
-// User includes
-#include "ftudatetimewizard.h"
-#include "ftudatetimeview.h"
-#include "ftudatetimeprivatecrkeys.h"
-
-static const char* dateTimeTitle = "Date and Time";
-static const char* dateTimeInfoText = "Set your Date Time and Location";
-static const char* dateTimeStripIcon =
-		":/images/ftudatetimewizard_menustrip_icon.svg";
-static const char* dateTimeTocIcon = ":/images/ftudatetimewizard_toc_icon.svg";
-
-/*!
-    \class FtuDateTimeWizard
-    This is the FTU Date time plugin wizard
- */
-
-/*!
-    Constructor.
- */
-FtuDateTimeWizard::FtuDateTimeWizard()
-{
-	// Set up wizard settings 
-	mWizardSettings.mMenustripDefaultIcon = QFileInfo(dateTimeStripIcon);
-	mWizardSettings.mMenustripPressedIcon = QFileInfo(dateTimeStripIcon);
-	mWizardSettings.mMenustripFocussedIcon = QFileInfo(dateTimeStripIcon);
-	mWizardSettings.mMenustripLabel = tr(dateTimeTitle);
-
-	mWizardSettings.mTocDefaultIcon = QFileInfo(dateTimeTocIcon);
-	mWizardSettings.mTocPressedIcon = QFileInfo(dateTimeTocIcon);
-	mWizardSettings.mTocFocussedIcon = QFileInfo(dateTimeTocIcon);
-	mWizardSettings.mTocLabel = tr(dateTimeTitle);
-}
-
-/*!
-    Destructor.
- */
-FtuDateTimeWizard::~FtuDateTimeWizard()
-{
-	//delete mWizardSettings;
-}
-
-/*!
-    Initialises the wizard.This is called by the FTU framework
- */
-void FtuDateTimeWizard::initializeWizard(qint32 cenrepOwnerId, int wizardIdx)
-{
-	Q_UNUSED(cenrepOwnerId)
-	Q_UNUSED(wizardIdx)
-
-	//Check if valid Nitz info is received
-	XQSettingsManager *settingsManager = new XQSettingsManager();
-	XQSettingsKey *validNitzCenrepKey = 
-			new XQSettingsKey(XQSettingsKey::TargetCentralRepository, KCRUidNitz, KValidNitz);
-	// Read the initial values from the cenrep
-	int validNitz = settingsManager->readItemValue(*validNitzCenrepKey).toInt();
-
-	//Clean up
-	delete validNitzCenrepKey;
-	delete settingsManager;
-
-	// The plugin will be loaded only if valid Nitz info is not received
-	if(validNitz == 0) {
-		// Set up view
-		if (mFtuDateTimeView == NULL) {
-			mFtuDateTimeView = new FtuDateTimeView();
-			mFtuDateTimeView->setAutomaticTimeUpdateOff(false);
-		}
-		// If our main view is not created, signal with false.
-		emit wizardInitialized(this, ((mFtuDateTimeView) ? true: false));
-	}
-	else {
-		emit wizardInitialized(this, false);
-	}
-}
-
-/*!
-    Activates the wizard.
-    Is called by the FTU framework when wizard becomes the current wizard
- */
-void FtuDateTimeWizard::activateWizard()
-{
-	mFtuDateTimeView->constructView();
-	// Signal info text to FTU framework
-	emit
-	infoTextUpdated(this, tr(dateTimeInfoText));
-
-	// Signal view change
-	emit viewChanged(this, mFtuDateTimeView);
-}
-
-/*!
-    Deactivates the wizard.Is called by FTU framework when wizard is no longer displayed.
-    Frees up resources that need not persist between wizard plugin activations.
- */
-void FtuDateTimeWizard::deactivateWizard()
-{
-	// Destroy everything but the initial view and data that takes a long time
-	// to reacquire when the plugin is later re-activated.
-}
-
-/*!
-    Notifies the FTU FW how the wizard is been shutdown.
-    Its called by FTU framework before the wizard plugin destructor is called.
-    /param reason for the ShutDown
- */
-bool FtuDateTimeWizard::shutdownWizard(FtuWizard::ShutdownReason reason)
-{
-	// Destroy all views
-	Q_UNUSED(reason);
-	return true;
-}
-
-/*!
-    Relayoutes the views for new size.
-    /param geometry
- */
-void FtuDateTimeWizard::resizeWizard(const QRectF& geometry)
-{
-	Q_UNUSED(geometry)
-	// Relayout view for new size   
-}
-
-/*!
-    Returns the settings for FTU framework.
- */
-const FtuWizardSetting& FtuDateTimeWizard::wizardSettings()
-{
-	return mWizardSettings;
-}
-
-/*!
-    Handles the back event.
- */
-bool FtuDateTimeWizard::handleBackEvent()
-{
-	return false;
-}
-
-/*!
-    Returns the wizard completed date.
- */
-QDate FtuDateTimeWizard::wizardCompletedDate()
-{
-	return (mFtuDateTimeView->getWizardCompletedDate());
-}
-
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/ftudatetimewizard/src/ftudatetimewizardfactory.cpp
--- a/clock/ftudatetimewizard/src/ftudatetimewizardfactory.cpp	Fri May 14 15:51:09 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Wizard plugin factory class to instantiate the wizard plugin
- *
- */
-
-// System includes
-#include <QtGui> // For Q_EXPORT_PLUGIN2
-
-// User includes
-#include "ftudatetimewizardfactory.h"
-#include "ftudatetimewizard.h"
-
-/*!
-    Returns the FTU plugin wizard instance.
- */
-FtuWizard* FtuDateTimeWizardFactory::createWizard() const
-{
-	return new FtuDateTimeWizard();
-}
-
-Q_EXPORT_PLUGIN2(ftudatetimeplugin, FtuDateTimeWizardFactory)
-
-// End of file  --Don't remove this.
diff -r a949c2543c15 -r ea672fcb0ea0 clock/inc/clockcommon.h
--- a/clock/inc/clockcommon.h	Fri May 14 15:51:09 2010 +0300
+++ b/clock/inc/clockcommon.h	Thu May 27 12:51:15 2010 +0300
@@ -27,16 +27,6 @@
 const QString PATH_TEXT("C:/");
 const int KMaximumCityListCount(50);
 
-const long int KCRUidNitz =  { 0x101F8876 };
-/** Active Protocol key */
-const long int KActiveProtocol = 0x00000001;
-/** Previous alarm time high */
-const long int KPreviousAlarmTime = 0x00000002;
-
-const long int KCRUidClockApp =  { 0x101F874D };
-/** Alarm snooze time key */
-const long int KClockAppSnoozeTime = 0x00000002;
-
 // Common definitions for docml.
 #define CLOCK_MAIN_VIEW_DOCML						":/xml/clockmainview.docml"
 #define CLOCK_MAIN_VIEW_PORTRAIT_SECTION			"portrait"
diff -r a949c2543c15 -r ea672fcb0ea0 clock/inc/clockprivatecrkeys.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/inc/clockprivatecrkeys.h	Thu May 27 12:51:15 2010 +0300
@@ -0,0 +1,34 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   The file contains the uid of keys used by application.
+*
+*/
+
+#ifndef CLOCKPRIVATECRKEYS_H
+#define CLOCKPRIVATECRKEYS_H
+
+/** Nitz Settings */
+/** Provides access to the Nitz status.*/
+const long int KCRUidNitz =  { 0x101F8876 };
+/** Active Protocol key */
+const long int KActiveProtocol = 0x00000000;
+/** Previous alarm time high */
+const long int KPreviousAlarmTime = 0x00000001;
+/** Valid Nitz Info key */
+const long int KValidNitz = 0x00000002;
+
+#endif  	// CLOCKPRIVATECRKEYS_H
+
+// End of file	--Don't remove this.
+
diff -r a949c2543c15 -r ea672fcb0ea0 notes/notesui/noteseditor/data/xml/notesnoteeditor.docml
--- a/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml	Fri May 14 15:51:09 2010 +0300
+++ b/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml	Thu May 27 12:51:15 2010 +0300
@@ -21,7 +21,7 @@
     <widget name="notesEditorView" type="HbView">
         <widget name="noteEditorWidget" role="HbView:widget" type="HbWidget">
             <widget name="notesEditorSubHeading" type="HbGroupBox">
-	        <string name="titleText" value=" "/>
+	        <string name="heading" value=" "/>
     	        <bool name="collapsable" value="FALSE"/>
             </widget>
             <widget name="editorHeading" type="HbLabel">
diff -r a949c2543c15 -r ea672fcb0ea0 notes/notesui/noteseditor/data/xml/todoeditor.docml
--- a/notes/notesui/noteseditor/data/xml/todoeditor.docml	Fri May 14 15:51:09 2010 +0300
+++ b/notes/notesui/noteseditor/data/xml/todoeditor.docml	Thu May 27 12:51:15 2010 +0300
@@ -3,7 +3,7 @@
     <widget name="todoEditorview" type="HbView">
         <widget name="todoEditorwidget" role="HbView:widget" type="HbWidget">
             <widget name="subHeading" type="HbGroupBox">
-                <string locid="txt_notes_subhead_new_todo" name="titleText" value="New To-do"/>
+                <string locid="txt_notes_subhead_new_todo" name="heading" value="New To-do"/>
                 <bool name="collapsable" value="FALSE"/>
             </widget>
             <widget name="todoEditorDataForm" type="HbDataForm">
diff -r a949c2543c15 -r ea672fcb0ea0 organizer_plat/calendar_settings_keys_api/calendar_settings_keys_api.pri
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/calendar_settings_keys_api/calendar_settings_keys_api.pri	Thu May 27 12:51:15 2010 +0300
@@ -0,0 +1,16 @@
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: Project specification file for clock_settings_keys_api
+#
+
+PUBLIC_HEADERS += calendar_settings_keys_api/inc/calendardomaincrkeys.h
diff -r a949c2543c15 -r ea672fcb0ea0 organizer_plat/calendar_settings_keys_api/inc/calendardomaincrkeys.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/calendar_settings_keys_api/inc/calendardomaincrkeys.h	Thu May 27 12:51:15 2010 +0300
@@ -0,0 +1,1 @@
+/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved.* This component and the accompanying materials are made available* under the terms of "Eclipse Public License v1.0"* which accompanies this distribution, and is available* at the URL "http://www.eclipse.org/legal/epl-v10.html".** Initial Contributors:* Nokia Corporation - initial contribution.** Contributors:** Description:   The file contains the uid of domain keys.**/#ifndef CALENDARDOMAINCRKEYS_H#define CALENDARDOMAINCRKEYS_H/** Calendar UI Settings keys*//** Provides access to the Calendar application's settings keys */const long int KCRUidCalendar =  { 0x101F874B };/*** Defines the time between alarm snoozes, in minutes.* Default value: 5**/const long int KCalendarSnoozeTime = 0x00000001;/*** Default Calendar alarm sound file.* Default value : "z:\data\sounds\digital\alarm.aac"**/const long int KCalendarDefaultSoundFile = 0x00000003;#endif  	// CALENDARDOMAINCRKEYS_H// End of file	--Don't remove this.
\ No newline at end of file
diff -r a949c2543c15 -r ea672fcb0ea0 organizer_plat/clock_settings_keys_api/clock_settings_keys_api.pri
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/clock_settings_keys_api/clock_settings_keys_api.pri	Thu May 27 12:51:15 2010 +0300
@@ -0,0 +1,16 @@
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: Project specification file for clock_settings_keys_api
+#
+
+PUBLIC_HEADERS += clock_settings_keys_api/inc/clockdomaincrkeys.h
diff -r a949c2543c15 -r ea672fcb0ea0 organizer_plat/clock_settings_keys_api/inc/clockdomaincrkeys.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/clock_settings_keys_api/inc/clockdomaincrkeys.h	Thu May 27 12:51:15 2010 +0300
@@ -0,0 +1,1 @@
+/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved.* This component and the accompanying materials are made available* under the terms of "Eclipse Public License v1.0"* which accompanies this distribution, and is available* at the URL "http://www.eclipse.org/legal/epl-v10.html".** Initial Contributors:* Nokia Corporation - initial contribution.** Contributors:** Description:   The file contains the uid of domain keys.**/#ifndef CLOCKDOMAINCRKEYS_H#define CLOCKDOMAINCRKEYS_H/**Clock Settings keys*//**Provides access to the ClockSettings keys*/const long int KCRUidClockApp =  { 0x101F874D };/**Default clock alarm sound file*/const long int KClockAppDefaultSoundFile = 0x00000000;/** Alarm snooze time key */const long int KClockAppSnoozeTime = 0x00000001;#endif  	// CLOCKDOMAINCRKEYS_H// End of file	--Don't remove this.
\ No newline at end of file
diff -r a949c2543c15 -r ea672fcb0ea0 organizer_plat/organizer_plat.pro
--- a/organizer_plat/organizer_plat.pro	Fri May 14 15:51:09 2010 +0300
+++ b/organizer_plat/organizer_plat.pro	Thu May 27 12:51:15 2010 +0300
@@ -24,6 +24,8 @@
 include(calendar_editor_api/calendar_editor_api.pri)
 include(notes_editor_api/notes_editor_api.pri)
 include(eventviewer_plugin_api/eventviewer_plugin_api.pri)
+include(clock_settings_keys_api/clock_settings_keys_api.pri)
+include(calendar_settings_keys_api/calendar_settings_keys_api.pri)
 
 symbian {
     headers.sources = $$PUBLIC_HEADERS