# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1276252674 -10800 # Node ID 360d55486d7fa729c4bee978e77ce5a19579169b # Parent ea672fcb0ea0b804cdbac5a1da3e1b2a33cde93f Revision: 201021 Kit: 2010123 diff -r ea672fcb0ea0 -r 360d55486d7f agendainterface/agendautil/src/agendautil_p.cpp --- a/agendainterface/agendautil/src/agendautil_p.cpp Thu May 27 12:51:15 2010 +0300 +++ b/agendainterface/agendautil/src/agendautil_p.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -1717,6 +1717,11 @@ } } } + int count = instanceList.Count(); + for (int i = count - 1; i >= 0; --i) { + CCalInstance *instance = instanceList[i]; + delete instance; + } CleanupStack::PopAndDestroy(); } @@ -2470,6 +2475,11 @@ } else { isEmpty = true; } + int count = instanceList.Count(); + for (int i = count - 1; i >= 0; --i) { + CCalInstance *instance = instanceList[i]; + delete instance; + } CleanupStack::PopAndDestroy(); return isEmpty; } diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/agendaeventviewer/data/agendaeventviewer.qrc --- a/calendarui/agendaeventviewer/data/agendaeventviewer.qrc Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/agendaeventviewer/data/agendaeventviewer.qrc Fri Jun 11 13:37:54 2010 +0300 @@ -7,6 +7,7 @@ agendaeventvieweritem.css + agendaeventvieweritem_color.css agendaeventvieweritem.widgetml \ No newline at end of file diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/agendaeventviewer/data/agendaeventvieweritem_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/agendaeventviewer/data/agendaeventvieweritem_color.css Fri Jun 11 13:37:54 2010 +0300 @@ -0,0 +1,23 @@ +AgendaEventViewerItem::primaryTextItem{ + color: var(qtc_list_item_content_normal); +} + +AgendaEventViewerItem::primaryTextItem[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +AgendaEventViewerItem::primaryTextItem[state="disabled"]{ + color: var(qtc_list_item_disabled); +} + +AgendaEventViewerItem::secondaryTextItem{ + color: var(qtc_list_item_content_normal); +} + +AgendaEventViewerItem::secondaryTextItem[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +AgendaEventViewerItem::secondaryTextItem[state="disabled"]{ + color: var(qtc_list_item_disabled); +} \ No newline at end of file diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/agendaeventviewer/src/agendaeventview.cpp --- a/calendarui/agendaeventviewer/src/agendaeventview.cpp Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -532,18 +532,7 @@ mMaptilePath = MapTileService::getMapTileImage(eventId, addressType); if (!mMaptilePath.isNull()) { - QIcon mapTileIcon(mMaptilePath); - QPainter painter; - QPixmap baloon(HbIcon("qtg_small_location").pixmap()); - QPixmap map (mapTileIcon.pixmap(width,height)); - //Display pin image in the center of maptile image - painter.begin( &map ); - painter.drawPixmap( (width/2)-(baloon.width()/2), - (height/2)-baloon.height(), baloon ); - painter.end(); - mapTileIcon.addPixmap( map ); - - HbIcon maptile(mapTileIcon); + HbIcon maptile(mMaptilePath); mMaptileLabel->setIcon(maptile); mMaptileLabel->setPreferredSize(QSizeF(width, height)); diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/application/application.pro --- a/calendarui/application/application.pro Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/application/application.pro Fri Jun 11 13:37:54 2010 +0300 @@ -35,7 +35,6 @@ "../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 ea672fcb0ea0 -r 360d55486d7f calendarui/bwins/calencontrolleru.def --- a/calendarui/bwins/calencontrolleru.def Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/bwins/calencontrolleru.def Fri Jun 11 13:37:54 2010 +0300 @@ -1,28 +1,38 @@ EXPORTS - ?checkMultipleCreation@CCalenController@@AAEXXZ @ 1 NONAME ; void CCalenController::checkMultipleCreation(void) - ?SetDefaultContext@CCalenController@@AAEXXZ @ 2 NONAME ; void CCalenController::SetDefaultContext(void) - ?getFirstView@CCalenController@@QAEHXZ @ 3 NONAME ; int CCalenController::getFirstView(void) - ?handleServiceManagerSlot@CCalenController@@QAEXHABVQDateTime@@@Z @ 4 NONAME ; void CCalenController::handleServiceManagerSlot(int, class QDateTime const &) - ?context@CCalenController@@QAEAAVMCalenContext@@XZ @ 5 NONAME ; class MCalenContext & CCalenController::context(void) - ?ViewManager@CCalenController@@QAEAAVCalenViewManager@@XZ @ 6 NONAME ; class CalenViewManager & CCalenController::ViewManager(void) - ?Infobar@CCalenController@@QAEPAVHbWidget@@XZ @ 7 NONAME ; class HbWidget * CCalenController::Infobar(void) - ?agendaInterface@CCalenController@@QAEPAVAgendaUtil@@XZ @ 8 NONAME ; class AgendaUtil * CCalenController::agendaInterface(void) - ?BroadcastNotification@CCalenController@@QAEXW4TCalenNotification@@@Z @ 9 NONAME ; void CCalenController::BroadcastNotification(enum TCalenNotification) - ?MainWindow@CCalenController@@QAEAAVHbMainWindow@@XZ @ 10 NONAME ; class HbMainWindow & CCalenController::MainWindow(void) - ?CancelNotifications@CCalenController@@QAEXPAVMCalenNotificationHandler@@@Z @ 11 NONAME ; void CCalenController::CancelNotifications(class MCalenNotificationHandler *) - ?Notifier@CCalenController@@QAEAAVCalenNotifier@@XZ @ 12 NONAME ; class CalenNotifier & CCalenController::Notifier(void) - ?InstanceL@CCalenController@@SAPAV1@XZ @ 13 NONAME ; class CCalenController * CCalenController::InstanceL(void) - ?CustomisationManager@CCalenController@@QAEAAVCCalenCustomisationManager@@XZ @ 14 NONAME ; class CCalenCustomisationManager & CCalenController::CustomisationManager(void) - ?IssueCommandL@CCalenController@@QAEHH@Z @ 15 NONAME ; int CCalenController::IssueCommandL(int) - ?Services@CCalenController@@QAEAAVMCalenServices@@XZ @ 16 NONAME ; class MCalenServices & CCalenController::Services(void) - ?InfobarTextL@CCalenController@@QAEPAVQString@@XZ @ 17 NONAME ; class QString * CCalenController::InfobarTextL(void) - ?Release@CCalenController@@QAEXXZ @ 18 NONAME ; void CCalenController::Release(void) - ?RegisterForNotificationsL@CCalenController@@QAEXPAVMCalenNotificationHandler@@W4TCalenNotification@@@Z @ 19 NONAME ; void CCalenController::RegisterForNotificationsL(class MCalenNotificationHandler *, enum TCalenNotification) - ??0CCalenController@@QAE@_N@Z @ 20 NONAME ; CCalenController::CCalenController(bool) - ?GetCommandHandlerL@CCalenController@@QAEPAVMCalenCommandHandler@@H@Z @ 21 NONAME ; class MCalenCommandHandler * CCalenController::GetCommandHandlerL(int) - ??1CCalenController@@QAE@XZ @ 22 NONAME ; CCalenController::~CCalenController(void) - ?OfferMenu@CCalenController@@QAEXPAVHbMenu@@@Z @ 23 NONAME ; void CCalenController::OfferMenu(class HbMenu *) - ?RegisterForNotificationsL@CCalenController@@QAEXPAVMCalenNotificationHandler@@AAV?$RArray@W4TCalenNotification@@@@@Z @ 24 NONAME ; void CCalenController::RegisterForNotificationsL(class MCalenNotificationHandler *, class RArray &) - ?NewServicesL@CCalenController@@UAEPAVMCalenServices@@XZ @ 25 NONAME ; class MCalenServices * CCalenController::NewServicesL(void) - ?ReleaseCustomisations@CCalenController@@QAEXXZ @ 26 NONAME ; void CCalenController::ReleaseCustomisations(void) + ?trUtf8@CCalenController@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString CCalenController::trUtf8(char const *, char const *, int) + ?checkMultipleCreation@CCalenController@@AAEXXZ @ 2 NONAME ; void CCalenController::checkMultipleCreation(void) + ?handleServiceManagerSlot@CCalenController@@QAEXHABVQDateTime@@@Z @ 3 NONAME ; void CCalenController::handleServiceManagerSlot(int, class QDateTime const &) + ?staticMetaObject@CCalenController@@2UQMetaObject@@B @ 4 NONAME ; struct QMetaObject const CCalenController::staticMetaObject + ?qt_metacall@CCalenController@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 5 NONAME ; int CCalenController::qt_metacall(enum QMetaObject::Call, int, void * *) + ?qt_metacast@CCalenController@@UAEPAXPBD@Z @ 6 NONAME ; void * CCalenController::qt_metacast(char const *) + ?BroadcastNotification@CCalenController@@QAEXW4TCalenNotification@@@Z @ 7 NONAME ; void CCalenController::BroadcastNotification(enum TCalenNotification) + ?CancelNotifications@CCalenController@@QAEXPAVMCalenNotificationHandler@@@Z @ 8 NONAME ; void CCalenController::CancelNotifications(class MCalenNotificationHandler *) + ?tr@CCalenController@@SA?AVQString@@PBD0@Z @ 9 NONAME ; class QString CCalenController::tr(char const *, char const *) + ?getStaticMetaObject@CCalenController@@SAABUQMetaObject@@XZ @ 10 NONAME ; struct QMetaObject const & CCalenController::getStaticMetaObject(void) + ?CustomisationManager@CCalenController@@QAEAAVCCalenCustomisationManager@@XZ @ 11 NONAME ; class CCalenCustomisationManager & CCalenController::CustomisationManager(void) + ?IssueCommandL@CCalenController@@QAEHH@Z @ 12 NONAME ; int CCalenController::IssueCommandL(int) + ?tr@CCalenController@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString CCalenController::tr(char const *, char const *, int) + ?Services@CCalenController@@QAEAAVMCalenServices@@XZ @ 14 NONAME ; class MCalenServices & CCalenController::Services(void) + ?OfferMenu@CCalenController@@QAEXPAVHbMenu@@@Z @ 15 NONAME ; void CCalenController::OfferMenu(class HbMenu *) + ?ReleaseCustomisations@CCalenController@@QAEXXZ @ 16 NONAME ; void CCalenController::ReleaseCustomisations(void) + ?SetDefaultContext@CCalenController@@AAEXXZ @ 17 NONAME ; void CCalenController::SetDefaultContext(void) + ??_ECCalenController@@UAE@I@Z @ 18 NONAME ; CCalenController::~CCalenController(unsigned int) + ?getFirstView@CCalenController@@QAEHXZ @ 19 NONAME ; int CCalenController::getFirstView(void) + ?metaObject@CCalenController@@UBEPBUQMetaObject@@XZ @ 20 NONAME ; struct QMetaObject const * CCalenController::metaObject(void) const + ?Infobar@CCalenController@@QAEPAVHbWidget@@XZ @ 21 NONAME ; class HbWidget * CCalenController::Infobar(void) + ?ViewManager@CCalenController@@QAEAAVCalenViewManager@@XZ @ 22 NONAME ; class CalenViewManager & CCalenController::ViewManager(void) + ?context@CCalenController@@QAEAAVMCalenContext@@XZ @ 23 NONAME ; class MCalenContext & CCalenController::context(void) + ?agendaInterface@CCalenController@@QAEPAVAgendaUtil@@XZ @ 24 NONAME ; class AgendaUtil * CCalenController::agendaInterface(void) + ?MainWindow@CCalenController@@QAEAAVHbMainWindow@@XZ @ 25 NONAME ; class HbMainWindow & CCalenController::MainWindow(void) + ?Notifier@CCalenController@@QAEAAVCalenNotifier@@XZ @ 26 NONAME ; class CalenNotifier & CCalenController::Notifier(void) + ?InstanceL@CCalenController@@SAPAV1@XZ @ 27 NONAME ; class CCalenController * CCalenController::InstanceL(void) + ??1CCalenController@@UAE@XZ @ 28 NONAME ; CCalenController::~CCalenController(void) + ?InfobarTextL@CCalenController@@QAEPAVQString@@XZ @ 29 NONAME ; class QString * CCalenController::InfobarTextL(void) + ?Release@CCalenController@@QAEXXZ @ 30 NONAME ; void CCalenController::Release(void) + ?trUtf8@CCalenController@@SA?AVQString@@PBD0@Z @ 31 NONAME ; class QString CCalenController::trUtf8(char const *, char const *) + ?RegisterForNotificationsL@CCalenController@@QAEXPAVMCalenNotificationHandler@@W4TCalenNotification@@@Z @ 32 NONAME ; void CCalenController::RegisterForNotificationsL(class MCalenNotificationHandler *, enum TCalenNotification) + ??0CCalenController@@QAE@_N@Z @ 33 NONAME ; CCalenController::CCalenController(bool) + ?GetCommandHandlerL@CCalenController@@QAEPAVMCalenCommandHandler@@H@Z @ 34 NONAME ; class MCalenCommandHandler * CCalenController::GetCommandHandlerL(int) + ?RegisterForNotificationsL@CCalenController@@QAEXPAVMCalenNotificationHandler@@AAV?$RArray@W4TCalenNotification@@@@@Z @ 35 NONAME ; void CCalenController::RegisterForNotificationsL(class MCalenNotificationHandler *, class RArray &) + ?NewServicesL@CCalenController@@UAEPAVMCalenServices@@XZ @ 36 NONAME ; class MCalenServices * CCalenController::NewServicesL(void) diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/bwins/calenglobaldatau.def --- a/calendarui/bwins/calenglobaldatau.def Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/bwins/calenglobaldatau.def Fri Jun 11 13:37:54 2010 +0300 @@ -1,5 +1,6 @@ EXPORTS ??0CalenContextImpl@@QAE@XZ @ 1 NONAME ; CalenContextImpl::CalenContextImpl(void) - ??0CalenContextImpl@@QAE@PAVMCalenContextChangeObserver@@@Z @ 2 NONAME ; CalenContextImpl::CalenContextImpl(class MCalenContextChangeObserver *) - ??0CalenContextImpl@@QAE@ABV0@@Z @ 3 NONAME ; CalenContextImpl::CalenContextImpl(class CalenContextImpl const &) + ??1CalenContextImpl@@QAE@XZ @ 2 NONAME ; CalenContextImpl::~CalenContextImpl(void) + ??0CalenContextImpl@@QAE@PAVMCalenContextChangeObserver@@@Z @ 3 NONAME ; CalenContextImpl::CalenContextImpl(class MCalenContextChangeObserver *) + ??0CalenContextImpl@@QAE@ABV0@@Z @ 4 NONAME ; CalenContextImpl::CalenContextImpl(class CalenContextImpl const &) diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/conf/CI_calendarUI.confml Binary file calendarui/conf/CI_calendarUI.confml has changed diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/conf/calendarUI.confml Binary file calendarui/conf/calendarUI.confml has changed diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/controller/inc/calencontroller.h --- a/calendarui/controller/inc/calencontroller.h Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/controller/inc/calencontroller.h Fri Jun 11 13:37:54 2010 +0300 @@ -25,6 +25,7 @@ #include // TApaCommand #include // Q_DECL_EXPORT macro #include +#include #include "hb_calencommands.hrh" // Calendar commands #include "calennotificationhandler.h" // TCalenNotification #include "calenservices.h" @@ -58,9 +59,10 @@ * The controller handles events from the rest of Calendar and delegates * them to the appropriate place (i.e. the action ui classes). */ -class CALENCONTROLLER_EXPORT CCalenController : public MCalenServicesFactory +class CALENCONTROLLER_EXPORT CCalenController : public QObject, public MCalenServicesFactory { - + Q_OBJECT + public: // Construction and destruction /** * C++ constructor diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/controller/src/calencontroller.cpp --- a/calendarui/controller/src/calencontroller.cpp Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/controller/src/calencontroller.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -57,9 +57,9 @@ checkMultipleCreation(); // Get an instance of AgendaUtil interface class - // This will take care of - mAgendaUtil = new AgendaUtil(); - + // This will take care of + mAgendaUtil = new AgendaUtil(this); + iStateMachine = CCalenStateMachine::NewL( *this ); // Create the notifier. @@ -222,7 +222,12 @@ CCalenController::~CCalenController() { TRACE_ENTRY_POINT; - + + if(iStateMachine) { + delete iStateMachine; + iStateMachine = NULL; + } + if ( iServices ) { iServices->Release(); @@ -233,7 +238,12 @@ delete iNotifier; iNotifier = NULL; } - + + if(mContext) { + delete mContext; + mContext = NULL; + } + if( iActionUi ) { delete iActionUi; diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/controller/src/calendeleteui.cpp --- a/calendarui/controller/src/calendeleteui.cpp Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/controller/src/calendeleteui.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -483,7 +483,6 @@ dateTime = ( dateTime > AgendaUtil::minTime()? dateTime : AgendaUtil::minTime()); HandleDeleteMultipleEventsL( AgendaUtil::minTime(), dateTime,1 ); - iController.BroadcastNotification(ECalenNotifyEntryDeleted); }else { iController.BroadcastNotification(ECalenNotifyDeleteFailed); } diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/controller/src/calenviewmanager.cpp --- a/calendarui/controller/src/calenviewmanager.cpp Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/controller/src/calenviewmanager.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -56,6 +56,7 @@ mCalenDayView = NULL; mCalenMonthView = NULL; mCalenDayViewAlt = NULL; + mSettingsView = NULL; // Connect to instance view and entry view creation signals from agenda // interface @@ -96,12 +97,22 @@ { TRACE_ENTRY_POINT; - delete mCalenMonthView; - delete mCalenDayView; - delete mSettingsView; - delete mDayViewDocLoader; - delete mDayViewAltDocLoader; - delete mMonthViewDocLoader; + if (mSettingsView) { + delete mSettingsView; + mSettingsView = 0; + } + if (mDayViewDocLoader) { + delete mDayViewDocLoader; + mDayViewDocLoader = 0; + } + if (mDayViewAltDocLoader) { + delete mDayViewAltDocLoader; + mDayViewAltDocLoader = 0; + } + if (mMonthViewDocLoader) { + delete mMonthViewDocLoader; + mMonthViewDocLoader = 0; + } TRACE_EXIT_POINT; } @@ -663,7 +674,9 @@ void CalenViewManager::handleInstanceViewCreation(int status) { Q_UNUSED(status); - mCalenMonthView->fetchEntriesAndUpdateModel(); + if (mCalenMonthView) { + mCalenMonthView->fetchEntriesAndUpdateModel(); + } } // ---------------------------------------------------------------------------- diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/eabi/calencontrolleru.def --- a/calendarui/eabi/calencontrolleru.def Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/eabi/calencontrolleru.def Fri Jun 11 13:37:54 2010 +0300 @@ -1,32 +1,39 @@ EXPORTS _ZN16CCalenController10MainWindowEv @ 1 NONAME _ZN16CCalenController11ViewManagerEv @ 2 NONAME - _ZN16CCalenController12InfobarTextLEv @ 3 NONAME - _ZN16CCalenController12NewServicesLEv @ 4 NONAME - _ZN16CCalenController12getFirstViewEv @ 5 NONAME - _ZN16CCalenController13IssueCommandLEi @ 6 NONAME - _ZN16CCalenController15agendaInterfaceEv @ 7 NONAME - _ZN16CCalenController17SetDefaultContextEv @ 8 NONAME - _ZN16CCalenController18GetCommandHandlerLEi @ 9 NONAME - _ZN16CCalenController19CancelNotificationsEP25MCalenNotificationHandler @ 10 NONAME - _ZN16CCalenController20CustomisationManagerEv @ 11 NONAME - _ZN16CCalenController21BroadcastNotificationE18TCalenNotification @ 12 NONAME - _ZN16CCalenController21ReleaseCustomisationsEv @ 13 NONAME - _ZN16CCalenController21checkMultipleCreationEv @ 14 NONAME - _ZN16CCalenController24handleServiceManagerSlotEiRK9QDateTime @ 15 NONAME - _ZN16CCalenController25RegisterForNotificationsLEP25MCalenNotificationHandler18TCalenNotification @ 16 NONAME - _ZN16CCalenController25RegisterForNotificationsLEP25MCalenNotificationHandlerR6RArrayI18TCalenNotificationE @ 17 NONAME - _ZN16CCalenController7InfobarEv @ 18 NONAME - _ZN16CCalenController7ReleaseEv @ 19 NONAME - _ZN16CCalenController7contextEv @ 20 NONAME - _ZN16CCalenController8NotifierEv @ 21 NONAME - _ZN16CCalenController8ServicesEv @ 22 NONAME - _ZN16CCalenController9InstanceLEv @ 23 NONAME - _ZN16CCalenController9OfferMenuEP6HbMenu @ 24 NONAME - _ZN16CCalenControllerC1Eb @ 25 NONAME - _ZN16CCalenControllerC2Eb @ 26 NONAME - _ZN16CCalenControllerD1Ev @ 27 NONAME - _ZN16CCalenControllerD2Ev @ 28 NONAME - _ZTI16CCalenController @ 29 NONAME - _ZTV16CCalenController @ 30 NONAME + _ZN16CCalenController11qt_metacallEN11QMetaObject4CallEiPPv @ 3 NONAME + _ZN16CCalenController11qt_metacastEPKc @ 4 NONAME + _ZN16CCalenController12InfobarTextLEv @ 5 NONAME + _ZN16CCalenController12NewServicesLEv @ 6 NONAME + _ZN16CCalenController12getFirstViewEv @ 7 NONAME + _ZN16CCalenController13IssueCommandLEi @ 8 NONAME + _ZN16CCalenController15agendaInterfaceEv @ 9 NONAME + _ZN16CCalenController16staticMetaObjectE @ 10 NONAME DATA 16 + _ZN16CCalenController17SetDefaultContextEv @ 11 NONAME + _ZN16CCalenController18GetCommandHandlerLEi @ 12 NONAME + _ZN16CCalenController19CancelNotificationsEP25MCalenNotificationHandler @ 13 NONAME + _ZN16CCalenController19getStaticMetaObjectEv @ 14 NONAME + _ZN16CCalenController20CustomisationManagerEv @ 15 NONAME + _ZN16CCalenController21BroadcastNotificationE18TCalenNotification @ 16 NONAME + _ZN16CCalenController21ReleaseCustomisationsEv @ 17 NONAME + _ZN16CCalenController21checkMultipleCreationEv @ 18 NONAME + _ZN16CCalenController24handleServiceManagerSlotEiRK9QDateTime @ 19 NONAME + _ZN16CCalenController25RegisterForNotificationsLEP25MCalenNotificationHandler18TCalenNotification @ 20 NONAME + _ZN16CCalenController25RegisterForNotificationsLEP25MCalenNotificationHandlerR6RArrayI18TCalenNotificationE @ 21 NONAME + _ZN16CCalenController7InfobarEv @ 22 NONAME + _ZN16CCalenController7ReleaseEv @ 23 NONAME + _ZN16CCalenController7contextEv @ 24 NONAME + _ZN16CCalenController8NotifierEv @ 25 NONAME + _ZN16CCalenController8ServicesEv @ 26 NONAME + _ZN16CCalenController9InstanceLEv @ 27 NONAME + _ZN16CCalenController9OfferMenuEP6HbMenu @ 28 NONAME + _ZN16CCalenControllerC1Eb @ 29 NONAME + _ZN16CCalenControllerC2Eb @ 30 NONAME + _ZN16CCalenControllerD0Ev @ 31 NONAME + _ZN16CCalenControllerD1Ev @ 32 NONAME + _ZN16CCalenControllerD2Ev @ 33 NONAME + _ZNK16CCalenController10metaObjectEv @ 34 NONAME + _ZTI16CCalenController @ 35 NONAME + _ZTV16CCalenController @ 36 NONAME + _ZThn8_N16CCalenController12NewServicesLEv @ 37 NONAME diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/eabi/calenglobaldatau.def --- a/calendarui/eabi/calenglobaldatau.def Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/eabi/calenglobaldatau.def Fri Jun 11 13:37:54 2010 +0300 @@ -5,4 +5,6 @@ _ZN16CalenContextImplC2EP27MCalenContextChangeObserver @ 4 NONAME _ZN16CalenContextImplC2ERKS_ @ 5 NONAME _ZN16CalenContextImplC2Ev @ 6 NONAME + _ZN16CalenContextImplD1Ev @ 7 NONAME + _ZN16CalenContextImplD2Ev @ 8 NONAME diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/globaldata/inc/calencontextimpl.h --- a/calendarui/globaldata/inc/calencontextimpl.h Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/globaldata/inc/calencontextimpl.h Fri Jun 11 13:37:54 2010 +0300 @@ -50,7 +50,7 @@ CALENCONTEXTIMPL_EXPORT CalenContextImpl( MCalenContextChangeObserver* observer ); CALENCONTEXTIMPL_EXPORT CalenContextImpl(); CALENCONTEXTIMPL_EXPORT CalenContextImpl( const CalenContextImpl& context ); - ~CalenContextImpl(); + CALENCONTEXTIMPL_EXPORT ~CalenContextImpl(); public: // from MCalenContext // Utils diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/globaldata/src/calencontextimpl.cpp --- a/calendarui/globaldata/src/calencontextimpl.cpp Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/globaldata/src/calencontextimpl.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -71,7 +71,7 @@ // (other items were commented in a header). // ---------------------------------------------------------------------------- // -CalenContextImpl::~CalenContextImpl() +EXPORT_C CalenContextImpl::~CalenContextImpl() { } diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/views/resources/caleneventlistviewitem_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/resources/caleneventlistviewitem_color.css Fri Jun 11 13:37:54 2010 +0300 @@ -0,0 +1,35 @@ +CalenEventListViewItem::text-4{ + color: var(qtc_list_item_content_normal); +} + +CalenEventListViewItem::text-4[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +CalenEventListViewItem::text-4[state="disabled"]{ + color: var(qtc_list_item_disabled); +} + +CalenEventListViewItem::icon-3{ + color: var(qtc_list_item_content_normal); +} + +CalenEventListViewItem::icon-3[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +CalenEventListViewItem::icon-3[state="disabled"]{ + color: var(qtc_list_item_disabled); +} + +CalenEventListViewItem::icon-4{ + color: var(qtc_list_item_content_normal); +} + +CalenEventListViewItem::icon-4[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +CalenEventListViewItem::icon-4[state="disabled"]{ + color: var(qtc_list_item_disabled); +} \ No newline at end of file diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/views/resources/calenresources.qrc --- a/calendarui/views/resources/calenresources.qrc Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/views/resources/calenresources.qrc Fri Jun 11 13:37:54 2010 +0300 @@ -4,6 +4,7 @@ calengriditemprototype.css caleneventlistviewitem.widgetml caleneventlistviewitem.css + caleneventlistviewitem_color.css qgn_indi_cdr_meeting_layer0.svg qtg_mono_exception.png diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/views/src/calenmonthgrid.cpp --- a/calendarui/views/src/calenmonthgrid.cpp Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/views/src/calenmonthgrid.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -945,6 +945,29 @@ Q_UNUSED(newOrientation) // We are overriding this function to avoid the default behavior of // hbgridview on orientation change as it swaps the row and column counts + // Calculate the proper index to be scrolled to + int rowsInPrevMonth; + int itemToBeScrolled; + QModelIndex indexToBeScrolled; + if (newOrientation == Qt::Horizontal) { + rowsInPrevMonth = mView->rowsInPrevMonth(); + itemToBeScrolled = rowsInPrevMonth * KCalenDaysInWeek; + indexToBeScrolled = mModel->index(itemToBeScrolled, 0); + mIsAtomicScroll = true; + scrollTo(indexToBeScrolled); + } else { + rowsInPrevMonth = mView->rowsInPrevMonth(); + itemToBeScrolled = rowsInPrevMonth * KCalenDaysInWeek; + indexToBeScrolled = mModel->index(itemToBeScrolled, 0); + mIsAtomicScroll = true; + scrollTo(indexToBeScrolled); + + itemToBeScrolled = ((rowsInPrevMonth + KNumOfVisibleRows) * + KCalenDaysInWeek) - 1; + indexToBeScrolled = mModel->index(itemToBeScrolled, 0); + mIsAtomicScroll = true; + scrollTo(indexToBeScrolled); + } } /*! diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockengines/clockserver/server/src/clockserverimpl.cpp --- a/clock/clockengines/clockserver/server/src/clockserverimpl.cpp Thu May 27 12:51:15 2010 +0300 +++ b/clock/clockengines/clockserver/server/src/clockserverimpl.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -31,7 +31,6 @@ #include "clockservermccobserver.h" #include "clockecomlistener.h" #include "clock_debug.h" -#include "clockprivatecrkeys.h" // Constants const TInt KZeroIndex( 0 ); @@ -519,29 +518,14 @@ // Set a flag saying we have plugin data. iPluginData = ETrue; - // Get the first boot status from cenrep. If it is the first boot, clockserver will not update the time. - TBool staleBoot( EFalse ); - - CRepository* cenRep( NULL ); - - TRAPD( errorVal, cenRep = CRepository::NewL( KCRUidStartup ) ); - - if( errorVal == KErrNone ) - { - errorVal = cenRep->Get( KStartupFirstBoot, staleBoot ); - } - - // Cleanup. - delete cenRep; - cenRep = NULL; - if( iMccReceived ) { __PRINTS( "We have already recieved the MCC" ); // Try to resolve the timezone id with the data that we have recieved. TInt timezoneId; - TRAP_IGNORE( TInt errorVal = iTzResolver->GetTimeZoneL( *iTimeAttributes, iMcc, timezoneId ) ); + TInt errorVal; + TRAP_IGNORE( errorVal = iTzResolver->GetTimeZoneL( *iTimeAttributes, iMcc, timezoneId ) ); __PRINT( "CClkSrvImpl::NotifyTimeChangeL - timeZoneId: %d", timezoneId ); @@ -564,24 +548,6 @@ if( KInvalidTimeZoneId != timezoneId ) { // A valid new zone was found successfully - - // Update the key for ValidNitz for the first boot - if(!staleBoot) - { - TInt validNitz( KSetValidNitz ); - CRepository* cenRep( NULL ); - - TRAPD( errorVal, cenRep = - CRepository::NewL( TUid::Uid(KCRUidNitz) ) ); - if( errorVal == KErrNone ) - { - errorVal = cenRep->Set( KValidNitz, validNitz ); - } - // Cleanup. - delete cenRep; - cenRep = NULL; - } - CTzId* newTzId = CTzId::NewL( timezoneId ); CleanupStack::PushL( newTzId ); @@ -593,12 +559,9 @@ { // The new zone is different than the current one // GOAL 3: Set the DST zone of the device - //if( staleBoot ) - //{ - __PRINTS( "Not the first boot and the timezone ID is different. Setting the zone." ); + __PRINTS( "Timezone ID is different. Setting the zone." ); - TRAP_IGNORE( tz.SetTimeZoneL( *newTzId ) ); - // } + TRAP_IGNORE( tz.SetTimeZoneL( *newTzId ) ); } CleanupStack::PopAndDestroy( newTzId ); @@ -613,12 +576,9 @@ // Set the UTC time only. This is being done because with the UTC time, // before the time is being set, the dst properties for the timezone are being checked. // If its not the first boot, then set the time. - //if( staleBoot ) - // { - __PRINTS( "Not the first boot. Setting the UTC time." ); + __PRINTS( "Setting the UTC time." ); - TRAP_IGNORE( User::SetUTCTime( nwUtcTime ) ); - // } + TRAP_IGNORE( User::SetUTCTime( nwUtcTime ) ); } // Reset the flags. @@ -634,8 +594,9 @@ // Try to resolve the timezone id with the data that we have recieved. TInt timezoneId; + TInt errorVal; const TBuf< 4 > invalidMCC( KInvalidMCC ); - TRAP_IGNORE( TInt errorVal = iTzResolver->GetTimeZoneL( *iTimeAttributes, invalidMCC, timezoneId ) ); + TRAP_IGNORE( errorVal = iTzResolver->GetTimeZoneL( *iTimeAttributes, invalidMCC, timezoneId ) ); if( KErrNone == errorVal ) { @@ -650,24 +611,6 @@ if( KInvalidTimeZoneId != timezoneId ) { // A valid new zone was found successfully - - // Update the key for ValidNitz for the first boot - if(!staleBoot) - { - TInt validNitz( KSetValidNitz ); - CRepository* cenRep( NULL ); - - TRAPD( errorVal, cenRep = - CRepository::NewL( TUid::Uid(KCRUidNitz) ) ); - if( errorVal == KErrNone ) - { - errorVal = cenRep->Set( KValidNitz, validNitz ); - } - // Cleanup. - delete cenRep; - cenRep = NULL; - } - CTzId* newTzId = CTzId::NewL( timezoneId ); CleanupStack::PushL( newTzId ); @@ -676,12 +619,9 @@ // The new zone is different than the current one // GOAL 3: Set the DST zone of the device // If firstboot then don't set the time. - //if( staleBoot ) - // { - __PRINTS( "Not the first boot and the timezone ID is different. Setting the zone." ); + __PRINTS( "The timezone ID is different. Setting the zone." ); - TRAP_IGNORE( tz.SetTimeZoneL( *newTzId ) ); - // } + TRAP_IGNORE( tz.SetTimeZoneL( *newTzId ) ); } CleanupStack::PopAndDestroy( newTzId ); } @@ -695,12 +635,9 @@ // Set the UTC time only. This is being done because with the UTC time, // before the time is being set, the dst properties for the timezone are being checked. // Set the time only if its not the first boot. - //if( staleBoot ) - // { - __PRINTS( "Not the first boot. Setting the UTC time." ); + __PRINTS( "Setting the UTC time." ); - TRAP_IGNORE( User::SetUTCTime( nwUtcTime ) ); - // } + TRAP_IGNORE( User::SetUTCTime( nwUtcTime ) ); } } __PRINTS( "Notifying the timechange to client" ); @@ -738,23 +675,6 @@ // Try and fetch the timezone ID using the MCC recieved. TRAP_IGNORE( iTzResolver->TzIdFromMccL( iMcc, tzIdArray, KInvalidTimeZoneId ) ); - // Code to check if its the first boot. - // Get the first boot status from cenrep. If it is the first boot, clockserver will not update the time. - TBool staleBoot( EFalse ); - - CRepository* cenRep( NULL ); - - TRAPD( errorVal, cenRep = CRepository::NewL( KCRUidStartup ) ); - - if( errorVal == KErrNone ) - { - errorVal = cenRep->Get( KStartupFirstBoot, staleBoot ); - } - - // Cleanup - delete cenRep; - cenRep = NULL; - // A single matching timezone was found. Set it as the default one. if( KSingleZone == tzIdArray.Count() ) { @@ -782,12 +702,9 @@ // The new zone is different than the current one // Set the DST zone of the device // Set the zone only for subsequent boots. - if( staleBoot ) - { - __PRINTS( "Not the first boot and the timezone ID is different. Setting the zone." ); + __PRINTS( "The timezone ID is different. Setting the zone." ); - TRAP_IGNORE( tz.SetTimeZoneL( *newTzId ) ); - } + TRAP_IGNORE( tz.SetTimeZoneL( *newTzId ) ); } CleanupStack::PopAndDestroy( newTzId ); } diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockcityselectionlist/data/clockcityselectionlist.qrc --- a/clock/clockui/clockcityselectionlist/data/clockcityselectionlist.qrc Thu May 27 12:51:15 2010 +0300 +++ b/clock/clockui/clockcityselectionlist/data/clockcityselectionlist.qrc Fri Jun 11 13:37:54 2010 +0300 @@ -4,6 +4,7 @@ style/clockcityselectionlistprototype.css + style/clockcityselectionlistprototype_color.css style/clockcityselectionlistprototype.widgetml diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockcityselectionlist/data/style/clockcityselectionlistprototype_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockcityselectionlist/data/style/clockcityselectionlistprototype_color.css Fri Jun 11 13:37:54 2010 +0300 @@ -0,0 +1,11 @@ +ClockCitySelectionListPrototype::cityNameItem{ + color: var(qtc_list_item_content_normal); +} + +ClockCitySelectionListPrototype::cityNameItem[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +ClockCitySelectionListPrototype::cityNameItem[state="disabled"]{ + color: var(qtc_list_item_disabled); +} \ No newline at end of file diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockviews/data/clockviews.qrc --- a/clock/clockui/clockviews/data/clockviews.qrc Thu May 27 12:51:15 2010 +0300 +++ b/clock/clockui/clockviews/data/clockviews.qrc Fri Jun 11 13:37:54 2010 +0300 @@ -2,10 +2,13 @@ style/clockalarmlistitemprototype.css style/clockalarmlistitemprototype.widgetml - style/clockhomecityitem.css - style/clockhomecityitem.widgetml - style/hblistviewitem.css - style/hblistviewitem.widgetml + style/clockalarmlistitemprototype_color.css + style/clockhomecityitem.css + style/clockhomecityitem.widgetml + style/clockhomecityitem_color.css + style/hblistviewitem.css + style/hblistviewitem.widgetml + style/hblistviewitem_color.css xml/clockmainview.docml diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockviews/data/style/clockalarmlistitemprototype_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockviews/data/style/clockalarmlistitemprototype_color.css Fri Jun 11 13:37:54 2010 +0300 @@ -0,0 +1,11 @@ +ClockAlarmListItemPrototype::text-4{ + color: var(qtc_list_item_content_normal); +} + +ClockAlarmListItemPrototype::text-4[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +ClockAlarmListItemPrototype::text-4[state="disabled"]{ + color: var(qtc_list_item_disabled); +} \ No newline at end of file diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockviews/data/style/clockhomecityitem_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockviews/data/style/clockhomecityitem_color.css Fri Jun 11 13:37:54 2010 +0300 @@ -0,0 +1,47 @@ +ClockHomeCityItem::dateText{ + color: var(qtc_list_item_title_normal); +} + +ClockHomeCityItem::dateText[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +ClockHomeCityItem::dateText[state="disabled"]{ + color: var(qtc_list_item_disabled); +} + +ClockHomeCityItem::cityText{ + color: var(qtc_list_item_content_normal); +} + +ClockHomeCityItem::cityText[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +ClockHomeCityItem::cityText[state="disabled"]{ + color: var(qtc_list_item_disabled); +} + +ClockHomeCityItem::dstIcon{ + color: var(qtc_list_item_title_normal); +} + +ClockHomeCityItem::dstIcon[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +ClockHomeCityItem::dstIcon[state="disabled"]{ + color: var(qtc_list_item_disabled); +} + +ClockHomeCityItem::timeText{ + color: var(qtc_list_item_content_normal); +} + +ClockHomeCityItem::timeText[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +ClockHomeCityItem::timeText[state="disabled"]{ + color: var(qtc_list_item_disabled); +} \ No newline at end of file diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockviews/data/style/hblistviewitem_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockviews/data/style/hblistviewitem_color.css Fri Jun 11 13:37:54 2010 +0300 @@ -0,0 +1,11 @@ +HbListViewItem::text-4{ + color: var(qtc_list_item_content_normal); +} + +HbListViewItem::text-4[state="pressed"]{ + color: var(qtc_list_item_pressed); +} + +HbListViewItem::text-4[state="disabled"]{ + color: var(qtc_list_item_disabled); +} \ No newline at end of file diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockviews/src/clockhomecityitem.cpp --- a/clock/clockui/clockviews/src/clockhomecityitem.cpp Thu May 27 12:51:15 2010 +0300 +++ b/clock/clockui/clockviews/src/clockhomecityitem.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -44,6 +44,7 @@ // Path for widgetml and css files. HbStyleLoader::registerFilePath(":/style/clockhomecityitem.css"); HbStyleLoader::registerFilePath(":/style/clockhomecityitem.widgetml"); + HbStyleLoader::registerFilePath(":/style/clockhomecityitem_color.css"); // Set the frame to the homecity widget. HbFrameItem *frame = new HbFrameItem(); @@ -60,6 +61,7 @@ { HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem.css"); HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem.widgetml"); + HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem_color.css"); } /*! diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockviews/src/clockmainview.cpp --- a/clock/clockui/clockviews/src/clockmainview.cpp Thu May 27 12:51:15 2010 +0300 +++ b/clock/clockui/clockviews/src/clockmainview.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -78,6 +78,8 @@ ":/style/clockalarmlistitemprototype.css"); HbStyleLoader::unregisterFilePath( ":/style/clockalarmlistitemprototype.widgetml"); + HbStyleLoader::unregisterFilePath( + ":/style/clockalarmlistitemprototype_color.css"); } @@ -144,6 +146,8 @@ HbStyleLoader::registerFilePath(":/style/clockalarmlistitemprototype.css"); HbStyleLoader::registerFilePath( ":/style/clockalarmlistitemprototype.widgetml"); + HbStyleLoader::registerFilePath( + ":/style/clockalarmlistitemprototype_color.css"); setmodel(); // Load the correct section based on orientation. diff -r ea672fcb0ea0 -r 360d55486d7f clock/clockui/clockviews/src/clockworldview.cpp --- a/clock/clockui/clockviews/src/clockworldview.cpp Thu May 27 12:51:15 2010 +0300 +++ b/clock/clockui/clockviews/src/clockworldview.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -72,8 +72,8 @@ mDocLoader = 0; } HbStyleLoader::unregisterFilePath(":/style/hblistviewitem.css"); - HbStyleLoader::unregisterFilePath( - ":/style/hblistviewitem.widgetml"); + HbStyleLoader::unregisterFilePath(":/style/hblistviewitem.widgetml"); + HbStyleLoader::unregisterFilePath(":/style/hblistviewitem_color.css"); } /*! @@ -125,8 +125,8 @@ mCityListView = qobject_cast ( mDocLoader->findWidget(CLOCK_WORLD_CITYLIST)); HbStyleLoader::registerFilePath(":/style/hblistviewitem.css"); - HbStyleLoader::registerFilePath( - ":/style/hblistviewitem.widgetml"); + HbStyleLoader::registerFilePath(":/style/hblistviewitem.widgetml"); + HbStyleLoader::registerFilePath(":/style/hblistviewitem_color.css"); mCityListView->setLayoutName("citylist-portrait"); mCityListView->setModel(mCityListModel); diff -r ea672fcb0ea0 -r 360d55486d7f clock/conf/CI_clockapp.confml Binary file clock/conf/CI_clockapp.confml has changed diff -r ea672fcb0ea0 -r 360d55486d7f clock/conf/clockapp.confml Binary file clock/conf/clockapp.confml has changed diff -r ea672fcb0ea0 -r 360d55486d7f clock/conf/clockapp_101F8876.crml Binary file clock/conf/clockapp_101F8876.crml has changed diff -r ea672fcb0ea0 -r 360d55486d7f clock/inc/clockprivatecrkeys.h --- a/clock/inc/clockprivatecrkeys.h Thu May 27 12:51:15 2010 +0300 +++ b/clock/inc/clockprivatecrkeys.h Fri Jun 11 13:37:54 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: The file contains the uid of keys used by application. +* Description: The file contains the uid of keys used by application. * */ @@ -25,10 +25,8 @@ 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 +#endif // CLOCKPRIVATECRKEYS_H // End of file --Don't remove this. diff -r ea672fcb0ea0 -r 360d55486d7f clock/rom/clockengines.iby --- a/clock/rom/clockengines.iby Thu May 27 12:51:15 2010 +0300 +++ b/clock/rom/clockengines.iby Fri Jun 11 13:37:54 2010 +0300 @@ -34,10 +34,11 @@ // ECOM plugins ECOM_PLUGIN( clocknitzplugin.dll, clocknitzplugin.rsc ) +// TODO : the following will be uncommented when implemented. // Backup registration files -data=DATAZ_\private\10005906\backup_registration.xml private\10005906\backup_registration.xml -data=DATAZ_\private\10005903\backup_registration.xml private\10005903\backup_registration.xml -data=DATAZ_\private\200159A2\backup_registration.xml private\200159A2\backup_registration.xml +// data=DATAZ_\private\10005906\backup_registration.xml private\10005906\backup_registration.xml +// data=DATAZ_\private\10005903\backup_registration.xml private\10005903\backup_registration.xml +// data=DATAZ_\private\200159A2\backup_registration.xml private\200159A2\backup_registration.xml #endif // __CLOCKENGINES_IBY__ diff -r ea672fcb0ea0 -r 360d55486d7f organizer_info/organizer_metadata/organizer_metadata.mrp --- a/organizer_info/organizer_metadata/organizer_metadata.mrp Thu May 27 12:51:15 2010 +0300 +++ b/organizer_info/organizer_metadata/organizer_metadata.mrp Fri Jun 11 13:37:54 2010 +0300 @@ -1,19 +1,3 @@ -# -# 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: -# - component organizer_metadata source \sf\app\organizer\organizer_info\organizer_metadata source \sf\app\organizer\package_definition.xml diff -r ea672fcb0ea0 -r 360d55486d7f organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/src/unittest_caleneditor.cpp --- a/organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/src/unittest_caleneditor.cpp Thu May 27 12:51:15 2010 +0300 +++ b/organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/src/unittest_caleneditor.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -2,7 +2,7 @@ * 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" + * under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r ea672fcb0ea0 -r 360d55486d7f organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/unittest_caleneditor.pro --- a/organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/unittest_caleneditor.pro Thu May 27 12:51:15 2010 +0300 +++ b/organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/unittest_caleneditor.pro Fri Jun 11 13:37:54 2010 +0300 @@ -2,7 +2,7 @@ # 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" +# under the terms of the License "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". #