--- a/agendainterface/agendautil/src/agendautil_p.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/agendainterface/agendautil/src/agendautil_p.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -1272,12 +1272,14 @@
CCalEntry* calEntry = iCalEntryView->FetchL(entry.id());
if (calEntry) {
+ CleanupStack::PushL(calEntry);
// Get all the entries with same global Uid.
RPointerArray<CCalEntry> entries;
CleanupResetAndDestroyPushL(entries);
iCalEntryView->FetchL(calEntry->UidL(), entries);
parentEntry = createAgendaEntryFromCalEntry(*entries[0]);
CleanupStack::PopAndDestroy(&entries);
+ CleanupStack::PopAndDestroy(calEntry);
}
)
@@ -1950,8 +1952,11 @@
entry.addAttendee(attendee);
}
+// TODO: Right now we are not adding category to agendaEntry.
+// Will be handled later when we have some usecase with category.
+/*
// Categories.
- const RPointerArray<CCalCategory> calCategories = calEntry.CategoryListL();
+ const RPointerArray<CCalCategory>& calCategories = calEntry.CategoryListL();
for (int i = 0; i < calCategories.Count(); i++) {
AgendaCategory category;
@@ -1967,7 +1972,7 @@
static_cast<AgendaCategory::CategoryType>(categoryType));
entry.addCategory(category);
}
-
+*/
// Id.
entry.d->m_id = calEntry.LocalUidL();
@@ -2255,7 +2260,6 @@
CCalAttendee* attendee = CCalAttendee::NewL(
TPtrC(reinterpret_cast<const TUint16*>(
attendees.at(i).address().utf16())));
- CleanupStack::PushL(attendee);
attendee->SetCommonNameL(
TPtrC(reinterpret_cast<const TUint16*>(
attendees.at(i).commonName().utf16())));
@@ -2266,7 +2270,6 @@
attendee->SetStatusL(static_cast<CCalAttendee::TCalStatus>(
attendees.at(i).status()));
entry.AddAttendeeL(attendee);
- CleanupStack::PopAndDestroy(attendee);
}
)
return (iError == KErrNone);
@@ -2288,13 +2291,11 @@
CCalCategory* category = CCalCategory::NewL(
static_cast<CCalCategory::TCalCategoryType>(type));
entry.AddCategoryL(category);
- delete category;
} else {
TPtrC categoryName = TPtrC(reinterpret_cast<const TUint16*>(
categories.at(i).extendedCategoryName().utf16()));
CCalCategory* category = CCalCategory::NewL(categoryName);
entry.AddCategoryL(category);
- delete category;
}
}
)
--- a/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -37,7 +37,8 @@
// ---------------------------------------------------------
//
AlarmAlertWidget::AlarmAlertWidget(AlarmAlertObserver *observer) :
- mObserver(observer)
+ mObserver(observer),
+ mDeviceDialog(NULL)
{
OstTraceFunctionEntry0( ALARMALERTWIDGET_ALARMALERTWIDGET_ENTRY );
OstTraceFunctionExit0( ALARMALERTWIDGET_ALARMALERTWIDGET_EXIT );
@@ -185,7 +186,9 @@
{
OstTraceFunctionEntry0( ALARMALERTWIDGET_DISMISSALARMDIALOG_ENTRY );
// Dismiss the dialog
- mDeviceDialog->Cancel();
+ if(mDeviceDialog) {
+ mDeviceDialog->Cancel();
+ }
OstTraceFunctionExit0( ALARMALERTWIDGET_DISMISSALARMDIALOG_EXIT );
}
--- a/alarmui/sis/alarmui.pkg Mon Sep 20 12:44:39 2010 +0530
+++ b/alarmui/sis/alarmui.pkg Tue Oct 05 13:57:00 2010 +0530
@@ -30,13 +30,17 @@
;Alarm UI part
-"\epoc32\release\armv5\urel\AlmAlert.dll" - "!:\sys\bin\AlmAlert.dll"
+"\epoc32\release\armv5\urel\AlmAlert.dll" - "!:\sys\bin\AlmAlert.dll"
"\epoc32\release\armv5\urel\AknAlarmService.dll" - "!:\sys\bin\AknAlarmService.dll"
+"\epoc32\release\armv5\urel\alarmalertwidget.dll" - "!:\sys\bin\alarmalertwidget.dll"
"\epoc32\data\Z\private\10282BC4\Rules\alarmuisnooze.rul" - "!:\private\10282BC4\Rules\alarmuisnooze.rul"
"\epoc32\data\z\resource\AlmAlert.rsc" - "!:\resource\AlmAlert.rsc"
-"\epoc32\data\z\resource\AlmAlert.r01" - "!:\resource\AlmAlert.r01"
+"\epoc32\data\z\resource\qt\translations\alarmui_en.qm" - "!:\resource\qt\translations\alarmui_en.qm"
+;Qt plugin files to be installed
+"\epoc32\release\armv5\urel\alarmalertplugin.dll" - "!:\sys\bin\alarmalertplugin.dll"
+"\epoc32\data\z\resource\plugins\devicedialogs\alarmalertplugin.qtplugin" - "!:\resource\plugins\devicedialogs\alarmalertplugin.qtplugin"
;"\epoc32\data\z\data\sounds\digital\clock.aac" data\sounds\digital\clock.aac
;"\epoc32\data\z\data\sounds\digital\alarm.aac" data\sounds\digital\alarm.aac
--- a/calendarui/agendaeventviewer/src/agendaeventview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -1172,7 +1172,9 @@
this, SLOT(close()));
window->removeView(mViewer);
- if (AgendaEntry::TypeTodo == mAgendaEntry.type()) {
+ // For To-do, if due date is in future, we retain it there.
+ // All the past incompleted to-dos will come on today.
+ if ((AgendaEntry::TypeTodo == mAgendaEntry.type()) && (mAgendaEntry.startTime().date() <= QDate::currentDate())) {
mAgendaEntry.setStartAndEndTime(
CalenDateUtils::today(), CalenDateUtils::today());
}
--- a/calendarui/controller/controller.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/controller/controller.pro Tue Oct 05 13:57:00 2010 +0530
@@ -47,7 +47,8 @@
-lbafl \
-lagendainterface \
-lagendaeventviewer \
- -lxqserviceutil
+ -lxqserviceutil \
+ -lafservice
TARGET.UID3 = 0x10282F25
TARGET.CAPABILITY = CAP_GENERAL_DLL
--- a/calendarui/controller/src/calenviewmanager.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/controller/src/calenviewmanager.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -21,7 +21,8 @@
#include <hbinstance.h>
#include <hbapplication.h> // hbapplication
#include <xqserviceutil.h> // service utils
-
+#include <afactivation.h>
+#include <AfActivityStorage.h>
//user includes
#include "calenviewmanager.h"
#include "calencontroller.h"
@@ -86,23 +87,22 @@
void CalenViewManager::SecondPhaseConstruction()
{
OstTraceFunctionEntry0( CALENVIEWMANAGER_SECONDPHASECONSTRUCTION_ENTRY );
-
- // Check the Application Startup reason from Activity Manager
- int activityReason = qobject_cast<HbApplication*>(qApp)->activateReason();
-
+
// Check if calendar is launched thru XQService framework
bool isFromServiceFrmWrk = XQServiceUtil::isService(); // Since activateReason
//of hbapplication is not returning right value if the activity is started
//as services so using the above line temporarily untill a fix is available in
- // hbappliacation. Need to remove this line after the fix is available for hbapplcation
-
-
- if (Hb::ActivationReasonActivity == activityReason) // Check if application is started
+ // hbappliac
+ AfActivation *activation = new AfActivation();
+ if(Af::ActivationReasonActivity == activation->reason())
// as an activity
{
// Application is started from an activity
// Extract activity data
- QVariant data = qobject_cast<HbApplication*>(qApp)->activateData();
+ AfActivityStorage *activitystorage = new AfActivityStorage();
+ QVariant data = activitystorage->activityData(activation->name());
+ delete activitystorage;
+
// Restore state from activity data
QByteArray serializedModel = data.toByteArray();
QDataStream stream(&serializedModel, QIODevice::ReadOnly);
@@ -153,8 +153,8 @@
mController.MainWindow().addView(mCalenMonthView);
mController.MainWindow().setCurrentView(mCalenMonthView);
}
-
-
+ //delete the activity intsance
+ delete activation;
OstTraceFunctionExit0( CALENVIEWMANAGER_SECONDPHASECONSTRUCTION_EXIT );
}
@@ -1015,10 +1015,11 @@
Q_UNUSED(ids);
HbView *currentview = mController.MainWindow().currentView();
if((mCalenMonthView == currentview)||(mCalenDayView == currentview)||
- (mCalenAgendaView == currentview ))
+ (mCalenAgendaView == currentview )||(mCalenAgendaViewAlt == currentview))
{
activateCurrentView();
}
+ delete currentview;
}
// ----------------------------------------------------------------------------
--- a/calendarui/tsrc/tsrc.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/tsrc/tsrc.pro Tue Oct 05 13:57:00 2010 +0530
@@ -21,7 +21,10 @@
SUBDIRS += unittest_calenviewerservice \
unittest_calencommonutils \
../views/dayview/tsrc \
+
+CONFIG += qtestlib
+CONFIG += symbian_test
+CONFIG += ordered
-CONFIG += ordered
# End of file --Don't remove this
--- a/calendarui/tsrc/unittest_calencommonutils/src/main.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/tsrc/unittest_calencommonutils/src/main.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -23,33 +23,35 @@
#include "test_calenagendautils.h"
#include "test_calendateutils.h"
-int main(int argc, char *argv[])
-{
- HbApplication app(argc, argv);
-
- TestCalenDateUtils testDateUtils;
-
- char *args[3];
- args[0] = argv[0];
- args[1] = "-o";
- args[2] = "c:\\data\\TestCalenDateUtils.txt";
-
- int retDateUtils = QTest::qExec(&testDateUtils, 3, args);
-
-
- TestCalenAgendaUtils testAgendaUtils;
-
- args[2] = "c:\\data\\TestCalenAgendaUtils.txt";
-
- int retAgendaUtils = QTest::qExec(&testAgendaUtils, 3, args);
-
- // Core dump if HbIconLoader instance is not destroyed before the
- // application instance. HbIconLoader uses QCoreApplication::aboutToQuit()
- // signal to destroy itself. app.exec() where the signal is normally emitted
- // is not called here. So, invoking the signal explicitly.
- QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection);
-
- return (retDateUtils && retAgendaUtils);
-}
+//int main(int argc, char *argv[])
+//{
+// HbApplication app(argc, argv);
+//
+// TestCalenDateUtils testDateUtils;
+//
+// char *args[3];
+// args[0] = argv[0];
+// args[1] = "-o";
+// args[2] = "c:\\data\\TestCalenDateUtils.txt";
+//
+// int retDateUtils = QTest::qExec(&testDateUtils, 3, args);
+//
+//
+// TestCalenAgendaUtils testAgendaUtils;
+//
+// args[2] = "c:\\data\\TestCalenAgendaUtils.txt";
+//
+// int retAgendaUtils = QTest::qExec(&testAgendaUtils, 3, args);
+//
+// // Core dump if HbIconLoader instance is not destroyed before the
+// // application instance. HbIconLoader uses QCoreApplication::aboutToQuit()
+// // signal to destroy itself. app.exec() where the signal is normally emitted
+// // is not called here. So, invoking the signal explicitly.
+// QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection);
+//
+// return (retDateUtils && retAgendaUtils);
+//}
+
+QTEST_MAIN ( TestCalenDateUtils )
// End of file --Don't remove this.
--- a/calendarui/tsrc/unittest_calenviewerservice/src/main.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/tsrc/unittest_calenviewerservice/src/main.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -22,6 +22,7 @@
// User includes
#include "test_calenviewerservice.h"
+/*
int main(int argc, char *argv[])
{
HbApplication app(argc, argv);
@@ -41,5 +42,8 @@
QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection);
return ret;
}
+*/
+
+QTEST_MAIN ( TestCalenViewerService )
// End of file --Don't remove this.
--- a/calendarui/views/bwins/calenviewsu.def Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/bwins/calenviewsu.def Tue Oct 05 13:57:00 2010 +0530
@@ -32,181 +32,183 @@
?handleThemeChange@CalenMonthGrid@@AAEXXZ @ 31 NONAME ; void CalenMonthGrid::handleThemeChange(void)
?populatePrevMonth@CalenMonthView@@QAEXXZ @ 32 NONAME ; void CalenMonthView::populatePrevMonth(void)
?qt_metacall@CalenSettingsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 33 NONAME ; int CalenSettingsView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 34 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *)
- ??1CalenPluginLabel@@UAE@XZ @ 35 NONAME ; CalenPluginLabel::~CalenPluginLabel(void)
- ?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 36 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &)
- ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 37 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *, int)
- ?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 38 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void)
- ?gestureEvent@CalenDayContentScrollArea@@MAEXPAVQGestureEvent@@@Z @ 39 NONAME ; void CalenDayContentScrollArea::gestureEvent(class QGestureEvent *)
- ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int)
- ?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 41 NONAME ; void * CalenMonthView::qt_metacast(char const *)
- ?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 42 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject
- ?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 43 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *)
- ?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 44 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const
- ??_ECalenDayContentScrollArea@@UAE@I@Z @ 45 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(unsigned int)
- ?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 46 NONAME ; void CalenPreviewPane::startAutoScroll(void)
- ?doLazyLoading@CalenMonthView@@QAEXXZ @ 47 NONAME ; void CalenMonthView::doLazyLoading(void)
- ?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 48 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *)
- ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 49 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *)
- ?staticMetaObject@CalenDayContentScrollArea@@2UQMetaObject@@B @ 50 NONAME ; struct QMetaObject const CalenDayContentScrollArea::staticMetaObject
- ??1CalenSettingsView@@UAE@XZ @ 51 NONAME ; CalenSettingsView::~CalenSettingsView(void)
- ?tapTriggered@CalenPreviewPane@@AAEXXZ @ 52 NONAME ; void CalenPreviewPane::tapTriggered(void)
- ?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 53 NONAME ; class QDateTime CalenPreviewPane::Date(void)
- ?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 54 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int)
- ?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 55 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const
- ??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 56 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *)
- ?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 57 NONAME ; int CalenMonthView::rowsInPrevMonth(void)
- ?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 58 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList<class CalenMonthData> &)
- ?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 59 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const
- ?clearListModel@CalenAgendaView@@QAEXXZ @ 60 NONAME ; void CalenAgendaView::clearListModel(void)
- ?gestureEvent@CalenMonthGrid@@MAEXPAVQGestureEvent@@@Z @ 61 NONAME ; void CalenMonthGrid::gestureEvent(class QGestureEvent *)
- ??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 62 NONAME ; CalenDayView::CalenDayView(class MCalenServices &)
- ?checkPanDirection@CalenDayContentScrollArea@@AAEXPAVQPanGesture@@@Z @ 63 NONAME ; void CalenDayContentScrollArea::checkPanDirection(class QPanGesture *)
- ?populateNextMonth@CalenMonthView@@QAEXXZ @ 64 NONAME ; void CalenMonthView::populateNextMonth(void)
- ?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 65 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &)
- ?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 66 NONAME ; void * CalenMonthGrid::qt_metacast(char const *)
- ?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 67 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void)
- ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 68 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *)
- ?isHorizontalSwipe@CalenDayContentScrollArea@@ABE_NM@Z @ 69 NONAME ; bool CalenDayContentScrollArea::isHorizontalSwipe(float) const
- ?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 70 NONAME ; int CalenMonthView::rowsInFutMonth(void)
- ?launchDayView@CalenMonthView@@QAEXXZ @ 71 NONAME ; void CalenMonthView::launchDayView(void)
- ?effectStarted@CalenPreviewPane@@QAEXXZ @ 72 NONAME ; void CalenPreviewPane::effectStarted(void)
- ?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 73 NONAME ; int CalenMonthView::getCurrGridIndex(void)
- ?gestureEvent@CalenPreviewPane@@MAEXPAVQGestureEvent@@@Z @ 74 NONAME ; void CalenPreviewPane::gestureEvent(class QGestureEvent *)
- ?prependRows@CalenMonthGrid@@QAEXXZ @ 75 NONAME ; void CalenMonthGrid::prependRows(void)
- ?orientationChanged@CalenMonthGrid@@MAEXW4Orientation@Qt@@@Z @ 76 NONAME ; void CalenMonthGrid::orientationChanged(enum Qt::Orientation)
- ?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??0CalenDayContentScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 78 NONAME ; CalenDayContentScrollArea::CalenDayContentScrollArea(class QGraphicsItem *)
- ?event@CalenDayContentScrollArea@@MAE_NPAVQEvent@@@Z @ 79 NONAME ; bool CalenDayContentScrollArea::event(class QEvent *)
- ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 80 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int)
- ??1CalenThickLinesDrawer@@UAE@XZ @ 81 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void)
- ?qt_metacast@CalenDayContentScrollArea@@UAEPAXPBD@Z @ 82 NONAME ; void * CalenDayContentScrollArea::qt_metacast(char const *)
- ?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 83 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *)
- ??_ECalenMonthView@@UAE@I@Z @ 84 NONAME ; CalenMonthView::~CalenMonthView(unsigned int)
- ??1CalenAgendaView@@UAE@XZ @ 85 NONAME ; CalenAgendaView::~CalenAgendaView(void)
- ?handleThemeChange@CalenThickLinesDrawer@@AAEXXZ @ 86 NONAME ; void CalenThickLinesDrawer::handleThemeChange(void)
- ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 87 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *)
- ?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 88 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &)
- ??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 89 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *)
- ??0CalenAgendaView@@QAE@AAVMCalenServices@@@Z @ 90 NONAME ; CalenAgendaView::CalenAgendaView(class MCalenServices &)
- ?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 91 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void)
- ?scrollToMiddleWidget@CalenDayContentScrollArea@@QAEXXZ @ 92 NONAME ; void CalenDayContentScrollArea::scrollToMiddleWidget(void)
- ?eventFilter@CalenDayContentScrollArea@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 93 NONAME ; bool CalenDayContentScrollArea::eventFilter(class QObject *, class QEvent *)
- ?stopScrolling@CalenPreviewPane@@QAEXXZ @ 94 NONAME ; void CalenPreviewPane::stopScrolling(void)
- ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *, int)
- ?staticMetaObject@CalenDayHourScrollArea@@2UQMetaObject@@B @ 96 NONAME ; struct QMetaObject const CalenDayHourScrollArea::staticMetaObject
- ?refreshView@CalenSettingsView@@QAEXXZ @ 97 NONAME ; void CalenSettingsView::refreshView(void)
- ?getStaticMetaObject@CalenDayHourScrollArea@@SAABUQMetaObject@@XZ @ 98 NONAME ; struct QMetaObject const & CalenDayHourScrollArea::getStaticMetaObject(void)
- ?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 99 NONAME ; void CalenMonthView::addBackgroundFrame(void)
- ?createGrid@CalenMonthView@@AAEXXZ @ 100 NONAME ; void CalenMonthView::createGrid(void)
- ?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 101 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *)
- ?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 102 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void)
- ?setDateToLabel@CalenMonthView@@AAEXXZ @ 103 NONAME ; void CalenMonthView::setDateToLabel(void)
- ?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 104 NONAME ; void CalenMonthView::setCurrGridIndex(int)
- ?launchPreviousView@CalenSettingsView@@AAEXXZ @ 105 NONAME ; void CalenSettingsView::launchPreviousView(void)
- ?addWeekNumbers@CalenMonthView@@AAEXXZ @ 106 NONAME ; void CalenMonthView::addWeekNumbers(void)
- ?downGesture@CalenMonthGrid@@AAEXXZ @ 107 NONAME ; void CalenMonthGrid::downGesture(void)
- ?setDateTime@CalenDayHourScrollArea@@QAEXABVQDateTime@@@Z @ 108 NONAME ; void CalenDayHourScrollArea::setDateTime(class QDateTime const &)
- ?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 109 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 110 NONAME ; void CalenDayView::setupView(class CalenDocLoader *)
- ?handleThemeChange@CalenPreviewPane@@QAEXXZ @ 111 NONAME ; void CalenPreviewPane::handleThemeChange(void)
- ?upGesture@CalenMonthGrid@@AAEXXZ @ 112 NONAME ; void CalenMonthGrid::upGesture(void)
- ??1CalenMonthView@@UAE@XZ @ 113 NONAME ; CalenMonthView::~CalenMonthView(void)
- ?scrollAreaMoveFinished@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 114 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveFinished(enum CalenScrollDirection)
- ?moveTo@CalenDayContentScrollArea@@AAEXABVQPointF@@H@Z @ 115 NONAME ; void CalenDayContentScrollArea::moveTo(class QPointF const &, int)
- ?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 116 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject
- ?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 117 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &)
- ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 118 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *, int)
- ?scrollAreaMoveStarted@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 119 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveStarted(enum CalenScrollDirection)
- ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 120 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int)
- ?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 121 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
- ?initializeForm@CalenSettingsView@@QAEXXZ @ 122 NONAME ; void CalenSettingsView::initializeForm(void)
- ?effectFinished@CalenPreviewPane@@QAEXXZ @ 123 NONAME ; void CalenPreviewPane::effectFinished(void)
- ?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 124 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int)
- ?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 125 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void)
- ?metaObject@CalenDayContentScrollArea@@UBEPBUQMetaObject@@XZ @ 126 NONAME ; struct QMetaObject const * CalenDayContentScrollArea::metaObject(void) const
- ?goToToday@CalenMonthView@@AAEXXZ @ 127 NONAME ; void CalenMonthView::goToToday(void)
- ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 128 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int)
- ?onContextChanged@CalenMonthView@@EAEXXZ @ 129 NONAME ; void CalenMonthView::onContextChanged(void)
- ?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 130 NONAME ; void * CalenPreviewPane::qt_metacast(char const *)
- ?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 131 NONAME ; int CalenMonthGrid::getCurrentIndex(void)
- ?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 132 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int)
- ?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 133 NONAME ; void CalenMonthView::removeWeekNumbers(void)
- ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int)
- ?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 135 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *)
- ??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 136 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &)
- ?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 137 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void)
- ??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 138 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *)
- ?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 139 NONAME ; void CalenMonthView::onLocaleChanged(int)
- ?doPopulation@CalenMonthView@@UAEXXZ @ 140 NONAME ; void CalenMonthView::doPopulation(void)
- ?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 141 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int)
- ?captureScreenshot@CalenNativeView@@QAEX_N@Z @ 142 NONAME ; void CalenNativeView::captureScreenshot(bool)
- ?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 143 NONAME ; void CalenPreviewPane::GetInstanceListL(void)
- ?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 144 NONAME ; void CalenMonthView::getInstanceList(class QList<class QDate> &, class QDateTime, class QDateTime)
- ?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 145 NONAME ; class QString CalenMonthView::tr(char const *, char const *)
- ?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 146 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void)
- ??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 147 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *)
- ?appendRows@CalenMonthGrid@@QAEXXZ @ 148 NONAME ; void CalenMonthGrid::appendRows(void)
- ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 149 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int)
- ??0CalenPluginLabel@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 150 NONAME ; CalenPluginLabel::CalenPluginLabel(class MCalenServices &, class QGraphicsItem *)
- ?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 151 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
- ?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 152 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList<class CalenMonthData> &)
- ?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 153 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject
- ?getCurrentDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 154 NONAME ; class QDateTime CalenMonthView::getCurrentDay(void)
- ?doPopulation@CalenAgendaView@@UAEXXZ @ 155 NONAME ; void CalenAgendaView::doPopulation(void)
- ?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 156 NONAME ; class QString CalenSettingsView::tr(char const *, char const *)
- ?checkStartTimeOfEvent@CalenPreviewPane@@AAEXAAVQDateTime@@@Z @ 157 NONAME ; void CalenPreviewPane::checkStartTimeOfEvent(class QDateTime &)
- ?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 158 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void)
- ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 159 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *)
- ?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 160 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject
- ?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 161 NONAME ; void CalenMonthView::populateWithInstanceView(void)
- ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 162 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *)
- ??1CalenAgendaViewWidget@@UAE@XZ @ 163 NONAME ; CalenAgendaViewWidget::~CalenAgendaViewWidget(void)
- ?orientationChanged@CalenDayContentScrollArea@@AAEXW4Orientation@Qt@@@Z @ 164 NONAME ; void CalenDayContentScrollArea::orientationChanged(enum Qt::Orientation)
- ?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 165 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime)
- ?qt_metacast@CalenDayHourScrollArea@@UAEPAXPBD@Z @ 166 NONAME ; void * CalenDayHourScrollArea::qt_metacast(char const *)
- ?doPopulation@CalenDayView@@UAEXXZ @ 167 NONAME ; void CalenDayView::doPopulation(void)
- ??1CalenDayView@@UAE@XZ @ 168 NONAME ; CalenDayView::~CalenDayView(void)
- ?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 169 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void)
- ?getStaticMetaObject@CalenDayContentScrollArea@@SAABUQMetaObject@@XZ @ 170 NONAME ; struct QMetaObject const & CalenDayContentScrollArea::getStaticMetaObject(void)
- ?updateMonthGridModel@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@H_N@Z @ 171 NONAME ; void CalenMonthGrid::updateMonthGridModel(class QList<class CalenMonthData> &, int, bool)
- ??1CalenMonthGrid@@UAE@XZ @ 172 NONAME ; CalenMonthGrid::~CalenMonthGrid(void)
- ?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 173 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const
- ?updateWeekNumGridModel@CalenMonthView@@AAEXXZ @ 174 NONAME ; void CalenMonthView::updateWeekNumGridModel(void)
- ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 175 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *, int)
- ?qt_metacast@CalenThickLinesDrawer@@UAEPAXPBD@Z @ 176 NONAME ; void * CalenThickLinesDrawer::qt_metacast(char const *)
- ?metaObject@CalenDayHourScrollArea@@UBEPBUQMetaObject@@XZ @ 177 NONAME ; struct QMetaObject const * CalenDayHourScrollArea::metaObject(void) const
- ?prepareForPopulation@CalenMonthView@@AAEXXZ @ 178 NONAME ; void CalenMonthView::prepareForPopulation(void)
- ?scrollByAmount@CalenDayContentScrollArea@@MAE_NABVQPointF@@@Z @ 179 NONAME ; bool CalenDayContentScrollArea::scrollByAmount(class QPointF const &)
- ?handleThemeChange@CalenMonthView@@AAEXXZ @ 180 NONAME ; void CalenMonthView::handleThemeChange(void)
- ?handlePreviewPaneGesture@CalenMonthView@@QAEX_N@Z @ 181 NONAME ; void CalenMonthView::handlePreviewPaneGesture(bool)
- ?updateDayLabel@CalenMonthView@@AAEXXZ @ 182 NONAME ; void CalenMonthView::updateDayLabel(void)
- ?setActiveDates@CalenMonthGrid@@AAEXVQDate@@@Z @ 183 NONAME ; void CalenMonthGrid::setActiveDates(class QDate)
- ?dateTime@CalenDayHourScrollArea@@QBE?AVQDateTime@@XZ @ 184 NONAME ; class QDateTime CalenDayHourScrollArea::dateTime(void) const
- ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0@Z @ 185 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *)
- ?setContextForActiveDay@CalenMonthView@@QAEXH@Z @ 186 NONAME ; void CalenMonthView::setContextForActiveDay(int)
- ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 187 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *)
- ??_ECalenSettingsView@@UAE@I@Z @ 188 NONAME ; CalenSettingsView::~CalenSettingsView(unsigned int)
- ??_ECalenThickLinesDrawer@@UAE@I@Z @ 189 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(unsigned int)
- ?metaObject@CalenSettingsView@@UBEPBUQMetaObject@@XZ @ 190 NONAME ; struct QMetaObject const * CalenSettingsView::metaObject(void) const
- ?getStaticMetaObject@CalenMonthView@@SAABUQMetaObject@@XZ @ 191 NONAME ; struct QMetaObject const & CalenMonthView::getStaticMetaObject(void)
- ?changeOrientation@CalenMonthView@@EAEXW4Orientation@Qt@@@Z @ 192 NONAME ; void CalenMonthView::changeOrientation(enum Qt::Orientation)
- ?paint@CalenMonthGrid@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 193 NONAME ; void CalenMonthGrid::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
- ?tr@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 194 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *)
- ?qt_metacast@CalenSettingsView@@UAEPAXPBD@Z @ 195 NONAME ; void * CalenSettingsView::qt_metacast(char const *)
- ?qt_metacall@CalenDayHourScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 196 NONAME ; int CalenDayHourScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?qt_metacall@CalenMonthView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 197 NONAME ; int CalenMonthView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?disconnectAboutToQuitEvent@CalenAgendaView@@QAEXXZ @ 198 NONAME ; void CalenAgendaView::disconnectAboutToQuitEvent(void)
- ?setActiveDay@CalenMonthView@@AAEXVQDateTime@@@Z @ 199 NONAME ; void CalenMonthView::setActiveDay(class QDateTime)
- ?itemActivated@CalenMonthGrid@@QAEXABVQModelIndex@@@Z @ 200 NONAME ; void CalenMonthGrid::itemActivated(class QModelIndex const &)
- ?moveFinished@CalenDayContentScrollArea@@AAEXXZ @ 201 NONAME ; void CalenDayContentScrollArea::moveFinished(void)
- ?qt_metacall@CalenMonthGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 202 NONAME ; int CalenMonthGrid::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?createEditor@CalenMonthView@@AAEXXZ @ 203 NONAME ; void CalenMonthView::createEditor(void)
- ??_ECalenPreviewPane@@UAE@I@Z @ 204 NONAME ; CalenPreviewPane::~CalenPreviewPane(unsigned int)
- ?scrollToHour@CalenDayHourScrollArea@@QAEXH@Z @ 205 NONAME ; void CalenDayHourScrollArea::scrollToHour(int)
- ?getActiveDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 206 NONAME ; class QDateTime CalenMonthView::getActiveDay(void)
- ?addRemoveActionsInMenu@CalenMonthView@@AAEXXZ @ 207 NONAME ; void CalenMonthView::addRemoveActionsInMenu(void)
- ??1CalenDayContentScrollArea@@UAE@XZ @ 208 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(void)
- ?polish@CalenThickLinesDrawer@@MAEXAAVHbStyleParameters@@@Z @ 209 NONAME ; void CalenThickLinesDrawer::polish(class HbStyleParameters &)
- ?checkIfWeCanScroll@CalenMonthGrid@@AAE_NW4scrollDirection@@@Z @ 210 NONAME ; bool CalenMonthGrid::checkIfWeCanScroll(enum scrollDirection)
+ ?polish@CalenThickLinesDrawer@@MAEXAAVHbStyleParameters@@@Z @ 34 NONAME ; void CalenThickLinesDrawer::polish(class HbStyleParameters &)
+ ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 35 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *)
+ ??1CalenPluginLabel@@UAE@XZ @ 36 NONAME ; CalenPluginLabel::~CalenPluginLabel(void)
+ ?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 37 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &)
+ ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 38 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *, int)
+ ?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 39 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void)
+ ?gestureEvent@CalenDayContentScrollArea@@MAEXPAVQGestureEvent@@@Z @ 40 NONAME ; void CalenDayContentScrollArea::gestureEvent(class QGestureEvent *)
+ ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int)
+ ?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 42 NONAME ; void * CalenMonthView::qt_metacast(char const *)
+ ?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 43 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject
+ ?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 44 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *)
+ ?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 45 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const
+ ??_ECalenDayContentScrollArea@@UAE@I@Z @ 46 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(unsigned int)
+ ?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 47 NONAME ; void CalenPreviewPane::startAutoScroll(void)
+ ?doLazyLoading@CalenMonthView@@QAEXXZ @ 48 NONAME ; void CalenMonthView::doLazyLoading(void)
+ ?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 49 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *)
+ ?localeChanged@CalenDayHourScrollArea@@QAEXXZ @ 50 NONAME ; void CalenDayHourScrollArea::localeChanged(void)
+ ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 51 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *)
+ ?staticMetaObject@CalenDayContentScrollArea@@2UQMetaObject@@B @ 52 NONAME ; struct QMetaObject const CalenDayContentScrollArea::staticMetaObject
+ ??1CalenSettingsView@@UAE@XZ @ 53 NONAME ; CalenSettingsView::~CalenSettingsView(void)
+ ?tapTriggered@CalenPreviewPane@@AAEXXZ @ 54 NONAME ; void CalenPreviewPane::tapTriggered(void)
+ ?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 55 NONAME ; class QDateTime CalenPreviewPane::Date(void)
+ ?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 56 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int)
+ ?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 57 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const
+ ??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 58 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *)
+ ?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 59 NONAME ; int CalenMonthView::rowsInPrevMonth(void)
+ ?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 60 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList<class CalenMonthData> &)
+ ?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 61 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const
+ ?clearListModel@CalenAgendaView@@QAEXXZ @ 62 NONAME ; void CalenAgendaView::clearListModel(void)
+ ?gestureEvent@CalenMonthGrid@@MAEXPAVQGestureEvent@@@Z @ 63 NONAME ; void CalenMonthGrid::gestureEvent(class QGestureEvent *)
+ ??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 64 NONAME ; CalenDayView::CalenDayView(class MCalenServices &)
+ ?checkPanDirection@CalenDayContentScrollArea@@AAEXPAVQPanGesture@@@Z @ 65 NONAME ; void CalenDayContentScrollArea::checkPanDirection(class QPanGesture *)
+ ?populateNextMonth@CalenMonthView@@QAEXXZ @ 66 NONAME ; void CalenMonthView::populateNextMonth(void)
+ ?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 67 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &)
+ ?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 68 NONAME ; void * CalenMonthGrid::qt_metacast(char const *)
+ ?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 69 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void)
+ ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 70 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *)
+ ?isHorizontalSwipe@CalenDayContentScrollArea@@ABE_NM@Z @ 71 NONAME ; bool CalenDayContentScrollArea::isHorizontalSwipe(float) const
+ ?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 72 NONAME ; int CalenMonthView::rowsInFutMonth(void)
+ ?launchDayView@CalenMonthView@@QAEXXZ @ 73 NONAME ; void CalenMonthView::launchDayView(void)
+ ?effectStarted@CalenPreviewPane@@QAEXXZ @ 74 NONAME ; void CalenPreviewPane::effectStarted(void)
+ ?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 75 NONAME ; int CalenMonthView::getCurrGridIndex(void)
+ ?gestureEvent@CalenPreviewPane@@MAEXPAVQGestureEvent@@@Z @ 76 NONAME ; void CalenPreviewPane::gestureEvent(class QGestureEvent *)
+ ?prependRows@CalenMonthGrid@@QAEXXZ @ 77 NONAME ; void CalenMonthGrid::prependRows(void)
+ ?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 78 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??0CalenDayContentScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 79 NONAME ; CalenDayContentScrollArea::CalenDayContentScrollArea(class QGraphicsItem *)
+ ?event@CalenDayContentScrollArea@@MAE_NPAVQEvent@@@Z @ 80 NONAME ; bool CalenDayContentScrollArea::event(class QEvent *)
+ ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 81 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int)
+ ??1CalenThickLinesDrawer@@UAE@XZ @ 82 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void)
+ ?qt_metacast@CalenDayContentScrollArea@@UAEPAXPBD@Z @ 83 NONAME ; void * CalenDayContentScrollArea::qt_metacast(char const *)
+ ?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 84 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *)
+ ??_ECalenMonthView@@UAE@I@Z @ 85 NONAME ; CalenMonthView::~CalenMonthView(unsigned int)
+ ??1CalenAgendaView@@UAE@XZ @ 86 NONAME ; CalenAgendaView::~CalenAgendaView(void)
+ ?handleThemeChange@CalenThickLinesDrawer@@AAEXXZ @ 87 NONAME ; void CalenThickLinesDrawer::handleThemeChange(void)
+ ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 88 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *)
+ ?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 89 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &)
+ ??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 90 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *)
+ ??0CalenAgendaView@@QAE@AAVMCalenServices@@@Z @ 91 NONAME ; CalenAgendaView::CalenAgendaView(class MCalenServices &)
+ ?updateTimeIndicator@CalenDayHourScrollArea@@QAEXXZ @ 92 NONAME ; void CalenDayHourScrollArea::updateTimeIndicator(void)
+ ?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 93 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void)
+ ?scrollToMiddleWidget@CalenDayContentScrollArea@@QAEXXZ @ 94 NONAME ; void CalenDayContentScrollArea::scrollToMiddleWidget(void)
+ ?eventFilter@CalenDayContentScrollArea@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 95 NONAME ; bool CalenDayContentScrollArea::eventFilter(class QObject *, class QEvent *)
+ ?stopScrolling@CalenPreviewPane@@QAEXXZ @ 96 NONAME ; void CalenPreviewPane::stopScrolling(void)
+ ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 97 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *, int)
+ ?staticMetaObject@CalenDayHourScrollArea@@2UQMetaObject@@B @ 98 NONAME ; struct QMetaObject const CalenDayHourScrollArea::staticMetaObject
+ ?refreshView@CalenSettingsView@@QAEXXZ @ 99 NONAME ; void CalenSettingsView::refreshView(void)
+ ?getStaticMetaObject@CalenDayHourScrollArea@@SAABUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const & CalenDayHourScrollArea::getStaticMetaObject(void)
+ ?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 101 NONAME ; void CalenMonthView::addBackgroundFrame(void)
+ ?createGrid@CalenMonthView@@AAEXXZ @ 102 NONAME ; void CalenMonthView::createGrid(void)
+ ?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 103 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *)
+ ?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 104 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void)
+ ?setDateToLabel@CalenMonthView@@AAEXXZ @ 105 NONAME ; void CalenMonthView::setDateToLabel(void)
+ ?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 106 NONAME ; void CalenMonthView::setCurrGridIndex(int)
+ ?launchPreviousView@CalenSettingsView@@AAEXXZ @ 107 NONAME ; void CalenSettingsView::launchPreviousView(void)
+ ?addWeekNumbers@CalenMonthView@@AAEXXZ @ 108 NONAME ; void CalenMonthView::addWeekNumbers(void)
+ ?downGesture@CalenMonthGrid@@AAEXXZ @ 109 NONAME ; void CalenMonthGrid::downGesture(void)
+ ?setDateTime@CalenDayHourScrollArea@@QAEXABVQDateTime@@@Z @ 110 NONAME ; void CalenDayHourScrollArea::setDateTime(class QDateTime const &)
+ ?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 111 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 112 NONAME ; void CalenDayView::setupView(class CalenDocLoader *)
+ ?handleThemeChange@CalenPreviewPane@@QAEXXZ @ 113 NONAME ; void CalenPreviewPane::handleThemeChange(void)
+ ?upGesture@CalenMonthGrid@@AAEXXZ @ 114 NONAME ; void CalenMonthGrid::upGesture(void)
+ ??1CalenMonthView@@UAE@XZ @ 115 NONAME ; CalenMonthView::~CalenMonthView(void)
+ ?scrollAreaMoveFinished@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 116 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveFinished(enum CalenScrollDirection)
+ ?moveTo@CalenDayContentScrollArea@@AAEXABVQPointF@@H@Z @ 117 NONAME ; void CalenDayContentScrollArea::moveTo(class QPointF const &, int)
+ ?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 118 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject
+ ?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 119 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &)
+ ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 120 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *, int)
+ ?scrollAreaMoveStarted@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 121 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveStarted(enum CalenScrollDirection)
+ ?checkIfWeCanScroll@CalenMonthGrid@@AAE_NW4scrollDirection@@@Z @ 122 NONAME ; bool CalenMonthGrid::checkIfWeCanScroll(enum scrollDirection)
+ ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 123 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int)
+ ?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 124 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
+ ?initializeForm@CalenSettingsView@@QAEXXZ @ 125 NONAME ; void CalenSettingsView::initializeForm(void)
+ ?effectFinished@CalenPreviewPane@@QAEXXZ @ 126 NONAME ; void CalenPreviewPane::effectFinished(void)
+ ?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 127 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int)
+ ?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 128 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void)
+ ?metaObject@CalenDayContentScrollArea@@UBEPBUQMetaObject@@XZ @ 129 NONAME ; struct QMetaObject const * CalenDayContentScrollArea::metaObject(void) const
+ ?goToToday@CalenMonthView@@AAEXXZ @ 130 NONAME ; void CalenMonthView::goToToday(void)
+ ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 131 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int)
+ ?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 132 NONAME ; void * CalenPreviewPane::qt_metacast(char const *)
+ ?onContextChanged@CalenMonthView@@EAEXXZ @ 133 NONAME ; void CalenMonthView::onContextChanged(void)
+ ?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 134 NONAME ; int CalenMonthGrid::getCurrentIndex(void)
+ ?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 135 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int)
+ ?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 136 NONAME ; void CalenMonthView::removeWeekNumbers(void)
+ ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 137 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int)
+ ?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 138 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *)
+ ??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 139 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &)
+ ?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 140 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void)
+ ??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 141 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *)
+ ?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 142 NONAME ; void CalenMonthView::onLocaleChanged(int)
+ ?doPopulation@CalenMonthView@@UAEXXZ @ 143 NONAME ; void CalenMonthView::doPopulation(void)
+ ?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 144 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int)
+ ?captureScreenshot@CalenNativeView@@QAEX_N@Z @ 145 NONAME ; void CalenNativeView::captureScreenshot(bool)
+ ?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 146 NONAME ; void CalenPreviewPane::GetInstanceListL(void)
+ ?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 147 NONAME ; void CalenMonthView::getInstanceList(class QList<class QDate> &, class QDateTime, class QDateTime)
+ ?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 148 NONAME ; class QString CalenMonthView::tr(char const *, char const *)
+ ?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 149 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void)
+ ??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 150 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *)
+ ?appendRows@CalenMonthGrid@@QAEXXZ @ 151 NONAME ; void CalenMonthGrid::appendRows(void)
+ ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 152 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int)
+ ??0CalenPluginLabel@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 153 NONAME ; CalenPluginLabel::CalenPluginLabel(class MCalenServices &, class QGraphicsItem *)
+ ?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 154 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
+ ?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 155 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList<class CalenMonthData> &)
+ ?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 156 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject
+ ?setDisallowedScrollDirection@CalenDayContentScrollArea@@QAEXW4CalenScrollDirection@@@Z @ 157 NONAME ; void CalenDayContentScrollArea::setDisallowedScrollDirection(enum CalenScrollDirection)
+ ?doPopulation@CalenAgendaView@@UAEXXZ @ 158 NONAME ; void CalenAgendaView::doPopulation(void)
+ ?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 159 NONAME ; class QString CalenSettingsView::tr(char const *, char const *)
+ ?checkStartTimeOfEvent@CalenPreviewPane@@AAEXAAVQDateTime@@@Z @ 160 NONAME ; void CalenPreviewPane::checkStartTimeOfEvent(class QDateTime &)
+ ?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 161 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void)
+ ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 162 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *)
+ ?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 163 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject
+ ?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 164 NONAME ; void CalenMonthView::populateWithInstanceView(void)
+ ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 165 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *)
+ ??1CalenAgendaViewWidget@@UAE@XZ @ 166 NONAME ; CalenAgendaViewWidget::~CalenAgendaViewWidget(void)
+ ?orientationChanged@CalenDayContentScrollArea@@AAEXW4Orientation@Qt@@@Z @ 167 NONAME ; void CalenDayContentScrollArea::orientationChanged(enum Qt::Orientation)
+ ?qt_metacast@CalenDayHourScrollArea@@UAEPAXPBD@Z @ 168 NONAME ; void * CalenDayHourScrollArea::qt_metacast(char const *)
+ ?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 169 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime)
+ ?doPopulation@CalenDayView@@UAEXXZ @ 170 NONAME ; void CalenDayView::doPopulation(void)
+ ??1CalenDayView@@UAE@XZ @ 171 NONAME ; CalenDayView::~CalenDayView(void)
+ ?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 172 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void)
+ ?getStaticMetaObject@CalenDayContentScrollArea@@SAABUQMetaObject@@XZ @ 173 NONAME ; struct QMetaObject const & CalenDayContentScrollArea::getStaticMetaObject(void)
+ ?updateMonthGridModel@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@H_N@Z @ 174 NONAME ; void CalenMonthGrid::updateMonthGridModel(class QList<class CalenMonthData> &, int, bool)
+ ??1CalenMonthGrid@@UAE@XZ @ 175 NONAME ; CalenMonthGrid::~CalenMonthGrid(void)
+ ?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 176 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const
+ ?updateWeekNumGridModel@CalenMonthView@@AAEXXZ @ 177 NONAME ; void CalenMonthView::updateWeekNumGridModel(void)
+ ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 178 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *, int)
+ ?qt_metacast@CalenThickLinesDrawer@@UAEPAXPBD@Z @ 179 NONAME ; void * CalenThickLinesDrawer::qt_metacast(char const *)
+ ?metaObject@CalenDayHourScrollArea@@UBEPBUQMetaObject@@XZ @ 180 NONAME ; struct QMetaObject const * CalenDayHourScrollArea::metaObject(void) const
+ ?prepareForPopulation@CalenMonthView@@AAEXXZ @ 181 NONAME ; void CalenMonthView::prepareForPopulation(void)
+ ?scrollByAmount@CalenDayContentScrollArea@@MAE_NABVQPointF@@@Z @ 182 NONAME ; bool CalenDayContentScrollArea::scrollByAmount(class QPointF const &)
+ ?handleThemeChange@CalenMonthView@@AAEXXZ @ 183 NONAME ; void CalenMonthView::handleThemeChange(void)
+ ?handlePreviewPaneGesture@CalenMonthView@@QAEX_N@Z @ 184 NONAME ; void CalenMonthView::handlePreviewPaneGesture(bool)
+ ?updateDayLabel@CalenMonthView@@AAEXXZ @ 185 NONAME ; void CalenMonthView::updateDayLabel(void)
+ ?setActiveDates@CalenMonthGrid@@AAEXVQDate@@@Z @ 186 NONAME ; void CalenMonthGrid::setActiveDates(class QDate)
+ ?dateTime@CalenDayHourScrollArea@@QBE?AVQDateTime@@XZ @ 187 NONAME ; class QDateTime CalenDayHourScrollArea::dateTime(void) const
+ ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0@Z @ 188 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *)
+ ?setContextForActiveDay@CalenMonthView@@QAEXH@Z @ 189 NONAME ; void CalenMonthView::setContextForActiveDay(int)
+ ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 190 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *)
+ ??_ECalenSettingsView@@UAE@I@Z @ 191 NONAME ; CalenSettingsView::~CalenSettingsView(unsigned int)
+ ??_ECalenThickLinesDrawer@@UAE@I@Z @ 192 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(unsigned int)
+ ?metaObject@CalenSettingsView@@UBEPBUQMetaObject@@XZ @ 193 NONAME ; struct QMetaObject const * CalenSettingsView::metaObject(void) const
+ ?getStaticMetaObject@CalenMonthView@@SAABUQMetaObject@@XZ @ 194 NONAME ; struct QMetaObject const & CalenMonthView::getStaticMetaObject(void)
+ ?disallowedScrollDirection@CalenDayContentScrollArea@@QBE?AW4CalenScrollDirection@@XZ @ 195 NONAME ; enum CalenScrollDirection CalenDayContentScrollArea::disallowedScrollDirection(void) const
+ ?changeOrientation@CalenMonthView@@EAEXW4Orientation@Qt@@@Z @ 196 NONAME ; void CalenMonthView::changeOrientation(enum Qt::Orientation)
+ ?paint@CalenMonthGrid@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 197 NONAME ; void CalenMonthGrid::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
+ ?tr@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 198 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *)
+ ?qt_metacast@CalenSettingsView@@UAEPAXPBD@Z @ 199 NONAME ; void * CalenSettingsView::qt_metacast(char const *)
+ ?qt_metacall@CalenDayHourScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 200 NONAME ; int CalenDayHourScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?qt_metacall@CalenMonthView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 201 NONAME ; int CalenMonthView::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?disconnectAboutToQuitEvent@CalenAgendaView@@QAEXXZ @ 202 NONAME ; void CalenAgendaView::disconnectAboutToQuitEvent(void)
+ ?setActiveDay@CalenMonthView@@AAEXVQDateTime@@@Z @ 203 NONAME ; void CalenMonthView::setActiveDay(class QDateTime)
+ ?itemActivated@CalenMonthGrid@@QAEXABVQModelIndex@@@Z @ 204 NONAME ; void CalenMonthGrid::itemActivated(class QModelIndex const &)
+ ?moveFinished@CalenDayContentScrollArea@@AAEXXZ @ 205 NONAME ; void CalenDayContentScrollArea::moveFinished(void)
+ ?qt_metacall@CalenMonthGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 206 NONAME ; int CalenMonthGrid::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?createEditor@CalenMonthView@@AAEXXZ @ 207 NONAME ; void CalenMonthView::createEditor(void)
+ ??_ECalenPreviewPane@@UAE@I@Z @ 208 NONAME ; CalenPreviewPane::~CalenPreviewPane(unsigned int)
+ ?scrollToHour@CalenDayHourScrollArea@@QAEXH@Z @ 209 NONAME ; void CalenDayHourScrollArea::scrollToHour(int)
+ ?getActiveDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 210 NONAME ; class QDateTime CalenMonthView::getActiveDay(void)
+ ?addRemoveActionsInMenu@CalenMonthView@@AAEXXZ @ 211 NONAME ; void CalenMonthView::addRemoveActionsInMenu(void)
+ ??1CalenDayContentScrollArea@@UAE@XZ @ 212 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(void)
--- a/calendarui/views/dayview/inc/calendaycommonheaders.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/inc/calendaycommonheaders.h Tue Oct 05 13:57:00 2010 +0530
@@ -19,6 +19,8 @@
#ifndef CALENDAYCOMMONHEADERS_H_
#define CALENDAYCOMMONHEADERS_H_
+#include <QDate>
+
// Constants defined by UI spec.
/*!
--- a/calendarui/views/dayview/inc/calendaycontentscrollarea.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/inc/calendaycontentscrollarea.h Tue Oct 05 13:57:00 2010 +0530
@@ -55,6 +55,9 @@
ECalenPanVertical,
ECalenPanHorizontal
};
+
+ CalenScrollDirection disallowedScrollDirection() const;
+ void setDisallowedScrollDirection(const CalenScrollDirection direction);
signals:
void scrollAreaMoveStarted(CalenScrollDirection scrollTo);
@@ -99,6 +102,11 @@
\brief Scroll area horizontal move direction
*/
CalenScrollDirection mMoveDirection;
+
+ /*!
+ \brief Scroll area horizontal move disallowed direction
+ */
+ CalenScrollDirection mDisallowedDirection;
};
#endif /* CALENDAYCONTENTSCROLLAREA_H_ */
--- a/calendarui/views/dayview/inc/calendayhourelement.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayhourelement.h Tue Oct 05 13:57:00 2010 +0530
@@ -22,6 +22,7 @@
#include <QTime>
#include <QPen>
#include <HbWidget>
+#include <HbTextItem>
// User includes
@@ -31,25 +32,35 @@
class CalenDayHourElement : public HbWidget
{
- Q_OBJECT
+Q_OBJECT
public:
CalenDayHourElement(const QTime &time, QGraphicsItem *parent = 0);
virtual ~CalenDayHourElement();
+ void paint(
+ QPainter * painter,
+ const QStyleOptionGraphicsItem * option,
+ QWidget * widget);
+
void setTime(const QTime &time);
QTime time() const;
-
- void paint(QPainter * painter, const QStyleOptionGraphicsItem * option,
- QWidget * widget);
+
+public slots:
+ void localeChanged();
private:
+ void setupWithLocale();
+private:
const CalenDayHourScrollArea *mContainer;
QTime mHour;
QColor mHourLineColor;
qreal mUnitInPixels;
+
+ HbTextItem *mTimeTextItem; //!< Text item for displaying time
+ HbTextItem *mAmpmTextItem; //!< Test item for displaying am/pm
};
#endif // CALENDAYHOURELEMENT_H
--- a/calendarui/views/dayview/inc/calendayhourscrollarea.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayhourscrollarea.h Tue Oct 05 13:57:00 2010 +0530
@@ -47,9 +47,11 @@
QDateTime dateTime() const;
void scrollToHour(int hour);
-
+
public slots:
void scrollVertically(const QPointF &newPosition);
+ void localeChanged();
+ void updateTimeIndicator();
private:
QDateTime mDateTime;
--- a/calendarui/views/dayview/inc/calendayutils.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayutils.h Tue Oct 05 13:57:00 2010 +0530
@@ -39,17 +39,11 @@
HbMainWindow* mainWindow();
- /**
- * Get event's start/end time fromm agenda entry.
- * Start/end time are validated to be within the current day (the case of
- * multi-day events)
- * @param start [out] valid start time
- * @param end [out] valid end time
- * @param entry [in] agenda entry asociated with the event.
- * @param currentDate [in] current date
- */
- void getEventValidStartEndTime( QDateTime& start, QDateTime& end,
- const AgendaEntry& entry, QDateTime& currentDate );
+ void getEventValidStartEndTime(
+ QDateTime& start,
+ QDateTime& end,
+ const AgendaEntry& entry,
+ QDateTime& currentDate);
protected:
CalenDayUtils();
--- a/calendarui/views/dayview/inc/calendayview.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayview.h Tue Oct 05 13:57:00 2010 +0530
@@ -164,6 +164,8 @@
void initializeViews();
+ void isDateValid();
+
private: // members related to view management and gesture handling
CalenDayModelManager* mModelManager;
--- a/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -57,7 +57,7 @@
*/
CalenDayContentScrollArea::CalenDayContentScrollArea(QGraphicsItem *parent) :
HbScrollArea(parent), mPanDayDirection(ECalenPanNotSet), mIsMoving(false),
- mMoveDirection(ECalenScrollNoDayChange)
+ mMoveDirection(ECalenScrollNoDayChange), mDisallowedDirection(ECalenScrollNoDayChange)
{
#ifdef CALENDAYVIEW_PANNING_ENABLED
grabGesture(Qt::PanGesture);
@@ -90,6 +90,27 @@
}
/*!
+ \brief Returns disallowed scroll direction (if defined)
+
+ \return Disallowed scroll direction
+ */
+CalenScrollDirection CalenDayContentScrollArea::disallowedScrollDirection() const
+{
+ return mDisallowedDirection;
+}
+
+/*!
+ \brief Sets disallowed scroll direction
+
+ \param direction Disallowed scroll direction to be set
+ */
+void CalenDayContentScrollArea::setDisallowedScrollDirection(
+ const CalenScrollDirection direction)
+{
+ mDisallowedDirection = direction;
+}
+
+/*!
\brief Scrolls to middle widget.
Scrolling to middle widget is done if needed.
@@ -376,16 +397,23 @@
*/
void CalenDayContentScrollArea::moveTo(const QPointF &newPosition, int time)
{
- // Connect to scrollingEnded SIGNAL to get feedback when scrolling ends
- connect(this, SIGNAL(scrollingEnded()), this, SLOT(moveFinished()));
+ bool canMove(true);
+ if (mDisallowedDirection != ECalenScrollNoDayChange) {
+ canMove = (mMoveDirection != mDisallowedDirection);
+ }
- // Scroll the content to new position and set isMoving flag
- scrollContentsTo(newPosition, time);
- mIsMoving = true;
-
- // Emit signal that moving has just started
- if (mMoveDirection != ECalenScrollNoDayChange) {
- emit scrollAreaMoveStarted(mMoveDirection);
+ if (canMove) {
+ // Connect to scrollingEnded SIGNAL to get feedback when scrolling ends
+ connect(this, SIGNAL(scrollingEnded()), this, SLOT(moveFinished()));
+
+ // Scroll the content to new position and set isMoving flag
+ scrollContentsTo(newPosition, time);
+ mIsMoving = true;
+
+ // Emit signal that moving has just started
+ if (mMoveDirection != ECalenScrollNoDayChange) {
+ emit scrollAreaMoveStarted(mMoveDirection);
+ }
}
}
--- a/calendarui/views/dayview/src/calendayhourelement.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/src/calendayhourelement.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -49,41 +49,24 @@
CalenDayHourElement::CalenDayHourElement(
const QTime &time,
QGraphicsItem *parent) :
- HbWidget(parent), mHour(time)
+ HbWidget(parent), mHour(time), mTimeTextItem(NULL), mAmpmTextItem(NULL)
{
// Necessary when widget implements own paint method
setFlag(QGraphicsItem::ItemHasNoContents, false);
-
+
HbDeviceProfile deviceProfile;
mUnitInPixels = deviceProfile.unitValue();
+ mHour = time;
// Initialize hour line color
- mHourLineColor = HbColorScheme::color(KCalenHourLineColor);
-
- // Create text items
- HbExtendedLocale systemLocale = HbExtendedLocale::system();
-
- // Get current time format and (if there's a need) separate time from am/pm text
- QChar timeSeparator = ' ';
- QStringList timeTextList = systemLocale.format(time,
- r_qtn_time_usual_with_zero).split(timeSeparator);
-
- // If needed, prepend '0' to get proper time format: [0-9][0-9]:[0-9][0-9]
- QString timeString = timeTextList[0];
- if (timeString.length() < KCalenTimeFormatLength) {
- timeString.prepend('0');
- }
-
- QString ampmString = "";
- if (timeTextList.count() > 1) {
- ampmString = timeTextList[1].toLower();
- }
-
- HbTextItem* timeTextItem = new HbTextItem(timeString, this);
- HbTextItem* ampmTextItem = new HbTextItem(ampmString, this);
-
- HbStyle::setItemName(timeTextItem, QLatin1String("time"));
- HbStyle::setItemName(ampmTextItem, QLatin1String("ampm"));
+ mHourLineColor = HbColorScheme::color(KCalenHourLineColor);
+
+ mTimeTextItem = new HbTextItem(this);
+ mAmpmTextItem = new HbTextItem(this);
+ HbStyle::setItemName(mTimeTextItem, QLatin1String("time"));
+ HbStyle::setItemName(mAmpmTextItem, QLatin1String("ampm"));
+
+ setupWithLocale();
// Parent container is needed to update widget's time
mContainer = static_cast<CalenDayHourScrollArea*> (parent);
@@ -94,7 +77,6 @@
*/
CalenDayHourElement::~CalenDayHourElement()
{
-
}
/*!
@@ -172,4 +154,42 @@
return mHour;
}
+/*!
+ \brief SLOT updates control when system locale changes
+ */
+void CalenDayHourElement::localeChanged()
+{
+ setupWithLocale();
+ repolish();
+}
+
+/*!
+ \brief Sets up internal data using current system locale.
+ */
+void CalenDayHourElement::setupWithLocale()
+{
+ HbDeviceProfile deviceProfile;
+
+ // Create text items
+ HbExtendedLocale systemLocale = HbExtendedLocale::system();
+
+ // Get current time format and (if there's a need) separate time from am/pm text
+ QChar timeSeparator = ' ';
+ QStringList timeTextList = systemLocale.format(mHour, r_qtn_time_usual_with_zero).split(timeSeparator);
+
+ // If needed, prepend '0' to get proper time format: [0-9][0-9]:[0-9][0-9]
+ QString timeString = timeTextList[0];
+ if (timeString.length() < KCalenTimeFormatLength) {
+ timeString.prepend('0');
+ }
+
+ QString ampmString = "";
+ if (timeTextList.count() > 1) {
+ ampmString = timeTextList[1].toLower();
+ }
+
+ mTimeTextItem->setText(timeString);
+ mAmpmTextItem->setText(ampmString);
+}
+
// End of File
--- a/calendarui/views/dayview/src/calendayhourscrollarea.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/src/calendayhourscrollarea.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -73,20 +73,6 @@
}
/*!
- \brief SLOT scrolls the view vertically to new position.
-
- \param newPosition New position
- */
-void CalenDayHourScrollArea::scrollVertically(const QPointF &newPosition)
-{
- QPointF currentPos = contentWidget()->pos();
- if (abs(newPosition.y()) != abs(currentPos.y())) {
- currentPos.setY(newPosition.y());
- scrollContentsTo(currentPos, 0);
- }
-}
-
-/*!
\brief Sets date and time for this container.
\param dateTime new date and time
@@ -95,6 +81,7 @@
{
mDateTime = dateTime;
}
+
/*!
\brief Returns date and time assigned to current view.
*/
@@ -129,4 +116,49 @@
scrollContentsTo(newPos);
}
+/*!
+ \brief SLOT scrolls the view vertically to new position.
+
+ \param newPosition New position
+ */
+void CalenDayHourScrollArea::scrollVertically(const QPointF &newPosition)
+{
+ QPointF currentPos = contentWidget()->pos();
+ if (abs(newPosition.y()) != abs(currentPos.y())) {
+ currentPos.setY(newPosition.y());
+ scrollContentsTo(currentPos, 0);
+ }
+}
+
+/*!
+ \brief SLOT updates time/date representation when system locale are changed.
+ */
+void CalenDayHourScrollArea::localeChanged()
+{
+ for (int i = 0; i < mHourElements.count(); i++) {
+ mHourElements.at(i)->localeChanged();
+ mHourElements.at(i)->update(mHourElements.at(i)->rect());
+ }
+}
+
+/*!
+ \brief SLOT refreshes time indicator if current day is displayed.
+
+ Time indicator should also be updated if transition between prev/next
+ day was done previously: failure ou1cimx1#565650 fixed
+ */
+void CalenDayHourScrollArea::updateTimeIndicator()
+{
+ QDateTime currentDateTime = QDateTime::currentDateTime();
+
+ bool updateNeeded = mDateTime.date() >= currentDateTime.date().addDays(-1);
+ updateNeeded = updateNeeded && mDateTime.date() <= currentDateTime.date().addDays(1);
+
+ if (updateNeeded) {
+ for (int i = 0; i < mHourElements.count(); i++) {
+ mHourElements.at(i)->update(mHourElements.at(i)->rect());
+ }
+ }
+}
+
// End of File
--- a/calendarui/views/dayview/src/calendayitemview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/src/calendayitemview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -11,18 +11,18 @@
*
* Contributors:
*
- * Description: Day view control of calendar
+ * Description: CalenDayItemView implementation
*
*/
-//System includes
+// System includes
#include <QGesture>
#include <QGraphicsLinearLayout>
#include <HbAbstractViewItem>
#include <HbInstance>
#include <HbAction>
-//User includes
+// User includes
#include "calendayitemview.h"
#include "calendayutils.h"
#include "calendaycontainer.h"
@@ -172,8 +172,7 @@
mInfo->InsertTimedEvent(apptInfo);
}
else
- if (CalenAgendaUtils::isAlldayEvent(entry)) //all-day event
- {
+ if (CalenAgendaUtils::isAlldayEvent(entry)) { //all-day event
apptInfo.iAllDay = true;
mInfo->InsertAlldayEvent(apptInfo);
}
@@ -200,6 +199,8 @@
\brief This function is called when a touch press event is received
within Abstract view item that is representing index.
Currently it does nothing.
+
+ \param index Index of pressed item
*/
void CalenDayItemView::itemPressed(const QModelIndex &index)
{
@@ -210,6 +211,8 @@
\brief This function is called when a touch release event is received
within Abstract view item that is representing index.
Currently it does nothing.
+
+ \param index Index of released item
*/
void CalenDayItemView::itemReleased(const QModelIndex &index)
{
@@ -219,7 +222,7 @@
/*!
\brief This function is called when the item specified by index is activated by the user.
- \param position Not used.
+ \param index Index of activated item
*/
void CalenDayItemView::itemActivated(const QModelIndex &index)
{
@@ -307,11 +310,6 @@
QObject::connect(this->model(), SIGNAL(modelReset()), this,
SLOT(modelReset()));
}
- if (mContainer) {
- // Connect with base class to enable handling item press by model index
- QObject::connect(mContainer, SIGNAL(itemCreated(HbAbstractViewItem *)),
- this, SLOT(itemCreated(HbAbstractViewItem*)));
- }
QObject::connect(this, SIGNAL(pressed(const QModelIndex&)), this,
SLOT(itemPressed(const QModelIndex&)));
QObject::connect(this, SIGNAL(released(const QModelIndex&)), this,
--- a/calendarui/views/dayview/src/calendaymodelmanager.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/src/calendaymodelmanager.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -148,7 +148,7 @@
}
break;
case NextDay: {
- mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(1));
+ mModels[NextDay]->refreshModel(mCurrentDayTime.addDays(1));
}
break;
default:
--- a/calendarui/views/dayview/src/calendayutils.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/src/calendayutils.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -140,23 +140,31 @@
return mMainWindow;
}
-/*!
- \brief getEventValidStartEndTime
- \brief Get event's valid start/end time from agenda entry.
+/*
+ * Get event's start/end time fromm agenda entry.
+ * Start/end time are validated to be within the current day (the case of
+ * multi-day events)
+ * @param start [out] valid start time
+ * @param end [out] valid end time
+ * @param entry [in] agenda entry asociated with the event.
+ * @param currentDate [in] current date
*/
-void CalenDayUtils::getEventValidStartEndTime( QDateTime& start, QDateTime& end,
- const AgendaEntry& entry, QDateTime& currentDate )
+void CalenDayUtils::getEventValidStartEndTime(
+ QDateTime& start,
+ QDateTime& end,
+ const AgendaEntry& entry,
+ QDateTime& currentDate)
{
start = entry.startTime();
end = entry.endTime();
-
- if ( !CalenDateUtils::onSameDay( start, currentDate ) ) {
- start = CalenDateUtils::beginningOfDay( currentDate );
+
+ if (!CalenDateUtils::onSameDay(start, currentDate)) {
+ start = CalenDateUtils::beginningOfDay(currentDate);
}
-
- if ( !CalenDateUtils::onSameDay( end, currentDate ) ) {
- QDateTime tommorrow( currentDate.addDays( 1 ));
- end = CalenDateUtils::beginningOfDay( tommorrow ).addSecs( -60 );
+
+ if (!CalenDateUtils::onSameDay(end, currentDate)) {
+ QDateTime tommorrow(currentDate.addDays(1));
+ end = CalenDateUtils::beginningOfDay(tommorrow).addSecs(-60);
}
}
--- a/calendarui/views/dayview/src/calendayview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/src/calendayview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -115,6 +115,13 @@
void CalenDayView::onLocaleChanged(int reason)
{
Q_UNUSED( reason )
+ if ((reason & EChangesSystemTime) || (reason & EChangesMidnightCrossover)) {
+ mDate = CalenDateUtils::today();
+ }
+
+ if ((reason & EChangesLocale)) {
+ mHourScrollArea->localeChanged();
+ }
}
/*!
@@ -131,6 +138,8 @@
//It's later used by hour element to display timeline
mHourScrollArea->setDateTime(mDate);
+ isDateValid();
+
//set in menu go to today visible
QDateTime currentDateTime = QDateTime::currentDateTime();
if (mGoToTodayMenuAction and currentDateTime.date() == mDate.date()) {
@@ -238,15 +247,19 @@
*/
void CalenDayView::dayChangeStarted(CalenScrollDirection direction)
{
- if (direction == ECalenScrollToNext) {
- mDate = mDate.addDays(1);
- }
- else {
- mDate = mDate.addDays(-1);
+ switch (direction) {
+ case ECalenScrollToNext:
+ mDate = mDate.addDays(1);
+ break;
+ case ECalenScrollToPrev:
+ mDate = mDate.addDays(-1);
+ break;
+ default:
+ break;
}
- //set in menu go to today visible
- QDateTime currentDateTime = QDateTime::currentDateTime();
+ // Update the visibility of 'Go to today' option in menu
+ QDateTime currentDateTime = QDateTime::currentDateTime();
if (mGoToTodayMenuAction and currentDateTime.date() == mDate.date()) {
mGoToTodayMenuAction->setVisible(false);
}
@@ -273,6 +286,8 @@
{
mModelManager->viewsScrollingFinished(direction);
mHourScrollArea->setDateTime(mDate);
+ mHourScrollArea->updateTimeIndicator();
+ isDateValid();
}
/*!
@@ -411,6 +426,25 @@
}
/*!
+ \brief Checks current date and if previous/next days are valid.
+
+ Checks if previous/next day is in range of supported dates: 1900-01-01 - 2100-12-30
+ */
+void CalenDayView::isDateValid()
+{
+ // Fix to ou1cimx1#583805: user shouldnot be able to scroll
+ // before 01/01/1900 and after 30/12/2100
+ mContentScrollArea->setDisallowedScrollDirection(ECalenScrollNoDayChange);
+ if (!CalenDateUtils::isValidDay(mDate.addDays(-1))) {
+ mContentScrollArea->setDisallowedScrollDirection(ECalenScrollToPrev);
+ }
+ else
+ if (!CalenDateUtils::isValidDay(mDate.addDays(1))) {
+ mContentScrollArea->setDisallowedScrollDirection(ECalenScrollToNext);
+ }
+}
+
+/*!
\brief This slot triggers new meeting creation view
*/
void CalenDayView::runNewMeeting()
@@ -510,26 +544,7 @@
CalenPluginLabel *regionalInfo = new CalenPluginLabel(
mServices, this);
regionalInfo->setFontSpec(HbFontSpec(HbFontSpec::Primary));
-
- // Set margins in groupbox according to UI spec
- HbStyle style;
- HbDeviceProfile deviceProfile;
- qreal leftMargin = 0.0;
- qreal rightMargin = 0.0;
- qreal topMargin = 0.0;
- qreal bottomMargin = 0.0;
- style.parameter(QString("hb-param-margin-gene-left"),
- leftMargin, deviceProfile);
- style.parameter(QString("hb-param-margin-gene-right"),
- rightMargin, deviceProfile);
- style.parameter(QString("hb-param-margin-gene-top"), topMargin,
- deviceProfile);
- style.parameter(QString("hb-param-margin-gene-bottom"),
- bottomMargin, deviceProfile);
- regionalInfo->setContentsMargins(leftMargin, topMargin,
- rightMargin, bottomMargin);
mRegionalInfoGroupBox->setContentWidget(regionalInfo);
-
mVLayout->insertItem(1, mRegionalInfoGroupBox);
}
QString *pluginString = pluginText();
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -22,10 +22,10 @@
#include "calendayinfo.h"
#include "calendaymodel.h"
+#include "calendayitem.h"
#define private public
-
#include "calendaycontainertest.h"
QVariantList MOCK_EVENTS_LIST;
@@ -51,6 +51,7 @@
void testConstructors();
void testSetGetDayInfo();
+ void testSetGetDate();
void testItemAdded();
void testItemRemoved();
void testReset();
@@ -182,11 +183,30 @@
}
/*!
+ Test function to check set and get date
+ 1) Test setDate()
+ 2) Test date()
+ */
+void TestCalenDayContainer::testSetGetDate()
+{
+ QDate today = QDate::currentDate();
+
+ //1)
+ mContainer->setDate(today);
+ QCOMPARE(mContainer->mDate, today);
+
+ //2)
+ QCOMPARE(mContainer->date(), today);
+}
+
+/*!
Function not implemented
*/
void TestCalenDayContainer::testItemAdded()
{
- //function dosen't do nothing. It will be updated after code changes
+ // function does nothing - just check function call
+ CalenDayItem *item = new CalenDayItem(mContainer);
+ mContainer->itemAdded(1, item, false);
}
/*!
@@ -194,7 +214,9 @@
*/
void TestCalenDayContainer::testItemRemoved()
{
- //function dosen't do nothing. It will be updated after code changes
+ // function does nothing - just check function call
+ CalenDayItem *item = new CalenDayItem(mContainer);
+ mContainer->itemRemoved(item, false);
}
/*!
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/unittest_calendaycontentscrollarea.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/unittest_calendaycontentscrollarea.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -18,7 +18,6 @@
#include <QGraphicsScene>
#include <QtTest/QtTest>
#include <QGesture>
-#include <QPanGesture>
#include <HbStyleLoader>
#include <HbWidget>
@@ -62,6 +61,8 @@
void testHorizontalSwipe();
void testMoveFinished();
void testOrientationChanged();
+ void testCheckPanDirection();
+ void testSetGetDisallowedScrollDirection();
private:
CalenDayContentScrollArea *mContentScrollArea;
@@ -367,6 +368,7 @@
1. Test moveTo, day not changed
2. Test moveTo, day changed to next
3. Test moveTo, day changed to prev
+ 4. Test moveTo, disallowed directon
*/
void TestCalenDayContentScrollArea::testMoveTo()
{
@@ -388,7 +390,7 @@
QCOMPARE(abs(pos.y()), abs(mContentScrollArea->contentWidget()->pos().y()));
QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
- //2)
+ //3)
newPos = QPointF(-20,0);
mContentScrollArea->mMoveDirection = ECalenScrollToNext;
mContentScrollArea->moveTo(newPos);
@@ -396,6 +398,15 @@
QCOMPARE(abs(mContentScrollArea->contentWidget()->pos().x()), abs(pos.x()));
QCOMPARE(abs(mContentScrollArea->contentWidget()->pos().y()), abs(pos.y()));
QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
+
+ //4)
+ newPos = QPointF(20,0);
+ pos = mContentScrollArea->contentWidget()->pos();
+ mContentScrollArea->mDisallowedDirection = ECalenScrollToNext;
+ mContentScrollArea->mMoveDirection = ECalenScrollToNext;
+ mContentScrollArea->moveTo(newPos);
+ QCOMPARE(abs(mContentScrollArea->contentWidget()->pos().x()), abs(pos.x()));
+ QCOMPARE(abs(mContentScrollArea->contentWidget()->pos().y()), abs(pos.y()));
#endif /* __WINSCW__ */
}
@@ -459,5 +470,80 @@
#endif /* __WINSCW__ */
}
+/*!
+ Test checkPanDirection function
+ 1) test pan direction, gesture cancelled, vertical orientation
+ 2) test pan direction, gesture started, vertical orientation, vertical movement
+ 3) test pan direction, gesture started, vertical orientation, horizontal movement
+ 4) test pan direction, gesture started, horizontal orientation, vertical movement
+ 5) test pan direction, gesture started, horizontal orientation, horizontal movement
+ */
+void TestCalenDayContentScrollArea::testCheckPanDirection()
+{
+#ifndef __WINSCW__
+ QPanGesture *gesture = new QPanGesture();
+
+ //1)
+ gesture->setOffset(QPointF(10, 100));
+ gTestGestureState = Qt::GestureCanceled;
+ mContentScrollArea->mPanDayDirection = CalenDayContentScrollArea::ECalenPanNotSet;
+ mContentScrollArea->mOrientation = Qt::Vertical;
+ mContentScrollArea->checkPanDirection(gesture);
+ QCOMPARE(mContentScrollArea->mPanDayDirection, CalenDayContentScrollArea::ECalenPanNotSet);
+
+ // Cases 2-5 temporarily unavailable
+/*
+ //2)
+ gesture->setOffset(QPointF(10, 100));
+ gTestGestureState = Qt::GestureStarted;
+ mContentScrollArea->mPanDayDirection = CalenDayContentScrollArea::ECalenPanNotSet;
+ mContentScrollArea->mOrientation = Qt::Vertical;
+ mContentScrollArea->checkPanDirection(gesture);
+ QCOMPARE(mContentScrollArea->mPanDayDirection, CalenDayContentScrollArea::ECalenPanVertical);
+
+ //3)
+ gesture->setOffset(QPointF(100, 10));
+ gTestGestureState = Qt::GestureStarted;
+ mContentScrollArea->mPanDayDirection = CalenDayContentScrollArea::ECalenPanNotSet;
+ mContentScrollArea->mOrientation = Qt::Vertical;
+ mContentScrollArea->checkPanDirection(gesture);
+ QCOMPARE(mContentScrollArea->mPanDayDirection, CalenDayContentScrollArea::ECalenPanHorizontal);
+
+ //4)
+ gesture->setOffset(QPointF(10, 100));
+ gTestGestureState = Qt::GestureStarted;
+ mContentScrollArea->mPanDayDirection = CalenDayContentScrollArea::ECalenPanNotSet;
+ mContentScrollArea->mOrientation = Qt::Horizontal;
+ mContentScrollArea->checkPanDirection(gesture);
+ QCOMPARE(mContentScrollArea->mPanDayDirection, CalenDayContentScrollArea::ECalenPanHorizontal);
+
+ //5)
+ gesture->setOffset(QPointF(100, 10));
+ gTestGestureState = Qt::GestureStarted;
+ mContentScrollArea->mPanDayDirection = CalenDayContentScrollArea::ECalenPanNotSet;
+ mContentScrollArea->mOrientation = Qt::Horizontal;
+ mContentScrollArea->checkPanDirection(gesture);
+ QCOMPARE(mContentScrollArea->mPanDayDirection, CalenDayContentScrollArea::ECalenPanVertical);
+*/
+#endif /* __WINSCW__ */
+}
+
+/*!
+ Test setter and getter for disallowed direction
+ 1) test setter
+ 2) test getter
+ */
+void TestCalenDayContentScrollArea::testSetGetDisallowedScrollDirection()
+{
+ QCOMPARE(mContentScrollArea->mDisallowedDirection, ECalenScrollNoDayChange);
+
+ //1)
+ mContentScrollArea->setDisallowedScrollDirection(ECalenScrollToNext);
+ QCOMPARE(mContentScrollArea->mDisallowedDirection, ECalenScrollToNext);
+
+ //2)
+ QCOMPARE(mContentScrollArea->disallowedScrollDirection(), ECalenScrollToNext);
+}
+
QTEST_MAIN(TestCalenDayContentScrollArea);
#include "unittest_calendaycontentscrollarea.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -17,6 +17,11 @@
#include <QGraphicsItem>
#include <QtTest/QtTest>
+#ifndef __WINSCW__
+#define private public
+#define protected public
+#endif
+
#include "calendayhourelementtest.h"
#include "calendayhourscrollarea.h"
@@ -46,6 +51,7 @@
void testSetGetTime();
void testPaint_data();
void testPaint();
+ void testLocaleChanged();
private:
CalenDayHourElementTest *mHourElement;
@@ -178,7 +184,7 @@
*/
void TestCalenDayHourElement::testPaint()
{
-
+ //1)
//get data to test
QFETCH(QDateTime, testedValue);
QFETCH(QString, testName);
@@ -205,8 +211,48 @@
#ifdef SAVE_IMAGES
//save drawed image
- img.save("c:/unittest/TestCalenDayHourElement_testPaint_" + testName + ".jpg");
-
+ img.save("c:/unittest/TestCalenDayHourElement_testPaint_" + testName + ".jpg");
+#endif
+
+ //2)
+ QDateTime currentDateTime = QDateTime::currentDateTime();
+ int currentHour = currentDateTime.time().hour();
+ mHourElement->setTime(QTime(currentHour + 1, 0 ));
+ //fill image with grey color to have better filings with look of "paper"
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ //run paint
+ mHourElement->paint(&painter,option,0);
+
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourElement_testPaint_" + testName + "2.jpg");
+#endif
+
+ //3)
+#ifndef __WINSCW__
+ mHourElement->mContainer = NULL;
+ //fill image with grey color to have better filings with look of "paper"
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ //run paint
+ mHourElement->paint(&painter,option,0);
+
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourElement_testPaint_" + testName + "3.jpg");
+#endif
+
+#endif
+}
+
+/*!
+ Test function for localChanged method
+ */
+void TestCalenDayHourElement::testLocaleChanged()
+{
+#ifndef __WINSCW__
+ mHourElement->mTimeTextItem->setText(QString(""));
+ mHourElement->localeChanged();
+ QVERIFY(mHourElement->mTimeTextItem->text() != QString(""));
#endif
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/calendayhourelement.h Tue Oct 05 13:57:00 2010 +0530
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2010 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: Mocked class CalenDayHourElement
+ *
+ */
+
+#ifndef CALENDAYHOURELEMENT_H
+#define CALENDAYHOURELEMENT_H
+
+// System includes
+#include <QTime>
+#include <HbWidget>
+
+// Test variables
+extern bool gTestLocaleChanged;
+extern bool gTestUpdatePerformed;
+
+// Mocked class
+class CalenDayHourElement : public HbWidget
+{
+Q_OBJECT
+
+public:
+
+ CalenDayHourElement(const QTime &time, QGraphicsItem *parent = 0) : HbWidget(parent) {
+ mHour = time;
+ }
+ virtual ~CalenDayHourElement() {
+
+ }
+
+ void paint(
+ QPainter * painter,
+ const QStyleOptionGraphicsItem * option,
+ QWidget * widget) {
+ Q_UNUSED(painter)
+ Q_UNUSED(option)
+ Q_UNUSED(widget)
+ }
+
+ void setTime(const QTime &time) {
+ mHour = time;
+ }
+
+ QTime time() const {
+ return mHour;
+ }
+
+ void update(const QRectF &rect = QRectF()) {
+ Q_UNUSED(rect)
+ gTestUpdatePerformed = true;
+ }
+
+public slots:
+ void localeChanged() {
+ gTestLocaleChanged = true;
+ }
+
+private:
+ QTime mHour;
+};
+
+#endif // CALENDAYHOURELEMENT_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -22,8 +22,13 @@
#include <QGraphicsScene>
#include <hbstyleloader.h>
+#define private public
+
#include "calendayhourscrollarea.h"
+// Test variables
+bool gTestLocaleChanged = false;
+bool gTestUpdatePerformed = false;
const qreal WIDGET_WIDTH = 300;
const qreal WIDGET_HEIGHT = 1000;
@@ -45,6 +50,8 @@
void testSetGetDateTime();
void testScrollToHour();
void testscrollVertically();
+ void testLocaleChanged();
+ void testUpdateTimeIndicator();
private:
CalenDayHourScrollArea *mHourScrollArea;
@@ -225,7 +232,7 @@
//create painter which will be used to paint
QPainter painter;
- //0
+ //1
mHourScrollArea->scrollVertically(QPoint(10,250));
painter.begin(&img);
painter.setRenderHint(QPainter::Antialiasing);
@@ -236,7 +243,7 @@
//save drawed image
img.save("c:/unittest/TestCalenDayHourScrollArea_testscrollVertically_250.png");
#endif
- //1
+ //2
mHourScrollArea->scrollVertically(QPoint(10,500));
painter.begin(&img);
painter.setRenderHint(QPainter::Antialiasing);
@@ -247,7 +254,7 @@
//save drawed image
img.save("c:/unittest/TestCalenDayHourScrollArea_testscrollVertically_500.png");
#endif
- //2
+ //3
mHourScrollArea->scrollVertically(QPoint(10,2000));
painter.begin(&img);
painter.setRenderHint(QPainter::Antialiasing);
@@ -261,5 +268,80 @@
scene.removeItem(mHourScrollArea);
}
+/*!
+ \brief It tests localeChanged slot
+ 1) test if localeChanged was called on hour elements
+ 2) test if nothing changes if there are no hour elements
+ */
+void TestCalenDayHourScrollArea::testLocaleChanged()
+{
+ //1)
+ gTestLocaleChanged = false;
+ mHourScrollArea->localeChanged();
+ QCOMPARE(gTestLocaleChanged, true);
+
+ //2)
+ gTestLocaleChanged = false;
+ // clear the list of elements
+ mHourScrollArea->mHourElements.clear();
+ QCOMPARE(mHourScrollArea->mHourElements.count(), 0);
+ mHourScrollArea->localeChanged();
+ QCOMPARE(gTestLocaleChanged, false);
+}
+
+/*!
+ \brief It tests updateTimeIndicator slot
+ 1) hour elements > 0, update not performed for day before yesterday
+ 2) hour elements > 0, update performed for current day
+ 3) hour elements > 0, update not performed for day after tomorrow
+ 4) hour elements = 0, update not performed for day before yesterday
+ 5) hour elements = 0, update not performed for current day
+ 6) hour elements = 0, update not performed for day after tomorrow
+ */
+void TestCalenDayHourScrollArea::testUpdateTimeIndicator()
+{
+ QDateTime currentDateTime = QDateTime::currentDateTime();
+
+ //1)
+ gTestUpdatePerformed = false;
+ mHourScrollArea->setDateTime(currentDateTime.addDays(-2));
+ mHourScrollArea->updateTimeIndicator();
+ QCOMPARE(gTestUpdatePerformed, false);
+
+ //2)
+ gTestUpdatePerformed = false;
+ mHourScrollArea->setDateTime(currentDateTime);
+ mHourScrollArea->updateTimeIndicator();
+ QCOMPARE(gTestUpdatePerformed, true);
+
+ //3)
+ gTestUpdatePerformed = false;
+ mHourScrollArea->setDateTime(currentDateTime.addDays(2));
+ mHourScrollArea->updateTimeIndicator();
+ QCOMPARE(gTestUpdatePerformed, false);
+
+ // clear the list of elements
+ mHourScrollArea->mHourElements.clear();
+ QCOMPARE(mHourScrollArea->mHourElements.count(), 0);
+
+ //4)
+ gTestUpdatePerformed = false;
+ mHourScrollArea->setDateTime(currentDateTime.addDays(-2));
+ mHourScrollArea->updateTimeIndicator();
+ QCOMPARE(gTestUpdatePerformed, false);
+
+ //5)
+ gTestUpdatePerformed = false;
+ mHourScrollArea->setDateTime(currentDateTime);
+ mHourScrollArea->updateTimeIndicator();
+ QCOMPARE(gTestUpdatePerformed, false);
+
+ //6)
+ gTestUpdatePerformed = false;
+ mHourScrollArea->setDateTime(currentDateTime.addDays(2));
+ mHourScrollArea->updateTimeIndicator();
+ QCOMPARE(gTestUpdatePerformed, false);
+}
+
QTEST_MAIN(TestCalenDayHourScrollArea);
#include "unittest_calendayhourscrollarea.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro Tue Oct 05 13:57:00 2010 +0530
@@ -47,7 +47,6 @@
SOURCES += unittest_calendayhourscrollarea.cpp \
- calendayhourelement.cpp \
calendayhourscrollarea.cpp \
calendayutils.cpp
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -55,6 +55,22 @@
void testSlotIndexForEndTime();
void testAlldayCount();
void testTodoCount();
+ void testTimeColumnContainsEvent();
+ void testTimeColumnAddOffset();
+ void testSlotIntervalAddOffset();
+ void testSlotIntervalOverlaps();
+ void testSlotIntervalUnion();
+ void testSlotIntervalAdjacent();
+ void testRegionAddOffset();
+ void testRegionOverlaps();
+ void testIsAlldayEvent_data();
+ void testIsAlldayEvent();
+ void testGetLocation();
+ void testGetSelectedSlot();
+ void testFindRegion();
+ void testFindEvent();
+ void testIsAlldayEventSelected();
+ void testAlldayEvent();
void testConstructors();
@@ -367,6 +383,270 @@
}
/*!
+ Test CalenTimeColumn::ContainsEvent() function
+ 1. Test ContainsEvent(), no events
+ 2. Test ContainsEvent(), events found
+ */
+void TestCalenDayInfo::testTimeColumnContainsEvent()
+{
+ CalenTimeColumn column;
+
+ //1)
+ ulong id = 1;
+ QDateTime dateTime = QDateTime::currentDateTime();
+ bool instanceViewed = true;
+ TCalenInstanceId instanceId(id, dateTime, instanceViewed);
+ QCOMPARE(column.ContainsEvent(instanceId), false);
+
+ //2)
+ CalenTimedEventInfo info;
+ info.iStartSlot = 5;
+ info.iEndSlot = 10;
+ info.iId = instanceId;
+ column.AddEvent(info);
+ QCOMPARE(column.ContainsEvent(instanceId), true);
+}
+
+/*!
+ Test CalenTimeColumn::AddOffset() function
+ 1. Test addOffset, offset = 0
+ 2. Test addOffset, offset != 0, no events
+ 3. Test addOffset, offset != 0, events count > 0
+ */
+void TestCalenDayInfo::testTimeColumnAddOffset()
+{
+ const int start = 5;
+ const int end = 10;
+ CalenTimeColumn column;
+ column.iStartSlot = start;
+ column.iEndSlot = end;
+
+ //1)
+ int offset = 0;
+ column.AddOffset(offset, 0);
+ QCOMPARE(column.iStartSlot, start);
+ QCOMPARE(column.iEndSlot, end);
+
+ //2)
+ offset = 5;
+ column.AddOffset(offset, 0);
+ QCOMPARE(column.iStartSlot, start + offset);
+ QCOMPARE(column.iEndSlot, end + offset);
+
+ //3)
+ column.iStartSlot = start;
+ column.iEndSlot = end;
+ CalenTimedEventInfo eventInfo;
+ eventInfo.iStartSlot = start;
+ eventInfo.iEndSlot = end;
+ column.iEventArray.append(eventInfo);
+ column.AddOffset(offset, 0);
+ QCOMPARE(column.iStartSlot, start + offset);
+ QCOMPARE(column.iEndSlot, end + offset);
+ QCOMPARE(column.iEventArray.at(0).iStartSlot, start + offset);
+ QCOMPARE(column.iEventArray.at(0).iEndSlot, end + offset);
+}
+
+/*!
+ Test CalenSlotInterval::AddOffset() function
+ 1. Test addOffset, pos < iStartSlot
+ 2. Test addOffset, pos > iStartSlot
+ 3. Test addOffset, pos > iEndSlot
+ */
+void TestCalenDayInfo::testSlotIntervalAddOffset()
+{
+ const int start = 5;
+ const int end = 10;
+
+ CalenSlotInterval interval;
+ interval.iStartSlot = start;
+ interval.iEndSlot = end;
+
+ //1)
+ int offset = 2;
+ int pos = 0;
+ interval.AddOffset(offset, pos);
+ QCOMPARE(interval.iStartSlot, start + offset);
+ QCOMPARE(interval.iEndSlot, end + offset);
+
+ //2)
+ pos = 6;
+ interval.iStartSlot = start;
+ interval.iEndSlot = end;
+ interval.AddOffset(offset, pos);
+ QCOMPARE(interval.iStartSlot, start);
+ QCOMPARE(interval.iEndSlot, end + offset);
+
+ //3)
+ pos = 12;
+ interval.iStartSlot = start;
+ interval.iEndSlot = end;
+ interval.AddOffset(offset, pos);
+ QCOMPARE(interval.iStartSlot, start);
+ QCOMPARE(interval.iEndSlot, end);
+}
+
+/*!
+ Test CalenSlotInterval::Overlaps() function
+ 1. Test non overlapping interval
+ 2. Test overlapping interval
+ 3. Test overlapping interval
+ */
+void TestCalenDayInfo::testSlotIntervalOverlaps()
+{
+ CalenSlotInterval interval;
+ interval.iStartSlot = 5;
+ interval.iEndSlot = 10;
+
+ //1)
+ CalenSlotInterval testInterval;
+ testInterval.iStartSlot = 15;
+ testInterval.iEndSlot = 25;
+ QCOMPARE(interval.Overlaps(testInterval), false);
+
+ //2)
+ testInterval.iStartSlot = 1;
+ testInterval.iEndSlot = 8;
+ QCOMPARE(interval.Overlaps(testInterval), true);
+
+ //3)
+ testInterval.iStartSlot = 9;
+ testInterval.iEndSlot = 15;
+ QCOMPARE(interval.Overlaps(testInterval), true);
+}
+
+/*!
+ Test CalenSlotInterval::Union() function
+ 1. Test Union(), empty test interval
+ 2. TTest Union(), non empty test interval
+ */
+void TestCalenDayInfo::testSlotIntervalUnion()
+{
+ const int start = 5;
+ const int end = 10;
+
+ CalenSlotInterval interval;
+ interval.iStartSlot = start;
+ interval.iEndSlot = end;
+
+ //1)
+ CalenSlotInterval testInterval;
+ testInterval.iStartSlot = start - 1;
+ testInterval.iEndSlot = start - 2;
+ interval.Union(testInterval);
+ QCOMPARE(interval.iStartSlot, start);
+ QCOMPARE(interval.iEndSlot, end);
+
+ //2)
+ testInterval.iStartSlot = start + 1;
+ testInterval.iEndSlot = end + 1;
+ interval.Union(testInterval);
+ QCOMPARE(interval.iStartSlot, start);
+ QCOMPARE(interval.iEndSlot, end + 1);
+}
+
+/*!
+ Test CalenSlotInterval::Adjacent() function
+ 1. Test overlapping interval
+ 2. Test non overlapping interval, adjacent
+ 3. Test non overlapping interval, non adjacent
+ */
+void TestCalenDayInfo::testSlotIntervalAdjacent()
+{
+ const int start = 5;
+ const int end = 10;
+
+ CalenSlotInterval interval;
+ interval.iStartSlot = start;
+ interval.iEndSlot = end;
+
+ //1)
+ CalenSlotInterval testInterval;
+ testInterval.iStartSlot = start + 1;
+ testInterval.iEndSlot = end - 1;
+ QCOMPARE(interval.Adjacent(testInterval), true);
+
+ //2)
+ testInterval.iStartSlot = start - 3;
+ testInterval.iEndSlot = start;
+ QCOMPARE(interval.Adjacent(testInterval), true);
+
+ //3)
+ testInterval.iStartSlot = start - 3;
+ testInterval.iEndSlot = start - 1;
+ QCOMPARE(interval.Adjacent(testInterval), false);
+}
+
+/*!
+ Test CalenTimeRegion::AddOffset() function
+ 1. Test addOffset, offset = 0, intervals empty, columns empty
+ 2. Test addOffset, offset != 0, intervals empty, columns empty
+ 3. Test addOffset, offset != 0, intervals not empty, columns not empty
+ */
+void TestCalenDayInfo::testRegionAddOffset()
+{
+ CalenTimeRegion region;
+
+ //1)
+ int offset = 0;
+ int pos = 0;
+ region.AddOffset(offset, pos);
+ QCOMPARE(region.iIntervals.count(), 0);
+ QCOMPARE(region.iColumns.count(), 0);
+
+ //2)
+ offset = 2;
+ region.AddOffset(offset, pos);
+ QCOMPARE(region.iIntervals.count(), 0);
+ QCOMPARE(region.iColumns.count(), 0);
+
+ //3)
+ CalenEventInterval interval;
+ interval.iStartSlot = 1;
+ interval.iEndSlot = 5;
+ region.iIntervals.append(interval);
+
+ CalenTimeColumn column;
+ column.iStartSlot = 2;
+ column.iEndSlot = 4;
+ region.iColumns.append(column);
+
+ region.AddOffset(offset, pos);
+
+ QCOMPARE(region.iIntervals.at(0).iStartSlot, interval.iStartSlot + offset);
+ QCOMPARE(region.iIntervals.at(0).iEndSlot, interval.iEndSlot + offset);
+
+ QCOMPARE(region.iColumns.at(0).iStartSlot, column.iStartSlot + offset);
+ QCOMPARE(region.iColumns.at(0).iEndSlot, column.iEndSlot + offset);
+}
+
+/*!
+ Test CalenTimeRegion::Overlaps() function
+ 1. Test non overlapping
+ 2. Test overlapping
+ */
+void TestCalenDayInfo::testRegionOverlaps()
+{
+ CalenTimeRegion region;
+ region.iStartSlot = 5;
+ region.iEndSlot = 10;
+
+ CalenTimeColumn column;
+ region.iColumns.append(column);
+
+ //1)
+ CalenSlotInterval testInterval;
+ testInterval.iStartSlot = 15;
+ testInterval.iEndSlot = 20;
+ QCOMPARE(region.Overlaps(testInterval), false);
+
+ //2)
+ testInterval.iStartSlot = 4;
+ testInterval.iEndSlot = 12;
+ QCOMPARE(region.Overlaps(testInterval), true);
+}
+
+/*!
Test function for constructors
1. Test if CalenDayInfo is not initialized
2. Test if CalenDayInfo is correcty created
@@ -382,6 +662,196 @@
QVERIFY(testCalenDayInfo);
}
+/*!
+ Test data for testIsAlldayEvent
+ Data:
+ 1. Test if false is return when days are diferent
+ Below days are the same
+ 2. Test when start and end time are not midnight
+ 3. Test when start is midnight and end not
+ 4. Test when start is not midnight and end is
+ 5. Test when start and end are midnight
+ */
+void TestCalenDayInfo::testIsAlldayEvent_data()
+{
+ QTest::addColumn<QDateTime>("testedValueStart");
+ QTest::addColumn<QDateTime>("testedValueEnd");
+ QTest::addColumn<bool>("testValue");
+
+ QTest::newRow("Diferent days")
+ << QDateTime(QDate(2010,9,14),QTime(12,20))
+ << QDateTime(QDate(2010,9,15),QTime(12,20))
+ << false;
+ QTest::newRow("Diferent times, not midnight")
+ << QDateTime(QDate(2010,9,14),QTime(12,20))
+ << QDateTime(QDate(2010,9,14),QTime(16,40))
+ << false;
+ QTest::newRow("Diferent times, start is mignight")
+ << QDateTime(QDate(2010,9,14),QTime(0,0))
+ << QDateTime(QDate(2010,9,14),QTime(12,20))
+ << false;
+ QTest::newRow("Diferent times, end is mignight")
+ << QDateTime(QDate(2010,9,14),QTime(12,20))
+ << QDateTime(QDate(2010,9,14),QTime(0,0))
+ << false;
+ QTest::newRow("Both are midnight")
+ << QDateTime(QDate(2010,9,14),QTime(0,0,0,0))
+ << QDateTime(QDate(2010,9,15),QTime(0,0,0,0))
+ << true;
+}
+
+/*!
+ Test function for IsAllDayEvent, it use data from testIsAlldayEvent_data
+
+ */
+void TestCalenDayInfo::testIsAlldayEvent()
+{
+ //get data to test
+ QFETCH(QDateTime, testedValueStart);
+ QFETCH(QDateTime, testedValueEnd);
+ QFETCH(bool, testValue);
+
+ //make test
+ QCOMPARE(mInfo->IsAlldayEvent(testedValueStart,testedValueEnd),testValue);
+
+}
+
+void TestCalenDayInfo::testGetLocation()
+{
+
+}
+
+/*!
+ Test function for getSelectedSlot
+ 1)Check when there is no region is selected
+ 2)Check when region is selected
+ */
+void TestCalenDayInfo::testGetSelectedSlot()
+{
+ int slot = 0;
+ int region = 0;
+ int columnIndex = 0;
+ int columns = 0;
+ //1)
+ mInfo->iSelectedRegion = -1;
+ mInfo->GetSelectedSlot(slot,region,columnIndex,columns);
+ QCOMPARE(slot , mInfo->iSelectedSlot);
+ QCOMPARE(region, KErrNotFound);
+ QCOMPARE(columnIndex, mInfo->iSelectedColumn);
+ QCOMPARE(columns, 0);
+
+ //2)
+ CalenTimeRegion timeRegion = CalenTimeRegion();
+ timeRegion.iColumns << CalenTimeColumn();
+ mInfo->iRegionList.append(CalenTimeRegion());
+ mInfo->iRegionList.append(CalenTimeRegion());
+
+ mInfo->iSelectedRegion = 1;
+ mInfo->GetSelectedSlot(slot,region,columnIndex,columns);
+ QCOMPARE(slot , mInfo->iSelectedSlot);
+ QCOMPARE(region, mInfo->iSelectedRegion);
+ QCOMPARE(columnIndex, mInfo->iSelectedColumn);
+ QCOMPARE(columns, 0);
+}
+
+/*!
+ Test function for FindRegion.
+ 1)Preapre region in day infor
+ 2)Prepare region inside above
+ 3)Find this inside region
+ */
+void TestCalenDayInfo::testFindRegion()
+{
+#ifndef __WINSCW__
+ //1)
+ CalenTimeRegion region;
+ region.iStartSlot = 1;
+ region.iEndSlot = 16;
+ region.iColumns << CalenTimeColumn();
+ mInfo->iRegionList.append(region);
+
+ //2)
+ CalenSlotInterval interval;
+ interval.iStartSlot = 8;
+ interval.iEndSlot = 12;
+
+ //3)
+ QVERIFY(mInfo->FindRegion(interval,1) == 0);
+#endif /*__WINSCW__*/
+}
+
+/*!
+ Test function for FindEvent
+ 1)Prepare events and select one to test
+ 2)Find selected event
+ */
+void TestCalenDayInfo::testFindEvent()
+{
+#ifndef __WINSCW__
+ //1)
+ CalenTimedEventInfo event;
+ event.iStartSlot = 3;
+ event.iEndSlot = 13;
+
+ CalenTimeColumn column = CalenTimeColumn();
+ column.AddEvent(event);
+
+ CalenTimeRegion region;
+ region.iStartSlot = 1;
+ region.iEndSlot = 16;
+ region.iColumns << column;
+ mInfo->iRegionList.append(region);
+
+
+ region.iStartSlot = 17;
+ region.iEndSlot = 20;
+ mInfo->iRegionList.append(region);
+
+ //preapre data to search
+ CalenSlotInterval interval;
+ interval.iStartSlot = 8;
+ interval.iEndSlot = 12;
+
+ mInfo->iSelectedRegion = 0;
+ mInfo->iSelectedColumn = 0;
+
+ //2)
+ QVERIFY(mInfo->FindEvent(interval,1) == 0);
+#endif /*__WINSCW__*/
+}
+
+/*!
+ Test function for IsAlldayEventSelected
+ 1)There is no all day event selected
+ 2)There is all day event selected
+ */
+void TestCalenDayInfo::testIsAlldayEventSelected()
+{
+ //1)
+ QVERIFY(mInfo->IsAlldayEventSelected() == false);
+
+ //2)
+ mInfo->iSelectedAlldayEvent = 0;
+ mInfo->iAlldayEvents.append(CalenTimedEventInfo());
+
+ QVERIFY(mInfo->IsAlldayEventSelected() == true);
+}
+
+/*!
+ Test function for AlldayEvent
+ 1)Prepare all day event at inxdex 0
+ 2)Check if good all day event is returned
+ */
+void TestCalenDayInfo::testAlldayEvent()
+{
+ CalenTimedEventInfo allDayEvent;
+ TCalenInstanceId id;
+ id = TCalenInstanceId::create(100, QDateTime(QDate(2010,9,21), QTime(12,12,12)),false);
+ allDayEvent.iId = id;
+ mInfo->iAlldayEvents.append(allDayEvent);
+
+ QVERIFY(mInfo->AlldayEvent(0).iId == id);
+}
QTEST_MAIN(TestCalenDayInfo);
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -68,6 +68,8 @@
void testUpdateChildItems();
void testHasEventDescription();
void testHasBackgroundFrame();
+ void testSetDescription();
+ void testSetStatusStrip();
void testConstructors();
private:
@@ -164,9 +166,142 @@
delete testItem;
}
+/*!
+ Test function for updating child items
+ 1. Test if child items are updated
+ 2. Just for coverage testing
+ */
void TestCalenDayItem::testUpdateChildItems()
{
+#ifndef __WINSCW__
+ //1)
+ mItem->mUpdated = false;
+ mItem->updateChildItems();
+ QCOMPARE(mItem->mUpdated, true);
+
+ //2)
+ mItem->mUpdated = true;
+ mItem->updateChildItems();
+ QCOMPARE(mItem->mUpdated, true);
+#endif
+}
+/*!
+ Test setting description of entry
+ 1. Setting description if only location is set
+ 2. Setting description if location and summary are set
+ 3. Setting description if location and summary are not set
+ 4. Setting description if summary is set and event is for all day
+ 5. Setting description if location and summary are set and event is
+ for all day
+ */
+void TestCalenDayItem::testSetDescription()
+{
+#ifndef __WINSCW__
+ AgendaEntry entry;
+ QString location("testLocation");
+ QString summary("testSummary");
+
+ //1)
+ entry.setLocation(location);
+ entry.setSummary("");
+ mItem->setDescription(entry, false);
+ QCOMPARE(mItem->mEventDesc->text(), location);
+
+ //2)
+ entry.setLocation(location);
+ entry.setSummary(summary);
+ mItem->setDescription(entry, false);
+ QString expected(summary);
+ expected.append(", ");
+ expected.append(location);
+ QCOMPARE(mItem->mEventDesc->text(), expected);
+
+ //3)
+ entry.setLocation("");
+ entry.setSummary("");
+ mItem->setDescription(entry, false);
+ QCOMPARE(mItem->mEventDesc->text(), hbTrId("txt_calendar_dblist_unnamed"));
+
+ //4)
+ entry.setLocation("");
+ entry.setSummary(summary);
+ mItem->setDescription(entry, true);
+ expected = "";
+ for (int i = 0; i < summary.count(); i++) {
+ expected.append(QString(summary.at(i)) + "\n");
+ }
+ QCOMPARE(mItem->mEventDesc->text(), expected);
+
+ //5)
+ entry.setLocation(location);
+ entry.setSummary(summary);
+ mItem->setDescription(entry, true);
+ QString description(summary + ", " + location);
+ expected = "";
+ for (int i = 0; i < description.count(); i++) {
+ expected.append(QString(description.at(i)) + "\n");
+ }
+ if (summary.count()) {
+ expected.remove(2 * summary.count() - 1, 1);
+ }
+ QCOMPARE(mItem->mEventDesc->text(), expected);
+#endif
+}
+
+/*!
+ Test setting status strip
+ 1. Setting status strip for event
+ 2. Setting status strip for all day event
+ 3. Setting status strip for confirmed event
+ 4. Setting status strip for tentative event
+ 5. Setting status strip for cancelled event
+ */
+void TestCalenDayItem::testSetStatusStrip()
+{
+#ifndef __WINSCW__
+ AgendaEntry entry;
+ QDateTime startTimeIn(QDate(12, 07, 2010), QTime(7, 0));
+ QDateTime endTimeIn(QDate(12, 07, 2010), QTime(10, 0));
+
+ //1)
+ entry.setStartAndEndTime(startTimeIn, endTimeIn);
+ mItem->setStatusStrip(entry, false);
+
+ QDateTime startTime;
+ QDateTime endTime;
+ QDateTime currentDateTime;
+ currentDateTime.setDate(mItem->container()->date());
+ CalenDayUtils::instance()->getEventValidStartEndTime(startTime, endTime,
+ entry, currentDateTime);
+ QPair<QTime, QTime> startEndTime = mItem->mColorStripe->startEndTime();
+ QCOMPARE(startEndTime.first, startTime.time());
+ QCOMPARE(startEndTime.second, endTime.time());
+
+ //2)
+ mItem->setStatusStrip(entry, true);
+ startEndTime = mItem->mColorStripe->startEndTime();
+ QCOMPARE(startEndTime.first, startTime.time());
+ QCOMPARE(startEndTime.second, endTime.time().addSecs(-1));
+
+ //3)
+ entry.setStatus(AgendaEntry::Confirmed);
+ mItem->setStatusStrip(entry, false);
+ QCOMPARE(CalenDayStatusStrip::Filled,
+ mItem->mColorStripe->drawingStyle());
+
+ //4)
+ entry.setStatus(AgendaEntry::Tentative);
+ mItem->setStatusStrip(entry, false);
+ QCOMPARE(CalenDayStatusStrip::StripWithLines,
+ mItem->mColorStripe->drawingStyle());
+
+ //5)
+ entry.setStatus(AgendaEntry::Cancelled);
+ mItem->setStatusStrip(entry, false);
+ QCOMPARE(CalenDayStatusStrip::OnlyFrame,
+ mItem->mColorStripe->drawingStyle());
+#endif
}
void TestCalenDayItem::testHasEventDescription()
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendayinfo.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendayinfo.h Tue Oct 05 13:57:00 2010 +0530
@@ -75,6 +75,21 @@
};
/*!
+ Mocked class CalenTimedEventInfo
+ */
+class CalenTimedEventInfo
+{
+public:
+ CalenTimedEventInfo() {
+
+ }
+
+ ~CalenTimedEventInfo() {
+
+ }
+};
+
+/*!
Mocked class CalenDayInfo
*/
class CalenDayInfo
@@ -96,9 +111,23 @@
}
- void Reset() {}
+ void Reset()
+ {
+ mList.clear();
+ iAlldayEvents.clear();
+ }
- void InsertTimedEvent( const SCalenApptInfo& aItemInfo ) {Q_UNUSED(aItemInfo);}
+ void InsertTimedEvent( const SCalenApptInfo& aItemInfo )
+ {
+ Q_UNUSED(aItemInfo);
+ CalenTimeRegion region;
+
+ region.iStartSlot = 10;
+ region.iEndSlot = 13;
+ region.iColumns << CalenTimeColumn();
+
+ mList << region;
+ }
void GetLocation( const SCalenApptInfo& aItemInfo, int& aStartSlot,
@@ -113,7 +142,7 @@
int AlldayCount()
{
- return 0;
+ return iAlldayEvents.count();
}
const QList<CalenTimeRegion>& RegionList() const
@@ -124,18 +153,14 @@
void InsertAlldayEvent( const SCalenApptInfo& aItemInfo )
{
Q_UNUSED(aItemInfo)
-
- CalenTimeRegion region;
- region.iStartSlot = 10;
- region.iEndSlot = 13;
- region.iColumns << CalenTimeColumn();
-
- mList << region;
+ CalenTimedEventInfo info;
+ iAlldayEvents.append(info);
}
public:
QList<CalenTimeRegion> mList;
+ QList<CalenTimedEventInfo> iAlldayEvents;
};
#endif // CALENDAYINFO_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendaymodel.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendaymodel.h Tue Oct 05 13:57:00 2010 +0530
@@ -43,18 +43,47 @@
{
Q_UNUSED(date)
Q_UNUSED(parent)
- Q_UNUSED(date)
+ Q_UNUSED(services)
};
+ void Reset()
+ {
+ mEntryList.clear();
+ }
+
+ bool insertRows(int num, int row, const QModelIndex &aparent)
+ {
+ Q_UNUSED(row);
+ Q_UNUSED(aparent);
+ AgendaEntry entry;
+ if ( !num ) {
+ entry.setType( AgendaEntry::TypeAppoinment ); //or reminder
+ // non all day event
+ entry.setStartAndEndTime( QDateTime(QDate(2010,07,12),QTime(0,0)),
+ QDateTime(QDate(2010,07,12),QTime(1,0)) );
+ }
+ else {
+ entry.setType( AgendaEntry::TypeEvent );
+ // all day event
+ entry.setStartAndEndTime( QDateTime(QDate(2010,07,12),QTime(0,0)),
+ QDateTime(QDate(2010,07,13),QTime(0,0)) );
+ }
+ mEntryList.append(QVariant::fromValue(entry));
+ return true;
+ }
+
// from QAbstractListModel
int rowCount(const QModelIndex &parent = QModelIndex()) const
{
- return 0;
+ Q_UNUSED(parent)
+ return mEntryList.count();
}
- QVariant data(const QModelIndex &index, int role) const
+
+ QVariant data(const QModelIndex &index, int role) const
{
- Q_UNUSED(index)
- Q_UNUSED(role)
+ if ( role == CalenDayEntry ) {
+ return mEntryList.at(index.row());
+ }
return QVariant();
}
@@ -65,7 +94,8 @@
QDateTime modelDate() const
{return QDateTime();}
-
+
+ QVariantList mEntryList;
};
#endif //CALENDAYMODEL_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -23,10 +23,12 @@
#include <hbabstractitemview.h>
#include <hbmenu.h>
+#ifndef __WINSCW__
#define private public
+#endif
#include "calendayitemview.h"
-
+#include "calendaymodel.h"
// Test variables
QRectF gTestWindowRect = QRectF(0, 0, 10, 20);
@@ -52,6 +54,10 @@
void testOpenSelectedItem();
void testEditSelectedItem();
void testDeleteSelectedItem();
+ void testItemActivated();
+ void testSetContextMenu();
+ void testContextMenu();
+ void testModelReset();
private:
MCalenServices mMCalenServices;
CalenDayItemView *mCalenDayItemView;
@@ -97,6 +103,8 @@
{
HbModelIterator *iterator = new HbModelIterator();
mCalenDayItemView = new CalenDayItemView(mMCalenServices,iterator,0);
+ mCalenDayItemView->setModel(new CalenDayModel(
+ QDateTime(QDate(12,07,2010),QTime(6,0)), mMCalenServices));
SELECTED_COMMAND = 0;
}
@@ -129,37 +137,154 @@
delete testItemView;
}
+/*!
+ Test issueing command on selected item.
+ */
void TestCalenItemView::testIssueCommandOnSelectedItem()
{
#ifndef __WINSCW__
+ mCalenDayItemView->model()->insertRow(0, QModelIndex());
+ QModelIndex modelIndex = mCalenDayItemView->model()->index(0, 0,
+ QModelIndex());
+ mCalenDayItemView->selectionModel()->setCurrentIndex(modelIndex,
+ QItemSelectionModel::Select);
mCalenDayItemView->issueCommandOnSelectedItem((quint32)ECalenEventView);
QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEventView);
#endif
}
+/*!
+ Test opening command on selected item.
+ */
void TestCalenItemView::testOpenSelectedItem()
{
#ifndef __WINSCW__
+ mCalenDayItemView->model()->insertRow(0, QModelIndex());
+ QModelIndex modelIndex = mCalenDayItemView->model()->index(0, 0,
+ QModelIndex());
+ mCalenDayItemView->selectionModel()->setCurrentIndex(modelIndex,
+ QItemSelectionModel::Select);
mCalenDayItemView->openSelectedItem();
QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEventView);
#endif
}
+/*!
+ Test edit command on selected item.
+ */
void TestCalenItemView::testEditSelectedItem()
{
#ifndef __WINSCW__
+ mCalenDayItemView->model()->insertRow(0, QModelIndex());
+ QModelIndex modelIndex = mCalenDayItemView->model()->index(0, 0,
+ QModelIndex());
+ mCalenDayItemView->selectionModel()->setCurrentIndex(modelIndex,
+ QItemSelectionModel::Select);
mCalenDayItemView->editSelectedItem();
QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEditCurrentEntry);
#endif
}
+/*!
+ Test delete command on selected item.
+ */
void TestCalenItemView::testDeleteSelectedItem()
{
#ifndef __WINSCW__
+ mCalenDayItemView->model()->insertRow(0, QModelIndex());
+ QModelIndex modelIndex = mCalenDayItemView->model()->index(0, 0,
+ QModelIndex());
+ mCalenDayItemView->selectionModel()->setCurrentIndex(modelIndex,
+ QItemSelectionModel::Select);
mCalenDayItemView->deleteSelectedItem();
QCOMPARE(SELECTED_COMMAND,(quint32)ECalenDeleteCurrentEntry);
#endif
}
+/*!
+ Test activation of item.
+ */
+void TestCalenItemView::testItemActivated()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->model()->insertRow(0, QModelIndex());
+ QModelIndex modelIndex = mCalenDayItemView->model()->index(0, 0,
+ QModelIndex());
+ mCalenDayItemView->selectionModel()->setCurrentIndex(modelIndex,
+ QItemSelectionModel::Select);
+ mCalenDayItemView->itemActivated( modelIndex );
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEventView);
+#endif
+}
+
+/*!
+ Test setting context menu
+ */
+void TestCalenItemView::testSetContextMenu()
+{
+ HbMenu* contextMenu = new HbMenu(NULL);
+ mCalenDayItemView->setContextMenu(contextMenu);
+ QCOMPARE(contextMenu, mCalenDayItemView->contextMenu());
+ delete contextMenu;
+}
+
+/*!
+ Test context menu
+ 1. Testing existing context menu
+ 2. Setting new context menu
+ */
+void TestCalenItemView::testContextMenu()
+{
+ //1)
+ QVERIFY(mCalenDayItemView->contextMenu() != NULL);
+
+ //2)
+ HbMenu* contextMenu = new HbMenu(NULL);
+ mCalenDayItemView->setContextMenu(contextMenu);
+ QCOMPARE(contextMenu, mCalenDayItemView->contextMenu());
+ delete contextMenu;
+}
+
+/*!
+ Test model reset
+ 1. Inserting timed event directly
+ 2. Inserting timed event to model
+ 3. Inserting al day event to model
+ 4. Setting model
+ 5. Setting day event info
+ */
+void TestCalenItemView::testModelReset()
+{
+#ifndef __WINSCW__
+ //1)
+ SCalenApptInfo dayInfo;
+ mCalenDayItemView->mInfo->InsertTimedEvent(dayInfo);
+ mCalenDayItemView->modelReset();
+ QCOMPARE(mCalenDayItemView->mInfo->RegionList().count(), 0);
+
+ //2)
+ // insert timed event
+ mCalenDayItemView->model()->insertRow(0, QModelIndex());
+ mCalenDayItemView->modelReset();
+ QCOMPARE(mCalenDayItemView->mInfo->RegionList().count(), 1);
+
+ //3)
+ // insert all day event
+ mCalenDayItemView->model()->insertRow(1, QModelIndex());
+ mCalenDayItemView->modelReset();
+ QCOMPARE(mCalenDayItemView->mInfo->AlldayCount(), 1);
+
+ //4)
+ mCalenDayItemView->setModel(NULL);
+ mCalenDayItemView->modelReset();
+ QCOMPARE(mCalenDayItemView->mInfo->RegionList().count(), 0);
+
+ //5)
+ mCalenDayItemView->mInfo = NULL;
+ mCalenDayItemView->modelReset();
+ QVERIFY(mCalenDayItemView->mInfo == NULL);
+#endif
+}
+
QTEST_MAIN(TestCalenItemView);
#include "unittest_calendayitemview.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/calenservices.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/calenservices.h Tue Oct 05 13:57:00 2010 +0530
@@ -43,6 +43,8 @@
QList<AgendaEntry> createEntryIdListForDay(const QDateTime &date,AgendaUtil::FilterFlags filter)
{
+ Q_UNUSED(date);
+ Q_UNUSED(filter);
QList<AgendaEntry> agenda;
AgendaEntry entry;
agenda << entry;
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -105,6 +105,7 @@
Test function for constructors
1. Test if model is not initialized
2. Test if model is correcty created
+ 3. Test if model is created but not initialized
*/
void TestCalenDayModel::testConstructors()
{
@@ -117,6 +118,13 @@
QVERIFY(testModel);
delete testModel;
+ testModel = 0;
+ //3)
+ QDateTime invalidDate = QDateTime::fromString("Invalid text");
+ testModel = new CalenDayModel(invalidDate, *mServices);
+
+ QVERIFY(testModel);
+ QVERIFY(testModel->modelDate().isValid() == false);
}
void TestCalenDayModel::testRowCount()
@@ -125,19 +133,37 @@
QCOMPARE(mModel->rowCount(QModelIndex()), 1);
}
+/*!
+ Test if it return good model data
+ 1)Test invalid model index
+ 2)Index is bigger than entry values
+ 3)Index is valid and there is entry value
+ 4)Wrong role
+ */
void TestCalenDayModel::testData()
{
+
+
mModel->refreshModel(QDateTime());
+ //1)
QVariant var = mModel->data(QModelIndex(), Qt::UserRole + 1);
- QString typeName(var.typeName());
- QCOMPARE(typeName, QString());
- mModel->refreshModel(QDateTime());
+ QCOMPARE(var, QVariant());
+
+ //2)
+ QModelIndex index = mModel->index(5);
- var = mModel->data(QModelIndex(), Qt::UserRole + 1);
- typeName = QString(var.typeName());
- QCOMPARE(typeName, QString(""));
+ var = mModel->data(index, Qt::UserRole + 1);
+ QCOMPARE(var, QVariant());
+ //3)
+ index = mModel->index(0);
+ var = mModel->data(index, Qt::UserRole + 1);
+ QCOMPARE(var.canConvert<AgendaEntry> (),true);
+
+ //4)
+ var = mModel->data(index, Qt::UserRole + 10);
+ QCOMPARE(var, QVariant());
}
void TestCalenDayModel::testRefreshModel()
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.pro Tue Oct 05 13:57:00 2010 +0530
@@ -32,7 +32,7 @@
../../../src/
# Input
-HEADERS += calendaymodel.h
+HEADERS += calendaymodel.h
SOURCES += unittest_calendaymodel.cpp \
calendaymodel.cpp
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/calencontext.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/calencontext.h Tue Oct 05 13:57:00 2010 +0530
@@ -24,6 +24,8 @@
class TCalenInstanceId;
class QDateTime;
+extern QDateTime CURRENT_DATE;
+
// INCLUDES
// CLASS DEFINITIONS
@@ -36,7 +38,7 @@
public :
QDateTime focusDateAndTime()
{
- return QDateTime(QDate(2000, 10, 10));
+ return CURRENT_DATE;
}
};
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/calendaymodel.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/calendaymodel.h Tue Oct 05 13:57:00 2010 +0530
@@ -41,9 +41,10 @@
public:
CalenDayModel(const QDateTime &date, MCalenServices &services,
QObject *parent = 0){
- Q_UNUSED(date);
Q_UNUSED(services);
Q_UNUSED(parent);
+ mModelRefreshed = 0;
+ mModelDate = date;
}
// from QAbstractListModel
@@ -58,12 +59,20 @@
}
void refreshModel(const QDateTime &date){
- Q_UNUSED(date);
+ mModelDate = date;
+ mModelRefreshed++;
}
QDateTime modelDate(){
- return QDateTime(QDate(2000, 10, 10));
+ return mModelDate;
}
+
+ //return info how much time model was refreshed
+ quint32 modelRefreshed() {return mModelRefreshed;}
+
+private:
+ quint32 mModelRefreshed;
+ QDateTime mModelDate;
};
#endif //CALENDAYMODEL_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/unittest_calendaymodelmanager.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/unittest_calendaymodelmanager.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -20,6 +20,8 @@
#include "calendaymodel.h"
#include "calendaymodelmanager.h"
+QDateTime CURRENT_DATE;
+
class TestCalenDayModelManager : public QObject
{
Q_OBJECT
@@ -37,6 +39,9 @@
void testGetModel();
void testRefreshAllModels();
void testRefreshSingleModel();
+ void testMoveBackward();
+ void testMoveForward();
+ //refreshAllModels
void testConstructors();
@@ -82,6 +87,7 @@
*/
void TestCalenDayModelManager::init()
{
+ CURRENT_DATE = QDateTime(QDate(2000, 10, 10));
mManager = new CalenDayModelManager(services, false);
}
@@ -121,28 +127,124 @@
delete testManager2;
}
+/*!
+ Test function for getModel.
+
+ It check is model has date setted if yes, then it is created.
+ */
void TestCalenDayModelManager::testGetModel()
- {
- MCalenServices services;
- CalenDayModel* model = static_cast<CalenDayModel*>(&(mManager->getModel(CalenDayModelManager::CurrentDay)));
- QCOMPARE(model->modelDate(), services.Context().focusDateAndTime());
- }
+{
+ CalenDayModel* model = static_cast<CalenDayModel*> (&(mManager->getModel(
+ CalenDayModelManager::CurrentDay)));
+ QCOMPARE(model->modelDate(), CURRENT_DATE);
+}
+/*!
+ Test function for RefreshAllModels
+ 1)Check that, all models are not refreshed
+ 2)Check that all folders are refreshed
+ */
void TestCalenDayModelManager::testRefreshAllModels()
- {
-
- }
+{
+ //1)
+ CalenDayModel* model1;
+ CalenDayModel* model2;
+ CalenDayModel* model3;
+
+ model1 = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::PreviousDay)));
+ model2 = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::CurrentDay)));
+ model3 = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::NextDay)));
+ QVERIFY(model1->modelRefreshed() == 0);
+ QVERIFY(model2->modelRefreshed() == 0);
+ QVERIFY(model3->modelRefreshed() == 0);
+
+ //2)
+ mManager->refreshAllModels();
+ model1 = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::PreviousDay)));
+ model2 = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::CurrentDay)));
+ model3 = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::NextDay)));
+ QVERIFY(model1->modelRefreshed() == 1);
+ QVERIFY(model2->modelRefreshed() == 1);
+ QVERIFY(model3->modelRefreshed() == 1);
+}
+/*!
+ Test functuion for RefreshSingleModel
+ 1) test refresh model for current day
+ 2) test refresh model for previous day
+ 3) test refresh model for next day
+ 4) test refresh model for no model selected
+ */
void TestCalenDayModelManager::testRefreshSingleModel()
- {
- mManager->refreshSingleModel(CalenDayModelManager::CurrentDay);
- QVERIFY(mManager);
- mManager->refreshSingleModel(CalenDayModelManager::PreviousDay);
- QVERIFY(mManager);
- mManager->refreshSingleModel(CalenDayModelManager::NextDay);
- QVERIFY(mManager);
- }
+{
+ CalenDayModel* model;
+
+ //1)
+ mManager->refreshSingleModel(CalenDayModelManager::CurrentDay);
+ model = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::CurrentDay)));
+ QVERIFY(model->modelRefreshed() > 0);
+
+ //2)
+ mManager->refreshSingleModel(CalenDayModelManager::PreviousDay);
+ model = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::PreviousDay)));
+ QVERIFY(model->modelRefreshed() > 0);
+
+ //3)
+ mManager->refreshSingleModel(CalenDayModelManager::NextDay);
+ model = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::NextDay)));
+ QVERIFY(model->modelRefreshed() > 0);
+
+ //4) it is equal 1 because each model was refreshed
+ mManager->refreshSingleModel(CalenDayModelManager::NumberOfDays);
+ model = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::CurrentDay)));
+ QVERIFY(model->modelRefreshed() == 1);
+ model = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::PreviousDay)));
+ QVERIFY(model->modelRefreshed() == 1);
+ model = static_cast<CalenDayModel*> (&(mManager->getModel(CalenDayModelManager::NextDay)));
+ QVERIFY(model->modelRefreshed() == 1);
+}
+/*!
+ test function for moveBackward()
+ 1)test if model for current date is good
+ 2)test if model change after bacward
+
+ It test also CalenDayModelManager::viewsScrollingFinished
+ */
+void TestCalenDayModelManager::testMoveBackward()
+{
+ //1)
+ CalenDayModel* model = static_cast<CalenDayModel*>(&(mManager->getModel(CalenDayModelManager::CurrentDay)));
+ QCOMPARE(model->modelDate(), CURRENT_DATE);
+
+ //2)
+ mManager->viewsScrollingFinished(ECalenScrollToPrev);
+
+ model = static_cast<CalenDayModel*>(&(mManager->getModel(CalenDayModelManager::CurrentDay)));
+ QCOMPARE(model->modelDate(), CURRENT_DATE.addDays(-1));
+}
+
+/*!
+ test function for moveBackward()
+ 1)test if model for current date is good
+ 2)test if model change after forward
+
+ It test also CalenDayModelManager::viewsScrollingFinished
+ */
+void TestCalenDayModelManager::testMoveForward()
+{
+ //1)
+ CalenDayModel* model = static_cast<CalenDayModel*> (&(mManager->getModel(
+ CalenDayModelManager::CurrentDay)));
+ QCOMPARE(model->modelDate(), CURRENT_DATE);
+
+ //2)
+ mManager->viewsScrollingFinished(ECalenScrollToNext);
+
+ model = static_cast<CalenDayModel*> (&(mManager->getModel(
+ CalenDayModelManager::CurrentDay)));
+ QCOMPARE(model->modelDate(), CURRENT_DATE.addDays(1));
+}
QTEST_MAIN(TestCalenDayModelManager);
#include "unittest_calendaymodelmanager.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -24,6 +24,8 @@
#include <QImage>
#include <QPair>
+#include "calendayutils.h"
+
const qreal WIDGET_WIDTH = 50;
const qreal WIDGET_HEIGHT = 150;
@@ -185,9 +187,12 @@
Test setting and getting start and end time of event
1)Set end and start of event
2)Change values
+ 3)Setting event shorter than 300 seconds
+ 4)Setting event for 300 seconds
*/
void TestCalenStatusStrip::testStartEndTime()
{
+ //1)
QPair<QTime, QTime> startEndTime;
startEndTime.first = QTime(12,12,12);
startEndTime.second = QTime(15,15,15);
@@ -197,6 +202,7 @@
QCOMPARE(mStatusStrip->startEndTime().first,startEndTime.first);
QCOMPARE(mStatusStrip->startEndTime().second,startEndTime.second);
+ //2)
startEndTime.first = QTime(1,1,1);
startEndTime.second = QTime(5,5,5);
@@ -204,6 +210,21 @@
QCOMPARE(mStatusStrip->startEndTime().first,startEndTime.first);
QCOMPARE(mStatusStrip->startEndTime().second,startEndTime.second);
+
+ //3)
+ // if time less than 300 seconds set it to 300 seconds (5 minutes)
+ startEndTime.first = QTime(0,0,0);
+ startEndTime.second = QTime(0,4,59);
+ mStatusStrip->setStartEndTime(startEndTime.first,startEndTime.second);
+ startEndTime.second = QTime(startEndTime.first.hour(),
+ startEndTime.first.minute() + 5);
+ QCOMPARE(mStatusStrip->startEndTime().second,startEndTime.second);
+
+ //4)
+ // check if ok for 300 seconds
+ startEndTime.second = QTime(0,5,00);
+ mStatusStrip->setStartEndTime(startEndTime.first,startEndTime.second);
+ QCOMPARE(mStatusStrip->startEndTime().second,startEndTime.second);
}
/*!
@@ -314,6 +335,8 @@
Test calculating minute height based on widget height and given time.
1)Calculate on given time
2)Change time of event
+ 3)For event longer than 15 minutes
+ 4)For event shorter than or equal to 15 minutes
*/
void TestCalenStatusStrip::testCalculateMinuteHegiht()
{
@@ -332,6 +355,20 @@
QTime(11,30,0));
testValue = WIDGET_HEIGHT / (qreal)90;
QCOMPARE(testedValue,testValue);
+
+ //3)
+ testedValue = mStatusStrip->calculateMinuteHeight(QTime(10,00,0),
+ QTime(10,29,0));
+ testValue = CalenDayUtils::instance()->hourElementHeight()
+ / ((qreal)2 * (qreal)29);
+ QCOMPARE(testedValue,testValue);
+
+ //4)
+ testedValue = mStatusStrip->calculateMinuteHeight(QTime(10,00,0),
+ QTime(10,15,0));
+ testValue = CalenDayUtils::instance()->hourElementHeight()
+ / ((qreal)4 * (qreal)15);
+ QCOMPARE(testedValue,testValue);
}
@@ -370,7 +407,64 @@
img.save("c:/unittest/TestCalenStatusStrip_testPaint.jpg");
#endif
+
+ //2)
+ //preapre data needed to draw on widget
+ startEndTime.first = QTime(10,59,0);
+ startEndTime.second = QTime(11,0,00);
+ //set event time
+ mStatusStrip->setStartEndTime(startEndTime.first,startEndTime.second);
+
+ //resize widget to be bigger than (0,0)
+ mStatusStrip->resize(WIDGET_WIDTH,WIDGET_HEIGHT);
+ size = mStatusStrip->size().toSize();
+
+ //create image that will simulate widget where painting should be done
+ QImage img2(size, QImage::Format_RGB32);
+ //create painter which will be used to paint
+ QPainter painter2(&img2);
+ //fill image with white color to have better filings with look of "paper"
+ painter2.fillRect(0,0,size.width(),size.height(),QColor(Qt::white));
+ // set drawing style
+ mStatusStrip->setDrawingStyle(CalenDayStatusStrip::StripWithLines);
+ //run paint
+ mStatusStrip->paint(&painter2,0);
+
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img2.save("c:/unittest/TestCalenStatusStrip_testPaintTC2.jpg");
+
+#endif
+
+ //3)
+ //preapre data needed to draw on widget
+ startEndTime.first = QTime(10,59,0);
+ startEndTime.second = QTime(11,0,00);
+
+ //set event time
+ mStatusStrip->setStartEndTime(startEndTime.first,startEndTime.second);
+
+ //resize widget to be bigger than (0,0)
+ mStatusStrip->resize(WIDGET_WIDTH,WIDGET_HEIGHT);
+ size = mStatusStrip->size().toSize();
+
+ //create image that will simulate widget where painting should be done
+ QImage img3(size, QImage::Format_RGB32);
+ //create painter which will be used to paint
+ QPainter painter3(&img3);
+ //fill image with white color to have better filings with look of "paper"
+ painter3.fillRect(0,0,size.width(),size.height(),QColor(Qt::white));
+ // set drawing style
+ mStatusStrip->setDrawingStyle(CalenDayStatusStrip::OnlyFrame);
+ //run paint
+ mStatusStrip->paint(&painter3,0);
+
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img3.save("c:/unittest/TestCalenStatusStrip_testPaintTC3.jpg");
+
+#endif
}
QTEST_MAIN(TestCalenStatusStrip);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/agendaentry.h Tue Oct 05 13:57:00 2010 +0530
@@ -0,0 +1,58 @@
+/*
+* 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: Mocked class AgendaEntry
+*
+*/
+
+#ifndef AGENDAENTRY_H
+#define AGENDAENTRY_H
+
+// System includes
+#include <QObject>
+#include <QDate>
+#include <QDateTime>
+
+class AgendaEntry
+{
+public:
+ AgendaEntry() {
+
+ }
+ virtual ~AgendaEntry() {
+
+ }
+
+ bool setStartAndEndTime(
+ const QDateTime& startTime, const QDateTime& endTime) {
+ mStartTime = startTime;
+ mEndTime = endTime;
+
+ return true;
+ }
+
+ QDateTime startTime() const {
+ return mStartTime;
+ }
+
+ QDateTime endTime() const {
+ return mEndTime;
+ }
+
+ QDateTime mStartTime;
+ QDateTime mEndTime;
+};
+
+#endif // AGENDAENTRY_H
+
+// End of file --Don't remove this.
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -21,6 +21,7 @@
#include "calendayutils.h"
#include "hbdeviceprofile.h"
#include "calendaycommonheaders.h"
+#include "agendaentry.h"
// Test variables
QRectF gTestWindowRect = QRectF(0, 0, 10, 20);
@@ -29,119 +30,188 @@
qreal unitInPix = 1;
class TestCalenDayUtils : public QObject
- {
+{
Q_OBJECT
public:
- TestCalenDayUtils();
- virtual ~TestCalenDayUtils();
+ TestCalenDayUtils();
+ virtual ~TestCalenDayUtils();
private slots:
- void initTestCase();
- void cleanupTestCase();
- void init();
- void cleanup();
+ void initTestCase();
+ void cleanupTestCase();
+ void init();
+ void cleanup();
- void testInstance();
- void testScreenWidth();
- void testHourElementWidth();
- void testHourElementHeight();
- void testContentWidth();
+ void testInstance();
+ void testScreenWidth();
+ void testHourElementWidth();
+ void testHourElementHeight();
+ void testContentWidth();
+ void testMinEventHeight();
+ void testMainWindow();
+ void testGetEventValidStartEndTime();
- void testConstructors();
- void testOrientation();
+ void testConstructors();
+ void testOrientation();
private:
- CalenDayUtils *mUtils;
- qreal mUnit;
- };
+ CalenDayUtils *mUtils;
+ qreal mUnit;
+};
/*!
Constructor
*/
TestCalenDayUtils::TestCalenDayUtils() :
- mUtils(NULL)
- {
- HbDeviceProfile s;
- mUnit = s.unitValue();
- }
+ mUtils(NULL)
+{
+ HbDeviceProfile s;
+ mUnit = s.unitValue();
+}
/*!
Destructor
*/
TestCalenDayUtils::~TestCalenDayUtils()
- {
+{
- }
+}
/*!
Called before testcase
*/
void TestCalenDayUtils::initTestCase()
- {
- }
+{
+}
/*!
Called after testcase
*/
void TestCalenDayUtils::cleanupTestCase()
- {
- }
+{
+}
/*!
Called before every function
*/
void TestCalenDayUtils::init()
- {
- mUtils = CalenDayUtils::instance();
- }
+{
+ mUtils = CalenDayUtils::instance();
+}
/*!
Called after everyfunction
*/
void TestCalenDayUtils::cleanup()
- {
- //delete mUtils;
- }
+{
+ //delete mUtils;
+}
void TestCalenDayUtils::testInstance()
- {
- CalenDayUtils* utils = CalenDayUtils::instance();
- QVERIFY(utils);
- }
+{
+ CalenDayUtils* utils = CalenDayUtils::instance();
+ QVERIFY(utils);
+}
void TestCalenDayUtils::testScreenWidth()
- {
- qreal sw = mUtils->screenWidth();
- QVERIFY(sw == gTestWindowRect.width());
- }
+{
+ qreal sw = mUtils->screenWidth();
+ QVERIFY(sw == gTestWindowRect.width());
+}
void TestCalenDayUtils::testHourElementWidth()
- {
- qreal hEW = mUtils->hourElementWidth();
- qreal myWidth = mUnit * 8.04 + param_value * 2;
-
- QCOMPARE(hEW, myWidth);
-
- }
+{
+ qreal hEW = mUtils->hourElementWidth();
+ qreal myWidth = mUnit * 8.04 + param_value * 2;
+
+ QCOMPARE(hEW, myWidth);
+
+}
void TestCalenDayUtils::testHourElementHeight()
- {
-
- qreal hEH = mUtils->hourElementHeight();
- qreal myHeight = mUnit* 4.1 + param_value * 2 + param_value * 2;
-
- QCOMPARE(hEH, myHeight);
- }
+{
+
+ qreal hEH = mUtils->hourElementHeight();
+ qreal myHeight = mUnit * 4.1 + param_value * 2 + param_value * 2;
+
+ QCOMPARE(hEH, myHeight);
+}
void TestCalenDayUtils::testContentWidth()
- {
- qreal cW = mUtils->contentWidth();
- qreal myWidth = gTestWindowRect.width() - (mUnit * 8.04 + param_value * 2);
-
- QCOMPARE(cW, myWidth);
- }
+{
+ qreal cW = mUtils->contentWidth();
+ qreal myWidth = gTestWindowRect.width() - (mUnit * 8.04 + param_value * 2);
+
+ QCOMPARE(cW, myWidth);
+}
+
+/*!
+ Test function for minimum event's height
+ */
+void TestCalenDayUtils::testMinEventHeight()
+{
+ qreal minH = mUtils->minEventHeight();
+ qreal myH = param_value + param_value + param_value;
+
+ QCOMPARE(minH, myH);
+}
+
+/*!
+ Test function for main window getter
+ */
+void TestCalenDayUtils::testMainWindow()
+{
+ HbMainWindow *window = NULL;
+ QVERIFY(!window);
+
+ window = mUtils->mainWindow();
+ QVERIFY(window);
+}
+/*!
+ Test function for getEventValidStartEndTime function
+ 1) start and end time are in current day: event start - end
+ 2) start time is yesterday, end time is in current day: event 0.00 - end
+ 3) start time is yesterday, end time is tomorrow: event 0.00 - 23.59
+ */
+void TestCalenDayUtils::testGetEventValidStartEndTime()
+{
+ QDateTime currentDate(QDate(2010, 9, 5), QTime(8, 15));
+
+ //1)
+ QDateTime inStart = currentDate.addSecs(-3600); // currentTime - 1 hour
+ QDateTime inEnd = currentDate.addSecs(3600); // currentTime + 1 hour
+
+ AgendaEntry entry;
+ entry.setStartAndEndTime(inStart, inEnd);
+
+ QDateTime outStart;
+ QDateTime outEnd;
+ mUtils->getEventValidStartEndTime(outStart, outEnd, entry, currentDate);
+ QCOMPARE(outStart, inStart);
+ QCOMPARE(outEnd, inEnd);
+
+ //2)
+ inStart = currentDate.addDays(-1); // currentTime - 1 day
+ inEnd = currentDate.addSecs(3600); // currentTime + 1 hour
+
+ entry.setStartAndEndTime(inStart, inEnd);
+
+ mUtils->getEventValidStartEndTime(outStart, outEnd, entry, currentDate);
+ QCOMPARE(outStart, QDateTime(currentDate.date(), QTime(0, 0, 0, 0)));
+ QCOMPARE(outEnd, inEnd);
+
+ //3)
+ inStart = currentDate.addDays(-1); // currentTime - 1 day
+ inEnd = currentDate.addDays(1); // currentTime + 1 day
+
+ entry.setStartAndEndTime(inStart, inEnd);
+
+ mUtils->getEventValidStartEndTime(outStart, outEnd, entry, currentDate);
+ QCOMPARE(outStart, QDateTime(currentDate.date(), QTime(0, 0, 0, 0)));
+ QCOMPARE(outEnd, QDateTime(currentDate.date(), QTime(23, 59, 0, 0)));
+}
/*!
Test function for constructors
@@ -149,16 +219,15 @@
2. Test if content widget is correcty created
*/
void TestCalenDayUtils::testConstructors()
- {
- //1)
- CalenDayUtils *testUtils = 0;
- QVERIFY(!testUtils);
+{
+ //1)
+ CalenDayUtils *testUtils = 0;
+ QVERIFY(!testUtils);
- //2)
- testUtils = CalenDayUtils::instance();
- QVERIFY(testUtils);
- }
-
+ //2)
+ testUtils = CalenDayUtils::instance();
+ QVERIFY(testUtils);
+}
/*!
Test function for getting main window's orientation
@@ -166,16 +235,15 @@
2)test if vertical orientation is returned
*/
void TestCalenDayUtils::testOrientation()
- {
- //1)
- gTestOrientation = Qt::Horizontal;
- QCOMPARE(CalenDayUtils::instance()->orientation(), Qt::Horizontal);
+{
+ //1)
+ gTestOrientation = Qt::Horizontal;
+ QCOMPARE(CalenDayUtils::instance()->orientation(), Qt::Horizontal);
- //2)
- gTestOrientation = Qt::Vertical;
- QCOMPARE(CalenDayUtils::instance()->orientation(), Qt::Vertical);
- }
-
+ //2)
+ gTestOrientation = Qt::Vertical;
+ QCOMPARE(CalenDayUtils::instance()->orientation(), Qt::Vertical);
+}
QTEST_MAIN(TestCalenDayUtils);
#include "unittest_calendayutils.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro Tue Oct 05 13:57:00 2010 +0530
@@ -39,7 +39,8 @@
hbdeviceprofile.h \
hbinstance.h \
calendayutils.h \
- calendaycommonheaders.h
+ calendaycommonheaders.h \
+ agendaentry.h
SOURCES += unittest_calendayutils.cpp \
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calencontext.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calencontext.h Tue Oct 05 13:57:00 2010 +0530
@@ -31,21 +31,21 @@
* them to the appropriate place (i.e. the action ui classes).
*/
class MCalenContext
- {
+{
public:
QDateTime focusDateAndTime()
{
- return QDateTime(QDate(2000, 10, 10));
+ return mFocusedDate;
}
void setFocusDate(const QDateTime& focusDateTime)
{
- Q_UNUSED(focusDateTime);
+ mFocusedDate = focusDateTime;;
}
void setFocusDateAndTime(const QDateTime& focusDateTime)
{
- Q_UNUSED(focusDateTime);
+ mFocusedDate = focusDateTime;
}
QDateTime defaultCalTimeForViewsL()
@@ -56,11 +56,16 @@
void setFocusDateAndTimeAndInstance( const QDateTime& focusDateTime,
const TCalenInstanceId& aInstanceId )
{
- Q_UNUSED(focusDateTime);
Q_UNUSED(aInstanceId);
+ mFocusedDate = focusDateTime;
}
- };
+private:
+ QDateTime mFocusedDate;
+
+};
+
+
#endif // CALENCONTEXT_H
// End of file
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calendaycontentscrollarea.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calendaycontentscrollarea.h Tue Oct 05 13:57:00 2010 +0530
@@ -23,50 +23,64 @@
#include "calendaycommonheaders.h"
+extern CalenScrollDirection gDisallowedDirection;
+
// Class declaration
class CalenDayContentScrollArea : public HbScrollArea
- {
+{
Q_OBJECT
public:
- CalenDayContentScrollArea(QGraphicsItem *parent = 0)
- {
- Q_UNUSED(parent);
- }
- virtual ~CalenDayContentScrollArea()
- {
- }
+ CalenDayContentScrollArea(QGraphicsItem *parent = 0)
+ {
+ Q_UNUSED(parent);
+ }
+
+ virtual ~CalenDayContentScrollArea()
+ {
+ }
+
+ CalenScrollDirection disallowedScrollDirection() const
+ {
+ return gDisallowedDirection;
+ }
- signals:
- void scrollAreaMoveStarted(CalenScrollDirection scrollTo);
- void scrollAreaMoveFinished(CalenScrollDirection scrollTo);
+ void setDisallowedScrollDirection(const CalenScrollDirection direction)
+ {
+ gDisallowedDirection = direction;
+ }
+
+signals:
+ void scrollAreaMoveStarted(CalenScrollDirection scrollTo);
+ void scrollAreaMoveFinished(CalenScrollDirection scrollTo);
public slots:
- void scrollToMiddleWidget()
- {
- }
+ void scrollToMiddleWidget()
+ {
+ }
protected:
- bool scrollByAmount(const QPointF &delta)
- {
- Q_UNUSED(delta);
- return false;
- }
+ bool scrollByAmount(const QPointF &delta)
+ {
+ Q_UNUSED(delta);
+ return false;
+ }
- void gestureEvent(QGestureEvent *event)
- {
- Q_UNUSED(event);
- }
- bool eventFilter(QObject *obj, QEvent *event)
- {
- Q_UNUSED(obj);Q_UNUSED(event);
- return false;
- }
- bool event(QEvent *e)
- {
- Q_UNUSED(e);
- return false;
- }
- };
+ void gestureEvent(QGestureEvent *event)
+ {
+ Q_UNUSED(event);
+ }
+ bool eventFilter(QObject *obj, QEvent *event)
+ {
+ Q_UNUSED(obj);
+ Q_UNUSED(event);
+ return false;
+ }
+ bool event(QEvent *e)
+ {
+ Q_UNUSED(e);
+ return false;
+ }
+};
#endif /* CALENDAYCONTENTSCROLLAREA_H_ */
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calendayhourscrollarea.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calendayhourscrollarea.h Tue Oct 05 13:57:00 2010 +0530
@@ -25,39 +25,51 @@
// User includes
#include "calendaycommonheaders.h"
+extern qint32 LOCALE_CHANGED;
+
// Class declaration
class CalenDayHourScrollArea : public HbScrollArea
- {
+{
Q_OBJECT
public:
- CalenDayHourScrollArea(QGraphicsItem *parent = 0)
- {
- Q_UNUSED(parent);
- }
- virtual ~CalenDayHourScrollArea()
- {
- }
- void setDateTime(const QDateTime &dateTime)
- {
- Q_UNUSED(dateTime);
- }
- QDateTime dateTime()
- {
- return QDateTime();
- }
+ CalenDayHourScrollArea(QGraphicsItem *parent = 0)
+ {
+ Q_UNUSED(parent);
+ }
+ virtual ~CalenDayHourScrollArea()
+ {
+ }
+ void setDateTime(const QDateTime &dateTime)
+ {
+ Q_UNUSED(dateTime);
+ }
+ QDateTime dateTime()
+ {
+ return QDateTime();
+ }
- void scrollToHour(int hour)
- {
- Q_UNUSED(hour);
- }
+ void scrollToHour(int hour)
+ {
+ Q_UNUSED(hour);
+ }
public slots:
- void scrollVertically(const QPointF &newPosition)
- {
- Q_UNUSED(newPosition);
- }
+ void scrollVertically(const QPointF &newPosition)
+ {
+ Q_UNUSED(newPosition);
+ }
+
+ void localeChanged()
+ {
+ LOCALE_CHANGED++;
+ }
+
+ void updateTimeIndicator()
+ {
- };
+ }
+
+};
#endif /* CALENDAYHOURSCROLLAREA_H_ */
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -24,6 +24,9 @@
#include "calendayview.h"
+qint32 LOCALE_CHANGED;
+CalenScrollDirection gDisallowedDirection = ECalenScrollNoDayChange;
+
class TestCalenDayView : public QObject
{
Q_OBJECT
@@ -48,6 +51,9 @@
void testRunNewMeeting();
void testRunGoToToday();
void testChangeView();
+ void testOnLocaleChanged();
+ void testGetCurrentDate();
+ void testIsDateValid();
private:
@@ -248,7 +254,8 @@
mView->runGoToToday();
- QVERIFY(mServices.lastCommand() == ECalenGotoToday);
+ QVERIFY(mServices.lastCommand() != 0);
+ QVERIFY(mServices.Context().focusDateAndTime() == CalenDateUtils::today());
#endif /*__WINSCW__*/
}
@@ -266,6 +273,87 @@
QVERIFY(mServices.lastCommand() == ECalenAgendaView);
}
+/*!
+ Test function for onLocaleChanged
+ 1)Test if after system time change date change also
+ 2)Test if after midnight crosover date change also
+ 3)In above also check i locale change run in scroll area, should no
+ 4)Check if locale change run in scroll area after set EChangeLocale
+ */
+void TestCalenDayView::testOnLocaleChanged()
+{
+#ifndef __WINSCW__
+ QDateTime testDate = QDateTime(QDate(2000, 10, 10));
+ //1)
+ mServices.Context().setFocusDateAndTime(testDate);
+ mView->getCurrentDate();
+ QCOMPARE(mView->mDate,testDate);
+ mView->onLocaleChanged(EChangesSystemTime);
+ QCOMPARE(mView->mDate,CalenDateUtils::today());
+
+ //2)
+ mServices.Context().setFocusDateAndTime(testDate);
+ mView->getCurrentDate();
+ QCOMPARE(mView->mDate,testDate);
+ mView->onLocaleChanged(EChangesMidnightCrossover);
+ QCOMPARE(mView->mDate,CalenDateUtils::today());
+
+ //3)
+ mServices.Context().setFocusDateAndTime(testDate);
+ mView->getCurrentDate();
+ mView->onLocaleChanged(EChangesSystemTime);
+ QCOMPARE(mView->mDate,CalenDateUtils::today());
+
+ //1)
+ mServices.Context().setFocusDateAndTime(testDate);
+ mView->getCurrentDate();
+ mView->onLocaleChanged(EChangesLocale);
+ QCOMPARE(LOCALE_CHANGED,1);
+#endif /*__WINSCW__*/
+}
+
+/*!
+ Test function for getCurrentDate.
+
+ Check if date given by context is good
+ */
+void TestCalenDayView::testGetCurrentDate()
+{
+#ifndef __WINSCW__
+ QDateTime testDate = QDateTime(QDate(2000, 10, 10), QTime(0, 0));
+ mServices.Context().setFocusDateAndTime(testDate);
+ mView->getCurrentDate();
+ QCOMPARE(mView->mDate,testDate);
+#endif /*__WINSCW__*/
+}
+
+/*!
+ Test function for checkDate helper function.
+
+ 1) date supported
+ 2) lowest supported date
+ 3) highest supported date
+ */
+void TestCalenDayView::testIsDateValid()
+{
+#ifndef __WINSCW__
+ //1)
+ mView->mDate = QDateTime(QDate(2010, 9, 22), QTime(0, 0));
+ mView->isDateValid();
+ QCOMPARE(gDisallowedDirection, ECalenScrollNoDayChange);
+
+ //2)
+ mView->mDate = QDateTime(QDate(1900, 1, 1), QTime(0, 0));
+ mView->isDateValid();
+ QCOMPARE(gDisallowedDirection, ECalenScrollToPrev);
+
+ //3)
+ mView->mDate = QDateTime(QDate(2100, 12, 30), QTime(0, 0));
+ mView->isDateValid();
+ QCOMPARE(gDisallowedDirection, ECalenScrollToNext);
+#endif /*__WINSCW__*/
+}
+
QTEST_MAIN(TestCalenDayView);
#include "unittest_calendayview.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.pro Tue Oct 05 13:57:00 2010 +0530
@@ -61,7 +61,7 @@
calendaycontainer.h \
calendayeventspane.h \
calendayitem.h \
- calendaystatusstrip.h
+ calendaystatusstrip.h
SOURCES += unittest_calendayview.cpp \
calendayview.cpp \
@@ -82,7 +82,8 @@
LIBS += -lagendainterface \
-lxqsettingsmanager \
- -lcalencommonutils
+ -lcalencommonutils \
+ -lafservice
}
# End of file --Don't remove this.
--- a/calendarui/views/eabi/calenviewsu.def Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/eabi/calenviewsu.def Tue Oct 05 13:57:00 2010 +0530
@@ -21,7 +21,7 @@
_ZN14CalenMonthGrid17handleThemeChangeEv @ 20 NONAME
_ZN14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 21 NONAME
_ZN14CalenMonthGrid17scrollingFinishedEv @ 22 NONAME
- _ZN14CalenMonthGrid18orientationChangedEN2Qt11OrientationE @ 23 NONAME
+ _ZN14CalenMonthGrid18checkIfWeCanScrollE15scrollDirection @ 23 NONAME
_ZN14CalenMonthGrid19getStaticMetaObjectEv @ 24 NONAME
_ZN14CalenMonthGrid19handleAppendingRowsER5QListI14CalenMonthDataE @ 25 NONAME
_ZN14CalenMonthGrid19setFocusToProperDayEv @ 26 NONAME
@@ -46,119 +46,119 @@
_ZN14CalenMonthView12getActiveDayEv @ 45 NONAME
_ZN14CalenMonthView12setActiveDayE9QDateTime @ 46 NONAME
_ZN14CalenMonthView13doLazyLoadingEv @ 47 NONAME
- _ZN14CalenMonthView13getCurrentDayEv @ 48 NONAME
- _ZN14CalenMonthView13launchDayViewEv @ 49 NONAME
- _ZN14CalenMonthView13monthDataListEv @ 50 NONAME
- _ZN14CalenMonthView14addWeekNumbersEv @ 51 NONAME
- _ZN14CalenMonthView14firstDayOfGridEv @ 52 NONAME
- _ZN14CalenMonthView14rowsInFutMonthEv @ 53 NONAME
- _ZN14CalenMonthView14setDateToLabelEv @ 54 NONAME
- _ZN14CalenMonthView14updateDayLabelEv @ 55 NONAME
- _ZN14CalenMonthView15dateFromContextERK13MCalenContext @ 56 NONAME
- _ZN14CalenMonthView15getInstanceListER5QListI5QDateE9QDateTimeS4_ @ 57 NONAME
- _ZN14CalenMonthView15onLocaleChangedEi @ 58 NONAME
- _ZN14CalenMonthView15rowsInPrevMonthEv @ 59 NONAME
- _ZN14CalenMonthView16getCurrGridIndexEv @ 60 NONAME
- _ZN14CalenMonthView16onContextChangedEv @ 61 NONAME
- _ZN14CalenMonthView16setCurrGridIndexEi @ 62 NONAME
- _ZN14CalenMonthView16staticMetaObjectE @ 63 NONAME DATA 16
- _ZN14CalenMonthView17changeOrientationEN2Qt11OrientationE @ 64 NONAME
- _ZN14CalenMonthView17handleThemeChangeEv @ 65 NONAME
- _ZN14CalenMonthView17populateNextMonthEv @ 66 NONAME
- _ZN14CalenMonthView17populatePrevMonthEv @ 67 NONAME
- _ZN14CalenMonthView17removeWeekNumbersEv @ 68 NONAME
- _ZN14CalenMonthView18addBackgroundFrameEv @ 69 NONAME
- _ZN14CalenMonthView18completePopulationEv @ 70 NONAME
- _ZN14CalenMonthView19getStaticMetaObjectEv @ 71 NONAME
- _ZN14CalenMonthView19populatePreviewPaneER9QDateTime @ 72 NONAME
- _ZN14CalenMonthView20prepareForPopulationEv @ 73 NONAME
- _ZN14CalenMonthView21refreshViewOnGoToDateEv @ 74 NONAME
- _ZN14CalenMonthView22addRemoveActionsInMenuEv @ 75 NONAME
- _ZN14CalenMonthView22setContextForActiveDayEi @ 76 NONAME
- _ZN14CalenMonthView22updateWeekNumGridModelEv @ 77 NONAME
- _ZN14CalenMonthView23handleChangeOrientationEv @ 78 NONAME
- _ZN14CalenMonthView23handleGridItemActivatedEv @ 79 NONAME
- _ZN14CalenMonthView24handlePreviewPaneGestureEb @ 80 NONAME
- _ZN14CalenMonthView24populateWithInstanceViewEv @ 81 NONAME
- _ZN14CalenMonthView24updateModelWithPrevMonthEv @ 82 NONAME
- _ZN14CalenMonthView25handleLeftEffectCompletedERKN8HbEffect12EffectStatusE @ 83 NONAME
- _ZN14CalenMonthView26disconnectAboutToQuitEventEv @ 84 NONAME
- _ZN14CalenMonthView26fetchEntriesAndUpdateModelEv @ 85 NONAME
- _ZN14CalenMonthView26handleRightEffectCompletedERKN8HbEffect12EffectStatusE @ 86 NONAME
- _ZN14CalenMonthView26updateModelWithFutureMonthEv @ 87 NONAME
- _ZN14CalenMonthView27showHideRegionalInformationEv @ 88 NONAME
- _ZN14CalenMonthView35updateMonthDataArrayWithActiveDatesEv @ 89 NONAME
- _ZN14CalenMonthView7setDateEv @ 90 NONAME
- _ZN14CalenMonthView9goToTodayEv @ 91 NONAME
- _ZN14CalenMonthView9setupViewEP14CalenDocLoader @ 92 NONAME
- _ZN14CalenMonthViewC1ER14MCalenServices @ 93 NONAME
- _ZN14CalenMonthViewC2ER14MCalenServices @ 94 NONAME
- _ZN14CalenMonthViewD0Ev @ 95 NONAME
- _ZN14CalenMonthViewD1Ev @ 96 NONAME
- _ZN14CalenMonthViewD2Ev @ 97 NONAME
- _ZN15CalenAgendaView12doPopulationEv @ 98 NONAME
- _ZN15CalenAgendaView14clearListModelEv @ 99 NONAME
- _ZN15CalenAgendaView26disconnectAboutToQuitEventEv @ 100 NONAME
- _ZN15CalenAgendaView9docLoaderEv @ 101 NONAME
- _ZN15CalenAgendaView9setupViewEP14CalenDocLoader @ 102 NONAME
- _ZN15CalenAgendaViewC1ER14MCalenServices @ 103 NONAME
- _ZN15CalenAgendaViewC2ER14MCalenServices @ 104 NONAME
- _ZN15CalenAgendaViewD0Ev @ 105 NONAME
- _ZN15CalenAgendaViewD1Ev @ 106 NONAME
- _ZN15CalenAgendaViewD2Ev @ 107 NONAME
- _ZN15CalenNativeView17captureScreenshotEb @ 108 NONAME
- _ZN16CalenPluginLabelC1ER14MCalenServicesP13QGraphicsItem @ 109 NONAME
- _ZN16CalenPluginLabelC2ER14MCalenServicesP13QGraphicsItem @ 110 NONAME
- _ZN16CalenPluginLabelD0Ev @ 111 NONAME
- _ZN16CalenPluginLabelD1Ev @ 112 NONAME
- _ZN16CalenPluginLabelD2Ev @ 113 NONAME
- _ZN16CalenPreviewPane11qt_metacallEN11QMetaObject4CallEiPPv @ 114 NONAME
- _ZN16CalenPreviewPane11qt_metacastEPKc @ 115 NONAME
- _ZN16CalenPreviewPane12gestureEventEP13QGestureEvent @ 116 NONAME
- _ZN16CalenPreviewPane12tapTriggeredEv @ 117 NONAME
- _ZN16CalenPreviewPane13effectStartedEv @ 118 NONAME
- _ZN16CalenPreviewPane13populateLabelE9QDateTime @ 119 NONAME
- _ZN16CalenPreviewPane13stopScrollingEv @ 120 NONAME
- _ZN16CalenPreviewPane14effectFinishedEv @ 121 NONAME
- _ZN16CalenPreviewPane15startAutoScrollEv @ 122 NONAME
- _ZN16CalenPreviewPane16GetInstanceListLEv @ 123 NONAME
- _ZN16CalenPreviewPane16staticMetaObjectE @ 124 NONAME DATA 16
- _ZN16CalenPreviewPane17handleThemeChangeEv @ 125 NONAME
- _ZN16CalenPreviewPane17scrollingFinishedEv @ 126 NONAME
- _ZN16CalenPreviewPane17setNoEntriesLabelEP7HbLabel @ 127 NONAME
- _ZN16CalenPreviewPane19getStaticMetaObjectEv @ 128 NONAME
- _ZN16CalenPreviewPane19onTwoSecondsTimeoutEv @ 129 NONAME
- _ZN16CalenPreviewPane21checkStartTimeOfEventER9QDateTime @ 130 NONAME
- _ZN16CalenPreviewPane4DateEv @ 131 NONAME
- _ZN16CalenPreviewPane7setViewEP14CalenMonthView @ 132 NONAME
- _ZN16CalenPreviewPaneC1ER14MCalenServicesP13QGraphicsItem @ 133 NONAME
- _ZN16CalenPreviewPaneC2ER14MCalenServicesP13QGraphicsItem @ 134 NONAME
- _ZN16CalenPreviewPaneD0Ev @ 135 NONAME
- _ZN16CalenPreviewPaneD1Ev @ 136 NONAME
- _ZN16CalenPreviewPaneD2Ev @ 137 NONAME
- _ZN17CalenSettingsView11qt_metacallEN11QMetaObject4CallEiPPv @ 138 NONAME
- _ZN17CalenSettingsView11qt_metacastEPKc @ 139 NONAME
- _ZN17CalenSettingsView11refreshViewEv @ 140 NONAME
- _ZN17CalenSettingsView14initializeFormEv @ 141 NONAME
- _ZN17CalenSettingsView16staticMetaObjectE @ 142 NONAME DATA 16
- _ZN17CalenSettingsView18launchPreviousViewEv @ 143 NONAME
- _ZN17CalenSettingsView19getStaticMetaObjectEv @ 144 NONAME
- _ZN17CalenSettingsViewC1ER14MCalenServicesP13QGraphicsItem @ 145 NONAME
- _ZN17CalenSettingsViewC2ER14MCalenServicesP13QGraphicsItem @ 146 NONAME
- _ZN17CalenSettingsViewD0Ev @ 147 NONAME
- _ZN17CalenSettingsViewD1Ev @ 148 NONAME
- _ZN17CalenSettingsViewD2Ev @ 149 NONAME
- _ZN21CalenAgendaViewWidgetC1ER14MCalenServicesP14CalenDocLoader @ 150 NONAME
- _ZN21CalenAgendaViewWidgetC2ER14MCalenServicesP14CalenDocLoader @ 151 NONAME
- _ZN21CalenAgendaViewWidgetD0Ev @ 152 NONAME
- _ZN21CalenAgendaViewWidgetD1Ev @ 153 NONAME
- _ZN21CalenAgendaViewWidgetD2Ev @ 154 NONAME
- _ZN21CalenThickLinesDrawer11qt_metacallEN11QMetaObject4CallEiPPv @ 155 NONAME
- _ZN21CalenThickLinesDrawer11qt_metacastEPKc @ 156 NONAME
- _ZN21CalenThickLinesDrawer16staticMetaObjectE @ 157 NONAME DATA 16
- _ZN21CalenThickLinesDrawer17handleThemeChangeEv @ 158 NONAME
- _ZN21CalenThickLinesDrawer19getStaticMetaObjectEv @ 159 NONAME
- _ZN21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 160 NONAME
+ _ZN14CalenMonthView13launchDayViewEv @ 48 NONAME
+ _ZN14CalenMonthView13monthDataListEv @ 49 NONAME
+ _ZN14CalenMonthView14addWeekNumbersEv @ 50 NONAME
+ _ZN14CalenMonthView14firstDayOfGridEv @ 51 NONAME
+ _ZN14CalenMonthView14rowsInFutMonthEv @ 52 NONAME
+ _ZN14CalenMonthView14setDateToLabelEv @ 53 NONAME
+ _ZN14CalenMonthView14updateDayLabelEv @ 54 NONAME
+ _ZN14CalenMonthView15dateFromContextERK13MCalenContext @ 55 NONAME
+ _ZN14CalenMonthView15getInstanceListER5QListI5QDateE9QDateTimeS4_ @ 56 NONAME
+ _ZN14CalenMonthView15onLocaleChangedEi @ 57 NONAME
+ _ZN14CalenMonthView15rowsInPrevMonthEv @ 58 NONAME
+ _ZN14CalenMonthView16getCurrGridIndexEv @ 59 NONAME
+ _ZN14CalenMonthView16onContextChangedEv @ 60 NONAME
+ _ZN14CalenMonthView16setCurrGridIndexEi @ 61 NONAME
+ _ZN14CalenMonthView16staticMetaObjectE @ 62 NONAME DATA 16
+ _ZN14CalenMonthView17changeOrientationEN2Qt11OrientationE @ 63 NONAME
+ _ZN14CalenMonthView17handleThemeChangeEv @ 64 NONAME
+ _ZN14CalenMonthView17populateNextMonthEv @ 65 NONAME
+ _ZN14CalenMonthView17populatePrevMonthEv @ 66 NONAME
+ _ZN14CalenMonthView17removeWeekNumbersEv @ 67 NONAME
+ _ZN14CalenMonthView18addBackgroundFrameEv @ 68 NONAME
+ _ZN14CalenMonthView18completePopulationEv @ 69 NONAME
+ _ZN14CalenMonthView19getStaticMetaObjectEv @ 70 NONAME
+ _ZN14CalenMonthView19populatePreviewPaneER9QDateTime @ 71 NONAME
+ _ZN14CalenMonthView20prepareForPopulationEv @ 72 NONAME
+ _ZN14CalenMonthView21refreshViewOnGoToDateEv @ 73 NONAME
+ _ZN14CalenMonthView22addRemoveActionsInMenuEv @ 74 NONAME
+ _ZN14CalenMonthView22setContextForActiveDayEi @ 75 NONAME
+ _ZN14CalenMonthView22updateWeekNumGridModelEv @ 76 NONAME
+ _ZN14CalenMonthView23handleChangeOrientationEv @ 77 NONAME
+ _ZN14CalenMonthView23handleGridItemActivatedEv @ 78 NONAME
+ _ZN14CalenMonthView24handlePreviewPaneGestureEb @ 79 NONAME
+ _ZN14CalenMonthView24populateWithInstanceViewEv @ 80 NONAME
+ _ZN14CalenMonthView24updateModelWithPrevMonthEv @ 81 NONAME
+ _ZN14CalenMonthView25handleLeftEffectCompletedERKN8HbEffect12EffectStatusE @ 82 NONAME
+ _ZN14CalenMonthView26disconnectAboutToQuitEventEv @ 83 NONAME
+ _ZN14CalenMonthView26fetchEntriesAndUpdateModelEv @ 84 NONAME
+ _ZN14CalenMonthView26handleRightEffectCompletedERKN8HbEffect12EffectStatusE @ 85 NONAME
+ _ZN14CalenMonthView26updateModelWithFutureMonthEv @ 86 NONAME
+ _ZN14CalenMonthView27showHideRegionalInformationEv @ 87 NONAME
+ _ZN14CalenMonthView35updateMonthDataArrayWithActiveDatesEv @ 88 NONAME
+ _ZN14CalenMonthView7setDateEv @ 89 NONAME
+ _ZN14CalenMonthView9goToTodayEv @ 90 NONAME
+ _ZN14CalenMonthView9setupViewEP14CalenDocLoader @ 91 NONAME
+ _ZN14CalenMonthViewC1ER14MCalenServices @ 92 NONAME
+ _ZN14CalenMonthViewC2ER14MCalenServices @ 93 NONAME
+ _ZN14CalenMonthViewD0Ev @ 94 NONAME
+ _ZN14CalenMonthViewD1Ev @ 95 NONAME
+ _ZN14CalenMonthViewD2Ev @ 96 NONAME
+ _ZN15CalenAgendaView12doPopulationEv @ 97 NONAME
+ _ZN15CalenAgendaView14clearListModelEv @ 98 NONAME
+ _ZN15CalenAgendaView26disconnectAboutToQuitEventEv @ 99 NONAME
+ _ZN15CalenAgendaView9docLoaderEv @ 100 NONAME
+ _ZN15CalenAgendaView9setupViewEP14CalenDocLoader @ 101 NONAME
+ _ZN15CalenAgendaViewC1ER14MCalenServices @ 102 NONAME
+ _ZN15CalenAgendaViewC2ER14MCalenServices @ 103 NONAME
+ _ZN15CalenAgendaViewD0Ev @ 104 NONAME
+ _ZN15CalenAgendaViewD1Ev @ 105 NONAME
+ _ZN15CalenAgendaViewD2Ev @ 106 NONAME
+ _ZN15CalenNativeView17captureScreenshotEb @ 107 NONAME
+ _ZN16CalenPluginLabelC1ER14MCalenServicesP13QGraphicsItem @ 108 NONAME
+ _ZN16CalenPluginLabelC2ER14MCalenServicesP13QGraphicsItem @ 109 NONAME
+ _ZN16CalenPluginLabelD0Ev @ 110 NONAME
+ _ZN16CalenPluginLabelD1Ev @ 111 NONAME
+ _ZN16CalenPluginLabelD2Ev @ 112 NONAME
+ _ZN16CalenPreviewPane11qt_metacallEN11QMetaObject4CallEiPPv @ 113 NONAME
+ _ZN16CalenPreviewPane11qt_metacastEPKc @ 114 NONAME
+ _ZN16CalenPreviewPane12gestureEventEP13QGestureEvent @ 115 NONAME
+ _ZN16CalenPreviewPane12tapTriggeredEv @ 116 NONAME
+ _ZN16CalenPreviewPane13effectStartedEv @ 117 NONAME
+ _ZN16CalenPreviewPane13populateLabelE9QDateTime @ 118 NONAME
+ _ZN16CalenPreviewPane13stopScrollingEv @ 119 NONAME
+ _ZN16CalenPreviewPane14effectFinishedEv @ 120 NONAME
+ _ZN16CalenPreviewPane15startAutoScrollEv @ 121 NONAME
+ _ZN16CalenPreviewPane16GetInstanceListLEv @ 122 NONAME
+ _ZN16CalenPreviewPane16staticMetaObjectE @ 123 NONAME DATA 16
+ _ZN16CalenPreviewPane17handleThemeChangeEv @ 124 NONAME
+ _ZN16CalenPreviewPane17scrollingFinishedEv @ 125 NONAME
+ _ZN16CalenPreviewPane17setNoEntriesLabelEP7HbLabel @ 126 NONAME
+ _ZN16CalenPreviewPane19getStaticMetaObjectEv @ 127 NONAME
+ _ZN16CalenPreviewPane19onTwoSecondsTimeoutEv @ 128 NONAME
+ _ZN16CalenPreviewPane21checkStartTimeOfEventER9QDateTime @ 129 NONAME
+ _ZN16CalenPreviewPane4DateEv @ 130 NONAME
+ _ZN16CalenPreviewPane7setViewEP14CalenMonthView @ 131 NONAME
+ _ZN16CalenPreviewPaneC1ER14MCalenServicesP13QGraphicsItem @ 132 NONAME
+ _ZN16CalenPreviewPaneC2ER14MCalenServicesP13QGraphicsItem @ 133 NONAME
+ _ZN16CalenPreviewPaneD0Ev @ 134 NONAME
+ _ZN16CalenPreviewPaneD1Ev @ 135 NONAME
+ _ZN16CalenPreviewPaneD2Ev @ 136 NONAME
+ _ZN17CalenSettingsView11qt_metacallEN11QMetaObject4CallEiPPv @ 137 NONAME
+ _ZN17CalenSettingsView11qt_metacastEPKc @ 138 NONAME
+ _ZN17CalenSettingsView11refreshViewEv @ 139 NONAME
+ _ZN17CalenSettingsView14initializeFormEv @ 140 NONAME
+ _ZN17CalenSettingsView16staticMetaObjectE @ 141 NONAME DATA 16
+ _ZN17CalenSettingsView18launchPreviousViewEv @ 142 NONAME
+ _ZN17CalenSettingsView19getStaticMetaObjectEv @ 143 NONAME
+ _ZN17CalenSettingsViewC1ER14MCalenServicesP13QGraphicsItem @ 144 NONAME
+ _ZN17CalenSettingsViewC2ER14MCalenServicesP13QGraphicsItem @ 145 NONAME
+ _ZN17CalenSettingsViewD0Ev @ 146 NONAME
+ _ZN17CalenSettingsViewD1Ev @ 147 NONAME
+ _ZN17CalenSettingsViewD2Ev @ 148 NONAME
+ _ZN21CalenAgendaViewWidgetC1ER14MCalenServicesP14CalenDocLoader @ 149 NONAME
+ _ZN21CalenAgendaViewWidgetC2ER14MCalenServicesP14CalenDocLoader @ 150 NONAME
+ _ZN21CalenAgendaViewWidgetD0Ev @ 151 NONAME
+ _ZN21CalenAgendaViewWidgetD1Ev @ 152 NONAME
+ _ZN21CalenAgendaViewWidgetD2Ev @ 153 NONAME
+ _ZN21CalenThickLinesDrawer11qt_metacallEN11QMetaObject4CallEiPPv @ 154 NONAME
+ _ZN21CalenThickLinesDrawer11qt_metacastEPKc @ 155 NONAME
+ _ZN21CalenThickLinesDrawer16staticMetaObjectE @ 156 NONAME DATA 16
+ _ZN21CalenThickLinesDrawer17handleThemeChangeEv @ 157 NONAME
+ _ZN21CalenThickLinesDrawer19getStaticMetaObjectEv @ 158 NONAME
+ _ZN21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 159 NONAME
+ _ZN21CalenThickLinesDrawer6polishER17HbStyleParameters @ 160 NONAME
_ZN21CalenThickLinesDrawerC1EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 161 NONAME
_ZN21CalenThickLinesDrawerC2EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 162 NONAME
_ZN21CalenThickLinesDrawerD0Ev @ 163 NONAME
@@ -168,105 +168,107 @@
_ZN22CalenDayHourScrollArea11qt_metacastEPKc @ 167 NONAME
_ZN22CalenDayHourScrollArea11setDateTimeERK9QDateTime @ 168 NONAME
_ZN22CalenDayHourScrollArea12scrollToHourEi @ 169 NONAME
- _ZN22CalenDayHourScrollArea16scrollVerticallyERK7QPointF @ 170 NONAME
- _ZN22CalenDayHourScrollArea16staticMetaObjectE @ 171 NONAME DATA 16
- _ZN22CalenDayHourScrollArea19getStaticMetaObjectEv @ 172 NONAME
- _ZN22CalenDayHourScrollAreaC1EP13QGraphicsItem @ 173 NONAME
- _ZN22CalenDayHourScrollAreaC2EP13QGraphicsItem @ 174 NONAME
- _ZN22CalenDayHourScrollAreaD0Ev @ 175 NONAME
- _ZN22CalenDayHourScrollAreaD1Ev @ 176 NONAME
- _ZN22CalenDayHourScrollAreaD2Ev @ 177 NONAME
- _ZN25CalenDayContentScrollArea11eventFilterEP7QObjectP6QEvent @ 178 NONAME
- _ZN25CalenDayContentScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 179 NONAME
- _ZN25CalenDayContentScrollArea11qt_metacastEPKc @ 180 NONAME
- _ZN25CalenDayContentScrollArea12gestureEventEP13QGestureEvent @ 181 NONAME
- _ZN25CalenDayContentScrollArea12moveFinishedEv @ 182 NONAME
- _ZN25CalenDayContentScrollArea14scrollByAmountERK7QPointF @ 183 NONAME
- _ZN25CalenDayContentScrollArea16staticMetaObjectE @ 184 NONAME DATA 16
- _ZN25CalenDayContentScrollArea17checkPanDirectionEP11QPanGesture @ 185 NONAME
- _ZN25CalenDayContentScrollArea18orientationChangedEN2Qt11OrientationE @ 186 NONAME
- _ZN25CalenDayContentScrollArea19getStaticMetaObjectEv @ 187 NONAME
- _ZN25CalenDayContentScrollArea20scrollToMiddleWidgetEv @ 188 NONAME
- _ZN25CalenDayContentScrollArea21scrollAreaMoveStartedE20CalenScrollDirection @ 189 NONAME
- _ZN25CalenDayContentScrollArea22scrollAreaMoveFinishedE20CalenScrollDirection @ 190 NONAME
- _ZN25CalenDayContentScrollArea5eventEP6QEvent @ 191 NONAME
- _ZN25CalenDayContentScrollArea6moveToERK7QPointFi @ 192 NONAME
- _ZN25CalenDayContentScrollAreaC1EP13QGraphicsItem @ 193 NONAME
- _ZN25CalenDayContentScrollAreaC2EP13QGraphicsItem @ 194 NONAME
- _ZN25CalenDayContentScrollAreaD0Ev @ 195 NONAME
- _ZN25CalenDayContentScrollAreaD1Ev @ 196 NONAME
- _ZN25CalenDayContentScrollAreaD2Ev @ 197 NONAME
- _ZNK14CalenMonthGrid10metaObjectEv @ 198 NONAME
- _ZNK14CalenMonthView10metaObjectEv @ 199 NONAME
- _ZNK16CalenPreviewPane10metaObjectEv @ 200 NONAME
- _ZNK17CalenSettingsView10metaObjectEv @ 201 NONAME
- _ZNK21CalenThickLinesDrawer10metaObjectEv @ 202 NONAME
- _ZNK22CalenDayHourScrollArea10metaObjectEv @ 203 NONAME
- _ZNK22CalenDayHourScrollArea8dateTimeEv @ 204 NONAME
- _ZNK25CalenDayContentScrollArea10metaObjectEv @ 205 NONAME
- _ZNK25CalenDayContentScrollArea17isHorizontalSwipeEf @ 206 NONAME
- _ZTI14CalenMonthGrid @ 207 NONAME
- _ZTI14CalenMonthView @ 208 NONAME
- _ZTI16CalenPreviewPane @ 209 NONAME
- _ZTI17CalenSettingsView @ 210 NONAME
- _ZTI21CalenThickLinesDrawer @ 211 NONAME
- _ZTI22CalenDayHourScrollArea @ 212 NONAME
- _ZTI25CalenDayContentScrollArea @ 213 NONAME
- _ZTV14CalenMonthGrid @ 214 NONAME
- _ZTV14CalenMonthView @ 215 NONAME
- _ZTV16CalenPreviewPane @ 216 NONAME
- _ZTV17CalenSettingsView @ 217 NONAME
- _ZTV21CalenThickLinesDrawer @ 218 NONAME
- _ZTV22CalenDayHourScrollArea @ 219 NONAME
- _ZTV25CalenDayContentScrollArea @ 220 NONAME
- _ZThn16_N12CalenDayViewD0Ev @ 221 NONAME
- _ZThn16_N12CalenDayViewD1Ev @ 222 NONAME
- _ZThn16_N14CalenMonthGridD0Ev @ 223 NONAME
- _ZThn16_N14CalenMonthGridD1Ev @ 224 NONAME
- _ZThn16_N14CalenMonthViewD0Ev @ 225 NONAME
- _ZThn16_N14CalenMonthViewD1Ev @ 226 NONAME
- _ZThn16_N15CalenAgendaViewD0Ev @ 227 NONAME
- _ZThn16_N15CalenAgendaViewD1Ev @ 228 NONAME
- _ZThn16_N16CalenPluginLabelD0Ev @ 229 NONAME
- _ZThn16_N16CalenPluginLabelD1Ev @ 230 NONAME
- _ZThn16_N16CalenPreviewPaneD0Ev @ 231 NONAME
- _ZThn16_N16CalenPreviewPaneD1Ev @ 232 NONAME
- _ZThn16_N17CalenSettingsViewD0Ev @ 233 NONAME
- _ZThn16_N17CalenSettingsViewD1Ev @ 234 NONAME
- _ZThn16_N21CalenAgendaViewWidgetD0Ev @ 235 NONAME
- _ZThn16_N21CalenAgendaViewWidgetD1Ev @ 236 NONAME
- _ZThn16_N21CalenThickLinesDrawerD0Ev @ 237 NONAME
- _ZThn16_N21CalenThickLinesDrawerD1Ev @ 238 NONAME
- _ZThn16_N22CalenDayHourScrollAreaD0Ev @ 239 NONAME
- _ZThn16_N22CalenDayHourScrollAreaD1Ev @ 240 NONAME
- _ZThn16_N25CalenDayContentScrollAreaD0Ev @ 241 NONAME
- _ZThn16_N25CalenDayContentScrollAreaD1Ev @ 242 NONAME
- _ZThn8_N12CalenDayViewD0Ev @ 243 NONAME
- _ZThn8_N12CalenDayViewD1Ev @ 244 NONAME
- _ZThn8_N14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 245 NONAME
- _ZThn8_N14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 246 NONAME
- _ZThn8_N14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 247 NONAME
- _ZThn8_N14CalenMonthGridD0Ev @ 248 NONAME
- _ZThn8_N14CalenMonthGridD1Ev @ 249 NONAME
- _ZThn8_N14CalenMonthViewD0Ev @ 250 NONAME
- _ZThn8_N14CalenMonthViewD1Ev @ 251 NONAME
- _ZThn8_N15CalenAgendaViewD0Ev @ 252 NONAME
- _ZThn8_N15CalenAgendaViewD1Ev @ 253 NONAME
- _ZThn8_N16CalenPluginLabelD0Ev @ 254 NONAME
- _ZThn8_N16CalenPluginLabelD1Ev @ 255 NONAME
- _ZThn8_N16CalenPreviewPaneD0Ev @ 256 NONAME
- _ZThn8_N16CalenPreviewPaneD1Ev @ 257 NONAME
- _ZThn8_N17CalenSettingsViewD0Ev @ 258 NONAME
- _ZThn8_N17CalenSettingsViewD1Ev @ 259 NONAME
- _ZThn8_N21CalenAgendaViewWidgetD0Ev @ 260 NONAME
- _ZThn8_N21CalenAgendaViewWidgetD1Ev @ 261 NONAME
- _ZThn8_N21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 262 NONAME
- _ZThn8_N21CalenThickLinesDrawerD0Ev @ 263 NONAME
- _ZThn8_N21CalenThickLinesDrawerD1Ev @ 264 NONAME
- _ZThn8_N22CalenDayHourScrollAreaD0Ev @ 265 NONAME
- _ZThn8_N22CalenDayHourScrollAreaD1Ev @ 266 NONAME
- _ZThn8_N25CalenDayContentScrollAreaD0Ev @ 267 NONAME
- _ZThn8_N25CalenDayContentScrollAreaD1Ev @ 268 NONAME
- _ZN14CalenMonthGrid18checkIfWeCanScrollE15scrollDirection @ 269 NONAME
- _ZN21CalenThickLinesDrawer6polishER17HbStyleParameters @ 270 NONAME
+ _ZN22CalenDayHourScrollArea13localeChangedEv @ 170 NONAME
+ _ZN22CalenDayHourScrollArea16scrollVerticallyERK7QPointF @ 171 NONAME
+ _ZN22CalenDayHourScrollArea16staticMetaObjectE @ 172 NONAME DATA 16
+ _ZN22CalenDayHourScrollArea19getStaticMetaObjectEv @ 173 NONAME
+ _ZN22CalenDayHourScrollArea19updateTimeIndicatorEv @ 174 NONAME
+ _ZN22CalenDayHourScrollAreaC1EP13QGraphicsItem @ 175 NONAME
+ _ZN22CalenDayHourScrollAreaC2EP13QGraphicsItem @ 176 NONAME
+ _ZN22CalenDayHourScrollAreaD0Ev @ 177 NONAME
+ _ZN22CalenDayHourScrollAreaD1Ev @ 178 NONAME
+ _ZN22CalenDayHourScrollAreaD2Ev @ 179 NONAME
+ _ZN25CalenDayContentScrollArea11eventFilterEP7QObjectP6QEvent @ 180 NONAME
+ _ZN25CalenDayContentScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 181 NONAME
+ _ZN25CalenDayContentScrollArea11qt_metacastEPKc @ 182 NONAME
+ _ZN25CalenDayContentScrollArea12gestureEventEP13QGestureEvent @ 183 NONAME
+ _ZN25CalenDayContentScrollArea12moveFinishedEv @ 184 NONAME
+ _ZN25CalenDayContentScrollArea14scrollByAmountERK7QPointF @ 185 NONAME
+ _ZN25CalenDayContentScrollArea16staticMetaObjectE @ 186 NONAME DATA 16
+ _ZN25CalenDayContentScrollArea17checkPanDirectionEP11QPanGesture @ 187 NONAME
+ _ZN25CalenDayContentScrollArea18orientationChangedEN2Qt11OrientationE @ 188 NONAME
+ _ZN25CalenDayContentScrollArea19getStaticMetaObjectEv @ 189 NONAME
+ _ZN25CalenDayContentScrollArea20scrollToMiddleWidgetEv @ 190 NONAME
+ _ZN25CalenDayContentScrollArea21scrollAreaMoveStartedE20CalenScrollDirection @ 191 NONAME
+ _ZN25CalenDayContentScrollArea22scrollAreaMoveFinishedE20CalenScrollDirection @ 192 NONAME
+ _ZN25CalenDayContentScrollArea28setDisallowedScrollDirectionE20CalenScrollDirection @ 193 NONAME
+ _ZN25CalenDayContentScrollArea5eventEP6QEvent @ 194 NONAME
+ _ZN25CalenDayContentScrollArea6moveToERK7QPointFi @ 195 NONAME
+ _ZN25CalenDayContentScrollAreaC1EP13QGraphicsItem @ 196 NONAME
+ _ZN25CalenDayContentScrollAreaC2EP13QGraphicsItem @ 197 NONAME
+ _ZN25CalenDayContentScrollAreaD0Ev @ 198 NONAME
+ _ZN25CalenDayContentScrollAreaD1Ev @ 199 NONAME
+ _ZN25CalenDayContentScrollAreaD2Ev @ 200 NONAME
+ _ZNK14CalenMonthGrid10metaObjectEv @ 201 NONAME
+ _ZNK14CalenMonthView10metaObjectEv @ 202 NONAME
+ _ZNK16CalenPreviewPane10metaObjectEv @ 203 NONAME
+ _ZNK17CalenSettingsView10metaObjectEv @ 204 NONAME
+ _ZNK21CalenThickLinesDrawer10metaObjectEv @ 205 NONAME
+ _ZNK22CalenDayHourScrollArea10metaObjectEv @ 206 NONAME
+ _ZNK22CalenDayHourScrollArea8dateTimeEv @ 207 NONAME
+ _ZNK25CalenDayContentScrollArea10metaObjectEv @ 208 NONAME
+ _ZNK25CalenDayContentScrollArea17isHorizontalSwipeEf @ 209 NONAME
+ _ZNK25CalenDayContentScrollArea25disallowedScrollDirectionEv @ 210 NONAME
+ _ZTI14CalenMonthGrid @ 211 NONAME
+ _ZTI14CalenMonthView @ 212 NONAME
+ _ZTI16CalenPreviewPane @ 213 NONAME
+ _ZTI17CalenSettingsView @ 214 NONAME
+ _ZTI21CalenThickLinesDrawer @ 215 NONAME
+ _ZTI22CalenDayHourScrollArea @ 216 NONAME
+ _ZTI25CalenDayContentScrollArea @ 217 NONAME
+ _ZTV14CalenMonthGrid @ 218 NONAME
+ _ZTV14CalenMonthView @ 219 NONAME
+ _ZTV16CalenPreviewPane @ 220 NONAME
+ _ZTV17CalenSettingsView @ 221 NONAME
+ _ZTV21CalenThickLinesDrawer @ 222 NONAME
+ _ZTV22CalenDayHourScrollArea @ 223 NONAME
+ _ZTV25CalenDayContentScrollArea @ 224 NONAME
+ _ZThn16_N12CalenDayViewD0Ev @ 225 NONAME
+ _ZThn16_N12CalenDayViewD1Ev @ 226 NONAME
+ _ZThn16_N14CalenMonthGridD0Ev @ 227 NONAME
+ _ZThn16_N14CalenMonthGridD1Ev @ 228 NONAME
+ _ZThn16_N14CalenMonthViewD0Ev @ 229 NONAME
+ _ZThn16_N14CalenMonthViewD1Ev @ 230 NONAME
+ _ZThn16_N15CalenAgendaViewD0Ev @ 231 NONAME
+ _ZThn16_N15CalenAgendaViewD1Ev @ 232 NONAME
+ _ZThn16_N16CalenPluginLabelD0Ev @ 233 NONAME
+ _ZThn16_N16CalenPluginLabelD1Ev @ 234 NONAME
+ _ZThn16_N16CalenPreviewPaneD0Ev @ 235 NONAME
+ _ZThn16_N16CalenPreviewPaneD1Ev @ 236 NONAME
+ _ZThn16_N17CalenSettingsViewD0Ev @ 237 NONAME
+ _ZThn16_N17CalenSettingsViewD1Ev @ 238 NONAME
+ _ZThn16_N21CalenAgendaViewWidgetD0Ev @ 239 NONAME
+ _ZThn16_N21CalenAgendaViewWidgetD1Ev @ 240 NONAME
+ _ZThn16_N21CalenThickLinesDrawerD0Ev @ 241 NONAME
+ _ZThn16_N21CalenThickLinesDrawerD1Ev @ 242 NONAME
+ _ZThn16_N22CalenDayHourScrollAreaD0Ev @ 243 NONAME
+ _ZThn16_N22CalenDayHourScrollAreaD1Ev @ 244 NONAME
+ _ZThn16_N25CalenDayContentScrollAreaD0Ev @ 245 NONAME
+ _ZThn16_N25CalenDayContentScrollAreaD1Ev @ 246 NONAME
+ _ZThn8_N12CalenDayViewD0Ev @ 247 NONAME
+ _ZThn8_N12CalenDayViewD1Ev @ 248 NONAME
+ _ZThn8_N14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 249 NONAME
+ _ZThn8_N14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 250 NONAME
+ _ZThn8_N14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 251 NONAME
+ _ZThn8_N14CalenMonthGridD0Ev @ 252 NONAME
+ _ZThn8_N14CalenMonthGridD1Ev @ 253 NONAME
+ _ZThn8_N14CalenMonthViewD0Ev @ 254 NONAME
+ _ZThn8_N14CalenMonthViewD1Ev @ 255 NONAME
+ _ZThn8_N15CalenAgendaViewD0Ev @ 256 NONAME
+ _ZThn8_N15CalenAgendaViewD1Ev @ 257 NONAME
+ _ZThn8_N16CalenPluginLabelD0Ev @ 258 NONAME
+ _ZThn8_N16CalenPluginLabelD1Ev @ 259 NONAME
+ _ZThn8_N16CalenPreviewPaneD0Ev @ 260 NONAME
+ _ZThn8_N16CalenPreviewPaneD1Ev @ 261 NONAME
+ _ZThn8_N17CalenSettingsViewD0Ev @ 262 NONAME
+ _ZThn8_N17CalenSettingsViewD1Ev @ 263 NONAME
+ _ZThn8_N21CalenAgendaViewWidgetD0Ev @ 264 NONAME
+ _ZThn8_N21CalenAgendaViewWidgetD1Ev @ 265 NONAME
+ _ZThn8_N21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 266 NONAME
+ _ZThn8_N21CalenThickLinesDrawerD0Ev @ 267 NONAME
+ _ZThn8_N21CalenThickLinesDrawerD1Ev @ 268 NONAME
+ _ZThn8_N22CalenDayHourScrollAreaD0Ev @ 269 NONAME
+ _ZThn8_N22CalenDayHourScrollAreaD1Ev @ 270 NONAME
+ _ZThn8_N25CalenDayContentScrollAreaD0Ev @ 271 NONAME
+ _ZThn8_N25CalenDayContentScrollAreaD1Ev @ 272 NONAME
--- a/calendarui/views/inc/calenagendaview.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/inc/calenagendaview.h Tue Oct 05 13:57:00 2010 +0530
@@ -179,7 +179,7 @@
QPointF mTapPoint;
bool mActionTaken;
bool mIsAboutToQuitEventConnected; // bool to check if agenda view is registered to get aboutToQuit signals
-
+ bool mDayViewActivated;
};
#endif /* CALENAGENDAVIEW_H */
--- a/calendarui/views/inc/calenmonthgrid.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/inc/calenmonthgrid.h Tue Oct 05 13:57:00 2010 +0530
@@ -65,7 +65,6 @@
int getCurrentIndex();
protected:
- void orientationChanged(Qt::Orientation newOrientation);
void gestureEvent(QGestureEvent *event);
private:
--- a/calendarui/views/inc/calenmonthview.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/inc/calenmonthview.h Tue Oct 05 13:57:00 2010 +0530
@@ -69,7 +69,6 @@
void doLazyLoading();
void handleGridItemActivated();
void setContextForActiveDay(int index);
- QDateTime getCurrentDay();
QDateTime getActiveDay();
int rowsInPrevMonth();
int rowsInFutMonth();
@@ -158,7 +157,6 @@
HbLabel *mSixthWeekLabel;
QList<CalenMonthData> mMonthDataArray;
QDateTime mDate;
- QDateTime mCurrentDay;
QDateTime mFirstDayOfGrid;
QDateTime mLastDayOfGrid;
int mTotalNumOfGridItems;
--- a/calendarui/views/inc/calennativeview.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/inc/calennativeview.h Tue Oct 05 13:57:00 2010 +0530
@@ -40,6 +40,7 @@
class MCalenServices;
class HbDateTimePicker;
+class AfActivityStorage;
class CalenNativeView : public CalenView,
public MCalenNotificationHandler
@@ -67,6 +68,11 @@
virtual void onLocaleChanged(int reason)=0;
virtual void onContextChanged() {};
virtual bool checkIfWeCanSwipe(QDateTime& date, bool rightGesture);
+ /**
+ * removeActivity removes the current view from the activity
+ *
+ */
+ bool removeActivity();
signals:
void closeDialogs();
@@ -88,7 +94,7 @@
void refreshDatePicker();
protected:
-
+ AfActivityStorage *mActivityStorage;
MCalenServices &mServices; // not owned.
int mActivityId; // Recent Activity ID, currently it holdes wither of ECalenMonthView or ECalenAgendaView
QVariantHash mScreenShotMetadata; // Screenshot
--- a/calendarui/views/src/calenagendaview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/src/calenagendaview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -23,7 +23,7 @@
#include <hbpangesture.h>
#include <hbswipegesture.h>
#include <hbapplication.h> // hbapplication
-#include <hbactivitymanager.h> // Activity Manager
+
// User includes
#include "calenagendaview.h"
@@ -51,7 +51,8 @@
mGoToTodayAction(NULL),
mSwitchToDayViewAction(NULL),
mActionTaken(false),
-mIsAboutToQuitEventConnected(false)
+mIsAboutToQuitEventConnected(false),
+mDayViewActivated(false)
{
OstTraceFunctionEntry0( CALENAGENDAVIEW_CALENAGENDAVIEW_ENTRY );
@@ -113,14 +114,10 @@
// in all views
mServices.OfferMenu(menu());
- // get a poitner to activity manager
- HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
-
- // clean up any previous versions of this activity, if any, i.e. activityName, from the activity manager.
+ // clean up any previous versions of this activity, if any, i.e. activityName,
// Ignore return value, first boot would always return False. bool declared
// only for debugging purpose.
- bool ok = activityManager->removeActivity(activityName);
-
+ bool ok = removeActivity();
OstTraceFunctionExit0( DUP1_CALENAGENDAVIEW_SETUPVIEW_EXIT );
}
@@ -132,7 +129,7 @@
void CalenAgendaView::doPopulation()
{
OstTraceFunctionEntry0( CALENAGENDAVIEW_DOPOPULATION_ENTRY );
-
+ mDayViewActivated = false;
// The content widget has not been constructed. Don't do anything
if (!mAgendaViewWidget) {
OstTraceFunctionExit0( CALENAGENDAVIEW_DOPOPULATION_EXIT );
@@ -180,7 +177,7 @@
// Population is complete, issue a notification
populationComplete();
-
+ captureScreenshot(true);
OstTraceFunctionExit0( DUP1_CALENAGENDAVIEW_DOPOPULATION_EXIT );
}
@@ -313,7 +310,7 @@
//
void CalenAgendaView::createNewEvent()
{
- captureScreenshot(true);
+
mAgendaViewWidget->createNewEvent();
}
@@ -375,7 +372,7 @@
void CalenAgendaView::launchDayView()
{
OstTraceFunctionEntry0( CALENAGENDAVIEW_LAUNCHDAYVIEW_ENTRY );
-
+ mDayViewActivated = true;
// Issue the command to launch the day view
mServices.IssueCommandL(ECalenDayView);
@@ -389,9 +386,12 @@
void CalenAgendaView::clearListModel()
{
OstTraceFunctionEntry0( CALENAGENDAVIEW_CLEARLISTMODEL_ENTRY );
-
+ // do not disconnect if day view is open
+ // save the agenda view as an activity
+ if(!mDayViewActivated){
// day view is removed from the list disconnect for aboutToQuit events
disconnectAboutToQuitEvent();
+ }
mAgendaViewWidget->clearListModel();
OstTraceFunctionExit0( CALENAGENDAVIEW_CLEARLISTMODEL_EXIT );
--- a/calendarui/views/src/calenmonthgrid.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/src/calenmonthgrid.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -176,8 +176,6 @@
loopEnd = dataCount;
}
- QDateTime currDate = mView->getCurrentDay();
- QDateTime currDateTime = CalenDateUtils::beginningOfDay(currDate);
QDateTime activeDay = mView->getActiveDay();
QDateTime activeDateTime = CalenDateUtils::beginningOfDay(activeDay);
@@ -205,7 +203,7 @@
}
// Check for current day
- if (currDateTime == CalenDateUtils::beginningOfDay(dateTime)) {
+ if (QDate::currentDate() == dateTime.date()) {
// Set the underline attribute to true
itemData << true;
} else {
@@ -262,14 +260,10 @@
// two calls have been made to scrollTo(), one with top
// visible item and other with bottom visible item
// Calculate the first visible item in the grid
- QModelIndex firstVisibleIndex = mModel->index(indexToBeScrolled -
- (KNumOfVisibleRows * KCalenDaysInWeek - 1), 0);
- scrollTo(firstVisibleIndex);
-
// Calculate the last visible item in the grid
QModelIndex lastVisibleIndex = mModel->index(indexToBeScrolled, 0);
- scrollTo(lastVisibleIndex);
+ scrollTo(lastVisibleIndex, HbAbstractItemView::PositionAtBottom);
}
OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDMODEL_EXIT );
@@ -293,17 +287,12 @@
int rowsInPrevMonth = mView->rowsInPrevMonth();
// Calculate the proper index to be scrolled to
- int itemToBeScrolled = rowsInPrevMonth * KCalenDaysInWeek;
+
+ int itemToBeScrolled = ((rowsInPrevMonth + KNumOfVisibleRows) *
+ KCalenDaysInWeek) - 1;
QModelIndex indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
mIsAtomicScroll = true;
- scrollTo(indexToBeScrolled);
-
- // Scroll to proper index
- itemToBeScrolled = ((rowsInPrevMonth + KNumOfVisibleRows) *
- KCalenDaysInWeek) - 1;
- indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
- mIsAtomicScroll = true;
- scrollTo(indexToBeScrolled);
+ scrollTo(indexToBeScrolled, HbAbstractItemView::PositionAtBottom);
// Update the sart position of the content widget
mStartPos = mContentWidget->pos();
@@ -340,8 +329,10 @@
QModelIndex itemIndex = mModel->index(i,0);
QVariant itemData = itemIndex.data(Qt::UserRole + 1);
QVariantList list = itemData.toList();
- list.replace(CalendarNamespace::CalendarMonthEventRole, true);
- mModel->itemFromIndex(itemIndex)->setData(list);
+ if (list.count() > CalendarNamespace::CalendarMonthEventRole ) {
+ list.replace(CalendarNamespace::CalendarMonthEventRole, true);
+ mModel->itemFromIndex(itemIndex)->setData(list);
+ }
}
}
} else {
@@ -758,8 +749,6 @@
{
OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEPREPENDINGROWS_ENTRY );
- QDateTime currDate = mView->getCurrentDay();
- QDateTime currDateTime = CalenDateUtils::beginningOfDay( currDate );
int rowsInPrevMonth = mView->rowsInPrevMonth();
// Add the new days
int countToBeAdded = rowsInPrevMonth * KCalenDaysInWeek;
@@ -783,7 +772,7 @@
itemData << false;
// Check for current day
- if (currDateTime == CalenDateUtils::beginningOfDay( dateTime )) {
+ if (QDate::currentDate() == dateTime.date()) {
// Set the underline icon attribute
itemData << true;
} else {
@@ -881,8 +870,6 @@
{
OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEAPPENDINGROWS_ENTRY );
- QDateTime currDate = mView->getCurrentDay();
- QDateTime currDateTime = CalenDateUtils::beginningOfDay( currDate );
int rowsInFutMonth = mView->rowsInFutMonth();
int countToBeAdded = rowsInFutMonth * KCalenDaysInWeek;
int lastVisibleIndex = monthDataList.count() - countToBeAdded;
@@ -906,7 +893,7 @@
itemData << false;
// Check for current day
- if (currDateTime == CalenDateUtils::beginningOfDay( dateTime )) {
+ if (QDate::currentDate() == dateTime.date()) {
// Set the underline icon attribute
itemData << true;
} else {
@@ -1163,42 +1150,6 @@
}
/*!
- Function to override the default behavior of hbgridview on orientation change
- */
-void CalenMonthGrid::orientationChanged(Qt::Orientation newOrientation)
-{
- OstTraceFunctionEntry0( CALENMONTHGRID_ORIENTATIONCHANGED_ENTRY );
-
- // 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);
- }
-
- OstTraceFunctionExit0( CALENMONTHGRID_ORIENTATIONCHANGED_EXIT );
-}
-
-/*!
Paint function to draw grid lines
*/
void CalenMonthGrid::paint(QPainter* painter,
--- a/calendarui/views/src/calenmonthview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/src/calenmonthview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -31,7 +31,7 @@
#include <agendautil.h>
#include <agendaentry.h>
#include <hbapplication.h> // hbapplication
-#include <hbactivitymanager.h> //Activity Manager
+
//user includes
#include "calenmonthview.h"
@@ -83,7 +83,6 @@
mOrientation = mServices.MainWindow().orientation();
// Read the date from the context
mDate = mServices.Context().focusDateAndTime();
- mCurrentDay = mDate;
// Create the settings manager instance and settings key for week number
mSettingsManager = new XQSettingsManager(this);
@@ -240,13 +239,11 @@
mIsFirstTimeLoad = true;
- // get a pointner to activity manager
- HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
- // clean up any previous versions of this activity, if any, i.e. activityName, from the activity manager.
+ // clean up any previous versions of this activity, if any, i.e. activityName
// Ignore return value, first boot would always return False. bool declared
// only for debugging purpose.
- bool ok = activityManager->removeActivity(activityName);
+ bool ok = removeActivity();
OstTraceFunctionExit0( CALENMONTHVIEW_SETUPVIEW_EXIT );
}
@@ -940,17 +937,6 @@
}
/*!
- Returns the currDay(Today)
- */
-QDateTime CalenMonthView::getCurrentDay()
-{
- OstTraceFunctionEntry0( CALENMONTHVIEW_GETCURRENTDAY_ENTRY );
-
- OstTraceFunctionExit0( CALENMONTHVIEW_GETCURRENTDAY_EXIT );
- return mCurrentDay;
-}
-
-/*!
Returns the active day(currently focussed day)
*/
QDateTime CalenMonthView::getActiveDay()
@@ -1448,11 +1434,10 @@
OstTraceFunctionEntry0( CALENMONTHVIEW_LAUNCHDAYVIEW_ENTRY );
mServices.IssueCommandL(ECalenDayView);
- // day view launched now, disconnect to get the call backs for saveActivity
- // on aboutToQuit signal
- disconnectAboutToQuitEvent();
-
- OstTraceFunctionExit0( CALENMONTHVIEW_LAUNCHDAYVIEW_EXIT );
+ // day view launched now, captre the screen shot of month view
+ captureScreenshot(true);
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_LAUNCHDAYVIEW_EXIT );
}
/*!
@@ -1660,12 +1645,9 @@
void CalenMonthView::onLocaleChanged(int reason)
{
OstTraceFunctionEntry0( CALENMONTHVIEW_ONLOCALECHANGED_ENTRY );
-
- if ((reason & EChangesSystemTime)
- || (reason & EChangesMidnightCrossover)) {
- mCurrentDay = CalenDateUtils::today();
- }
- OstTraceFunctionExit0( CALENMONTHVIEW_ONLOCALECHANGED_EXIT );
+ Q_UNUSED(reason);
+ return;
+ OstTraceFunctionExit0( CALENMONTHVIEW_ONLOCALECHANGED_EXIT );
}
/*!
--- a/calendarui/views/src/calennativeview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/src/calennativeview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -26,6 +26,7 @@
#include <vwsdef.h>
#include <hbactivitymanager.h> //Activity Manager
#include <hbapplication.h> //hbapplication
+#include <afactivitystorage.h>
//user includes
#include <CalenUid.h>
@@ -58,7 +59,8 @@
OstTraceFunctionEntry0( CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY );
setTitle(hbTrId("txt_calendar_title_calendar"));
-
+ //initialize the activity
+ mActivityStorage = new AfActivityStorage(this);
// Create services API and register for notifications
RArray<TCalenNotification> notificationArray;
CleanupClosePushL(notificationArray);
@@ -322,10 +324,6 @@
void CalenNativeView::saveActivity()
{
OstTraceFunctionEntry0( CALENNATIVEVIEW_SAVEACTIVITY_ENTRY );
-
- // Get a pointer to activity manager
- HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
-
// check if alerady a valid screen shot is captured
if (!mIsCapturedScreenShotValid) {
mScreenShotMetadata.clear(); // remove any screenshot captured earlier
@@ -339,9 +337,8 @@
bool ok(false);
// Save activity
- ok = activityManager->addActivity(activityName, serializedActivity, mScreenShotMetadata);
-
- // Check is activity saved sucessfully
+ ok = mActivityStorage->saveActivity(activityName,serializedActivity,mScreenShotMetadata);
+ // Check is activity saved sucessfully
if ( !ok ) {
qFatal("Add failed" ); // Panic is activity is not saved successfully
}
@@ -369,4 +366,14 @@
return value;
}
+
+/*!
+ Function to remove the activity
+ */
+bool CalenNativeView::removeActivity()
+ {
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_REMOVEACTIVITY_ENTRY );
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_REMOVEACTIVITY_EXIT );
+ return mActivityStorage->removeActivity(activityName);
+ }
//End Of File
--- a/calendarui/views/traces/calennativeviewTraces.h Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/traces/calennativeviewTraces.h Tue Oct 05 13:57:00 2010 +0530
@@ -39,6 +39,8 @@
#define CALENNATIVEVIEW_SAVEACTIVITY_EXIT 0x8a0143
#define CALENNATIVEVIEW_CHECKIFWECANSWIPE_ENTRY 0x8a0191
#define CALENNATIVEVIEW_CHECKIFWECANSWIPE_EXIT 0x8a0192
+#define CALENNATIVEVIEW_REMOVEACTIVITY_ENTRY 0x8a0193
+#define CALENNATIVEVIEW_REMOVEACTIVITY_EXIT 0x8a0194
#endif
--- a/calendarui/views/traces/fixed_id.definitions Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/traces/fixed_id.definitions Tue Oct 05 13:57:00 2010 +0530
@@ -294,6 +294,8 @@
[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_POPULATIONCOMPLETE_EXIT=0x12a
[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_REFRESHVIEWONGOTODATE_ENTRY=0x133
[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_REFRESHVIEWONGOTODATE_EXIT=0x134
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_REMOVEACTIVITY_ENTRY=0x193
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_REMOVEACTIVITY_EXIT=0x194
[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_SAVEACTIVITY_ENTRY=0x142
[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_SAVEACTIVITY_EXIT=0x143
[TRACE]TRACE_FLOW[0x8A]_CALENPLUGINLABEL_CALENPLUGINLABEL_ENTRY=0x144
--- a/calendarui/views/views.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/views/views.pro Tue Oct 05 13:57:00 2010 +0530
@@ -39,7 +39,8 @@
-lcalencommonutils \
-lcalensettings \
-lagendainterface \
- -lxqsettingsmanager
+ -lxqsettingsmanager \
+ -lafservice
TARGET.UID3 = 0x10282F26
TARGET.CAPABILITY = CAP_GENERAL_DLL
--- a/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -173,10 +173,10 @@
mVirtualKeyboard = new HbAbstractVkbHost(mAlarmEditorView);
}
connect(
- mVirtualKeyboard, SIGNAL(keypadOpened()),
+ mVirtualKeyboard, SIGNAL(aboutToOpen()),
this, SLOT(handleKeypadOpen()));
connect(
- mVirtualKeyboard, SIGNAL(keypadClosed()),
+ mVirtualKeyboard, SIGNAL(aboutToClose()),
this, SLOT(handleKeypadClosed()));
--- a/clock/clockui/clockviewmanager/clockviewmanager.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/clockui/clockviewmanager/clockviewmanager.pro Tue Oct 05 13:57:00 2010 +0530
@@ -40,7 +40,8 @@
LIBS += \
-lclockviews \
- -lclockwidget
+ -lclockwidget \
+ -lafservice
}
SOURCES += \
--- a/clock/clockui/clockviewmanager/src/clockviewmanager.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/clockui/clockviewmanager/src/clockviewmanager.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -22,6 +22,8 @@
#include <HbApplication>
#include <HbActivityManager>
#include <HbToolBar>
+#include <AfActivation.h>
+#include <AfActivityStorage.h>
// User includes
#include "clockviewmanager.h"
@@ -56,12 +58,14 @@
{
OstTraceFunctionEntry0( CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY );
// Activity Reason from Activity Manager
- int activityReason = qobject_cast<HbApplication*>(qApp)->activateReason();
-
- if (Hb::ActivationReasonActivity == activityReason) {
+ AfActivation *activation = new AfActivation();
+
+ if (Af::ActivationReasonActivity == activation->reason()) {
// Application is started from an activity
// extract activity data
- QVariant data = qobject_cast<HbApplication*>(qApp)->activateData();
+ AfActivityStorage *activitystorage = new AfActivityStorage();
+ QVariant data = activitystorage->activityData(activation->name());
+ delete activitystorage;
// restore state from activity data
QByteArray serializedModel = data.toByteArray();
QDataStream stream(&serializedModel, QIODevice::ReadOnly);
@@ -92,7 +96,7 @@
window, SIGNAL(viewReady()),
this, SLOT(loadOtherViews()));
}
-
+delete activation;
OstTraceFunctionExit0( CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT );
}
--- a/clock/clockui/clockviews/clockviews.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/clockui/clockviews/clockviews.pro Tue Oct 05 13:57:00 2010 +0530
@@ -55,7 +55,8 @@
-lclockcityselectionlist \
-lclockwidget \
-lclockwidgetplugin \
- -lxqsettingsmanager
+ -lxqsettingsmanager \
+ -lafservice
}
SOURCES += \
--- a/clock/clockui/clockviews/inc/clockmainview.h Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/clockui/clockviews/inc/clockmainview.h Tue Oct 05 13:57:00 2010 +0530
@@ -42,6 +42,7 @@
class ClockWidget;
class XQSettingsManager;
class XQSettingsKey;
+class AfActivityStorage;
class ClockMainView : public HbView
{
@@ -81,6 +82,7 @@
void removeSnoozedAlarm();
void updateDateLabel();
void updateClockWidget();
+ bool removeActivity();
private:
QTimer *mTickTimer;
@@ -110,6 +112,8 @@
XQSettingsManager *mSettingsManager;
XQSettingsKey *mClockTypeSettingsKey;
+
+ AfActivityStorage *mActivityStorage;
int mSelectedItem;
bool mHideAlarmList;
--- a/clock/clockui/clockviews/src/clockmainview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/clockui/clockviews/src/clockmainview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -32,6 +32,7 @@
#include <xqsettingsmanager.h>
#include <xqsettingskey.h>
#include <clockdomaincrkeys.h>
+#include <AfActivityStorage.h>//activity
// User includes
#include "clockmainview.h"
@@ -118,7 +119,8 @@
OstTraceFunctionEntry0( CLOCKMAINVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
-
+ //initialize the activity
+ mActivityStorage = new AfActivityStorage(this);
mTimezoneClient = controllerIf.timezoneClient();
mSettingsUtility = controllerIf.settingsUtility();
mAlarmClient = controllerIf.alarmClient();
@@ -212,6 +214,8 @@
mDayLabel->setTextColor(mLabelColorGroup);
mPlaceLabel = static_cast<HbLabel *> (mDocLoader->findObject("placetext"));
mPlaceLabel->setTextColor(mLabelColorGroup);
+ mPlaceLabel->setAlignment(Qt::AlignLeft);
+ mPlaceLabel->setTextWrapping(Hb::TextNoWrap);
mDstIcon = static_cast<HbLabel *> (mDocLoader->findObject("dstIcon"));
mClockWidget = static_cast<ClockWidget*> (
mDocLoader->findObject(CLOCK_WIDGET));
@@ -228,13 +232,12 @@
window, SIGNAL(orientationChanged(Qt::Orientation)),
this, SLOT(checkOrientationAndLoadSection(Qt::Orientation)));
- // Get a pointer to activity Manager
- HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
+
- // clean up any previous versions of this activity from the activity manager.
+ // clean up any previous versions of this activity.
// ignore return value as the first boot would always return a false
// bool declared on for debugging purpose
- bool ok = activityManager->removeActivity(clockMainView);
+ bool ok = removeActivity();
// connect for the aboutToQuit events on application Exit as to call saveActivity
connect(qobject_cast<HbApplication*>(qApp), SIGNAL(aboutToQuit()), this, SLOT(saveActivity()));
@@ -542,6 +545,7 @@
updateDateLabel();
// Update clock widget.
updateClockWidget();
+ captureScreenShot(false);
OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATEVIEW_EXIT );
}
@@ -837,8 +841,6 @@
void ClockMainView::saveActivity()
{
OstTraceFunctionEntry0( CLOCKMAINVIEW_SAVEACTIVITY_ENTRY );
- // Get a pointer to activity Manager
- HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
// check if a valid screenshot is already captured
if (!mIsScreenShotCapruted) {
mScreenShot.clear();
@@ -851,10 +853,20 @@
stream << MainView;
// add the activity to the activity manager
- bool ok = activityManager->addActivity(clockMainView, serializedActivity, mScreenShot);
+ bool ok = mActivityStorage->saveActivity(clockMainView, serializedActivity, mScreenShot);
if ( !ok ) {
qFatal("Add failed" );
}
OstTraceFunctionExit0( CLOCKMAINVIEW_SAVEACTIVITY_EXIT );
}
+
+/*!
+ Function to remove the activity
+ */
+bool ClockMainView::removeActivity()
+ {
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_REMOVEACTIVITY_ENTRY );
+ OstTraceFunctionExit0( CLOCKMAINVIEW_REMOVEACTIVITY_EXIT );
+ return mActivityStorage->removeActivity(clockMainView);
+ }
// End of file --Don't remove.
--- a/clock/clockui/clockviews/traces/clockmainviewTraces.h Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/clockui/clockviews/traces/clockmainviewTraces.h Tue Oct 05 13:57:00 2010 +0530
@@ -75,6 +75,8 @@
#define CLOCKMAINVIEW_SAVEACTIVITY_EXIT 0x8a005b
#define CLOCKMAINVIEW_EVENTMONITOR_ENTRY 0x8a0085
#define CLOCKMAINVIEW_EVENTMONITOR_EXIT 0x8a0086
+#define CLOCKMAINVIEW_REMOVEACTIVITY_ENTRY 0x8a0087
+#define CLOCKMAINVIEW_REMOVEACTIVITY_EXIT 0x8a0088
#endif
--- a/clock/clockui/clockviews/traces/fixed_id.definitions Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/clockui/clockviews/traces/fixed_id.definitions Tue Oct 05 13:57:00 2010 +0530
@@ -82,6 +82,8 @@
[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_OPENSETTINGS_EXIT=0x3b
[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REFRESHMAINVIEW_ENTRY=0x34
[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REFRESHMAINVIEW_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REMOVEACTIVITY_ENTRY=0x87
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REMOVEACTIVITY_EXIT=0x88
[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REMOVESNOOZEDALARM_ENTRY=0x42
[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REMOVESNOOZEDALARM_EXIT=0x43
[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SAVEACTIVITY_ENTRY=0x5a
--- a/clock/group/bld.inf Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/group/bld.inf Tue Oct 05 13:57:00 2010 +0530
@@ -21,7 +21,6 @@
../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)
--- a/clock/sis/clock.pkg Mon Sep 20 12:44:39 2010 +0530
+++ b/clock/sis/clock.pkg Tue Oct 05 13:57:00 2010 +0530
@@ -68,8 +68,4 @@
"/epoc32/release/armv5/urel/clocksettingsviewplugin.dll" - "!:/sys/bin/clocksettingsviewplugin.dll"
"/epoc32/data/z/resource/qt/plugins/clock/clocksettingsviewplugin.qtplugin" - "!:/resource/qt/plugins/clock/clocksettingsviewplugin.qtplugin"
-"/epoc32/release/armv5/urel/ftudatetimewizard.dll" - "!:/sys/bin/ftudatetimewizard.dll"
-"/epoc32/data/z/resource/qt/plugins/FTU/ftudatetimewizard.qtplugin" - "!:/resource/qt/plugins/FTU/ftudatetimewizard.qtplugin"
-"/epoc32/data/z/fturesources/plugins/wizardproviders/ftudatetimewizard.manifest" - "!:/fturesources/plugins/wizardproviders/ftudatetimewizard.manifest"
-
;END OF FILE
--- a/notes/data/notes.qrc Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/data/notes.qrc Tue Oct 05 13:57:00 2010 +0530
@@ -1,1 +1,1 @@
-<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/xml">
<file alias="notesmainview.docml">xml/notesmainview.docml</file>
<file alias="notescollectionsview.docml">xml/notescollectionsview.docml</file>
<file alias="notestodoview.docml">xml/notestodoview.docml</file>
<file alias="notesfavoriteview.docml">xml/notesfavoriteview.docml</file>
<file alias="notesnoteview.docml">xml/notesnoteview.docml</file>
</qresource>
<qresource prefix= "/style">
<file alias="hblistviewitem.css">style/hblistviewitem.css</file>
<file alias="hblistviewitem.widgetml">style/hblistviewitem.widgetml</file>
</qresource>
</RCC>
\ No newline at end of file
+<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/xml">
<file alias="notesmainview.docml">xml/notesmainview.docml</file>
<file alias="notescollectionsview.docml">xml/notescollectionsview.docml</file>
<file alias="notestodoview.docml">xml/notestodoview.docml</file>
<file alias="notesfavoriteview.docml">xml/notesfavoriteview.docml</file>
<file alias="notesnoteview.docml">xml/notesnoteview.docml</file>
</qresource>
<qresource prefix= "/style">
<file alias="hblistviewitem.css">style/hblistviewitem.css</file>
<file alias="hblistviewitem.widgetml">style/hblistviewitem.widgetml</file>
<file alias="notestodoeditorcustomitem.css">style/notestodoeditorcustomitem.css</file>
</qresource>
</RCC>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/data/style/notestodoeditorcustomitem.css Tue Oct 05 13:57:00 2010 +0530
@@ -0,0 +1,22 @@
+NotesTodoEditorCustomItem[!hasIcon][alarmdateItem]:landscape
+{
+ layout:layout_portrait_without_icon;
+}
+
+NotesTodoEditorCustomItem[hasIcon][alarmdateItem]:landscape
+{
+ layout:layout_portrait_with_icon;
+}
+
+NotesTodoEditorCustomItem[alarmdateItem]::dataItem_Label:landscape
+{
+ size-policy-horizontal:preferred;
+}
+
+NotesTodoEditorCustomItem[alarmdateItem]::dataItem_ContentWidget:landscape
+{
+ top: -var(hb-param-margin-gene-top);
+ left:-var(hb-param-margin-gene-left);
+ right:var(hb-param-margin-gene-right);
+ bottom:var(hb-param-margin-gene-bottom);
+}
--- a/notes/notesui/noteseditor/src/notestodoeditorcustomitem.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/notesui/noteseditor/src/notestodoeditorcustomitem.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -97,6 +97,7 @@
switch(itemType) {
case HbDataFormModelItem::CustomItemBase + DueDateItemOffset: {
+ setProperty("alarmdateItem",false);
mDueDateItem = new HbPushButton();
mDueDateItem->setObjectName("dueDateItem");
connect(
@@ -107,6 +108,8 @@
}
case HbDataFormModelItem::CustomItemBase + AlarmDateItemOffset: {
+
+ setProperty("alarmdateItem",true);
// Adding two push buttions.
HbWidget *widget = new HbWidget();
QGraphicsLinearLayout *layout =
--- a/notes/notesui/notesviewmanager/notesviewmanager.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/notesui/notesviewmanager/notesviewmanager.pro Tue Oct 05 13:57:00 2010 +0530
@@ -45,7 +45,8 @@
LIBS += \
-lagendainterface \
-lnotesmodel \
- -lnotesviews
+ -lnotesviews \
+ -lafservice
}
SOURCES += \
--- a/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -25,7 +25,8 @@
#include <HbMessageBox>
#include <HbAction>
#include <hbapplication> // hbapplication
-#include <hbactivitymanager> // hbactivitymanager
+#include <AfActivation.h>
+#include <AfActivityStorage.h>
// User includes
#include "notesviewmanager.h"
@@ -74,13 +75,15 @@
mAgendaUtil = mAppControllerIf.agendaUtil();
// Check the Application Startup reason from Activity Manager
- int activityReason = qobject_cast<HbApplication*>(qApp)->activateReason();
+ AfActivation *activation = new AfActivation();
// Check if application is started from an application
- if (Hb::ActivationReasonActivity == activityReason) {
+ if (Af::ActivationReasonActivity == activation->reason()) {
// Application is started from an activity
// extract activity data
- QVariant data = qobject_cast<HbApplication*>(qApp)->activateData();
+ AfActivityStorage *activitystorage = new AfActivityStorage();
+ QVariant data = activitystorage->activityData(activation->name());
+ delete activitystorage;
// Restore state from activity data
QByteArray serializedModel = data.toByteArray();
QDataStream stream(&serializedModel, QIODevice::ReadOnly);
@@ -100,7 +103,8 @@
// Load the main view at the start up.
loadNotesMainView();
}
-
+ //delet the activity instance
+ delete activation;
connect(
mAgendaUtil, SIGNAL(instanceViewCreationCompleted(int)),
this,SLOT(handleInstanceViewCreationCompleted(int)));
--- a/notes/notesui/notesviews/inc/notesmainview.h Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/notesui/notesviews/inc/notesmainview.h Tue Oct 05 13:57:00 2010 +0530
@@ -41,6 +41,7 @@
class NotesSortFilterProxyModel;
class NotesEditor;
class AgendaEventViewer;
+class AfActivityStorage;
class NotesMainView : public HbView
{
@@ -59,7 +60,11 @@
signals:
void deleteEntry(ulong entryId);
-
+private :
+ /*
+ * remove the activity
+ */
+ bool removeActivity();
private slots:
void createNewNote();
void handleItemReleased(const QModelIndex &index);
@@ -113,6 +118,7 @@
bool mIsLongTop;
bool mIsScreenShotCapruted; // check if the screenshot captured is valid
QVariantHash mScreenShot; // screenshot
+ AfActivityStorage *mActivityStorage;;
};
#endif // NOTESMAINVIEW_H
--- a/notes/notesui/notesviews/notesviews.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/notesui/notesviews/notesviews.pro Tue Oct 05 13:57:00 2010 +0530
@@ -46,7 +46,8 @@
-lagendainterface \
-lnotesmodel \
-lnoteseditor \
- -lagendaeventviewer
+ -lagendaeventviewer \
+ -lafservice
}
SOURCES += \
--- a/notes/notesui/notesviews/src/notesmainview.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/notesui/notesviews/src/notesmainview.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -31,7 +31,8 @@
#include <HbGroupBox>
#include <HbListViewItem>
#include <hbapplication> // hbapplication
-#include <hbactivitymanager> // hbactivitymanager
+#include <AfActivityStorage.h>
+
// User includes
#include <agendautil.h>
@@ -99,7 +100,10 @@
NotesAppControllerIf &controllerIf, NotesDocLoader *docLoader)
{
OstTraceFunctionEntry0( NOTESMAINVIEW_SETUPVIEW_ENTRY );
-
+ // Get a pointer to activity storage
+ mActivityStorage = new AfActivityStorage(this);
+
+
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
mNotesModel = mAppControllerIf->notesModel();
@@ -157,14 +161,11 @@
HbListViewItem *prototype = mListView->listItemPrototype();
prototype->setGraphicsSize(HbListViewItem::SmallIcon);
- // Get a pointer to activity Manager
- HbActivityManager* activityManager =
- qobject_cast<HbApplication*>(qApp)->activityManager();
- // clean up any previous versions of this activity from the activity manager
+ // clean up any previous versions of this activity
// ignore return value as the first boot would always return a false
// bool declared on for debugging purpose
- bool ok = activityManager->removeActivity(notes);
+ bool ok = removeActivity();
// connect main view for the first time to recieve aboutToQuit signal
connect(
@@ -769,9 +770,7 @@
void NotesMainView::saveActivity()
{
OstTraceFunctionEntry0( NOTESMAINVIEW_SAVEACTIVITY_ENTRY );
- // Get a pointer to activity Manager
- HbActivityManager* activityManager =
- qobject_cast<HbApplication*>(qApp)->activityManager();
+
// check if a valid screenshot is already captured
if (!mIsScreenShotCapruted) {
@@ -788,12 +787,19 @@
stream << NotesNamespace::NotesMainViewId;
// add the activity to the activity manager
- bool ok = activityManager->addActivity(
+ bool ok = mActivityStorage->saveActivity(
notes, serializedActivity, mScreenShot);
+
if (!ok) {
qFatal("Add failed" );
}
OstTraceFunctionExit0( NOTESMAINVIEW_SAVEACTIVITY_EXIT );
}
+bool NotesMainView::removeActivity()
+{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_REMOVEACTIVITY_ENTRY );
+ OstTraceFunctionExit0( NOTESMAINVIEW_REMOVEACTIVITY_EXIT);
+ return mActivityStorage->removeActivity(notes);
+}
// End of file --Don't remove this.
--- a/notes/notesui/notesviews/traces/fixed_id.definitions Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/notesui/notesviews/traces/fixed_id.definitions Tue Oct 05 13:57:00 2010 +0530
@@ -141,6 +141,8 @@
[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_NOTESMAINVIEW_EXIT=0x4c
[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_OPENNOTE_ENTRY=0x7d
[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_OPENNOTE_EXIT=0x7e
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_REMOVEACTIVITY_ENTRY=0xe6
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_REMOVEACTIVITY_EXIT=0xe7
[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SAVEACTIVITY_ENTRY=0x85
[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SAVEACTIVITY_EXIT=0x86
[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SCROLLTO_ENTRY=0x6a
--- a/notes/notesui/notesviews/traces/notesmainviewTraces.h Mon Sep 20 12:44:39 2010 +0530
+++ b/notes/notesui/notesviews/traces/notesmainviewTraces.h Tue Oct 05 13:57:00 2010 +0530
@@ -66,6 +66,8 @@
#define NOTESMAINVIEW_CAPTURESCREENSHOT_EXIT 0x8a0084
#define NOTESMAINVIEW_SAVEACTIVITY_ENTRY 0x8a0085
#define NOTESMAINVIEW_SAVEACTIVITY_EXIT 0x8a0086
+#define NOTESMAINVIEW_REMOVEACTIVITY_ENTRY 0x8a00e6
+#define NOTESMAINVIEW_REMOVEACTIVITY_EXIT 0x8a00e7
#endif
--- a/organizer_plat/agenda_interface_api/agenda_interface_api.pri Mon Sep 20 12:44:39 2010 +0530
+++ b/organizer_plat/agenda_interface_api/agenda_interface_api.pri Tue Oct 05 13:57:00 2010 +0530
@@ -17,4 +17,5 @@
PUBLIC_HEADERS += agenda_interface_api/inc/AgendaEntry
PUBLIC_HEADERS += agenda_interface_api/inc/agendautil.h
PUBLIC_HEADERS += agenda_interface_api/inc/AgendaUtil
-PUBLIC_HEADERS += agenda_interface_api/inc/agendainterfacedefines.h
\ No newline at end of file
+PUBLIC_HEADERS += agenda_interface_api/inc/agendainterfacedefines.h
+PUBLIC_HEADERS += agenda_interface_api/inc/calenmulticaluids.h
\ No newline at end of file
--- a/organizer_plat/agenda_interface_api/bld.inf Mon Sep 20 12:44:39 2010 +0530
+++ b/organizer_plat/agenda_interface_api/bld.inf Tue Oct 05 13:57:00 2010 +0530
@@ -30,4 +30,4 @@
inc/agendautil.h APP_LAYER_PLATFORM_EXPORT_PATH(agendautil.h)
inc/AgendaUtil APP_LAYER_PLATFORM_EXPORT_PATH(AgendaUtil)
inc/agendainterfacedefines.h APP_LAYER_PLATFORM_EXPORT_PATH(agendainterfacedefines.h)
-
+inc/calenmulticaluids.h APP_LAYER_PLATFORM_EXPORT_PATH(calenmulticaluids.h)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/agenda_interface_api/inc/calenmulticaluids.h Tue Oct 05 13:57:00 2010 +0530
@@ -0,0 +1,37 @@
+/*
+* 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 :
+*
+*/
+
+#ifndef CALENMULTICALUIDS_HRH_
+#define CALENMULTICALUIDS_HRH_
+
+
+enum TCalenPropertyUid
+ {
+ EFolderLUID = 1,
+ ECreationTime,
+ EModificationTime,
+ ESyncStatus,
+ EIsSharedFolder,
+ EGlobalUUID,
+ EDeviceSyncServiceOwner,
+ EOwnerName,
+ EMarkAsDelete,
+ EDeviceSyncProfileID,
+ ESyncConfigEnabled
+ };
+
+#endif /* CALENMULTICALUIDS_HRH_ */
--- a/organizer_plat/agenda_interface_api/tsrc/tsrc.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/organizer_plat/agenda_interface_api/tsrc/tsrc.pro Tue Oct 05 13:57:00 2010 +0530
@@ -19,5 +19,7 @@
SUBDIRS += unittest_agendautil
CONFIG += ordered
+CONFIG += qtestlib
+CONFIG += symbian_test
# End of file --Don't remove this
--- a/organizer_plat/agenda_interface_api/tsrc/unittest_agendautil/src/unittest_agendautil.cpp Mon Sep 20 12:44:39 2010 +0530
+++ b/organizer_plat/agenda_interface_api/tsrc/unittest_agendautil/src/unittest_agendautil.cpp Tue Oct 05 13:57:00 2010 +0530
@@ -1053,6 +1053,7 @@
QCOMPARE(completedTime, unCompletedTodo.completedDateTime());
}
+/*
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
@@ -1066,6 +1067,9 @@
int res = QTest::qExec(&tc, 3, pass);
return res;
}
+*/
+
+QTEST_MAIN ( TestAgendaUtil )
#include "unittest_agendautil.moc"
--- a/organizer_plat/agenda_versit_2_api/tsrc/group/agnversit2.pkg Mon Sep 20 12:44:39 2010 +0530
+++ b/organizer_plat/agenda_versit_2_api/tsrc/group/agnversit2.pkg Tue Oct 05 13:57:00 2010 +0530
@@ -34,120 +34,120 @@
;Agnversit2datainputfiles
"\epoc32\release\armv5\urel\testagnversit2.dll"-"$:\sys\bin\testagnversit2.dll"
-"..\data\mmc\unittest\agnversit2\input\AddAnniversaryCheck.ics"-"E:\testing\data\unittest\agnversit2\input\AddAnniversaryCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\AddAnniversaryIn.ics"-"E:\testing\data\unittest\agnversit2\input\AddAnniversaryIn.ics"
-"..\data\mmc\unittest\agnversit2\input\AgnVersit2Test.ini"-"E:\testing\data\unittest\agnversit2\input\AgnVersit2Test.ini"
-"..\data\mmc\unittest\agnversit2\input\AgnVersit2Test.script"-"E:\testing\data\unittest\agnversit2\input\AgnVersit2Test.script"
-"..\data\mmc\unittest\agnversit2\input\AllCategoriesCheck.ics"-"E:\testing\data\unittest\agnversit2\input\AllCategoriesCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\AllCategoriesIn.ics"-"E:\testing\data\unittest\agnversit2\input\AllCategoriesIn.ics"
-"..\data\mmc\unittest\agnversit2\input\AttendeeRoleStatusCheck.ics"-"E:\testing\data\unittest\agnversit2\input\AttendeeRoleStatusCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\AttendeeRoleStatusIn.ics"-"E:\testing\data\unittest\agnversit2\input\AttendeeRoleStatusIn.ics"
-"..\data\mmc\unittest\agnversit2\input\Corrupt1In.ics"-"E:\testing\data\unittest\agnversit2\input\Corrupt1In.ics"
-"..\data\mmc\unittest\agnversit2\input\Corrupt2In.ics"-"E:\testing\data\unittest\agnversit2\input\Corrupt2In.ics"
-"..\data\mmc\unittest\agnversit2\input\Corrupt3In.ics"-"E:\testing\data\unittest\agnversit2\input\Corrupt3In.ics"
-"..\data\mmc\unittest\agnversit2\input\Empty.ics"-"E:\testing\data\unittest\agnversit2\input\Empty.ics"
-"..\data\mmc\unittest\agnversit2\input\FloatingTimeCheck.ics"-"E:\testing\data\unittest\agnversit2\input\FloatingTimeCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\FloatingTimeIn.ics"-"E:\testing\data\unittest\agnversit2\input\FloatingTimeIn.ics"
-"..\data\mmc\unittest\agnversit2\input\GreatBigICalIn.ics"-"E:\testing\data\unittest\agnversit2\input\GreatBigICalIn.ics"
-"..\data\mmc\unittest\agnversit2\input\GreatBigICalOut.ics"-"E:\testing\data\unittest\agnversit2\input\GreatBigICalOut.ics"
-"..\data\mmc\unittest\agnversit2\input\MinimalVFreeBusyCheck.ics"-"E:\testing\data\unittest\agnversit2\input\MinimalVFreeBusyCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\MinimalVFreeBusyIn.ics"-"E:\testing\data\unittest\agnversit2\input\MinimalVFreeBusyIn.ics"
-"..\data\mmc\unittest\agnversit2\input\MinimalVJournalCheck.ics"-"E:\testing\data\unittest\agnversit2\input\MinimalVJournalCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\MinimalVJournalIn.ics"-"E:\testing\data\unittest\agnversit2\input\MinimalVJournalIn.ics"
-"..\data\mmc\unittest\agnversit2\input\myownIn.ics"-"E:\testing\data\unittest\agnversit2\input\myownIn.ics"
-"..\data\mmc\unittest\agnversit2\input\NotAniCal.bmp"-"E:\testing\data\unittest\agnversit2\input\NotAniCal.bmp"
-"..\data\mmc\unittest\agnversit2\input\NotCorruptCheck.ics"-"E:\testing\data\unittest\agnversit2\input\NotCorruptCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\NotCorruptIn.ics"-"E:\testing\data\unittest\agnversit2\input\NotCorruptIn.ics"
-"..\data\mmc\unittest\agnversit2\input\NotSupportedContinueCheck.ics"-"E:\testing\data\unittest\agnversit2\input\NotSupportedContinueCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\NotSupportedIn.ics"-"E:\testing\data\unittest\agnversit2\input\NotSupportedIn.ics"
-"..\data\mmc\unittest\agnversit2\input\NotSupportedSkipCheck.ics"-"E:\testing\data\unittest\agnversit2\input\NotSupportedSkipCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\NotSupportedStopCheck.ics"-"E:\testing\data\unittest\agnversit2\input\NotSupportedStopCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\oomin.ics"-"E:\testing\data\unittest\agnversit2\input\oomin.ics"
-"..\data\mmc\unittest\agnversit2\input\oomout.ics"-"E:\testing\data\unittest\agnversit2\input\oomout.ics"
-"..\data\mmc\unittest\agnversit2\input\OutlookAllDayRepeatWeeklyCheck.ics"-"E:\testing\data\unittest\agnversit2\input\OutlookAllDayRepeatWeeklyCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\OutlookAllDayRepeatWeeklyIn.ics"-"E:\testing\data\unittest\agnversit2\input\OutlookAllDayRepeatWeeklyIn.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleNumberingMonthlyCheck.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleNumberingMonthlyCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleNumberingMonthlyIn.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleNumberingMonthlyIn.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleNumberingWeeklyCheck.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleNumberingWeeklyCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleNumberingWeeklyIn.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleNumberingWeeklyIn.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleNumberingYearlyCheck.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleNumberingYearlyCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleNumberingYearlyIn.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleNumberingYearlyIn.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleTzAllDaysFromIntCheck.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleTzAllDaysFromIntCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleTzAllDaysFromIntIn.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleTzAllDaysFromIntIn.ics"
-"..\data\mmc\unittest\agnversit2\input\RRuleTzAllDaysFromIntIn1.ics"-"E:\testing\data\unittest\agnversit2\input\RRuleTzAllDaysFromIntIn1.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVeventAttendeeCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVeventAttendeeCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVeventAttendeeIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVeventAttendeeIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventCategoriesCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventCategoriesCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventCategoriesIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventCategoriesIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVeventCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVeventCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventCommentsCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventCommentsCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventCommentsIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventCommentsIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVeventDescriptionCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVeventDescriptionCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVeventDescriptionIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVeventDescriptionIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventDurationCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventDurationCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventDurationIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventDurationIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventExdateCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventExdateCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventExdateIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventExdateIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVeventIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVeventIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventLastModCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventLastModCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventLastModIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventLastModIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventLocationCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventLocationCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventLocationIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventLocationIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventOrganizerCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventOrganizerCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventOrganizerIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventOrganizerIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventRdateCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventRdateCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventRdateIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventRdateIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventRecurIdCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventRecurIdCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventRecurIdIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventRecurIdIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventRruleCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventRruleCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventRruleIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventRruleIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventSequenceCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventSequenceCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventSequenceIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventSequenceIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventStatusCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventStatusCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventStatusIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventStatusIn.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventSummaryCheck.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventSummaryCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\SimpleVEventSummaryIn.ics"-"E:\testing\data\unittest\agnversit2\input\SimpleVEventSummaryIn.ics"
-"..\data\mmc\unittest\agnversit2\input\Versit2EscapeSeqCheck.ics"-"E:\testing\data\unittest\agnversit2\input\Versit2EscapeSeqCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\Versit2EscapeSeqIn.ics"-"E:\testing\data\unittest\agnversit2\input\Versit2EscapeSeqIn.ics"
-"..\data\mmc\unittest\agnversit2\input\Versit2FilterCompsCheck.ics"-"E:\testing\data\unittest\agnversit2\input\Versit2FilterCompsCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\Versit2FilterCompsIn.ics"-"E:\testing\data\unittest\agnversit2\input\Versit2FilterCompsIn.ics"
-"..\data\mmc\unittest\agnversit2\input\Versit2FilterPropsCheck.ics"-"E:\testing\data\unittest\agnversit2\input\Versit2FilterPropsCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\Versit2FilterPropsIn.ics"-"E:\testing\data\unittest\agnversit2\input\Versit2FilterPropsIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventAddCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventAddCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventAddIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventAddIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventCancelCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventCancelCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventCancelIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventCancelIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventCounterCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventCounterCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventCounterIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventCounterIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventDeclineCounterCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventDeclineCounterCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventDeclineCounterIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventDeclineCounterIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventPublishCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventPublishCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventPublishIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventPublishIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventRefreshCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventRefreshCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventRefreshIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventRefreshIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventReplyCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventReplyCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventReplyIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventReplyIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventRequestCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventRequestCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventRequestIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventRequestIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventRRuleCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventRRuleCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventRRuleIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventRRuleIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventStatusCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VEventStatusCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VEventStatusIn.ics"-"E:\testing\data\unittest\agnversit2\input\VEventStatusIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoAddCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoAddCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoAddIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoAddIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoCancelCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoCancelCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoCancelIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoCancelIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoCounterCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoCounterCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoCounterIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoCounterIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoDeclineCounterCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoDeclineCounterCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoDeclineCounterIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoDeclineCounterIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoPublishCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoPublishCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoPublishIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoPublishIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoRefreshCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoRefreshCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoRefreshIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoRefreshIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoReplyCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoReplyCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoReplyIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoReplyIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoRequestCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoRequestCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoRequestIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoRequestIn.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoStatusCheck.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoStatusCheck.ics"
-"..\data\mmc\unittest\agnversit2\input\VTodoStatusIn.ics"-"E:\testing\data\unittest\agnversit2\input\VTodoStatusIn.ics"
+"..\data\mmc\unittest\agnversit2\input\AddAnniversaryCheck.ics"-"C:\testing\data\unittest\agnversit2\input\AddAnniversaryCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\AddAnniversaryIn.ics"-"C:\testing\data\unittest\agnversit2\input\AddAnniversaryIn.ics"
+"..\data\mmc\unittest\agnversit2\input\AgnVersit2Test.ini"-"C:\testing\data\unittest\agnversit2\input\AgnVersit2Test.ini"
+"..\data\mmc\unittest\agnversit2\input\AgnVersit2Test.script"-"C:\testing\data\unittest\agnversit2\input\AgnVersit2Test.script"
+"..\data\mmc\unittest\agnversit2\input\AllCategoriesCheck.ics"-"C:\testing\data\unittest\agnversit2\input\AllCategoriesCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\AllCategoriesIn.ics"-"C:\testing\data\unittest\agnversit2\input\AllCategoriesIn.ics"
+"..\data\mmc\unittest\agnversit2\input\AttendeeRoleStatusCheck.ics"-"C:\testing\data\unittest\agnversit2\input\AttendeeRoleStatusCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\AttendeeRoleStatusIn.ics"-"C:\testing\data\unittest\agnversit2\input\AttendeeRoleStatusIn.ics"
+"..\data\mmc\unittest\agnversit2\input\Corrupt1In.ics"-"C:\testing\data\unittest\agnversit2\input\Corrupt1In.ics"
+"..\data\mmc\unittest\agnversit2\input\Corrupt2In.ics"-"C:\testing\data\unittest\agnversit2\input\Corrupt2In.ics"
+"..\data\mmc\unittest\agnversit2\input\Corrupt3In.ics"-"C:\testing\data\unittest\agnversit2\input\Corrupt3In.ics"
+"..\data\mmc\unittest\agnversit2\input\Empty.ics"-"C:\testing\data\unittest\agnversit2\input\Empty.ics"
+"..\data\mmc\unittest\agnversit2\input\FloatingTimeCheck.ics"-"C:\testing\data\unittest\agnversit2\input\FloatingTimeCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\FloatingTimeIn.ics"-"C:\testing\data\unittest\agnversit2\input\FloatingTimeIn.ics"
+"..\data\mmc\unittest\agnversit2\input\GreatBigICalIn.ics"-"C:\testing\data\unittest\agnversit2\input\GreatBigICalIn.ics"
+"..\data\mmc\unittest\agnversit2\input\GreatBigICalOut.ics"-"C:\testing\data\unittest\agnversit2\input\GreatBigICalOut.ics"
+"..\data\mmc\unittest\agnversit2\input\MinimalVFreeBusyCheck.ics"-"C:\testing\data\unittest\agnversit2\input\MinimalVFreeBusyCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\MinimalVFreeBusyIn.ics"-"C:\testing\data\unittest\agnversit2\input\MinimalVFreeBusyIn.ics"
+"..\data\mmc\unittest\agnversit2\input\MinimalVJournalCheck.ics"-"C:\testing\data\unittest\agnversit2\input\MinimalVJournalCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\MinimalVJournalIn.ics"-"C:\testing\data\unittest\agnversit2\input\MinimalVJournalIn.ics"
+"..\data\mmc\unittest\agnversit2\input\myownIn.ics"-"C:\testing\data\unittest\agnversit2\input\myownIn.ics"
+"..\data\mmc\unittest\agnversit2\input\NotAniCal.bmp"-"C:\testing\data\unittest\agnversit2\input\NotAniCal.bmp"
+"..\data\mmc\unittest\agnversit2\input\NotCorruptCheck.ics"-"C:\testing\data\unittest\agnversit2\input\NotCorruptCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\NotCorruptIn.ics"-"C:\testing\data\unittest\agnversit2\input\NotCorruptIn.ics"
+"..\data\mmc\unittest\agnversit2\input\NotSupportedContinueCheck.ics"-"C:\testing\data\unittest\agnversit2\input\NotSupportedContinueCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\NotSupportedIn.ics"-"C:\testing\data\unittest\agnversit2\input\NotSupportedIn.ics"
+"..\data\mmc\unittest\agnversit2\input\NotSupportedSkipCheck.ics"-"C:\testing\data\unittest\agnversit2\input\NotSupportedSkipCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\NotSupportedStopCheck.ics"-"C:\testing\data\unittest\agnversit2\input\NotSupportedStopCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\oomin.ics"-"C:\testing\data\unittest\agnversit2\input\oomin.ics"
+"..\data\mmc\unittest\agnversit2\input\oomout.ics"-"C:\testing\data\unittest\agnversit2\input\oomout.ics"
+"..\data\mmc\unittest\agnversit2\input\OutlookAllDayRepeatWeeklyCheck.ics"-"C:\testing\data\unittest\agnversit2\input\OutlookAllDayRepeatWeeklyCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\OutlookAllDayRepeatWeeklyIn.ics"-"C:\testing\data\unittest\agnversit2\input\OutlookAllDayRepeatWeeklyIn.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleNumberingMonthlyCheck.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleNumberingMonthlyCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleNumberingMonthlyIn.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleNumberingMonthlyIn.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleNumberingWeeklyCheck.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleNumberingWeeklyCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleNumberingWeeklyIn.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleNumberingWeeklyIn.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleNumberingYearlyCheck.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleNumberingYearlyCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleNumberingYearlyIn.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleNumberingYearlyIn.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleTzAllDaysFromIntCheck.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleTzAllDaysFromIntCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleTzAllDaysFromIntIn.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleTzAllDaysFromIntIn.ics"
+"..\data\mmc\unittest\agnversit2\input\RRuleTzAllDaysFromIntIn1.ics"-"C:\testing\data\unittest\agnversit2\input\RRuleTzAllDaysFromIntIn1.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVeventAttendeeCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVeventAttendeeCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVeventAttendeeIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVeventAttendeeIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventCategoriesCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventCategoriesCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventCategoriesIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventCategoriesIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVeventCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVeventCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventCommentsCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventCommentsCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventCommentsIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventCommentsIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVeventDescriptionCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVeventDescriptionCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVeventDescriptionIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVeventDescriptionIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventDurationCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventDurationCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventDurationIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventDurationIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventExdateCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventExdateCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventExdateIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventExdateIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVeventIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVeventIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventLastModCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventLastModCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventLastModIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventLastModIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventLocationCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventLocationCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventLocationIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventLocationIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventOrganizerCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventOrganizerCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventOrganizerIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventOrganizerIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventRdateCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventRdateCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventRdateIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventRdateIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventRecurIdCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventRecurIdCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventRecurIdIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventRecurIdIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventRruleCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventRruleCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventRruleIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventRruleIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventSequenceCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventSequenceCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventSequenceIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventSequenceIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventStatusCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventStatusCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventStatusIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventStatusIn.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventSummaryCheck.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventSummaryCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\SimpleVEventSummaryIn.ics"-"C:\testing\data\unittest\agnversit2\input\SimpleVEventSummaryIn.ics"
+"..\data\mmc\unittest\agnversit2\input\Versit2EscapeSeqCheck.ics"-"C:\testing\data\unittest\agnversit2\input\Versit2EscapeSeqCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\Versit2EscapeSeqIn.ics"-"C:\testing\data\unittest\agnversit2\input\Versit2EscapeSeqIn.ics"
+"..\data\mmc\unittest\agnversit2\input\Versit2FilterCompsCheck.ics"-"C:\testing\data\unittest\agnversit2\input\Versit2FilterCompsCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\Versit2FilterCompsIn.ics"-"C:\testing\data\unittest\agnversit2\input\Versit2FilterCompsIn.ics"
+"..\data\mmc\unittest\agnversit2\input\Versit2FilterPropsCheck.ics"-"C:\testing\data\unittest\agnversit2\input\Versit2FilterPropsCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\Versit2FilterPropsIn.ics"-"C:\testing\data\unittest\agnversit2\input\Versit2FilterPropsIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventAddCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventAddCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventAddIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventAddIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventCancelCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventCancelCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventCancelIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventCancelIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventCounterCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventCounterCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventCounterIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventCounterIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventDeclineCounterCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventDeclineCounterCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventDeclineCounterIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventDeclineCounterIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventPublishCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventPublishCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventPublishIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventPublishIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventRefreshCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventRefreshCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventRefreshIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventRefreshIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventReplyCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventReplyCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventReplyIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventReplyIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventRequestCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventRequestCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventRequestIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventRequestIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventRRuleCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventRRuleCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventRRuleIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventRRuleIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventStatusCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VEventStatusCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VEventStatusIn.ics"-"C:\testing\data\unittest\agnversit2\input\VEventStatusIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoAddCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoAddCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoAddIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoAddIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoCancelCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoCancelCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoCancelIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoCancelIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoCounterCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoCounterCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoCounterIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoCounterIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoDeclineCounterCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoDeclineCounterCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoDeclineCounterIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoDeclineCounterIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoPublishCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoPublishCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoPublishIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoPublishIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoRefreshCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoRefreshCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoRefreshIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoRefreshIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoReplyCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoReplyCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoReplyIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoReplyIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoRequestCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoRequestCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoRequestIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoRequestIn.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoStatusCheck.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoStatusCheck.ics"
+"..\data\mmc\unittest\agnversit2\input\VTodoStatusIn.ics"-"C:\testing\data\unittest\agnversit2\input\VTodoStatusIn.ics"
--- a/organizer_plat/tsrc/tsrc.pro Mon Sep 20 12:44:39 2010 +0530
+++ b/organizer_plat/tsrc/tsrc.pro Tue Oct 05 13:57:00 2010 +0530
@@ -23,5 +23,6 @@
../clock_settingsview_plugin_api/tsrc
CONFIG += ordered
+CONFIG += symbian_test
# End of file --Don't remove this
--- a/organizer_pub/calendar_interim_utils2_api/tsrc/stiff/group/CalenInterimUtils2Test.pkg Mon Sep 20 12:44:39 2010 +0530
+++ b/organizer_pub/calendar_interim_utils2_api/tsrc/stiff/group/CalenInterimUtils2Test.pkg Tue Oct 05 13:57:00 2010 +0530
@@ -46,7 +46,7 @@
; None
; Install files
-"/epoc32/release/armv5/udeb/caleninterimutils2test.dll" - "!:/Sys/Bin/caleninterimutils2test.dll"
+"\epoc32\release\armv5\urel\caleninterimutils2test.dll" - "$:\Sys\Bin\caleninterimutils2test.dll"
"/epoc32/winscw/C/testframework/caleninterimutils2test.cfg" - "c:/testframework/caleninterimutils2test.cfg"
;"/epoc32/winscw/C/testframework/TestFramework.ini" - "c:/testframework/TestFramework.ini"