# HG changeset patch # User hgs # Date 1283748165 -19800 # Node ID a5ed90760192fd81d1ec36b004b95cacc0d98fe9 # Parent 1881ad52dc454a7ed097a5ae975a7f9ee029f502 201035 diff -r 1881ad52dc45 -r a5ed90760192 agendainterface/agendautil/src/agendautil_p.cpp --- a/agendainterface/agendautil/src/agendautil_p.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/agendainterface/agendautil/src/agendautil_p.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -1789,7 +1789,9 @@ */ QDateTime AgendaUtilPrivate::maxTime() { - TTime maxTime = TCalTime::MaxTime(); + // Returns maximum time allowed, 31.12.2100 0:00 is max so 30.12.2100 is + // last actual date to be used. + TTime maxTime = TCalTime::MaxTime() - TTimeIntervalMinutes( 1 ); // Convert it to QT QDate date( @@ -2962,14 +2964,14 @@ calRRule.GetByMonthDayL(monthDays); QList qMonthDays; for (int i = 0; i < monthDays.Count(); i++) { - qMonthDays.append(monthDays[i]); + qMonthDays.append(monthDays[i] + 1); } agendaRepeatRule.setByMonthDay(qMonthDays); agendaRepeatRule.setType((AgendaRepeatRule::RuleType) (calRRule.Type())); agendaRepeatRule.setInterval(calRRule.Interval()); TCalTime time = calRRule.Until(); - TTime untilTime = time.TimeUtcL(); + TTime untilTime = time.TimeLocalL(); QDateTime repeatUntil(QDate(untilTime.DateTime().Year(), untilTime.DateTime().Month() + 1, untilTime.DateTime().Day() + 1), @@ -2978,7 +2980,7 @@ agendaRepeatRule.setUntil(repeatUntil); TCalTime dayStart = calRRule.DtStart(); - TDateTime ruleStart = dayStart.TimeUtcL().DateTime(); + TDateTime ruleStart = dayStart.TimeLocalL().DateTime(); QDateTime qRuleStart(QDate(ruleStart.Year(), ruleStart.Month() + 1, ruleStart.Day() + 1),QTime(ruleStart.Hour(), ruleStart.Minute())); agendaRepeatRule.setRepeatRuleStart(qRuleStart); @@ -3029,6 +3031,7 @@ repeatRule.SetDtStart(ruleStartCalTime); repeatRule.SetInterval(agendaRRule.interval()); repeatRule.SetUntil(ruleRepeatTillTime); + repeatRule.SetWkSt((TDay)agendaRRule.weekStart()); QList qDays = agendaRRule.byDay(); RArray days; diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp --- a/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -127,7 +127,7 @@ alarmInfo->iTime.FormatL(timeString, timeFormat); - alarmInfo->iTime.FormatL(dateString, dateFormat); + alarmInfo->iDate.FormatL(dateString, dateFormat); // Create a session with the device dialog server mDeviceDialog = CHbDeviceDialogSymbian::NewL(); diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro --- a/alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro Mon Sep 06 10:12:45 2010 +0530 @@ -33,7 +33,6 @@ alarmalertdocloader.cpp - RESOURCES += alarmalert.qrc TRANSLATIONS += alarmui.ts diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc --- a/alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc Mon Sep 06 10:12:45 2010 +0530 @@ -1,7 +1,8 @@ - xml/alarmalert_calendar_unlocked.docml + xml/alarmalert_timed_calendar_unlocked.docml xml/alarmalert_clock_unlocked.docml xml/alarmalert_todo_unlocked.docml + xml/alarmalert_nontimed_calendar_unlocked.docml \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml --- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml --- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml Mon Sep 06 10:12:45 2010 +0530 @@ -1,57 +1,110 @@ - + - + + + - + - - - - - + + - - - - - - - + + - + - - - - - - - - - + + + + + + + + + + + +
+ + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_nontimed_calendar_unlocked.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_nontimed_calendar_unlocked.docml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_timed_calendar_unlocked.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_timed_calendar_unlocked.docml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml --- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml Mon Sep 06 10:12:45 2010 +0530 @@ -1,56 +1,111 @@ - + - + + + - + - - - + + - - - - - - - - + + - - - - + + - - - - - - - - + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/inc/alarmalertwidget_p.h --- a/alarmui/alarmalertwidget/alarmalertplugin/inc/alarmalertwidget_p.h Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/inc/alarmalertwidget_p.h Mon Sep 06 10:12:45 2010 +0530 @@ -36,7 +36,10 @@ class HbAction; class AlarmAlertDocLoader; -const QString alarmNormalUICalendarDocml(":/xml/alarmalert_calendar_unlocked.docml"); +const QString alarmNormalUICalendarDocml( + ":/xml/alarmalert_timed_calendar_unlocked.docml"); +const QString alarmNormalUINonTimedCalendarDocml( + ":/xml/alarmalert_nontimed_calendar_unlocked.docml"); const QString alarmNormalUIClockDocml(":/xml/alarmalert_clock_unlocked.docml"); const QString alarmNormalUITodoDocml(":/xml/alarmalert_todo_unlocked.docml"); @@ -105,7 +108,7 @@ * @brief From QGraphicsWidget * @see QGraphicsWidget */ - void closeEvent(QCloseEvent *event); + void hideEvent(QHideEvent *event); signals: @@ -124,7 +127,7 @@ /** * @brief Callback function for handling orientation changes */ - void handleOrientationChange(); + void handleOrientationChange(Qt::Orientation orientation); /** * @brief Called when the user snoozes the alarm diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp --- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -155,24 +155,35 @@ QVariantMap::const_iterator iter = parameters.constBegin(); int count = parameters.size(); AlarmType alertType = OtherAlarm; + bool isTimedAlarm = false; while (iter != parameters.constEnd()) { QString key(iter.key()); if (alarmType == key) { alertType = static_cast (iter.value().toInt()); } + if (alarmIsTimed == key) { + isTimedAlarm = iter.value().toBool(); + } iter++; } + bool loadSuccess = false; if (alertType == ClockAlarm) { alertDocLoader->load(alarmNormalUIClockDocml, &loadSuccess); }else if (alertType == TodoAlarm) { alertDocLoader->load(alarmNormalUITodoDocml, &loadSuccess); }else if(alertType == CalendarAlarm) { - alertDocLoader->load(alarmNormalUICalendarDocml, &loadSuccess); + if (isTimedAlarm) { + alertDocLoader->load(alarmNormalUICalendarDocml, &loadSuccess); + } else { + alertDocLoader->load( + alarmNormalUINonTimedCalendarDocml, &loadSuccess); + } } if(!loadSuccess) { qFatal("Unable to load the docml"); } + // Transfer the ownership of docloader object to alarmalertdialogprivate. AlarmAlertDialogPrivate *alertDialog = qobject_cast (alertDocLoader->findWidget("dialog")); alertDialog->setupNormalUI(alertDocLoader); ret = alertDialog; diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp --- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -166,27 +166,16 @@ } // --------------------------------------------------------- -// AlarmAlertDialogPrivate::closeEvent +// AlarmAlertDialogPrivate::hideEvent // rest of the details are commented in the header // --------------------------------------------------------- // -void AlarmAlertDialogPrivate::closeEvent(QCloseEvent *event) +void AlarmAlertDialogPrivate::hideEvent(QHideEvent *event) { - OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY ); - - // Do not notify the client back if the close was initiated by client itself - if(!mClosedByClient) { - // Package the user response and send it - QVariantMap param; - param.insert(alarmCommand, mUserResponse); - emit deviceDialogData(param); - } - // This signal has to be emitted so that the dialog can be cleaned up later - emit deviceDialogClosed(); - - // Forward the call to the base class - HbDialog::closeEvent(event); - OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT ); + OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HIDEEVENT_ENTRY ); + HbDialog::hideEvent(event); + emit deviceDialogClosed(); + OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HIDEEVENT_EXIT ); } // --------------------------------------------------------- @@ -194,10 +183,44 @@ // rest of the details are commented in the header // --------------------------------------------------------- // -void AlarmAlertDialogPrivate::handleOrientationChange () +void AlarmAlertDialogPrivate::handleOrientationChange(Qt::Orientation orientation) { OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_ENTRY ); - // TODO: Need to change this as per the UI concept + QString section; + QString filename; + if (orientation == Qt::Horizontal) { + section = "landscape"; + } else { + section = "portrait"; + } + bool loadSuccess = false; + switch (mAlarmAlertType) { + case ClockAlarm: + mAlertDocLoader->load(alarmNormalUIClockDocml, section, &loadSuccess); + break; + case TodoAlarm: + mAlertDocLoader->load(alarmNormalUITodoDocml, section, &loadSuccess); + break; + case CalendarAlarm: + if (mIsTimedAlarm) { + filename = alarmNormalUICalendarDocml; + section = "timedAlarmportrait"; + if(orientation == Qt::Horizontal) { + section = "timedAlarmLandscape"; + } + } else { + filename = alarmNormalUINonTimedCalendarDocml; + section = "nonTimedAlarmPortrait"; + if(orientation == Qt::Horizontal) { + section = "nonTimedAlarmLandscape"; + } + } + mAlertDocLoader->load(filename, section, &loadSuccess); + break; + default: + break; + } + OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_EXIT ); } @@ -210,7 +233,10 @@ { OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_SNOOZED_ENTRY ); mUserResponse = Snooze; - close(); + QVariantMap param; + param.insert(alarmCommand, mUserResponse); + emit deviceDialogData(param); + OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SNOOZED_EXIT ); } @@ -226,12 +252,13 @@ mUserResponse = Silence; mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze")); mIsSilenceKey = false; + setDismissOnAction(true); QVariantMap param; param.insert(alarmCommand, mUserResponse); emit deviceDialogData(param); }else { - mUserResponse = Snooze; - close(); + snoozed(); + } OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SILENCED_EXIT ); } @@ -260,7 +287,9 @@ { OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_DISMISSED_ENTRY ); mUserResponse = Stop; - close(); + QVariantMap param; + param.insert(alarmCommand, mUserResponse); + emit deviceDialogData(param); OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_DISMISSED_EXIT ); } @@ -316,6 +345,11 @@ return; } mAlertDocLoader = alertDocLoader; + + mMainWindow = hbInstance->allMainWindows().first(); + connect( + mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)), + this, SLOT(handleOrientationChange(Qt::Orientation))); if (mAlarmAlertType == ClockAlarm) { handleClockAlarms(); @@ -335,6 +369,9 @@ void AlarmAlertDialogPrivate::handleClockAlarms() { OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLECLOCKALARMS_ENTRY ); + + handleOrientationChange(mMainWindow->orientation()); + QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading"); if (!headingWidget) { qFatal("Unable to load the heading Widget"); @@ -368,7 +405,6 @@ qFatal("Unable to load the snoozeAction softkey"); } snoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze")); - disconnect(snoozeAction, SIGNAL(triggered()), this, SLOT(close())); connect(snoozeAction, SIGNAL(triggered()), this, SLOT(snoozed())); HbAction *stopAction = qobject_cast ( @@ -377,7 +413,6 @@ qFatal("Unable to load the stopAction softkey"); } stopAction->setText(hbTrId("txt_calendar_button_alarm_stop")); - disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close())); connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed())); if (!mCanSnooze) { @@ -394,17 +429,12 @@ void AlarmAlertDialogPrivate::handleCalendarAlarms() { OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_ENTRY ); - bool success = false; HbExtendedLocale locale = HbExtendedLocale::system(); // Check if the alarm has the time info or not. // For all day events the time label has to be hidden // So load the proper sections accordingly if ( mIsTimedAlarm ) { - mAlertDocLoader->load( - alarmNormalUICalendarDocml, "calendarTimed",&success); - if (!success) { - qFatal("Unable to load the calendarTimed section"); - } + handleOrientationChange(mMainWindow->orientation()); mAlarmDateTime = qobject_cast ( mAlertDocLoader->findWidget("alarmTime")); if (!mAlarmDateTime) { @@ -418,17 +448,7 @@ } alarmDate->setPlainText(mAlarmDate); }else { - mAlertDocLoader->load( - alarmNormalUICalendarDocml, "nonTimedAlarm",&success); - if (!success) { - qFatal("Unable to load the nonTimedAlarm section"); - } - mAlarmDateTime = qobject_cast ( - mAlertDocLoader->findWidget("alarmTime")); - if (!mAlarmDateTime) { - qFatal("Unable to find the alarmTime label"); - } - mAlarmDateTime->hide(); + handleOrientationChange(mMainWindow->orientation()); HbLabel *alarmDate = qobject_cast ( mAlertDocLoader->findWidget("alarmDate")); if (!alarmDate) { @@ -437,10 +457,6 @@ alarmDate->setPlainText(mAlarmDate); } - QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading"); - if (!headingWidget) { - qFatal("Unable to find the heading widget"); - } mAlarmDescription = qobject_cast ( mAlertDocLoader->findWidget("alarmDescription")); if (!mAlarmDescription) { @@ -466,7 +482,7 @@ if (!mSnoozeAction) { qFatal("Unable to find the snoozeAction softkey"); } - disconnect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(close())); + if (!mCanSnooze) { mSnoozeAction->setVisible(false); }else { @@ -474,6 +490,7 @@ mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_silence")); connect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(silenced())); mIsSilenceKey = true; + setDismissOnAction(false); } else { mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze")); connect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(snoozed())); @@ -485,7 +502,6 @@ qFatal("Unable to find the stopAction softkey"); } stopAction->setText(hbTrId("txt_calendar_button_alarm_stop")); - disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close())); connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed())); OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_EXIT ); } @@ -498,6 +514,9 @@ void AlarmAlertDialogPrivate::handleToDoAlarms() { OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_ENTRY ); + + handleOrientationChange(mMainWindow->orientation()); + QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading"); if (!headingWidget) { qFatal("Unable to load the heading widget"); @@ -528,7 +547,7 @@ if (!mSnoozeAction) { qFatal("Unable to load the snoozeAction softkey"); } - disconnect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(close())); + if (!mCanSnooze) { mSnoozeAction->setVisible(false); }else { @@ -536,6 +555,7 @@ mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_silence")); connect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(silenced())); mIsSilenceKey = true; + setDismissOnAction(false); } else { mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze")); connect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(snoozed())); @@ -547,7 +567,6 @@ qFatal("Unable to load the stopAction softkey"); } stopAction->setText(hbTrId("txt_calendar_button_alarm_stop")); - disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close())); connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed())); OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_EXIT ); } diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/traces/OstTraceDefinitions.h --- a/alarmui/alarmalertwidget/alarmalertplugin/traces/OstTraceDefinitions.h Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/OstTraceDefinitions.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,3 +1,20 @@ +/* +* This is Default Licence added by TraceCompiler +* 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: +* +*/ #ifndef __OSTTRACEDEFINITIONS_H__ #define __OSTTRACEDEFINITIONS_H__ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertdocloaderTraces.h --- a/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertdocloaderTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertdocloaderTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,10 +1,26 @@ -// Created by TraceCompiler 2.2.3 +/* + * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: Definition file for class AlarmAlertDocLoader. + * + */ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __ALARMALERTDOCLOADERTRACES_H__ #define __ALARMALERTDOCLOADERTRACES_H__ -#define KOstTraceComponentID 0xe3ae7edb +#define KOstTraceComponentID 0xe3ab5737 #define ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_ENTRY 0x8a0001 #define ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT 0x8a0002 diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertpluginTraces.h --- a/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertpluginTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertpluginTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,10 +1,26 @@ -// Created by TraceCompiler 2.2.3 +/* +* 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: +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __ALARMALERTPLUGINTRACES_H__ #define __ALARMALERTPLUGINTRACES_H__ -#define KOstTraceComponentID 0xe3ae7edb +#define KOstTraceComponentID 0xe3ab5737 #define ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY 0x8a0007 #define ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT 0x8a0008 diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertwidget_pTraces.h --- a/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertwidget_pTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertwidget_pTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,10 +1,26 @@ -// Created by TraceCompiler 2.2.3 +/* +* 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: +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __ALARMALERTWIDGET_PTRACES_H__ #define __ALARMALERTWIDGET_PTRACES_H__ -#define KOstTraceComponentID 0xe3ae7edb +#define KOstTraceComponentID 0xe3ab5737 #define ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_ENTRY 0x8a0017 #define ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT 0x8a0018 @@ -19,8 +35,6 @@ #define ALARMALERTDIALOGPRIVATE_DEVICEDIALOGWIDGET_ENTRY 0x8a0021 #define ALARMALERTDIALOGPRIVATE_SHOWEVENT_ENTRY 0x8a0022 #define ALARMALERTDIALOGPRIVATE_SHOWEVENT_EXIT 0x8a0023 -#define ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY 0x8a0024 -#define ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT 0x8a0025 #define ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_ENTRY 0x8a0026 #define ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_EXIT 0x8a0027 #define ALARMALERTDIALOGPRIVATE_SNOOZED_ENTRY 0x8a0028 @@ -42,6 +56,8 @@ #define ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_EXIT 0x8a0038 #define ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_ENTRY 0x8a0039 #define ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_EXIT 0x8a003a +#define ALARMALERTDIALOGPRIVATE_HIDEEVENT_ENTRY 0x8a003b +#define ALARMALERTDIALOGPRIVATE_HIDEEVENT_EXIT 0x8a003c #endif diff -r 1881ad52dc45 -r a5ed90760192 alarmui/alarmalertwidget/alarmalertplugin/traces/fixed_id.definitions --- a/alarmui/alarmalertwidget/alarmalertplugin/traces/fixed_id.definitions Tue Aug 31 18:15:13 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/fixed_id.definitions Mon Sep 06 10:12:45 2010 +0530 @@ -1,3 +1,20 @@ +## +# This is Default Licence added by TraceCompiler +# 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: +# +## #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. [GROUP]TRACE_FLOW=0x8a [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_ABOUTTODISPLAY_ENTRY=0x2c @@ -6,8 +23,6 @@ [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT=0x18 [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEDEVICEDIALOG_ENTRY=0x1f [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEDEVICEDIALOG_EXIT=0x20 -[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY=0x24 -[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT=0x25 [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_DEVICEDIALOGERROR_ENTRY=0x1d [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_DEVICEDIALOGERROR_EXIT=0x1e [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_DEVICEDIALOGWIDGET_ENTRY=0x21 @@ -21,6 +36,8 @@ [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_EXIT=0x27 [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_ENTRY=0x39 [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HIDEEVENT_ENTRY=0x3b +[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HIDEEVENT_EXIT=0x3c [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_ENTRY=0x30 [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_EXIT=0x31 [TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SETDEVICEDIALOGPARAMETERS_ENTRY=0x1b @@ -58,3 +75,5 @@ [TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT=0x4 [TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY=0x9 [TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT=0xa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY=0x24 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT=0x25 diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/data/agendaeventvieweritem.css --- a/calendarui/agendaeventviewer/data/agendaeventvieweritem.css Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/data/agendaeventvieweritem.css Mon Sep 06 10:12:45 2010 +0530 @@ -1,80 +1,55 @@ - -AgendaEventViewerItem[leftPrimaryIconItem="true"]:portrait { - layout: layout-eventvieweritem-stretch; - fixed-width: var(hb-param-screen-width); +AgendaEventViewerItem { + layout: layout-eventvieweritem; } -AgendaEventViewerItem[leftPrimaryIconItem="true"]:landscape { - layout: layout-eventvieweritem-stretch; - fixed-width: var(hb-param-screen-width); +AgendaEventViewerItem:portrait { + fixed-width: var(hb-param-screen-width); } - -AgendaEventViewerItem:portrait { - layout: layout-eventvieweritem; - fixed-width: var(hb-param-screen-width); +AgendaEventViewerItem:landscape { + fixed-width: var(hb-param-screen-width); } -AgendaEventViewerItem:landscape { - layout: layout-eventvieweritem; - fixed-width: var(hb-param-screen-width); +AgendaEventViewerItem::primaryLeftIconItem { + fixed-width:var(hb-param-graphic-size-primary-small); + fixed-height:var(hb-param-graphic-size-primary-small); + top: -var(hb-param-margin-gene-top); + left: -var(hb-param-margin-gene-left); } - -AgendaEventViewerItem::primaryLeftIconItem { - fixed-width:var(hb-param-graphic-size-primary-small); - fixed-height:var(hb-param-graphic-size-primary-small); - top: -var(hb-param-margin-gene-top); - left: -var(hb-param-margin-gene-left); - - -} - -AgendaEventViewerItem::primaryRightIconItem { - fixed-width:var(hb-param-graphic-size-secondary); - fixed-height:var(hb-param-graphic-size-secondary); - top: -var(hb-param-margin-gene-top); - right: var(hb-param-margin-gene-right); +AgendaEventViewerItem::primaryTextItem { + text-height: var(hb-param-text-height-primary); + font-variant: primary; + text-align: left; + top: -var(hb-param-margin-gene-top); + right: var(hb-param-margin-gene-middle-horizontal); + left: -var(hb-param-margin-gene-middle-horizontal); } -AgendaEventViewerItem::secondaryIconItem { - fixed-width:var(hb-param-graphic-size-primary-small); - fixed-height:var(hb-param-graphic-size-primary-small); - left: -var(hb-param-margin-gene-left); - +AgendaEventViewerItem::primaryRightIconItem { + fixed-width:var(hb-param-graphic-size-secondary); + fixed-height:var(hb-param-graphic-size-secondary); + right: var(hb-param-margin-gene-right); +} + +AgendaEventViewerItem::secondaryLeftIconItem { + fixed-width:var(hb-param-graphic-size-primary-small); + fixed-height:var(hb-param-graphic-size-primary-small); + left: -var(hb-param-margin-gene-left); } -AgendaEventViewerItem::primaryTextItem[leftPrimaryIconItem="true"] { - text-height: var(hb-param-text-height-primary); - font-variant: primary; - text-align: left; - top: -var(hb-param-margin-gene-top); - right: var(hb-param-margin-gene-middle-horizontal); - left: -var(hb-param-margin-gene-middle-horizontal); -} -AgendaEventViewerItem::primaryTextItem[leftPrimaryIconItem="false"] { - text-height: var(hb-param-text-height-primary); - font-variant: primary; - text-align: left; - top: -var(hb-param-margin-gene-top); - right: var(hb-param-margin-gene-middle-horizontal); - - +AgendaEventViewerItem::secondaryTextItem { + text-height: var(hb-param-text-height-secondary); + font-variant: secondary; + text-align: left; + right: var(hb-param-margin-gene-middle-horizontal); + bottom: var(hb-param-margin-gene-bottom); + top: -var(hb-param-margin-gene-middle-vertical); + left: -var(hb-param-margin-gene-middle-horizontal); } -AgendaEventViewerItem::secondaryTextItem[leftPrimaryIconItem="true"]{ - text-height: var(hb-param-text-height-secondary); - font-variant: secondary; - text-align: left; - top: -var(hb-param-margin-gene-middle-vertical); - right: var(hb-param-margin-gene-right); - bottom: var(hb-param-margin-gene-bottom); + +AgendaEventViewerItem::secondaryRightIconItem { + fixed-width:var(hb-param-graphic-size-secondary); + fixed-height:var(hb-param-graphic-size-secondary); + right: var(hb-param-margin-gene-right); } -AgendaEventViewerItem::secondaryTextItem[leftPrimaryIconItem="false"] { - text-height: var(hb-param-text-height-secondary); - font-variant: secondary; - text-align: left; - top: -var(hb-param-margin-gene-middle-vertical); - right: var(hb-param-margin-gene-right); - bottom: var(hb-param-margin-gene-bottom); - left: -var(hb-param-margin-gene-middle-horizontal); -} diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/data/agendaeventvieweritem.widgetml --- a/calendarui/agendaeventviewer/data/agendaeventvieweritem.widgetml Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/data/agendaeventvieweritem.widgetml Mon Sep 06 10:12:45 2010 +0530 @@ -1,41 +1,34 @@ - - - - - - - - - - - - - - - - - - + + - - - + + + + + + + + - - - - - + + - - + + + + + + + - - - - + + - + \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/inc/agendaeventview.h --- a/calendarui/agendaeventviewer/inc/agendaeventview.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/inc/agendaeventview.h Mon Sep 06 10:12:45 2010 +0530 @@ -124,7 +124,7 @@ AgendaEntry mOriginalAgendaEntry; AgendaEntry mAgendaEntry; QPointer mNotesEditorPluginLoader; - CalenEditor *mCalenEditor; + QPointer mCalenEditor; QGraphicsLinearLayout *mLinearLayout; HbTranslator *mTranslator; @@ -140,6 +140,8 @@ bool mCalenEditorClosed ; int mMaptileStatus; bool mNotesPluginLoaded; + ulong mParentId; + ulong mEntryIdDeleted; private: friend class AgendaEventViewerPrivate; diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/inc/agendaeventvieweritem.h --- a/calendarui/agendaeventviewer/inc/agendaeventvieweritem.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/inc/agendaeventvieweritem.h Mon Sep 06 10:12:45 2010 +0530 @@ -36,15 +36,17 @@ public: void setEventViewerItemData(const QStringList & itemData, int role); + void setTextItemData(int index, const QString &itemData); + void setIconItemData(int index, const QString &itemData); private: HbTextItem *mPrimaryText; HbTextItem *mSecondaryText; - HbIconItem *mPrimaryIcon; - HbIconItem *mSecondaryIcon; + HbIconItem *mPrimaryLeftIcon; HbIconItem *mPrimaryRightIcon; - HbIconItem *mPrimaryLeftIcon; + HbIconItem *mSecondaryLeftIcon; + HbIconItem *mSecondaryRightIcon; }; diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/src/agendaeventview.cpp --- a/calendarui/agendaeventviewer/src/agendaeventview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -62,10 +62,7 @@ // Constants #define CHARACTER_SPACE " " #define CHARACTER_HYPHEN " - " - - -//This Property is use for setting a primary left icon -static const char *primaryLeftIconItem("leftPrimaryIconItem"); +#define DUMMY_ICON "dummyIcon" /*! \class AgendaEventView. @@ -93,9 +90,10 @@ mProgressTimer(NULL), mProgressIconCount(0), mMaptileStatusReceived(false), + mCalenEditorClosed(true), mMaptileStatus(-1), mNotesPluginLoaded(false), - mCalenEditorClosed(true) + mEntryIdDeleted(0) { OstTraceFunctionEntry0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY ); mTranslator->loadCommon(); @@ -115,9 +113,6 @@ mSubjectWidget = qobject_cast ( mDocLoader->findWidget(AGENDA_EVENT_VIEWER_SUBJECT_WIDGET)); - //load layout that supports icon before subject label - mSubjectWidget->setProperty(primaryLeftIconItem,true); - mDateTimeWidget = qobject_cast ( mDocLoader->findWidget(AGENDA_EVENT_VIEWER_DATE_TIME_WIDGET)); @@ -214,7 +209,10 @@ mOriginalAgendaEntry = entry; mAgendaEntry = entry; - + + // For later reference + mParentId = mOwner->mAgendaUtil->parentEntry(mAgendaEntry).id(); + // Add the viewer data reading from the agenda entry. addViewerData(); @@ -247,11 +245,11 @@ mMainWindow = new HbMainWindow(); mMainWindow->addView(mViewer); mMainWindow->setCurrentView(mViewer); - connect(mMainWindow,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation))); + connect(mMainWindow,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation))); } else { window->addView(mViewer); window->setCurrentView(mViewer); - connect(window,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation))); + connect(window,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation))); } // Add softkey after adding view on window @@ -419,6 +417,8 @@ getSubjectIcon(mAgendaEntry.type(),subjectIcon); itemList.append(subjectIcon); itemList.append(priorityIcon); + // This "DUMMY_ICON" is required only for the subject layout. + itemList.append(DUMMY_ICON); itemList.append(QString::null); mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole); @@ -441,8 +441,7 @@ itemData.append(QString::null); itemData.append(QString::null); itemData.append("qtg_small_calendar"); - - mDateTimeWidget->setProperty(primaryLeftIconItem, false); + itemData.append(QString::null); mDateTimeWidget->setEventViewerItemData(itemData, Qt::DecorationRole); itemData.clear(); @@ -527,21 +526,18 @@ { OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDLOCATIONDATA_ENTRY ); QStringList itemData; + itemData.append(QString::null); + itemData.append(QString::null); + itemData.append("qtg_small_location"); QString progressIcon(QString::null); if ( mLocationFeatureEnabled ) { getProgressIndicatorstatus(progressIcon); } if( progressIcon.isNull() ) { itemData.append(QString::null); - itemData.append(QString::null); - itemData.append("qtg_small_location"); - mLocationWidget->setProperty(primaryLeftIconItem, false); } else { - itemData.append("qtg_small_location"); - itemData.append( progressIcon ); - itemData.append(QString::null); - mLocationWidget->setProperty(primaryLeftIconItem, true); + itemData.append( progressIcon ); } mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole); itemData.clear(); @@ -579,7 +575,7 @@ itemData.append(QString::null); itemData.append(QString::null); itemData.append("qtg_small_reminder"); - mReminderWidget->setProperty(primaryLeftIconItem, false); + itemData.append(QString::null); mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole); itemData.clear(); itemData.append(QString::null); @@ -601,7 +597,7 @@ itemData.append(QString::null); itemData.append(QString::null); itemData.append(QString::null); - mReminderWidget->setProperty(primaryLeftIconItem, true); + itemData.append(QString::null); mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole); itemData.clear(); completedText = systemLocale.format(mAgendaEntry.completedDateTime().date(), @@ -626,7 +622,7 @@ }else { itemData.append("qtg_small_repeat"); } - mRepeatWidget->setProperty(primaryLeftIconItem, false); + itemData.append(QString::null); mRepeatWidget->setEventViewerItemData(itemData, Qt::DecorationRole); itemData.clear(); itemData.append(QString::null); @@ -645,7 +641,7 @@ itemData.append(QString::null); itemData.append(QString::null); itemData.append(QString::null); - mDescriptionWidget->setProperty(primaryLeftIconItem, true); + itemData.append(QString::null); mDescriptionWidget->setEventViewerItemData(itemData, Qt::DecorationRole); itemData.clear(); itemData.append(hbTrId("txt_calendar_dblist_description")); @@ -934,6 +930,9 @@ { OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY ); HbDialog *popUp = new HbDialog(); + // Set the parent for the dialog + // Once the parent object is deleted the dialog will also be deleted + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); popUp->setAttribute( Qt::WA_DeleteOnClose, true ); @@ -977,6 +976,9 @@ OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY ); HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion); + // Set the parent for the dialog + // Once the parent object is deleted the dialog will also be deleted + popup->setParent(this); popup->setDismissPolicy(HbDialog::NoDismiss); popup->setTimeout(HbDialog::NoTimeout); popup->setAttribute( Qt::WA_DeleteOnClose, true ); @@ -1016,7 +1018,7 @@ popup->removeAction(list[i]); } HbAction *deleteAction = - new HbAction(hbTrId("txt_calendar_button_delete"), popup); + new HbAction(hbTrId("txt_common_button_delete"), popup); popup->addAction(deleteAction); connect(deleteAction, SIGNAL(triggered()), this , SLOT(handleDeleteAction())); @@ -1243,12 +1245,28 @@ void AgendaEventView::handleEntryDeletion(ulong id) { OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_ENTRY ); - - if (id == mAgendaEntry.id()) { - // Close the agenda entry viewer - close(); - mOwner->deletingCompleted(); - } + // Check if the entry which is viewed has been deleted or not + // The first check id == mAgendaEntry.id() will fail for the following case + // Exceptional entry is opened in the viewer. Edit this occurence in editor. + // From editor delete all occurences of the entry. In this case the viewer + // has the exceptional entry id which is not the same id which got deleted. + // Its the parent entry id. So checking if its a child and the entry deleted + // is the parent of this child. + if (id == mAgendaEntry.id() || + (!mAgendaEntry.recurrenceId().isNull() && id == mParentId)) { + // If the editor is opened and the deletion is happening from editor + // then there is no need to emit the signal deletingCompleted() [as the + // deletingStarted() is not been emitted already] + // In this case closing of viewer will happen only once the editor + // is closed properly + mEntryIdDeleted = id; + if(!mCalenEditor) { + // If the editor is not opened then emit deletingCompleted() + // and close the viewer + mOwner->deletingCompleted(); + close(); + } + } OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_EXIT ); } @@ -1278,9 +1296,26 @@ // Cleanup. mCalenEditorClosed = true; - mCalenEditor->deleteLater(); mOwner->editingCompleted(); - + if(mCalenEditor) { + mCalenEditor->deleteLater(); + // Check if the entry is deleted + if(mEntryIdDeleted) { + ulong currentId = mAgendaEntry.id(); + // If the deleted entry is the same as current id then close viewer + // The second check is for exceptional entries which will be true, + // when all the occurences of the entry is deleted from the editor + // In this case the entry id deleted won't the same as current id + if(currentId == mEntryIdDeleted || mEntryIdDeleted == mParentId) { + // Close the viewer as the entry no longer exists + close(); + } + // Reset the value. + mEntryIdDeleted = 0; + } + } + + OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_EXIT ); } @@ -1362,10 +1397,10 @@ mProgressIconCount = mProgressIconCount % 10 + 1; iconName.append(QVariant(mProgressIconCount).toString()); QStringList itemData; + itemData.append(QString::null); + itemData.append(QString::null); itemData.append("qtg_small_location"); itemData.append(iconName); - itemData.append(QString::null); - mLocationWidget->setProperty(primaryLeftIconItem, true); mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole); mProgressTimer->start(100); } @@ -1378,7 +1413,7 @@ itemData.append(QString::null); itemData.append(QString::null); itemData.append("qtg_small_location"); - mLocationWidget->setProperty(primaryLeftIconItem, false); + itemData.append(QString::null); mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole); Qt::Orientations orientation=hbInstance->allMainWindows().first()->orientation(); mMaptilePath.clear(); @@ -1396,12 +1431,12 @@ } else { QStringList itemData; + itemData.append(QString::null); + itemData.append(QString::null); itemData.append("qtg_small_location"); QString stopIcon; stopIcon.append(QString("qtg_mono_search_stop")); itemData.append(stopIcon); - itemData.append(QString::null); - mLocationWidget->setProperty(primaryLeftIconItem, true); mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole); } @@ -1475,6 +1510,8 @@ getSubjectIcon(mAgendaEntry.type(),subjectIcon); itemList.append(subjectIcon); itemList.append(priorityIcon); + // This "DUMMY_ICON" is required only for the subject layout. + itemList.append(DUMMY_ICON); itemList.append(QString::null); mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole); @@ -1501,6 +1538,7 @@ */ void AgendaEventView::saveAndCloseEditor() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_ENTRY ); if(mCalenEditorClosed){ QObject *plugin = qobject_cast ( mNotesEditorPluginLoader->instance()); @@ -1517,6 +1555,7 @@ mCalenEditor->saveAndCloseEditor(); } } + OstTraceFunctionEntry0( AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_EXIT ); } /*! @@ -1525,6 +1564,8 @@ */ void AgendaEventView::closeAgendaEventView() { - close(); + OstTraceFunctionEntry0( AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_ENTRY ); + close(); + OstTraceFunctionEntry0( AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_EXIT ); } // End of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp --- a/calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -45,13 +45,15 @@ */ AgendaEventViewerItem::AgendaEventViewerItem(QGraphicsItem *parent) : HbWidget(parent), mPrimaryText(NULL), mSecondaryText(NULL), - mPrimaryIcon(NULL), mSecondaryIcon(NULL),mPrimaryRightIcon(NULL), - mPrimaryLeftIcon(NULL) + mPrimaryLeftIcon(NULL),mPrimaryRightIcon(NULL), + mSecondaryLeftIcon(NULL),mSecondaryRightIcon(NULL) { OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY ); // Path for widgetml and css files. - HbStyleLoader::registerFilePath(":/"); + HbStyleLoader::registerFilePath(":/agendaeventvieweritem.css"); + HbStyleLoader::registerFilePath(":/agendaeventvieweritem.widgetml"); + HbStyleLoader::registerFilePath(":/agendaeventvieweritem_color.css"); OstTraceFunctionExit0( AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT ); } @@ -62,7 +64,9 @@ AgendaEventViewerItem::~AgendaEventViewerItem() { OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY ); - HbStyleLoader::unregisterFilePath(":/"); + HbStyleLoader::unregisterFilePath(":/agendaeventvieweritem.css"); + HbStyleLoader::unregisterFilePath(":/agendaeventvieweritem.widgetml"); + HbStyleLoader::unregisterFilePath(":/agendaeventvieweritem_color.css"); OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT ); } @@ -79,101 +83,156 @@ { OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_ENTRY ); if (!itemData.isEmpty()) { - QString firstItemData(QString::null); - QString secondItemData(QString::null); - QString thirdItemData(QString::null); - if (itemData.count() == 2) { - firstItemData = itemData.at(0); - secondItemData = itemData.at(1); - } - else if (itemData.count() == 3) { - firstItemData = itemData.at(0); - secondItemData = itemData.at(1); - thirdItemData = itemData.at(2); - } else { - firstItemData = itemData.at(0); - } if (role == Qt::DisplayRole) { - if (!firstItemData.isEmpty()) { + for (int index=0; index < itemData.count(); index++) + setTextItemData(index, itemData.at(index)); + + } else { + if (role == Qt::DecorationRole) { + for (int index=0; index < itemData.count(); index++) + setIconItemData(index, itemData.at(index)); + + } + } + repolish(); + OstTraceFunctionExit0( AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT ); + } +} + +/*! + Sets the text data for EventViewer items + + \param index item index + \param itenmData To set the given value to item + */ +void AgendaEventViewerItem::setTextItemData(int index, const QString &itemData) +{ + OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_ENTRY ); + switch(index) { + case 0: { + if (!itemData.isEmpty()) { if (!mPrimaryText) { mPrimaryText = new HbTextItem(this); HbStyle::setItemName(mPrimaryText, "primaryTextItem"); mPrimaryText->setElideMode(Qt::ElideNone); } - mPrimaryText->setText(firstItemData); + mPrimaryText->setText(itemData); } else { if (mPrimaryText) { delete mPrimaryText; mPrimaryText = NULL; } } - + break; + } + case 1: { if (!mSecondaryText) { mSecondaryText = new HbTextItem(this); HbStyle::setItemName(mSecondaryText, "secondaryTextItem"); mSecondaryText->setTextWrapping(Hb::TextWordWrap); } - - if (!secondItemData.isEmpty()) { - - mSecondaryText->setText(secondItemData); + + if (!itemData.isEmpty()) { + + mSecondaryText->setText(itemData); } else { mSecondaryText->setText(""); - } - } else { - if (role == Qt::DecorationRole) { - if (!firstItemData.isEmpty()) { - if (!mPrimaryLeftIcon) { - mPrimaryLeftIcon = new HbIconItem(this); - } - HbStyle::setItemName(mPrimaryLeftIcon, "primaryLeftIconItem"); - mPrimaryLeftIcon->setVisible(true); - mPrimaryLeftIcon->setIconName(firstItemData); + } + break; + } + } + OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_EXIT ); +} + +/*! + Sets the icon data for EventViewer items + + \param index item index + \param itenmData To set the given value to item + */ - } else { - if (mPrimaryLeftIcon) { - HbStyle::setItemName(mPrimaryLeftIcon,""); - mPrimaryLeftIcon->setVisible(false); - } - - } - if (!secondItemData.isEmpty()) { - if (!mPrimaryRightIcon) { - mPrimaryRightIcon = new HbIconItem(this); - } - HbStyle::setItemName(mPrimaryRightIcon, "primaryRightIconItem"); - mPrimaryRightIcon->setVisible(true); - mPrimaryRightIcon->setIconName(secondItemData); +void AgendaEventViewerItem::setIconItemData(int index, const QString &itemData) +{ + OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETICONITEMDATA_ENTRY ); + switch (index) { + case 0: { + if (!itemData.isEmpty()) { + if (!mPrimaryLeftIcon) { + mPrimaryLeftIcon = new HbIconItem(this); + } + HbStyle::setItemName(mPrimaryLeftIcon, "primaryLeftIconItem"); + mPrimaryLeftIcon->setIconName(itemData); - } else { - if (mPrimaryRightIcon) { - HbStyle::setItemName(mPrimaryRightIcon,""); - mPrimaryRightIcon->setVisible(false); - } - - } - if (!thirdItemData.isEmpty()) { - if (!mSecondaryIcon) { - mSecondaryIcon = new HbIconItem(this); - HbStyle::setItemName(mSecondaryIcon, - "secondaryIconItem"); - } - mSecondaryIcon->setIconName(thirdItemData); - - } else { - if (mSecondaryIcon) { - delete mSecondaryIcon; - mSecondaryIcon = NULL; - } - + } else { + if (mPrimaryLeftIcon) { + delete mPrimaryLeftIcon; + mPrimaryLeftIcon = NULL; } } + break; } + case 1: { + if (!itemData.isEmpty()) { + if (!mPrimaryRightIcon) { + mPrimaryRightIcon = new HbIconItem(this); + } + HbStyle::setItemName(mPrimaryRightIcon, "primaryRightIconItem"); + mPrimaryRightIcon->setVisible(true); + mPrimaryRightIcon->setIconName(itemData); + + } else { + if (mPrimaryRightIcon) { + HbStyle::setItemName(mPrimaryRightIcon, ""); + mPrimaryRightIcon->setVisible(false); + } + + } + break; + } + case 2: { + if (!itemData.isEmpty()) { + if (!mSecondaryLeftIcon) { + mSecondaryLeftIcon = new HbIconItem(this); + HbStyle::setItemName(mSecondaryLeftIcon, + "secondaryLeftIconItem"); + } + mSecondaryLeftIcon->setIconName(itemData); + + } else { + if (mSecondaryLeftIcon) { + delete mSecondaryLeftIcon; + mSecondaryLeftIcon = NULL; + } + + } + break; + } + case 3: { + + if (!itemData.isEmpty()) { + if (!mSecondaryRightIcon) { + mSecondaryRightIcon = new HbIconItem(this); + HbStyle::setItemName(mSecondaryRightIcon, + "secondaryRightIconItem"); + } + mSecondaryRightIcon->setIconName(itemData); + + } else { + if (mSecondaryRightIcon) { + delete mSecondaryRightIcon; + mSecondaryRightIcon = NULL; + } + + } + break; + + } + } - repolish(); - OstTraceFunctionExit0( AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT ); + OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETICONITEMDATA_EXIT ); } // End of file --Don't remove this. + diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/traces/OstTraceDefinitions.h --- a/calendarui/agendaeventviewer/traces/OstTraceDefinitions.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/traces/OstTraceDefinitions.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,3 +1,20 @@ +/* +* This is Default Licence added by TraceCompiler +* 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: +* +*/ #ifndef __OSTTRACEDEFINITIONS_H__ #define __OSTTRACEDEFINITIONS_H__ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/traces/agendaeventviewTraces.h --- a/calendarui/agendaeventviewer/traces/agendaeventviewTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/traces/agendaeventviewTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,20 @@ -// Created by TraceCompiler 2.2.3 +/* +* 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: +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __AGENDAEVENTVIEWTRACES_H__ @@ -88,6 +104,10 @@ #define AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT 0x8a007f #define AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY 0x8a0080 #define AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT 0x8a0081 +#define AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_ENTRY 0x8a0082 +#define AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_EXIT 0x8a0083 +#define AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_ENTRY 0x8a0084 +#define AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_EXIT 0x8a0085 #endif diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/traces/agendaeventviewerTraces.h --- a/calendarui/agendaeventviewer/traces/agendaeventviewerTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/traces/agendaeventviewerTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,20 @@ -// Created by TraceCompiler 2.2.3 +/* +* 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: Definition of AgendaEventViewer class +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __AGENDAEVENTVIEWERTRACES_H__ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/traces/agendaeventviewer_pTraces.h --- a/calendarui/agendaeventviewer/traces/agendaeventviewer_pTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/traces/agendaeventviewer_pTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,20 @@ -// Created by TraceCompiler 2.2.3 +/* +* 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: Definition of AgendaEventViewerPrivate class +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __AGENDAEVENTVIEWER_PTRACES_H__ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/traces/agendaeventviewerdocloaderTraces.h --- a/calendarui/agendaeventviewer/traces/agendaeventviewerdocloaderTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/traces/agendaeventviewerdocloaderTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,20 @@ -// Created by TraceCompiler 2.2.3 +/* +* 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: Definition of the class AgendaEventViewerDocLoader +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __AGENDAEVENTVIEWERDOCLOADERTRACES_H__ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/traces/agendaeventvieweritemTraces.h --- a/calendarui/agendaeventviewer/traces/agendaeventvieweritemTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/traces/agendaeventvieweritemTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,20 @@ -// Created by TraceCompiler 2.2.3 +/* +* 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: Definition of AgendaEventViewerItem class +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __AGENDAEVENTVIEWERITEMTRACES_H__ @@ -12,6 +28,10 @@ #define DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT 0x8a007b #define AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_ENTRY 0x8a007c #define AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT 0x8a007d +#define AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_ENTRY 0x8a0086 +#define AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_EXIT 0x8a0087 +#define AGENDAEVENTVIEWERITEM_SETICONITEMDATA_ENTRY 0x8a0088 +#define AGENDAEVENTVIEWERITEM_SETICONITEMDATA_EXIT 0x8a0089 #endif diff -r 1881ad52dc45 -r a5ed90760192 calendarui/agendaeventviewer/traces/fixed_id.definitions --- a/calendarui/agendaeventviewer/traces/fixed_id.definitions Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/agendaeventviewer/traces/fixed_id.definitions Mon Sep 06 10:12:45 2010 +0530 @@ -1,3 +1,20 @@ +## +# This is Default Licence added by TraceCompiler +# 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: +# +## #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. [GROUP]TRACE_FLOW=0x8a [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_ENTRY=0x75 @@ -6,6 +23,10 @@ [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT=0x79 [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_ENTRY=0x7c [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT=0x7d +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETICONITEMDATA_ENTRY=0x88 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETICONITEMDATA_EXIT=0x89 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_ENTRY=0x86 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_EXIT=0x87 [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_ENTRY=0x5d [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_EXIT=0x5e [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_DELETINGCOMPLETED_ENTRY=0x71 @@ -58,6 +79,8 @@ [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ALARMTIMETEXT_EXIT=0x24 [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CHANGEDORIENTATION_ENTRY=0x4f [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CHANGEDORIENTATION_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_ENTRY=0x84 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_EXIT=0x85 [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSE_ENTRY=0x3b [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSE_EXIT=0x3c [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_DELETEAGENDAENTRY_ENTRY=0x37 @@ -96,6 +119,8 @@ [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_REPEATRULE_EXIT=0x22 [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SAVEAGENDAENTRY_ENTRY=0x39 [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SAVEAGENDAENTRY_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_ENTRY=0x82 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_EXIT=0x83 [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY=0x2f [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_EXIT=0x30 [TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY=0x2d diff -r 1881ad52dc45 -r a5ed90760192 calendarui/application/application.pro --- a/calendarui/application/application.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/application/application.pro Mon Sep 06 10:12:45 2010 +0530 @@ -38,6 +38,9 @@ "../conf/calendarUI_101F874B.crml APP_LAYER_CRML(calendarUI_101F874B.crml)" \ # stubsis is added to provide IAD "../stubsis/calendar_stub.sis /epoc32/data/z/system/install/calendar_stub.sis" \ + # splashml + "resources/calendar.docml /epoc32/data/z/resource/hb/splashml/calendar.docml" \ + "resources/calendar.splashml /epoc32/data/z/resource/hb/splashml/calendar.splashml" \ # backup_registration.xml "data/backup_registration.xml /epoc32/data/z/private/10005901/backup_registration.xml" \ "data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10005901/backup_registration.xml" \ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/application/resources/calendar.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/application/resources/calendar.docml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff -r 1881ad52dc45 -r a5ed90760192 calendarui/application/resources/calendar.splashml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/application/resources/calendar.splashml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,6 @@ + + calendar.docml + view + 0x10005901 + Calendar + diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/inc/caleneditor_p.h --- a/calendarui/caleneditor/inc/caleneditor_p.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/inc/caleneditor_p.h Mon Sep 06 10:12:45 2010 +0530 @@ -168,8 +168,11 @@ const double geoLatitude, const double geoLongitude); void handleDescriptionChange(const QString description); void saveAndCloseEditor(); - void showDeleteConfirmationQuery(bool closeEditor = false); + void showDeletePopup(); + void showDeleteConfirmationQuery(); + void showDeleteOccurencePopup(); void handleDeleteAction(); + void handleDeleteOccurence(int index); void launchSettingsView(); void discardChanges(); void handleDescriptionAction(); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/src/caleneditor_p.cpp --- a/calendarui/caleneditor/src/caleneditor_p.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditor_p.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -396,6 +396,9 @@ { OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_ENTRY ); HbDialog *popUp = new HbDialog(); + // Set the parent for the dialog + // Once the editor object is deleted the dialog will also be deleted + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); popUp->setAttribute( Qt::WA_DeleteOnClose, true ); @@ -578,10 +581,7 @@ headingWidget->setHeading(hbTrId("txt_calendar_subhead_meeting")); }else if(CalenAgendaUtils::isAlldayEvent(*mEditedEntry)) { headingWidget->setHeading(hbTrId("txt_calendar_subhead_all_day_event")); - }else if (entryType == AgendaEntry::TypeTodo) { - headingWidget->setHeading(hbTrId("txt_calendar_subhead_to_do")); - } - + } } initModel(); @@ -852,6 +852,7 @@ */ QDateTime CalenEditorPrivate::defaultTimeSameDay( ) { + OstTraceFunctionEntry0( CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_ENTRY ); QDateTime currentDateTime = QDateTime::currentDateTime(); //Start time should be one hour more than current time. @@ -883,10 +884,12 @@ // After adding one hour and rounding off the minutes to current time, // if midnight crossover happens return default time(8:00 am) for next day - if(CalenDateUtils::isOnToday(currentDateTime)) + if(CalenDateUtils::isOnToday(currentDateTime)) { + OstTraceFunctionExit0( CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_EXIT ); return currentDateTime; - else + } else { return CalenDateUtils::defaultTime(currentDateTime); + } } /*! @@ -894,6 +897,7 @@ */ void CalenEditorPrivate::refreshTimeForUncheckAllDay() { + OstTraceFunctionEntry0( CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_ENTRY ); //Get the default time as 8:00 am from CalenDateUtils. QDateTime fromDateTime = CalenDateUtils::defaultTime(mEditedEntry->startTime()); QDateTime toDateTime; @@ -912,6 +916,7 @@ // Set the default start time to the event. mEditedEntry->setStartAndEndTime(fromDateTime, toDateTime); + OstTraceFunctionExit0( CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_EXIT ); } /*! @@ -1330,10 +1335,12 @@ */ void CalenEditorPrivate::handleSubjectChange(const QString subject) { + OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_ENTRY ); mEditedEntry->setSummary(subject); if(!mNewEntry ){ addDiscardAction(); } + OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_EXIT ); } /*! @@ -1450,36 +1457,49 @@ void CalenEditorPrivate::handleLocationEditingFinished() { OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_ENTRY ); + QString trimmedLocation ; + trimmedLocation = mEditedEntry->location().trimmed(); if ( !mOriginalEntry->location().isEmpty() ) { - AgendaGeoValue entryGeoValue =mAgendaUtil->fetchById(mEditedEntry->id()).geoValue(); - if ( !entryGeoValue.isNull() && (mEditedEntry->location()!=mOriginalEntry->location()) ) - { - - mEditedEntry->setGeoValue(entryGeoValue); - HbMessageBox* confirmationQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion); - - confirmationQuery->setDismissPolicy(HbDialog::NoDismiss); - confirmationQuery->setTimeout(HbDialog::NoTimeout); - confirmationQuery->setIconVisible(true); - - QString displayText; - displayText = displayText.append(hbTrId("txt_calendar_info_location_updated_keep_existing")); - - confirmationQuery->setText(displayText); - - // Remove the default actions. - QList defaultActions = confirmationQuery->actions(); - for (int index=0;indexremoveAction(defaultActions[index]); - } - - defaultActions.clear(); - confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_yes"))); - confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_no"))); - confirmationQuery->open(this, SLOT(selectEditingFinishedAction(HbAction*))); - } + if(!trimmedLocation .isEmpty()) + { + AgendaGeoValue entryGeoValue =mAgendaUtil->fetchById(mEditedEntry->id()).geoValue(); + if ( !entryGeoValue.isNull() && (mEditedEntry->location()!=mOriginalEntry->location()) ) + { + + mEditedEntry->setGeoValue(entryGeoValue); + HbMessageBox* confirmationQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion); + // Set the parent for the dialog + // Once the editor object is deleted the dialog will also be deleted + confirmationQuery->setParent(this); + confirmationQuery->setDismissPolicy(HbDialog::NoDismiss); + confirmationQuery->setTimeout(HbDialog::NoTimeout); + confirmationQuery->setIconVisible(true); + + QString displayText; + displayText = displayText.append(hbTrId("txt_calendar_info_location_updated_keep_existing")); + + confirmationQuery->setText(displayText); + + // Remove the default actions. + QList defaultActions = confirmationQuery->actions(); + for (int index=0;indexremoveAction(defaultActions[index]); + } + + defaultActions.clear(); + confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_yes"))); + confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_no"))); + confirmationQuery->open(this, SLOT(selectEditingFinishedAction(HbAction*))); + } + } + else + { + mEditedEntry->clearGeoValue(); + // sets null string for the location + mEditedEntry->setLocation(trimmedLocation ); + } } OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_EXIT ); } @@ -1521,9 +1541,7 @@ { OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_ENTRY ); Action action = handleDone(); - if (CalenEditorPrivate::ActionDelete != action) { - closeEditor(); - } + closeEditor(); if (CalenEditorPrivate::ActionSave == action) { // check if we need to launch the calendar application @@ -1564,12 +1582,52 @@ return; }else { // Delete entry and close editor - deleteEntry(true); + // if editor is launched from Notes then don't delete entry + // Just exit from calendar editor + if (mOriginalEntry->id() > 0) { + // If user is editing single instanc then delete single instance + // else delete entry + if (mEditRange == ThisOnly) { + // User wants to delete only this occurence + mAgendaUtil->deleteRepeatedEntry(*mOriginalEntry, + AgendaUtil::ThisOnly); + } else { + // Delete the entry. + mAgendaUtil->deleteEntry(mOriginalEntry->id()); + } + closeEditor(); + } } OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT ); } /*! + Deletes the entry based on the selection: This occurence or All occurences + */ +void CalenEditorPrivate::handleDeleteOccurence(int index) +{ + OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_ENTRY ); + switch (index) { + case 0: + // User wants to delete only this occurence + mAgendaUtil->deleteRepeatedEntry(mEntry, AgendaUtil::ThisOnly); + break; + case 1: + // User wants to delete all the occurences + // Delete the parent entry. + if(isChild()) { + AgendaEntry entryToBeDeleted = mAgendaUtil->parentEntry(mEntry); + mAgendaUtil->deleteEntry(entryToBeDeleted.id()); + }else { + mAgendaUtil->deleteEntry(mOriginalEntry->id()); + } + break; + } + closeEditor(); + OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_EXIT ); +} + +/*! Launches the Settings view. */ void CalenEditorPrivate::launchSettingsView() @@ -1591,56 +1649,97 @@ } /*! - * Show delete confirmation query + * Show delete confirmation query based on the entry */ -void CalenEditorPrivate::showDeleteConfirmationQuery(bool closeEditor) +void CalenEditorPrivate::showDeleteConfirmationQuery() { OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_ENTRY ); + if(mOriginalEntry->isRepeating() || isChild()) { + showDeleteOccurencePopup(); + }else { + showDeletePopup(); + } + OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT ); +} + +/*! + * Show delete confirmation query for repeated entries + */ +void CalenEditorPrivate::showDeleteOccurencePopup() +{ + OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_ENTRY ); + HbDialog *popUp = new HbDialog(); + // Set the parent for the dialog + // Once the editor object is deleted the dialog will also be deleted + popUp->setParent(this); + popUp->setDismissPolicy(HbDialog::NoDismiss); + popUp->setTimeout(HbDialog::NoTimeout); + popUp->setAttribute( Qt::WA_DeleteOnClose, true ); + + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical); + HbWidget *editWidget = new HbWidget(); + editWidget->setLayout(layout); + + HbRadioButtonList *editButtonList = new HbRadioButtonList(); + + QStringList list; + list << hbTrId("txt_calendar_info_this_occurrence_only") + << hbTrId("txt_calendar_info_all_occurences"); + + editButtonList->setItems(list); + + layout->addItem(editButtonList); + + popUp->setContentWidget(editWidget); + popUp->setHeadingWidget(new HbLabel(hbTrId("txt_calendar_title_delete_repeated_entry"))); + + // Create cancel action + HbAction *cancelAction = + new HbAction(hbTrId("txt_common_button_cancel_singledialog")); + popUp->addAction(cancelAction); + connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close())); + connect(editButtonList, SIGNAL(itemSelected(int)), this, + SLOT(handleDeleteOccurence(int))); + connect(cancelAction, SIGNAL(triggered()), this, SLOT(close())); + + // Show the popup + popUp->open(); + OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_EXIT ); +} + +/*! + * Show delete confirmation query for non repeated entries + */ +void CalenEditorPrivate::showDeletePopup() +{ + OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETEPOPUP_ENTRY ); HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion); + // Set the parent for the dialog + // Once the editor object is deleted the dialog will also be deleted + popup->setParent(this); popup->setDismissPolicy(HbDialog::NoDismiss); popup->setTimeout(HbDialog::NoTimeout); popup->setAttribute( Qt::WA_DeleteOnClose, true ); - QString text = 0; + popup->setText(hbTrId("txt_calendar_info_delete_entry")); - switch (mOriginalEntry->type()) { - case AgendaEntry::TypeAppoinment: - case AgendaEntry::TypeEvent: { - if (mEditRange == ThisAndAll) { - text.append(hbTrId("txt_calendar_info_delete_entries")); - } else { - text.append(hbTrId("txt_calendar_info_delete_meeting")); - } - break; - } - case AgendaEntry::TypeAnniversary: { - text.append(hbTrId("txt_calendar_info_delete_anniversary")); - break; - } + QList list = popup->actions(); + for(int i=0; i < list.count(); i++) + { + popup->removeAction(list[i]); } - - popup->setText(text); - - QList list = popup->actions(); - for(int i=0; i < list.count(); i++) - { - popup->removeAction(list[i]); - } HbAction *deleteAction = new HbAction(hbTrId("txt_common_button_delete"), - popup); + popup); popup->addAction(deleteAction); connect(deleteAction, SIGNAL(triggered()), this, - SLOT(handleDeleteAction())); + SLOT(handleDeleteAction())); HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"), - popup); - // Editor should not be closed for all the cases when cancel is pressed - if(closeEditor) { - connect(cancelAction, SIGNAL(triggered()), this, - SLOT(closeEditor())); - } + popup); + connect(cancelAction, SIGNAL(triggered()), this, SLOT(close())); popup->addAction(cancelAction); popup->open(); - OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT ); + + OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETEPOPUP_EXIT ); } /*! @@ -1650,7 +1749,7 @@ bool CalenEditorPrivate::isChild() const { OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISCHILD_ENTRY ); - return mEditedEntry->recurrenceId().toUTC().isNull(); + return !(mEditedEntry->recurrenceId().toUTC().isNull()); } /*! @@ -1698,10 +1797,6 @@ } OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEDONE_EXIT ); return CalenEditorPrivate::ActionNothing; - case CalenEditorPrivate::ActionDelete: - showDeleteConfirmationQuery(true); - OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_HANDLEDONE_EXIT ); - return CalenEditorPrivate::ActionDelete; case CalenEditorPrivate::ActionNothing: return CalenEditorPrivate::ActionNothing; default: @@ -1749,34 +1844,6 @@ } /*! - Delete the entry - @param closeEditor set true to close editor else default value is false - */ -void CalenEditorPrivate::deleteEntry(bool close) -{ - OstTraceFunctionEntry0( CALENEDITORPRIVATE_DELETEENTRY_ENTRY ); - // if editor is launched from Notes then don't delete entry - // Just exit from calendar editor - if (mOriginalEntry->id() > 0) { - // If user is editing single instanc then delete single instance - // else delete entry - if (mEditRange == ThisOnly) { - // User wants to delete only this occurence - mAgendaUtil->deleteRepeatedEntry(*mOriginalEntry, - AgendaUtil::ThisOnly); - } else { - // Delete the entry. - mAgendaUtil->deleteEntry(mOriginalEntry->id()); - } - - if (close) { - closeEditor(); - } - } - OstTraceFunctionExit0( CALENEDITORPRIVATE_DELETEENTRY_EXIT ); -} - -/*! Change the entry before saving, depending on AllDay checkbox state */ bool CalenEditorPrivate::handleAllDayToSave() @@ -1948,11 +2015,13 @@ */ bool CalenEditorPrivate::isRepeatUntilItemAdded() { + OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_ENTRY ); // For exceptional entries the repeatfield will not be present // So need to check if the repeat field is there or not if( mRepeatField ) { return mRepeatField->isRepeatUntilItemAdded(); }else { + OstTraceFunctionExit0( CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_EXIT ); return false; } } @@ -2005,6 +2074,7 @@ */ int CalenEditorPrivate::getReminderCount() { + OstTraceFunctionEntry0( CALENEDITORPRIVATE_GETREMINDERCOUNT_ENTRY ); return mReminderField->reminderItemsCount(); } @@ -2033,6 +2103,17 @@ */ void CalenEditorPrivate::forcedSaveEntry() { - saveAndCloseEditor(); + OstTraceFunctionEntry0( CALENEDITORPRIVATE_FORCEDSAVEENTRY_ENTRY ); + // Check if the editor is launched completely + // If yes, save entry and close the editor + if(mEditorView) { + saveAndCloseEditor(); + }else { + // If the view is not launched then just emit signal dialogClosed() + // When the edit popup is shown for repeating entries, + // this else case will get executed + emit q_ptr->dialogClosed(); + } + OstTraceFunctionExit0( CALENEDITORPRIVATE_FORCEDSAVEENTRY_EXIT ); } // End of file --Don't remove this. diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/src/caleneditorcustomitem.cpp --- a/calendarui/caleneditor/src/caleneditorcustomitem.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditorcustomitem.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -274,7 +274,7 @@ void CalenEditorCustomItem::launchLocationPicker() { - OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY ); + OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY ); if(!mAppManager) { mAppManager = new XQApplicationManager(); @@ -418,6 +418,9 @@ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_HANDLEDATE_ENTRY ); // Create a popup with datepicker for the user to select date. HbDialog *popUp = new HbDialog(); + // Set the parent for the dialog + // Once the parent object is deleted the dialog will also be deleted + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); popUp->setAttribute( Qt::WA_DeleteOnClose, true ); @@ -455,6 +458,9 @@ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_HANDLETIME_ENTRY ); // Create a popup with time picker for the user to select time. HbDialog *popUp = new HbDialog(); + // Set the parent for the dialog + // Once the parent object is deleted the dialog will also be deleted + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); popUp->setAttribute( Qt::WA_DeleteOnClose, true ); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/src/caleneditordatahandler.cpp --- a/calendarui/caleneditor/src/caleneditordatahandler.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditordatahandler.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -382,13 +382,6 @@ return CalenEditorPrivate::ActionSave; } } - if (areTextItemsCleared() && !nonTextItemsEdited()) { - // ***** edited entry + text items emptied + non-text items not edited - // Even if user may have edited non-text fields, - // delete the note - OstTraceFunctionExit0( DUP3_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT ); - return CalenEditorPrivate::ActionDelete; - } // Save the note, since the text fields contain something OstTraceFunctionExit0( DUP4_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT ); return CalenEditorPrivate::ActionSave; diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/src/caleneditorreminderfield.cpp --- a/calendarui/caleneditor/src/caleneditorreminderfield.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditorreminderfield.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -143,6 +143,7 @@ */ void CalenEditorReminderField::setSavedMeetingReminderIndex() { + OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_ENTRY ); // Get the reminder offset value. int reminderOffset = mCalenEditor->editedEntry()->alarm().timeOffset(); @@ -157,6 +158,7 @@ setCurrentIndex(ReminderAtStart); else setCurrentIndex(Reminder15MinsBefore); + OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_EXIT ); } /*! @@ -411,6 +413,7 @@ */ void CalenEditorReminderField::UpdateReminderChoicesForSameDay(QTime startTime) { + OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_ENTRY ); QTime currentTime = QTime::currentTime(); int offset = currentTime.secsTo(startTime); @@ -475,6 +478,7 @@ mEditorForm->addConnection(mReminderItem, SIGNAL(currentIndexChanged(int)), this, SLOT(handleReminderIndexChanged(int))); + OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_EXIT ); } /*! @@ -637,6 +641,7 @@ */ int CalenEditorReminderField::getReminderIndexBasedOnEntryAlarm() { + OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_ENTRY ); // Get the appropriate reminder index depending on the value of time offset. AgendaAlarm actualAlarm = mCalenEditor->editedEntry()->alarm(); QTime referenceTime(0, 0, 0); @@ -658,6 +663,7 @@ mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins * 60)); } + OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_EXIT ); return index; } @@ -735,6 +741,9 @@ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_ENTRY ); HbDialog *popUp = new HbDialog(); + // Set the parent for the dialog + // Once the parent object is deleted the dialog will also be deleted + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); popUp->setAttribute( Qt::WA_DeleteOnClose, true ); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/src/caleneditorrepeatfield.cpp --- a/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -246,6 +246,7 @@ */ void CalenEditorRepeatField::removeRepeatUntilItem() { + OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_ENTRY ); mRepeatRuleType = AgendaRepeatRule::InvalidRule; if (mRepeatUntilItemAdded) { mEditorForm->removeConnection(mCustomRepeatUntilItem, SIGNAL(clicked()), @@ -258,6 +259,7 @@ mRepeatUntilItemAdded = false; mCustomRepeatUntilItem = 0; } + OstTraceFunctionExit0( CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_EXIT ); } /*! @@ -268,8 +270,6 @@ void CalenEditorRepeatField::handleRepeatIndexChanged(int index) { OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_ENTRY ); - mIsBiWeekly = false; - mIsWorkdays = false; HbExtendedLocale locale = HbExtendedLocale::system(); // Get the user role we have set for this index @@ -291,10 +291,16 @@ repeatPropertyChange = false; } QDate repeatUntilDate = mRepeatUntilDate; + int itemIndex = CalenEditorPrivate::RepeatUntilItem; + if (!mCalenEditor->isReminderTimeForAllDayAdded()) { + itemIndex -= 1; + } // Update the repeat type only if its has been changed // ie. if the previous repeatrole is different from the current repeat role if (value != mRepeatRoleValue) { mRepeatRoleValue = value; + mIsBiWeekly = false; + mIsWorkdays = false; switch (value) { case DailyRole: { if (!mRepeatUntilItemAdded) { @@ -401,16 +407,21 @@ // the reminder choices are updated if(repeatPropertyChange || repeatUntilDate != mRepeatUntilDate) { mCalenEditor->updateReminderChoices(); - // Once the entry is changed from non repeating to repeating - // and if the alarm set is off - // Then change the reminder option to the default 'one day before' - // if the option is valid - if (mCalenEditor->isAllDayEvent() && - repeatPropertyChange && mRepeatUntilItemAdded) { - if(!mCalenEditor->isReminderTimeForAllDayAdded() && - mCalenEditor->getReminderCount() >= 3) { - mCalenEditor->setCurrentIndexOfReminderField( + + // Once the entry is changed from non repeating to repeating we scroll to the repeat until item. + if(repeatPropertyChange && mRepeatUntilItemAdded) { + mEditorForm->scrollTo(mCalenEditorModel->index(itemIndex, 0), HbAbstractItemView::EnsureVisible); + + // Once the entry is changed from non repeating to repeating + // and if the alarm set is off + // Then change the reminder option to the default 'one day before' + // if the option is valid + if (mCalenEditor->isAllDayEvent()) { + if(!mCalenEditor->isReminderTimeForAllDayAdded() && + mCalenEditor->getReminderCount() >= 3) { + mCalenEditor->setCurrentIndexOfReminderField( CalenEditorReminderField::ReminderOneDayBefore); + } } } } @@ -458,8 +469,6 @@ r_qtn_date_usual_with_zero); mCustomRepeatUntilItem->setContentWidgetData("text", dateString); } - //Scroll to repeat until item added - mEditorForm->scrollTo(mCalenEditorModel->index(index, 0), HbAbstractItemView::EnsureVisible); OstTraceFunctionExit0( CALENEDITORREPEATFIELD_INSERTREPEATUNTILITEM_EXIT ); } @@ -481,6 +490,9 @@ { OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_LAUNCHREPEATUNTILDATEPICKER_ENTRY ); HbDialog *popUp = new HbDialog(); + // Set the parent for the dialog + // Once the parent object is deleted the dialog will also be deleted + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); popUp->setHeadingWidget( new HbLabel( @@ -725,6 +737,11 @@ if (mRepeatRuleType != AgendaRepeatRule::InvalidRule) { AgendaRepeatRule repeatRule(mRepeatRuleType); + //Set the week start day in the repeat rule. + HbExtendedLocale locale = HbExtendedLocale::system(); + AgendaRepeatRule::Day wkStart = (AgendaRepeatRule::Day)locale.startOfWeek(); + repeatRule.setWeekStart(wkStart); + //TODO : Set the repeat from and to dates QVariant dateVariant = mCustomRepeatUntilItem->contentWidgetData("text"); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/traces/caleneditor_pTraces.h --- a/calendarui/caleneditor/traces/caleneditor_pTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/traces/caleneditor_pTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -107,14 +107,9 @@ #define CALENEDITORPRIVATE_HANDLEDONE_ENTRY 0x8a0075 #define CALENEDITORPRIVATE_HANDLEDONE_EXIT 0x8a0076 #define DUP1_CALENEDITORPRIVATE_HANDLEDONE_EXIT 0x8a0077 -#define DUP2_CALENEDITORPRIVATE_HANDLEDONE_EXIT 0x8a0078 #define DUP3_CALENEDITORPRIVATE_HANDLEDONE_EXIT 0x8a0079 #define CALENEDITORPRIVATE_SAVEENTRY_ENTRY 0x8a007a -#define CALENEDITORPRIVATE_SAVEENTRY_EXIT 0x8a007b -#define DUP1_CALENEDITORPRIVATE_SAVEENTRY_EXIT 0x8a007c #define DUP2_CALENEDITORPRIVATE_SAVEENTRY_EXIT 0x8a007d -#define CALENEDITORPRIVATE_DELETEENTRY_ENTRY 0x8a007e -#define CALENEDITORPRIVATE_DELETEENTRY_EXIT 0x8a007f #define CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY 0x8a0080 #define CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0081 #define DUP1_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0082 @@ -140,14 +135,29 @@ #define CALENEDITORPRIVATE_CURRENTINDEXOFREMINDERFIELD_ENTRY 0x8a0096 #define CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_ENTRY 0x8a0097 #define CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_EXIT 0x8a0098 -#define CALENEDITORPRIVATE_SETREMINDERCHOICES_ENTRY 0x8a0099 -#define CALENEDITORPRIVATE_SETREMINDERCHOICES_EXIT 0x8a009a #define CALENEDITORPRIVATE_ISEDITRANGETHISONLY_ENTRY 0x8a009b #define CALENEDITORPRIVATE_ISEDITRANGETHISONLY_EXIT 0x8a009c #define CALENEDITORPRIVATE_ISALLDAYFIELDADDED_ENTRY 0x8a009d #define CALENEDITORPRIVATE_ISALLDAYFIELDADDED_EXIT 0x8a009e #define DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a014e #define DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a014f +#define CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_ENTRY 0x8a0150 +#define CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_EXIT 0x8a0151 +#define CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_ENTRY 0x8a0152 +#define CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_EXIT 0x8a0153 +#define CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_ENTRY 0x8a0154 +#define CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_EXIT 0x8a0155 +#define CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_ENTRY 0x8a0156 +#define CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_EXIT 0x8a0157 +#define CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_ENTRY 0x8a0158 +#define CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_EXIT 0x8a0159 +#define CALENEDITORPRIVATE_SHOWDELETEPOPUP_ENTRY 0x8a015a +#define CALENEDITORPRIVATE_SHOWDELETEPOPUP_EXIT 0x8a015b +#define CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_ENTRY 0x8a015c +#define CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_EXIT 0x8a015d +#define CALENEDITORPRIVATE_GETREMINDERCOUNT_ENTRY 0x8a015e +#define CALENEDITORPRIVATE_FORCEDSAVEENTRY_ENTRY 0x8a015f +#define CALENEDITORPRIVATE_FORCEDSAVEENTRY_EXIT 0x8a0160 #endif diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/traces/caleneditordatahandlerTraces.h --- a/calendarui/caleneditor/traces/caleneditordatahandlerTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/traces/caleneditordatahandlerTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -45,7 +45,6 @@ #define CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f4 #define DUP1_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f5 #define DUP2_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f6 -#define DUP3_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f7 #define DUP4_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f8 #define CALENEDITORDATAHANDLER_DURATIONGREATERTHANREPEATINTERVALERROR_ENTRY 0x8a00f9 #define CALENEDITORDATAHANDLER_DURATIONGREATERTHANREPEATINTERVALERROR_EXIT 0x8a00fa diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/traces/caleneditorreminderfieldTraces.h --- a/calendarui/caleneditor/traces/caleneditorreminderfieldTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/traces/caleneditorreminderfieldTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -48,6 +48,12 @@ #define CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_EXIT 0x8a012f #define CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_ENTRY 0x8a0130 #define CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_EXIT 0x8a0131 +#define CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_ENTRY 0x8a0161 +#define CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_EXIT 0x8a0162 +#define CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_ENTRY 0x8a0163 +#define CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_EXIT 0x8a0164 +#define CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_ENTRY 0x8a0165 +#define CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_EXIT 0x8a0166 #endif diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/traces/caleneditorrepeatfieldTraces.h --- a/calendarui/caleneditor/traces/caleneditorrepeatfieldTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/traces/caleneditorrepeatfieldTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -34,6 +34,8 @@ #define DUP1_CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT 0x8a014b #define CALENEDITORREPEATFIELD_SAVEREPEATRULE_ENTRY 0x8a014c #define CALENEDITORREPEATFIELD_SAVEREPEATRULE_EXIT 0x8a014d +#define CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_ENTRY 0x8a0167 +#define CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_EXIT 0x8a0168 #endif diff -r 1881ad52dc45 -r a5ed90760192 calendarui/caleneditor/traces/fixed_id.definitions --- a/calendarui/caleneditor/traces/fixed_id.definitions Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/caleneditor/traces/fixed_id.definitions Mon Sep 06 10:12:45 2010 +0530 @@ -108,8 +108,8 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CREATE_ENTRY=0x1e [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CREATE_EXIT=0x1f [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CURRENTINDEXOFREMINDERFIELD_ENTRY=0x96 -[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DELETEENTRY_ENTRY=0x7e -[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DELETEENTRY_EXIT=0x7f +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_ENTRY=0x150 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_EXIT=0x151 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DISCARDCHANGES_ENTRY=0x70 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DISCARDCHANGES_EXIT=0x71 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_EDITEDENTRY_ENTRY=0x8a @@ -118,6 +118,9 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_EDIT_EXIT=0x18 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ENABLEFROMTOTIMEFILEDS_ENTRY=0x88 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ENABLEFROMTOTIMEFILEDS_EXIT=0x89 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_FORCEDSAVEENTRY_ENTRY=0x15f +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_FORCEDSAVEENTRY_EXIT=0x160 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_GETREMINDERCOUNT_ENTRY=0x15e [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_ENTRY=0x5b [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_EXIT=0x5c [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY=0x80 @@ -128,6 +131,8 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLECANCEL_EXIT=0x27 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDELETEACTION_ENTRY=0x6b [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT=0x6c +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_ENTRY=0x156 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_EXIT=0x157 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_ENTRY=0x41 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_EXIT=0x42 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONCHANGE_ENTRY=0x65 @@ -140,6 +145,8 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_EXIT=0x5e [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_ENTRY=0x61 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_EXIT=0x62 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_ENTRY=0x154 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_EXIT=0x155 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_INITMODEL_ENTRY=0x31 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_INITMODEL_EXIT=0x32 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISALLDAYEVENT_ENTRY=0x93 @@ -152,6 +159,8 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISNEWENTRY_ENTRY=0x8e [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISNEWENTRY_EXIT=0x8f [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISREMINDERTIMEFORALLDAYADDED_ENTRY=0x92 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_ENTRY=0x15c +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_EXIT=0x15d [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_ENTRY=0x6e [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_EXIT=0x6f [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_OPENEDITOR_ENTRY=0x28 @@ -172,12 +181,13 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEREPEATITEM_EXIT=0x54 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATESUBJECTITEM_ENTRY=0x45 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATESUBJECTITEM_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_ENTRY=0x152 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_EXIT=0x153 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_ENTRY=0x57 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_EXIT=0x58 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_ENTRY=0x67 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_EXIT=0x68 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEENTRY_ENTRY=0x7a -[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7b [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEFROMDATETIME_ENTRY=0x4d [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEFROMDATETIME_EXIT=0x4e [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVETODATETIME_ENTRY=0x51 @@ -186,12 +196,14 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SELECTEDITINGFINISHEDACTION_EXIT=0x64 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_ENTRY=0x97 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_EXIT=0x98 -[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETREMINDERCHOICES_ENTRY=0x99 -[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETREMINDERCHOICES_EXIT=0x9a [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETUPVIEW_ENTRY=0x2d [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETUPVIEW_EXIT=0x2e [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_ENTRY=0x72 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT=0x73 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_ENTRY=0x158 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_EXIT=0x159 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETEPOPUP_ENTRY=0x15a +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETEPOPUP_EXIT=0x15b [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_ENTRY=0x22 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_EXIT=0x23 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOR_ENTRY=0x2b @@ -206,6 +218,8 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_CURRENTREMINDERINDEX_EXIT=0x12b [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_ENTRY=0x12e [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_EXIT=0x12f +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_ENTRY=0x165 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_EXIT=0x166 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_ENTRY=0x114 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_EXIT=0x115 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_INSERTREMINDERTIMEFIELD_ENTRY=0x11d @@ -236,8 +250,12 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDEROFF_EXIT=0x118 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDERTIMEFORALLDAY_ENTRY=0x125 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDERTIMEFORALLDAY_EXIT=0x126 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_ENTRY=0x161 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_EXIT=0x162 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_ENTRY=0x11b [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_EXIT=0x11c +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_ENTRY=0x163 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_EXIT=0x164 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_ADDITEMTOMODEL_ENTRY=0x136 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_ADDITEMTOMODEL_EXIT=0x137 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY=0x132 @@ -255,6 +273,8 @@ [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_POPULATEREPEATITEM_EXIT=0x13b [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REMOVEITEMFROMMODEL_ENTRY=0x138 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REMOVEITEMFROMMODEL_EXIT=0x139 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_ENTRY=0x167 +[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_EXIT=0x168 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REPEATUNTILDATE_ENTRY=0x147 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REPEATUNTILDATE_EXIT=0x148 [TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_SAVEREPEATRULE_ENTRY=0x14c @@ -294,7 +314,6 @@ [TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_EXIT=0x60 [TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT=0x95 [TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_OPENEDITOR_EXIT=0x2a -[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7c [TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_ENTRY=0x10a [TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_EXIT=0x10b [TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY=0x134 @@ -313,7 +332,6 @@ [TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_EDIT_ENTRY=0x1b [TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_EDIT_EXIT=0x1c [TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x83 -[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_HANDLEDONE_EXIT=0x78 [TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7d [TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITOR_CALENEDITOR_ENTRY=0x5 [TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITOR_CALENEDITOR_EXIT=0x6 @@ -322,7 +340,6 @@ [TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITOR_EDIT_EXIT=0xb [TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xa8 [TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT=0xe2 -[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT=0xf7 [TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORPRIVATE_EDIT_EXIT=0x1d [TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x84 [TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORPRIVATE_HANDLEDONE_EXIT=0x79 @@ -334,4 +351,11 @@ [TRACE]TRACE_FLOW[0x8A]_DUP5_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x86 [TRACE]TRACE_FLOW[0x8A]_DUP6_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x87 [TRACE]TRACE_FLOW[0x8A]_DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x14e -[TRACE]TRACE_FLOW[0x8A]_DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x14f \ No newline at end of file +[TRACE]TRACE_FLOW[0x8A]_DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x14f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DELETEENTRY_ENTRY=0x7e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DELETEENTRY_EXIT=0x7f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETREMINDERCHOICES_ENTRY=0x99 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETREMINDERCHOICES_EXIT=0x9a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT=0xf7 diff -r 1881ad52dc45 -r a5ed90760192 calendarui/controller/inc/calendeleteui.h --- a/calendarui/controller/inc/calendeleteui.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/controller/inc/calendeleteui.h Mon Sep 06 10:12:45 2010 +0530 @@ -200,13 +200,16 @@ * called when a dialog is dismissed */ void DialogDismissedL( const int aButtonId ); - + +signals: + void closeDialogs(); + public slots: void doCompleted( int aFirstPassError ); void handleDateQuery(HbAction* action); void handleDeletion(HbAction* action); - void handleDeleteCancel(); + void handleCancelAndClose(HbAction* action); private slots: void handleRepeatedEntryDelete(int index); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/controller/inc/calennotificationhandler.h --- a/calendarui/controller/inc/calennotificationhandler.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/controller/inc/calennotificationhandler.h Mon Sep 06 10:12:45 2010 +0530 @@ -39,6 +39,7 @@ ECalenNotifySettingsChanged, ECalenNotifyViewCreationStarted, ECalenNotifyDialogClosed, + ECalenNotifyCloseDialogs, ECalenNotifyCommandFailed, ECalenNotifyDeleteFailed, ECalenNotifyEntryClosed, diff -r 1881ad52dc45 -r a5ed90760192 calendarui/controller/src/calencontroller.cpp --- a/calendarui/controller/src/calencontroller.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/controller/src/calencontroller.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -638,6 +638,10 @@ { OstTraceFunctionEntry0( CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_ENTRY ); + // Broadcast the notification ECalenNotifyCloseDialogs + // to close the opened dialogs if any + BroadcastNotification(ECalenNotifyCloseDialogs); + if (iIsFromServiceFrmWrk) { // Set the context properly mContext->setFocusDateAndTime(dateTime); @@ -646,48 +650,57 @@ iIsFromServiceFrmWrk = false; - } else { // Calendar was in backgroung but now its being brought to foreground + } else { + // Calendar was in backgroung but now its being brought to foreground + + // Remove the previous view to avoid flicker + iViewManager->removePreviousView(); + // If current state is editing state or printing state // or deleting state or sending state, then dont do anything as // user might loose the data - CCalenStateMachine::TCalenStateIndex currentState = iStateMachine->CurrentState(); + + CCalenStateMachine::TCalenStateIndex currentState = + iStateMachine->CurrentState(); + if ((currentState == CCalenStateMachine::ECalenDeletingState) || (currentState == CCalenStateMachine::ECalenPrintingState) || (currentState == CCalenStateMachine::ECalenSendingState)) { // simply return - we dont have anything to do - } - - else if (currentState == CCalenStateMachine::ECalenViewingState) { - if(iViewManager->isEventViewerActive()){ - iViewManager->closeAgendaEventView(); - } + } else if (currentState == CCalenStateMachine::ECalenViewingState) { + if(iViewManager->isEventViewerActive()) { + iViewManager->closeAgendaEventView(); + } + } else if (currentState == CCalenStateMachine::ECalenEditingState) { + // close the editor and save the entry if application is + // in background and launch the desired view + if(iViewManager->isEventViewerActive()) { + // First close editor and then viewer + iViewManager->saveAndCloseEditor(); + iViewManager->closeAgendaEventView(); + } else { + // If viewer is not active, just close the editor + iActionUi->saveAndCloseEditor(); + } + } else if (currentState == CCalenStateMachine::ECalenSettingsState) { + iViewManager->removeSettingsView(); } - else if (currentState == CCalenStateMachine::ECalenEditingState) { - // close the editor and save the entry if application is in background - //and launch the desired view - if(iViewManager->isEventViewerActive()){ - iViewManager->saveAndCloseEditor(); - iViewManager->closeAgendaEventView(); - } - else{ - iActionUi->saveAndCloseEditor(); - } - } - - else if (currentState == CCalenStateMachine::ECalenSettingsState){ - iViewManager->removeSettingsView(); - } // Set the context properly mContext->setFocusDateAndTime(dateTime); IssueCommandL(view); - + // connect to raise the window to foreground once the view is ready - connect(&MainWindow(), SIGNAL(viewReady()), - this, SLOT(raiseWindow())); + connect(&MainWindow(), SIGNAL(viewReady()), this, SLOT(raiseWindow())); + + // Dispatches all posted events of type DeferredDelete, + // i.e. empties the event queue in case any deletion is pending + qApp->sendPostedEvents(0, QEvent::DeferredDelete); } + OstTraceFunctionExit0( CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_EXIT ); } + void CCalenController::raiseWindow() { MainWindow().raise(); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/controller/src/calendeleteui.cpp --- a/calendarui/controller/src/calendeleteui.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/controller/src/calendeleteui.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -104,7 +104,14 @@ { OstTraceFunctionEntry0( CALENDELETEUI_CONSTRUCTL_ENTRY ); - iController.RegisterForNotificationsL( this, ECalenNotifyCancelDelete ); + RArray notifications; + notifications.Append(ECalenNotifyCancelDelete); + notifications.Append(ECalenNotifyCloseDialogs); + + iController.RegisterForNotificationsL( this, notifications ); + + notifications.Close(); + iMoreEntriesToDelete = EFalse; iDisplayQuery = EFalse; iEntriesToDelete = KEntriesToDelete; @@ -133,6 +140,11 @@ } } + else if (aNotification == ECalenNotifyCloseDialogs ) + { + // Emit the signal to close all the dialogs which are already opened + emit closeDialogs(); + } OstTraceFunctionExit0( CALENDELETEUI_HANDLENOTIFICATION_EXIT ); } @@ -385,6 +397,7 @@ // Create a popup with datepicker to select the date. HbDialog *popUp = new HbDialog(); + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout ); popUp->setAttribute( Qt::WA_DeleteOnClose, true ); @@ -406,6 +419,8 @@ popUp->addAction(mDeleteAction); mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"),popUp); popUp->addAction(mCancelAction); + // Close the popup once closeDialogs() is received + connect(this, SIGNAL(closeDialogs()), popUp, SLOT(close())); // Show the popup popUp->open(this, SLOT(handleDateQuery(HbAction*))); @@ -449,7 +464,7 @@ } }else { // User pressed cancel - handleDeleteCancel(); + iController.BroadcastNotification(ECalenNotifyDeleteFailed); } // Reset the member variables mDeleteAction = NULL; @@ -468,6 +483,7 @@ OstTraceFunctionEntry0( CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_ENTRY ); HbDialog *popUp = new HbDialog(); + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); popUp->setAttribute( Qt::WA_DeleteOnClose, true ); @@ -491,34 +507,39 @@ hbTrId("txt_calendar_title_delete_repeated_entry"))); // Add cancel action - HbAction *cancelAction = new HbAction( - hbTrId("txt_common_button_cancel_singledialog")); - popUp->addAction(cancelAction); + mCancelAction = new HbAction( + hbTrId("txt_common_button_cancel_singledialog")); + popUp->addAction(mCancelAction); connect(editButtonList, SIGNAL(itemSelected(int)), this, SLOT(handleRepeatedEntryDelete(int))); connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close())); - connect(cancelAction, SIGNAL(triggered()), this, - SLOT(handleDeleteCancel())); - + // Close the popup once closeDialogs() is received + connect(this, SIGNAL(closeDialogs()), popUp, SLOT(close())); // Show the popup - popUp->open(); + popUp->open(this, SLOT(handleCancelAndClose(HbAction*))); OstTraceFunctionExit0( CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_EXIT ); } // ---------------------------------------------------------------------------- -// CalenDeleteUi::handleDeleteCancel -// Handles the cancel action +// CalenDeleteUi::handleCancelAndClose +// Handles the cancel action and the close of the popup // (other items were commented in a header). // ---------------------------------------------------------------------------- // -void CalenDeleteUi::handleDeleteCancel() +void CalenDeleteUi::handleCancelAndClose(HbAction* action) { - OstTraceFunctionEntry0( CALENDELETEUI_HANDLEDELETECANCEL_ENTRY ); - - iController.BroadcastNotification(ECalenNotifyDeleteFailed); - - OstTraceFunctionExit0( CALENDELETEUI_HANDLEDELETECANCEL_EXIT ); + OstTraceFunctionEntry0( CALENDELETEUI_HANDLECANCELANDCLOSE_ENTRY ); + if(action == mCancelAction || !action) { + // If the user presses cancel button broadcast ECalenNotifyDeleteFailed + // Action will be null if the popup is closed by itself + // without pressing any buttons. So in this case also notification + // has to be broadcasted as ECalenNotifyDeleteFailed + + iController.BroadcastNotification(ECalenNotifyDeleteFailed); + } + mCancelAction = NULL; + OstTraceFunctionExit0( CALENDELETEUI_HANDLECANCELANDCLOSE_EXIT ); } void CalenDeleteUi::handleRepeatedEntryDelete(int index) @@ -565,6 +586,7 @@ OstTraceFunctionEntry0( CALENDELETEUI_SHOWDELETEQUERY_ENTRY ); HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion); + popup->setParent(this); popup->setDismissPolicy(HbDialog::NoDismiss); popup->setTimeout(HbDialog::NoTimeout); popup->setAttribute( Qt::WA_DeleteOnClose, true ); @@ -615,6 +637,9 @@ popup->addAction(mDeleteAction); mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"), popup); popup->addAction(mCancelAction); + // Close the popup once closeDialogs() is received + connect(this, SIGNAL(closeDialogs()), popup, SLOT(close())); + // Show the popup popup->open(this, SLOT(handleDeletion(HbAction*))); OstTraceFunctionExit0( CALENDELETEUI_SHOWDELETEQUERY_EXIT ); @@ -683,9 +708,11 @@ break; } - } else { - // If the user presses cancel button the notification will be - // ECalenNotifyDeleteFailed as default. + } else if(!action || action == mCancelAction ) { + // Action will be null if the popup is closed by itself + // without pressing any buttons. So in this case also notification + // has to be broadcasted as ECalenNotifyDeleteFailed + // If the user presses cancel button also the same has to happen // Notify the status iController.BroadcastNotification(notification); } diff -r 1881ad52dc45 -r a5ed90760192 calendarui/controller/traces/calendeleteuiTraces.h --- a/calendarui/controller/traces/calendeleteuiTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/controller/traces/calendeleteuiTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -36,8 +36,6 @@ #define CALENDELETEUI_HANDLEDATEQUERY_EXIT 0x8a007c #define CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_ENTRY 0x8a007d #define CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_EXIT 0x8a007e -#define CALENDELETEUI_HANDLEDELETECANCEL_ENTRY 0x8a007f -#define CALENDELETEUI_HANDLEDELETECANCEL_EXIT 0x8a0080 #define CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_ENTRY 0x8a0081 #define CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_EXIT 0x8a0082 #define CALENDELETEUI_SHOWDELETEQUERY_ENTRY 0x8a0083 @@ -69,6 +67,8 @@ #define CALENDELETEUI_DISPLAYWAITDIALOGL_EXIT 0x8a009d #define CALENDELETEUI_MARKEDENTRIESDELETEDL_ENTRY 0x8a009e #define CALENDELETEUI_MARKEDENTRIESDELETEDL_EXIT 0x8a009f +#define CALENDELETEUI_HANDLECANCELANDCLOSE_ENTRY 0x8a01f9 +#define CALENDELETEUI_HANDLECANCELANDCLOSE_EXIT 0x8a01fa #endif diff -r 1881ad52dc45 -r a5ed90760192 calendarui/controller/traces/calenviewmanagerTraces.h --- a/calendarui/controller/traces/calenviewmanagerTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/controller/traces/calenviewmanagerTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -60,8 +60,6 @@ #define CALENVIEWMANAGER_HANDLEINSTANCEVIEWCREATION_EXIT 0x8a01f2 #define CALENVIEWMANAGER_HANDLEENTRYVIEWCREATION_ENTRY 0x8a01f3 #define CALENVIEWMANAGER_HANDLEENTRYVIEWCREATION_EXIT 0x8a01f4 -#define CALENVIEWMANAGER_HANDLEDAYVIEWREADY_ENTRY 0x8a01f5 -#define CALENVIEWMANAGER_HANDLEDAYVIEWREADY_EXIT 0x8a01f6 #define CALENVIEWMANAGER_LAUNCHSETTINGSVIEW_ENTRY 0x8a01f7 #define CALENVIEWMANAGER_LAUNCHSETTINGSVIEW_EXIT 0x8a01f8 diff -r 1881ad52dc45 -r a5ed90760192 calendarui/controller/traces/fixed_id.definitions --- a/calendarui/controller/traces/fixed_id.definitions Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/controller/traces/fixed_id.definitions Mon Sep 06 10:12:45 2010 +0530 @@ -52,12 +52,12 @@ [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DODELETESINGLEINSTANCEL_EXIT=0x97 [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_ENTRYDELETED_ENTRY=0x87 [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_ENTRYDELETED_EXIT=0x88 +[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLECANCELANDCLOSE_ENTRY=0x1f9 +[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLECANCELANDCLOSE_EXIT=0x1fa [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLECOMMANDL_ENTRY=0x6b [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLECOMMANDL_EXIT=0x6c [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDATEQUERY_ENTRY=0x7b [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDATEQUERY_EXIT=0x7c -[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETECANCEL_ENTRY=0x7f -[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETECANCEL_EXIT=0x80 [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_ENTRY=0x89 [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_EXIT=0x8a [TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETION_ENTRY=0x85 @@ -148,8 +148,6 @@ [TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_GETFIRSTVIEW_EXIT=0x1d0 [TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLECOMMANDL_ENTRY=0x1e1 [TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLECOMMANDL_EXIT=0x1e2 -[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDAYVIEWREADY_ENTRY=0x1f5 -[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDAYVIEWREADY_EXIT=0x1f6 [TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDELETINGCOMPLETED_ENTRY=0x1ef [TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDELETINGCOMPLETED_EXIT=0x1f0 [TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDELETINGSTARTED_ENTRY=0x1ed @@ -504,3 +502,8 @@ [TRACE]TRACE_FLOW[0x8A]_DUP9_CALENDOCLOADER_CREATEOBJECT_EXIT=0xba [TRACE]TRACE_FLOW[0x8A]_TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_ENTRY=0x117 [TRACE]TRACE_FLOW[0x8A]_TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_EXIT=0x118 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETECANCEL_ENTRY=0x7f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETECANCEL_EXIT=0x80 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDAYVIEWREADY_ENTRY=0x1f5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDAYVIEWREADY_EXIT=0x1f6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_EXIT=0x5c diff -r 1881ad52dc45 -r a5ed90760192 calendarui/regionalplugins/lunarchinese/inc/CalenLunarChinesePlugin.h --- a/calendarui/regionalplugins/lunarchinese/inc/CalenLunarChinesePlugin.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/regionalplugins/lunarchinese/inc/CalenLunarChinesePlugin.h Mon Sep 06 10:12:45 2010 +0530 @@ -42,6 +42,7 @@ class CCalenLunarLocalizer; class CCalenLunarLocalizedInfo; class CalenRegionalInfo; +class HbMessageBox; @@ -116,6 +117,8 @@ HbTranslator* iTranslator; CalenRegionalInfo* iRegionalInfo ; + + HbMessageBox* mPopup; }; #endif //__CALENLUNARCHINESEPLUGIN_H__ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp --- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -130,7 +130,16 @@ void CCalenLunarChinesePlugin::ConstructL() { OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_ENTRY ); - iServices->RegisterForNotificationsL( this, ECalenNotifyContextChanged ); + + RArray notifications; + notifications.Append(ECalenNotifyContextChanged); + notifications.Append(ECalenNotifyCloseDialogs); + + iServices->RegisterForNotificationsL( this, notifications ); + + notifications.Close(); + + iServices->GetCommandRange( iStart, iEnd ); // Install the translator before the CCalenLunarLocalizer is constructed @@ -299,10 +308,14 @@ const TCalenNotification aNotification ) { OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_ENTRY ); - if (aNotification == ECalenNotifyContextChanged) - { - TRAP_IGNORE(UpdateLocalizerInfoL()); - } + if (aNotification == ECalenNotifyContextChanged) { + TRAP_IGNORE(UpdateLocalizerInfoL()); + } else if(aNotification == ECalenNotifyCloseDialogs) { + if(mPopup){ + //close the popup + mPopup->done(0); + } + } OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_EXIT ); } @@ -359,30 +372,34 @@ // void CCalenLunarChinesePlugin::ExecuteMessageDialogL(QString aMsgText) { - OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_ENTRY ); - // Instantiate a popup - HbMessageBox *popup = new HbMessageBox(); - popup->setDismissPolicy(HbDialog::NoDismiss); - popup->setTimeout(HbDialog::NoTimeout); - popup->setIconVisible(false); - popup->setAttribute( Qt::WA_DeleteOnClose, true ); - - popup->setHeadingWidget(new HbLabel(hbTrId("txt_calendar_title_lunar_calendar"))); - popup->setText(aMsgText); - - // Remove the default actions - QList list = popup->actions(); - for(int i=0; i < list.count(); i++) - { - popup->removeAction(list[i]); - } - // Sets the primary action - popup->addAction(new HbAction(hbTrId("txt_common_button_close_singledialog"), popup)); + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_ENTRY ); + + // Instantiate a popup + mPopup = new HbMessageBox(); + mPopup->setDismissPolicy(HbDialog::NoDismiss); + mPopup->setTimeout(HbDialog::NoTimeout); + mPopup->setIconVisible(false); + mPopup->setAttribute(Qt::WA_DeleteOnClose, true); + + mPopup->setHeadingWidget(new HbLabel(hbTrId( + "txt_calendar_title_lunar_calendar"))); + mPopup->setText(aMsgText); - // Launch popup - popup->open(); - OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_EXIT ); - } + // Remove the default actions + QList list = mPopup->actions(); + for (int i = 0; i < list.count(); i++) + { + mPopup->removeAction(list[i]); + } + // Sets the primary action + mPopup->addAction(new HbAction(hbTrId( + "txt_common_button_close_singledialog"), mPopup)); + + // Launch popup + mPopup->open(); + + OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_EXIT ); + } //EOF diff -r 1881ad52dc45 -r a5ed90760192 calendarui/rom/calendar.iby --- a/calendarui/rom/calendar.iby Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/rom/calendar.iby Mon Sep 06 10:12:45 2010 +0530 @@ -36,6 +36,10 @@ // Stub sis data=DATAZ_\system\install\calendar_stub.sis \System\Install\calendar_stub.sis +data=ZRESOURCE\hb\splashml\calendar.splashml RESOURCE_FILES_DIR\hb\splashml\calendar.splashml +data=ZRESOURCE\hb\splashml\calendar.docml RESOURCE_FILES_DIR\hb\splashml\calendar.docml + + file=ABI_DIR\BUILD_DIR\calencommonutils.dll SHARED_LIB_DIR\calencommonutils.dll file=ABI_DIR\BUILD_DIR\calenglobaldata.dll SHARED_LIB_DIR\calenglobaldata.dll file=ABI_DIR\BUILD_DIR\calencustomisationmanager.dll SHARED_LIB_DIR\calencustomisationmanager.dll diff -r 1881ad52dc45 -r a5ed90760192 calendarui/settings/src/calensettings.cpp --- a/calendarui/settings/src/calensettings.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/settings/src/calensettings.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -307,14 +307,9 @@ // Append Show Week Number settings item mShowWeekNumberItem = new HbDataFormModelItem(); mShowWeekNumberItem->setType(HbDataFormModelItem::ToggleValueItem); - - QStringList values; - values << hbTrId("txt_calendar_button_no") - << hbTrId("txt_calendar_button_yes"); mShowWeekNumberItem->setData(HbDataFormModelItem::LabelRole, QString(hbTrId("txt_calendar_setlabel_show_week_numbers"))); mShowWeekNumberItem->setContentWidgetData("objectName", "showWeekNumber"); - mSettingsModel->appendDataFormItem(mShowWeekNumberItem); mSettingsForm->addConnection(mShowWeekNumberItem, SIGNAL(clicked()), this, SLOT(handleWeekNumberChange())); @@ -344,7 +339,6 @@ //set the start day of the week to locale locale.SetStartOfWeek(day); locale.Set(); - updateShowWeekItem(); } /*! @@ -356,33 +350,38 @@ HbExtendedLocale locale = HbExtendedLocale::system(); mStartOfWeek = locale.startOfWeek(); mShowWeekStartOnInfoItem->setContentWidgetData("currentIndex", mStartOfWeek); - // Read the value form cenrep QVariant value = mSettingsManager->readItemValue(*mWeekNumberCenrepKey); uint showWeekNumber = value.toUInt(); //if start day is not Monday - //set the show week number option dimmed , + //removed the show week number option , //else set to proper status - if(mStartOfWeek != HbExtendedLocale::Monday) { - mShowWeekNumberItem->setContentWidgetData(QString("text"), - QString(hbTrId("txt_calendar_button_no"))); - mShowWeekNumberItem->setContentWidgetData(QString("additionalText"), - QString(hbTrId("txt_calendar_button_yes"))); - mShowWeekNumberItem->setEnabled(false); + if (mStartOfWeek != HbExtendedLocale::Monday) { + if (mWeekNumberItemAdded) { + mSettingsForm->removeConnection(mShowWeekNumberItem, SIGNAL(clicked()), + this, SLOT(handleWeekNumberChange())); + mSettingsModel->removeItem(mShowWeekNumberItem); + mWeekNumberItemAdded = false; + } } else { - if(showWeekNumber) { - mShowWeekNumberItem->setContentWidgetData(QString("text"), - QString(hbTrId("txt_calendar_button_yes"))); - mShowWeekNumberItem->setContentWidgetData(QString("additionalText"), - QString(hbTrId("txt_calendar_button_no"))); - } else { - mShowWeekNumberItem->setContentWidgetData(QString("text"), - QString(hbTrId("txt_calendar_button_no"))); - mShowWeekNumberItem->setContentWidgetData(QString("additionalText"), - QString(hbTrId("txt_calendar_button_yes"))); - } - mShowWeekNumberItem->setEnabled(true); + //if option "show week number is not present" + //add the option in view + if (!mWeekNumberItemAdded) { + addWeekNumberItem(); + } + if (showWeekNumber) { + mShowWeekNumberItem->setContentWidgetData(QString("text"), + QString(hbTrId("txt_calendar_button_yes"))); + mShowWeekNumberItem->setContentWidgetData(QString("additionalText"), + QString(hbTrId("txt_calendar_button_no"))); + } else { + mShowWeekNumberItem->setContentWidgetData(QString("text"), + QString(hbTrId("txt_calendar_button_no"))); + mShowWeekNumberItem->setContentWidgetData(QString("additionalText"), + QString(hbTrId("txt_calendar_button_yes"))); + } + } } // End of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/bwins/calenviewsu.def --- a/calendarui/views/bwins/calenviewsu.def Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/bwins/calenviewsu.def Mon Sep 06 10:12:45 2010 +0530 @@ -8,203 +8,203 @@ ?setFocusToProperDay@CalenMonthGrid@@AAEXXZ @ 7 NONAME ; void CalenMonthGrid::setFocusToProperDay(void) ??1CalenPreviewPane@@UAE@XZ @ 8 NONAME ; CalenPreviewPane::~CalenPreviewPane(void) ?mousePressEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 9 NONAME ; void CalenMonthGrid::mousePressEvent(class QGraphicsSceneMouseEvent *) - ?monthDataList@CalenMonthView@@QAEAAV?$QList@VCalenMonthData@@@@XZ @ 10 NONAME ; class QList & CalenMonthView::monthDataList(void) - ?completePopulation@CalenMonthView@@AAEXXZ @ 11 NONAME ; void CalenMonthView::completePopulation(void) - ??0CalenAgendaViewWidget@@QAE@AAVMCalenServices@@PAVCalenDocLoader@@@Z @ 12 NONAME ; CalenAgendaViewWidget::CalenAgendaViewWidget(class MCalenServices &, class CalenDocLoader *) - ?handleAppendingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 13 NONAME ; void CalenMonthGrid::handleAppendingRows(class QList &) - ?handleChangeOrientation@CalenMonthView@@AAEXXZ @ 14 NONAME ; void CalenMonthView::handleChangeOrientation(void) - ?staticMetaObject@CalenSettingsView@@2UQMetaObject@@B @ 15 NONAME ; struct QMetaObject const CalenSettingsView::staticMetaObject - ?docLoader@CalenAgendaView@@QAEPAVCalenDocLoader@@XZ @ 16 NONAME ; class CalenDocLoader * CalenAgendaView::docLoader(void) - ?getStaticMetaObject@CalenSettingsView@@SAABUQMetaObject@@XZ @ 17 NONAME ; struct QMetaObject const & CalenSettingsView::getStaticMetaObject(void) - ?updateMonthDataArrayWithActiveDates@CalenMonthView@@AAEXXZ @ 18 NONAME ; void CalenMonthView::updateMonthDataArrayWithActiveDates(void) - ?scrollingFinished@CalenMonthGrid@@QAEXXZ @ 19 NONAME ; void CalenMonthGrid::scrollingFinished(void) - ?setCurrentIdex@CalenMonthGrid@@QAEXH@Z @ 20 NONAME ; void CalenMonthGrid::setCurrentIdex(int) - ?setupView@CalenAgendaView@@QAEXPAVCalenDocLoader@@@Z @ 21 NONAME ; void CalenAgendaView::setupView(class CalenDocLoader *) - ??_ECalenMonthGrid@@UAE@I@Z @ 22 NONAME ; CalenMonthGrid::~CalenMonthGrid(unsigned int) - ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 23 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *) - ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 24 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *) - ?populatePrevMonth@CalenMonthView@@QAEXXZ @ 25 NONAME ; void CalenMonthView::populatePrevMonth(void) - ?qt_metacall@CalenSettingsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 26 NONAME ; int CalenSettingsView::qt_metacall(enum QMetaObject::Call, int, void * *) - ??1CalenPluginLabel@@UAE@XZ @ 27 NONAME ; CalenPluginLabel::~CalenPluginLabel(void) - ?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 28 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &) - ?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 29 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void) - ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 30 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int) - ?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 31 NONAME ; void * CalenMonthView::qt_metacast(char const *) - ?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 32 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject - ?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 33 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *) - ?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 34 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const - ?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 35 NONAME ; void CalenPreviewPane::startAutoScroll(void) - ?doLazyLoading@CalenMonthView@@QAEXXZ @ 36 NONAME ; void CalenMonthView::doLazyLoading(void) - ?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 37 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *) - ??1CalenSettingsView@@UAE@XZ @ 38 NONAME ; CalenSettingsView::~CalenSettingsView(void) - ?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 39 NONAME ; class QDateTime CalenPreviewPane::Date(void) - ?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int) - ?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const - ??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 42 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *) - ?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 43 NONAME ; int CalenMonthView::rowsInPrevMonth(void) - ?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 44 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList &) - ?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 45 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const - ?clearListModel@CalenAgendaView@@QAEXXZ @ 46 NONAME ; void CalenAgendaView::clearListModel(void) - ?gestureEvent@CalenMonthGrid@@MAEXPAVQGestureEvent@@@Z @ 47 NONAME ; void CalenMonthGrid::gestureEvent(class QGestureEvent *) - ??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 48 NONAME ; CalenDayView::CalenDayView(class MCalenServices &) - ?populateNextMonth@CalenMonthView@@QAEXXZ @ 49 NONAME ; void CalenMonthView::populateNextMonth(void) - ?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 50 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &) - ?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 51 NONAME ; void * CalenMonthGrid::qt_metacast(char const *) - ?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 52 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void) - ?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 53 NONAME ; int CalenMonthView::rowsInFutMonth(void) - ?launchDayView@CalenMonthView@@QAEXXZ @ 54 NONAME ; void CalenMonthView::launchDayView(void) - ?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 55 NONAME ; int CalenMonthView::getCurrGridIndex(void) - ?gestureEvent@CalenPreviewPane@@MAEXPAVQGestureEvent@@@Z @ 56 NONAME ; void CalenPreviewPane::gestureEvent(class QGestureEvent *) - ?prependRows@CalenMonthGrid@@QAEXXZ @ 57 NONAME ; void CalenMonthGrid::prependRows(void) - ?orientationChanged@CalenMonthGrid@@MAEXW4Orientation@Qt@@@Z @ 58 NONAME ; void CalenMonthGrid::orientationChanged(enum Qt::Orientation) - ?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 59 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *) - ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 60 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int) - ??1CalenThickLinesDrawer@@UAE@XZ @ 61 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void) - ?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 62 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *) - ??_ECalenMonthView@@UAE@I@Z @ 63 NONAME ; CalenMonthView::~CalenMonthView(unsigned int) - ??1CalenAgendaView@@UAE@XZ @ 64 NONAME ; CalenAgendaView::~CalenAgendaView(void) - ?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 65 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &) - ??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 66 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *) - ??0CalenAgendaView@@QAE@AAVMCalenServices@@@Z @ 67 NONAME ; CalenAgendaView::CalenAgendaView(class MCalenServices &) - ?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 68 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void) - ?stopScrolling@CalenPreviewPane@@QAEXXZ @ 69 NONAME ; void CalenPreviewPane::stopScrolling(void) - ?refreshView@CalenSettingsView@@QAEXXZ @ 70 NONAME ; void CalenSettingsView::refreshView(void) - ?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 71 NONAME ; void CalenMonthView::addBackgroundFrame(void) - ?createGrid@CalenMonthView@@AAEXXZ @ 72 NONAME ; void CalenMonthView::createGrid(void) - ?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 73 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *) - ?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void) - ?launchPreviousView@CalenSettingsView@@AAEXXZ @ 75 NONAME ; void CalenSettingsView::launchPreviousView(void) - ?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 76 NONAME ; void CalenMonthView::setCurrGridIndex(int) - ?setDateToLabel@CalenMonthView@@AAEXXZ @ 77 NONAME ; void CalenMonthView::setDateToLabel(void) - ?addWeekNumbers@CalenMonthView@@AAEXXZ @ 78 NONAME ; void CalenMonthView::addWeekNumbers(void) - ?downGesture@CalenMonthGrid@@AAEXXZ @ 79 NONAME ; void CalenMonthGrid::downGesture(void) - ?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 80 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *) - ?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 81 NONAME ; void CalenDayView::setupView(class CalenDocLoader *) - ?upGesture@CalenMonthGrid@@AAEXXZ @ 82 NONAME ; void CalenMonthGrid::upGesture(void) - ??1CalenMonthView@@UAE@XZ @ 83 NONAME ; CalenMonthView::~CalenMonthView(void) - ?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 84 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &) - ?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 85 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject - ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 86 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int) - ?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 87 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) - ?initializeForm@CalenSettingsView@@QAEXXZ @ 88 NONAME ; void CalenSettingsView::initializeForm(void) - ?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 89 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int) - ?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 90 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void) - ?goToToday@CalenMonthView@@AAEXXZ @ 91 NONAME ; void CalenMonthView::goToToday(void) - ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int) - ?onContextChanged@CalenMonthView@@EAEXXZ @ 93 NONAME ; void CalenMonthView::onContextChanged(void) - ?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 94 NONAME ; void * CalenPreviewPane::qt_metacast(char const *) - ?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 95 NONAME ; int CalenMonthGrid::getCurrentIndex(void) - ?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 96 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int) - ?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 97 NONAME ; void CalenMonthView::removeWeekNumbers(void) - ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 98 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int) - ??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 99 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &) - ?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void) - ?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 101 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *) - ??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 102 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *) - ?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 103 NONAME ; void CalenMonthView::onLocaleChanged(int) - ?doPopulation@CalenMonthView@@UAEXXZ @ 104 NONAME ; void CalenMonthView::doPopulation(void) - ?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 105 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int) - ?captureScreenshot@CalenNativeView@@QAEX_N@Z @ 106 NONAME ; void CalenNativeView::captureScreenshot(bool) - ?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 107 NONAME ; void CalenPreviewPane::GetInstanceListL(void) - ?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 108 NONAME ; void CalenMonthView::getInstanceList(class QList &, class QDateTime, class QDateTime) - ?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 109 NONAME ; class QString CalenMonthView::tr(char const *, char const *) - ??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 110 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *) - ?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 111 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void) - ?appendRows@CalenMonthGrid@@QAEXXZ @ 112 NONAME ; void CalenMonthGrid::appendRows(void) - ?HandleNotification@CalenAgendaView@@UAEXW4TCalenNotification@@@Z @ 113 NONAME ; void CalenAgendaView::HandleNotification(enum TCalenNotification) - ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 114 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int) - ??0CalenPluginLabel@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 115 NONAME ; CalenPluginLabel::CalenPluginLabel(class MCalenServices &, class QGraphicsItem *) - ?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 116 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) - ?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 117 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList &) - ?getCurrentDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 118 NONAME ; class QDateTime CalenMonthView::getCurrentDay(void) - ?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 119 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject - ?doPopulation@CalenAgendaView@@UAEXXZ @ 120 NONAME ; void CalenAgendaView::doPopulation(void) - ?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 121 NONAME ; class QString CalenSettingsView::tr(char const *, char const *) - ?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 122 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void) - ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 123 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *) - ?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 124 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject - ?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 125 NONAME ; void CalenMonthView::populateWithInstanceView(void) - ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 126 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *) - ??1CalenAgendaViewWidget@@UAE@XZ @ 127 NONAME ; CalenAgendaViewWidget::~CalenAgendaViewWidget(void) - ?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 128 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime) - ?doPopulation@CalenDayView@@UAEXXZ @ 129 NONAME ; void CalenDayView::doPopulation(void) - ??1CalenDayView@@UAE@XZ @ 130 NONAME ; CalenDayView::~CalenDayView(void) - ?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 131 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void) - ?updateMonthGridModel@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@H_N@Z @ 132 NONAME ; void CalenMonthGrid::updateMonthGridModel(class QList &, int, bool) - ??1CalenMonthGrid@@UAE@XZ @ 133 NONAME ; CalenMonthGrid::~CalenMonthGrid(void) - ?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 134 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const - ?updateWeekNumGridModel@CalenMonthView@@AAEXXZ @ 135 NONAME ; void CalenMonthView::updateWeekNumGridModel(void) - ?qt_metacast@CalenThickLinesDrawer@@UAEPAXPBD@Z @ 136 NONAME ; void * CalenThickLinesDrawer::qt_metacast(char const *) - ?prepareForPopulation@CalenMonthView@@AAEXXZ @ 137 NONAME ; void CalenMonthView::prepareForPopulation(void) - ?handlePreviewPaneGesture@CalenMonthView@@QAEX_N@Z @ 138 NONAME ; void CalenMonthView::handlePreviewPaneGesture(bool) - ?updateDayLabel@CalenMonthView@@AAEXXZ @ 139 NONAME ; void CalenMonthView::updateDayLabel(void) - ?setActiveDates@CalenMonthGrid@@AAEXVQDate@@@Z @ 140 NONAME ; void CalenMonthGrid::setActiveDates(class QDate) - ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0@Z @ 141 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *) - ?setContextForActiveDay@CalenMonthView@@QAEXH@Z @ 142 NONAME ; void CalenMonthView::setContextForActiveDay(int) - ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 143 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *) - ??_ECalenSettingsView@@UAE@I@Z @ 144 NONAME ; CalenSettingsView::~CalenSettingsView(unsigned int) - ??_ECalenThickLinesDrawer@@UAE@I@Z @ 145 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(unsigned int) - ?metaObject@CalenSettingsView@@UBEPBUQMetaObject@@XZ @ 146 NONAME ; struct QMetaObject const * CalenSettingsView::metaObject(void) const - ?getStaticMetaObject@CalenMonthView@@SAABUQMetaObject@@XZ @ 147 NONAME ; struct QMetaObject const & CalenMonthView::getStaticMetaObject(void) - ?changeOrientation@CalenMonthView@@EAEXW4Orientation@Qt@@@Z @ 148 NONAME ; void CalenMonthView::changeOrientation(enum Qt::Orientation) - ?paint@CalenMonthGrid@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 149 NONAME ; void CalenMonthGrid::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) - ?tr@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 150 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *) - ?qt_metacast@CalenSettingsView@@UAEPAXPBD@Z @ 151 NONAME ; void * CalenSettingsView::qt_metacast(char const *) - ?qt_metacall@CalenMonthView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 152 NONAME ; int CalenMonthView::qt_metacall(enum QMetaObject::Call, int, void * *) - ?disconnectAboutToQuitEvent@CalenAgendaView@@QAEXXZ @ 153 NONAME ; void CalenAgendaView::disconnectAboutToQuitEvent(void) - ?setActiveDay@CalenMonthView@@AAEXVQDateTime@@@Z @ 154 NONAME ; void CalenMonthView::setActiveDay(class QDateTime) - ?itemActivated@CalenMonthGrid@@QAEXABVQModelIndex@@@Z @ 155 NONAME ; void CalenMonthGrid::itemActivated(class QModelIndex const &) - ?qt_metacall@CalenMonthGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 156 NONAME ; int CalenMonthGrid::qt_metacall(enum QMetaObject::Call, int, void * *) - ?createEditor@CalenMonthView@@AAEXXZ @ 157 NONAME ; void CalenMonthView::createEditor(void) - ??_ECalenPreviewPane@@UAE@I@Z @ 158 NONAME ; CalenPreviewPane::~CalenPreviewPane(unsigned int) - ?getActiveDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 159 NONAME ; class QDateTime CalenMonthView::getActiveDay(void) - ?addRemoveActionsInMenu@CalenMonthView@@AAEXXZ @ 160 NONAME ; void CalenMonthView::addRemoveActionsInMenu(void) - ?scrollVertically@CalenDayHourScrollArea@@QAEXABVQPointF@@@Z @ 161 NONAME ; void CalenDayHourScrollArea::scrollVertically(class QPointF const &) - ??_ECalenDayHourScrollArea@@UAE@I@Z @ 162 NONAME ; CalenDayHourScrollArea::~CalenDayHourScrollArea(unsigned int) - ??0CalenDayHourScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 163 NONAME ; CalenDayHourScrollArea::CalenDayHourScrollArea(class QGraphicsItem *) - ??1CalenDayHourScrollArea@@UAE@XZ @ 164 NONAME ; CalenDayHourScrollArea::~CalenDayHourScrollArea(void) - ?qt_metacall@CalenDayContentScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 165 NONAME ; int CalenDayContentScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *) - ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 166 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *) - ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 167 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *, int) - ?gestureEvent@CalenDayContentScrollArea@@MAEXPAVQGestureEvent@@@Z @ 168 NONAME ; void CalenDayContentScrollArea::gestureEvent(class QGestureEvent *) - ??_ECalenDayContentScrollArea@@UAE@I@Z @ 169 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(unsigned int) - ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 170 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *) - ?staticMetaObject@CalenDayContentScrollArea@@2UQMetaObject@@B @ 171 NONAME ; struct QMetaObject const CalenDayContentScrollArea::staticMetaObject - ?checkPanDirection@CalenDayContentScrollArea@@AAEXPAVQPanGesture@@@Z @ 172 NONAME ; void CalenDayContentScrollArea::checkPanDirection(class QPanGesture *) - ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 173 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *) - ??0CalenDayContentScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 174 NONAME ; CalenDayContentScrollArea::CalenDayContentScrollArea(class QGraphicsItem *) - ?event@CalenDayContentScrollArea@@MAE_NPAVQEvent@@@Z @ 175 NONAME ; bool CalenDayContentScrollArea::event(class QEvent *) - ?qt_metacast@CalenDayContentScrollArea@@UAEPAXPBD@Z @ 176 NONAME ; void * CalenDayContentScrollArea::qt_metacast(char const *) - ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 177 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *) - ?scrollToMiddleWidget@CalenDayContentScrollArea@@QAEXXZ @ 178 NONAME ; void CalenDayContentScrollArea::scrollToMiddleWidget(void) - ?eventFilter@CalenDayContentScrollArea@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 179 NONAME ; bool CalenDayContentScrollArea::eventFilter(class QObject *, class QEvent *) - ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 180 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *, int) - ?staticMetaObject@CalenDayHourScrollArea@@2UQMetaObject@@B @ 181 NONAME ; struct QMetaObject const CalenDayHourScrollArea::staticMetaObject - ?getStaticMetaObject@CalenDayHourScrollArea@@SAABUQMetaObject@@XZ @ 182 NONAME ; struct QMetaObject const & CalenDayHourScrollArea::getStaticMetaObject(void) - ?setDateTime@CalenDayHourScrollArea@@QAEXABVQDateTime@@@Z @ 183 NONAME ; void CalenDayHourScrollArea::setDateTime(class QDateTime const &) - ?scrollAreaMoveFinished@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 184 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveFinished(enum CalenScrollDirection) - ?moveTo@CalenDayContentScrollArea@@AAEXABVQPointF@@H@Z @ 185 NONAME ; void CalenDayContentScrollArea::moveTo(class QPointF const &, int) - ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 186 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *, int) - ?scrollAreaMoveStarted@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 187 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveStarted(enum CalenScrollDirection) - ?metaObject@CalenDayContentScrollArea@@UBEPBUQMetaObject@@XZ @ 188 NONAME ; struct QMetaObject const * CalenDayContentScrollArea::metaObject(void) const - ?checkStartTimeOfEvent@CalenPreviewPane@@AAEXAAVQDateTime@@@Z @ 189 NONAME ; void CalenPreviewPane::checkStartTimeOfEvent(class QDateTime &) - ?orientationChanged@CalenDayContentScrollArea@@AAEXW4Orientation@Qt@@@Z @ 190 NONAME ; void CalenDayContentScrollArea::orientationChanged(enum Qt::Orientation) - ?qt_metacast@CalenDayHourScrollArea@@UAEPAXPBD@Z @ 191 NONAME ; void * CalenDayHourScrollArea::qt_metacast(char const *) - ?getStaticMetaObject@CalenDayContentScrollArea@@SAABUQMetaObject@@XZ @ 192 NONAME ; struct QMetaObject const & CalenDayContentScrollArea::getStaticMetaObject(void) - ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 193 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *, int) - ?metaObject@CalenDayHourScrollArea@@UBEPBUQMetaObject@@XZ @ 194 NONAME ; struct QMetaObject const * CalenDayHourScrollArea::metaObject(void) const - ?scrollByAmount@CalenDayContentScrollArea@@MAE_NABVQPointF@@@Z @ 195 NONAME ; bool CalenDayContentScrollArea::scrollByAmount(class QPointF const &) - ?dateTime@CalenDayHourScrollArea@@QBE?AVQDateTime@@XZ @ 196 NONAME ; class QDateTime CalenDayHourScrollArea::dateTime(void) const - ?qt_metacall@CalenDayHourScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 197 NONAME ; int CalenDayHourScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *) - ?moveFinished@CalenDayContentScrollArea@@AAEXXZ @ 198 NONAME ; void CalenDayContentScrollArea::moveFinished(void) - ?scrollToHour@CalenDayHourScrollArea@@QAEXH@Z @ 199 NONAME ; void CalenDayHourScrollArea::scrollToHour(int) - ??1CalenDayContentScrollArea@@UAE@XZ @ 200 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(void) - ?handleThemeChange@CalenMonthGrid@@AAEXXZ @ 201 NONAME ; void CalenMonthGrid::handleThemeChange(void) - ?effectStarted@CalenPreviewPane@@QAEXXZ @ 202 NONAME ; void CalenPreviewPane::effectStarted(void) - ?handleThemeChange@CalenThickLinesDrawer@@AAEXXZ @ 203 NONAME ; void CalenThickLinesDrawer::handleThemeChange(void) - ?effectFinished@CalenPreviewPane@@QAEXXZ @ 204 NONAME ; void CalenPreviewPane::effectFinished(void) - ?handleThemeChange@CalenMonthView@@AAEXXZ @ 205 NONAME ; void CalenMonthView::handleThemeChange(void) - ?isHorizontalSwipe@CalenDayContentScrollArea@@ABE_NM@Z @ 206 NONAME ; bool CalenDayContentScrollArea::isHorizontalSwipe(float) const - ?handleThemeChange@CalenPreviewPane@@QAEXXZ @ 207 NONAME ; void CalenPreviewPane::handleThemeChange(void) - ?disconnectAboutToQuitEvent@CalenMonthView@@QAEXXZ @ 208 NONAME ; void CalenMonthView::disconnectAboutToQuitEvent(void) + ?scrollVertically@CalenDayHourScrollArea@@QAEXABVQPointF@@@Z @ 10 NONAME ; void CalenDayHourScrollArea::scrollVertically(class QPointF const &) + ?disconnectAboutToQuitEvent@CalenMonthView@@QAEXXZ @ 11 NONAME ; void CalenMonthView::disconnectAboutToQuitEvent(void) + ?monthDataList@CalenMonthView@@QAEAAV?$QList@VCalenMonthData@@@@XZ @ 12 NONAME ; class QList & CalenMonthView::monthDataList(void) + ?completePopulation@CalenMonthView@@AAEXXZ @ 13 NONAME ; void CalenMonthView::completePopulation(void) + ??0CalenAgendaViewWidget@@QAE@AAVMCalenServices@@PAVCalenDocLoader@@@Z @ 14 NONAME ; CalenAgendaViewWidget::CalenAgendaViewWidget(class MCalenServices &, class CalenDocLoader *) + ?handleAppendingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 15 NONAME ; void CalenMonthGrid::handleAppendingRows(class QList &) + ?handleChangeOrientation@CalenMonthView@@AAEXXZ @ 16 NONAME ; void CalenMonthView::handleChangeOrientation(void) + ?staticMetaObject@CalenSettingsView@@2UQMetaObject@@B @ 17 NONAME ; struct QMetaObject const CalenSettingsView::staticMetaObject + ?docLoader@CalenAgendaView@@QAEPAVCalenDocLoader@@XZ @ 18 NONAME ; class CalenDocLoader * CalenAgendaView::docLoader(void) + ?getStaticMetaObject@CalenSettingsView@@SAABUQMetaObject@@XZ @ 19 NONAME ; struct QMetaObject const & CalenSettingsView::getStaticMetaObject(void) + ?updateMonthDataArrayWithActiveDates@CalenMonthView@@AAEXXZ @ 20 NONAME ; void CalenMonthView::updateMonthDataArrayWithActiveDates(void) + ?scrollingFinished@CalenMonthGrid@@QAEXXZ @ 21 NONAME ; void CalenMonthGrid::scrollingFinished(void) + ??_ECalenDayHourScrollArea@@UAE@I@Z @ 22 NONAME ; CalenDayHourScrollArea::~CalenDayHourScrollArea(unsigned int) + ??0CalenDayHourScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 23 NONAME ; CalenDayHourScrollArea::CalenDayHourScrollArea(class QGraphicsItem *) + ?setCurrentIdex@CalenMonthGrid@@QAEXH@Z @ 24 NONAME ; void CalenMonthGrid::setCurrentIdex(int) + ??1CalenDayHourScrollArea@@UAE@XZ @ 25 NONAME ; CalenDayHourScrollArea::~CalenDayHourScrollArea(void) + ?setupView@CalenAgendaView@@QAEXPAVCalenDocLoader@@@Z @ 26 NONAME ; void CalenAgendaView::setupView(class CalenDocLoader *) + ??_ECalenMonthGrid@@UAE@I@Z @ 27 NONAME ; CalenMonthGrid::~CalenMonthGrid(unsigned int) + ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *) + ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *) + ?qt_metacall@CalenDayContentScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 30 NONAME ; int CalenDayContentScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *) + ?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 &) + ?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 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 &) + ?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 &, 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) diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/inc/calendaycommonheaders.h --- a/calendarui/views/dayview/inc/calendaycommonheaders.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/inc/calendaycommonheaders.h Mon Sep 06 10:12:45 2010 +0530 @@ -27,9 +27,9 @@ const int KCalenHoursInDay = 24; /*! - Number of time slots in hour (half of hour is defined as time slot) (UI spec) + Number of time slots in hour (one slot = 15 minutes) (UI spec) */ -const int KCalenSlotsInHour = 2; +const int KCalenSlotsInHour = 4; /*! Content area (1/4 of screen) dedicated for All day events in Day View (UI spec) diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/inc/calendaycontentscrollarea.h --- a/calendarui/views/dayview/inc/calendaycontentscrollarea.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/inc/calendaycontentscrollarea.h Mon Sep 06 10:12:45 2010 +0530 @@ -24,6 +24,11 @@ // User includes #include "calendaycommonheaders.h" +/*! + Value [degree] defines the max. angle of swipe gesture which should change day. + */ +const qreal KCalenSwipeAngle = 30; + #ifdef CALENVIEWS_DLL #define CALENDAYCONTENTSCROLLAREA_EXPORT Q_DECL_EXPORT #else diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/inc/calendayitemview.h --- a/calendarui/views/dayview/inc/calendayitemview.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/inc/calendayitemview.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,19 +1,19 @@ /* -* 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: Day view control of calendar -* -*/ + * 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: Day view control of calendar + * + */ #ifndef CALENDAYITEMVIEW_H #define CALENDAYITEMVIEW_H @@ -31,7 +31,7 @@ class CalenDayItemView : public HbAbstractItemView { - Q_OBJECT + Q_OBJECT public: enum CalendarPanDirection { @@ -46,113 +46,42 @@ CalendarForwardRecycle }; - /** - * Constructor. - */ - CalenDayItemView(MCalenServices &services, HbModelIterator* iterator, QGraphicsItem *parent); - - /** - * Destructor. - */ + CalenDayItemView( + MCalenServices &services, + HbModelIterator* iterator, + QGraphicsItem *parent); ~CalenDayItemView(); - /** - * - */ - void scrollTo(const QModelIndex &index, HbAbstractItemView::ScrollHint hint = EnsureVisible); + void scrollTo( + const QModelIndex &index, + HbAbstractItemView::ScrollHint hint = EnsureVisible); public slots: - /** - * - */ virtual void reset(); - - /** - * Handles signal that is emitted when reset() is called, before the model's - * internal state (e.g. persistent model indexes) has been invalidated. - */ void modelAboutToBeReset(); - - /** - * Handles signal that is emitted when reset() is called, after the model's - * internal state (e.g. persistent model indexes) has been invalidated. - */ void modelReset(); - /** - * - */ void scrollVertically(const QPointF &newPosition); - + private slots: - - /** - * This function is called when a touch down event is received within Abstract view item that is representing index. - */ - void itemPressed(const QPointF &position); - - /** - * This function is called when a touch release event is received within Abstract view item that is representing index. - */ - void itemReleased(const QPointF &position); - - /** - * This function is called when the item specified by index is activated by the user. - */ - void itemActivated(const QPointF &position); - - /** - * This function is called when long press event is received within Abstract view item viewItem. - * - * @param item The item. - * @param coords is scene position where the long press event happened - */ + + void itemPressed(const QModelIndex &index); + void itemReleased(const QModelIndex &index); + void itemActivated(const QModelIndex &index); void itemLongPressed(HbAbstractViewItem*, QPointF); - - /** - * Slot which is called whenever the orientation of the device changes - * @param orientation Current device orientation - */ + void orientationChanged(Qt::Orientation orientation); - - /** - * Opens currently selected model item. - */ + void openSelectedItem(); - - /** - * Edits currently selected model item. - */ void editSelectedItem(); - - /** - * Deletes currently selected model item. - */ - void deleteSelectedItem(); + void deleteSelectedItem(); private: - - /** - * Connects item view's slots. - */ + void setupSlots(); - - /** - * Creates Context menu. - */ void setupContextMenu(); - - /** - * Sets context to currently selected model item and issues calendar command. - * - * @param command Calendar command. - */ - bool issueCommandOnSelectedItem( int command ); - - /** - * Clears current selection in Selection Model. - */ + bool issueCommandOnSelectedItem(int command); void clearSelectionInModel(); private: @@ -160,19 +89,19 @@ /** * Calendar services. Not owned. */ - MCalenServices &mServices; - + MCalenServices &mServices; + /** * Item container. */ CalenDayContainer* mContainer; - + /** * Day event info. * Own. */ CalenDayInfo* mInfo; - + /** * context menu */ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/inc/calendayutils.h --- a/calendarui/views/dayview/inc/calendayutils.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/inc/calendayutils.h Mon Sep 06 10:12:45 2010 +0530 @@ -32,6 +32,7 @@ qreal screenWidth() const; qreal hourElementWidth() const; qreal hourElementHeight() const; + qreal minEventHeight() const; qreal contentWidth() const; Qt::Orientation orientation() const; @@ -56,6 +57,7 @@ private: qreal calculateHourElementWidth() const; qreal calculateHourElementHeight() const; + qreal calculateMinEventHeight() const; private: // data @@ -65,6 +67,7 @@ qreal mHourElementWidth; //!< The width of hour element qreal mHourElementHeight; //!< The height of hour element + qreal mMinEventHeight; //!< The minimum height of event bubble }; #endif /* CALENDAYUTILS_H_ */ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/inc/calendayview.h --- a/calendarui/views/dayview/inc/calendayview.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/inc/calendayview.h Mon Sep 06 10:12:45 2010 +0530 @@ -92,13 +92,6 @@ */ virtual void populationComplete(); -//From MCalenNotificationHandler - - /** - * The function handles calendar notifications. - */ - virtual void HandleNotification( const TCalenNotification notification ); - public: //API @@ -182,6 +175,7 @@ CalenDocLoader* mDocLoader; //!< Document loader for day view bool mIsLaunching; //!< Indicates that view is launching first time + HbWidget *mGesturesAbsorber; //!minEventHeight(); + eventHeight = (eventHeight < minHeight ? minHeight : eventHeight); QRectF eventGeometry(eventStartX, eventStartY, eventWidth, eventHeight); // Workaround to prevent size hint caching inside effectiveSizeHint diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/src/calendaycontentscrollarea.cpp --- a/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -39,11 +39,6 @@ */ const int KCalenHScrollMoveParam = 30; //!< Percentage -/*! - Value [degree] defines the max. angle of swipe gesture which should change day. - */ -const qreal KCalenSwipeAngle = 30; - /*! \class CalenDayContentScrollArea @@ -279,15 +274,19 @@ else { QGestureEvent* gesture = static_cast (event); - // Check if we get a pan gesture - QPanGesture *panGesture = qobject_cast ( - gesture->gesture(Qt::PanGesture)); + QPanGesture *panGesture = qobject_cast(gesture->gesture(Qt::PanGesture)); if (panGesture) { checkPanDirection(panGesture); if (mPanDayDirection == ECalenPanHorizontal) { gestureEvent(gesture); handled = true; } + }else{ + QSwipeGesture *swipeGesture = qobject_cast(gesture->gesture(Qt::SwipeGesture)); + if (swipeGesture) { + gestureEvent(gesture); + handled = true; + } } } } diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/src/calendayinfo.cpp --- a/calendarui/views/dayview/src/calendayinfo.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/src/calendayinfo.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -21,6 +21,7 @@ #include "calenagendautils.h" #include "calenconstants.h" #include "calendateutils.h" +#include "calendayutils.h" namespace { @@ -50,9 +51,9 @@ iRegionList[i].Close(); } iRegionList.clear(); - iUntimedEvents.clear();//Close(); - iTodoEvents.clear();//Close(); - iAlldayEvents.clear();//Close(); + iUntimedEvents.clear(); + iTodoEvents.clear(); + iAlldayEvents.clear(); } /*! @@ -63,10 +64,10 @@ for (int i = 0; i < iRegionList.count(); i++) { iRegionList[i].Close(); } - iRegionList.clear();//Reset(); - iUntimedEvents.clear();//Reset(); - iTodoEvents.clear();//Reset(); - iAlldayEvents.clear();//Reset(); + iRegionList.clear(); + iUntimedEvents.clear(); + iTodoEvents.clear(); + iAlldayEvents.clear(); iUntimedSlotCount = 0; iFirstUntimedSlot = KFSCalStartingHour * iSlotsInHour; @@ -87,8 +88,16 @@ int startIndex = SlotIndexForStartTime(aItemInfo.iStartTime); int endIndex = SlotIndexForEndTime(aItemInfo.iEndTime); - if (endIndex == startIndex) { - endIndex++; + + // 10.1 update: the minimum height of event is defined by UI spec., + // so number of occupied slots must be verified to hold at least bubble + // with minimum possible height + qreal slotHeight = CalenDayUtils::instance()->hourElementHeight() + / iSlotsInHour; + int minSlotsInEvent = qRound((CalenDayUtils::instance()->minEventHeight() + / slotHeight) + 0.5); + if (endIndex < startIndex + minSlotsInEvent) { + endIndex = startIndex + minSlotsInEvent; } if (iRegionList.count() > 0) { // the timed events must be added in order diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/src/calendayitemview.cpp --- a/calendarui/views/dayview/src/calendayitemview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/src/calendayitemview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -1,19 +1,19 @@ /* -* 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: Day view control of calendar -* -*/ + * 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: Day view control of calendar + * + */ //System includes #include @@ -33,137 +33,140 @@ #include "calenagendautils.h" #include "CalenUid.h" +/*! + \brief Constructor + */ +CalenDayItemView::CalenDayItemView( + MCalenServices &services, + HbModelIterator *iterator, + QGraphicsItem *parent) : + HbAbstractItemView(mContainer = new CalenDayContainer(), iterator, parent), + mServices(services) +{ + mInfo = new CalenDayInfo(CalenDayInfo::EFour); + mContainer->setDayInfo(mInfo); -/*! - \brief Constructor -*/ -CalenDayItemView::CalenDayItemView( MCalenServices &services, HbModelIterator *iterator, QGraphicsItem *parent ) -: HbAbstractItemView(mContainer = new CalenDayContainer(), iterator, parent), - mServices( services ) -{ - mInfo = new CalenDayInfo( CalenDayInfo::ETwo ); - mContainer->setDayInfo( mInfo ); - //setup Selection Model QItemSelectionModel* selModel = new QItemSelectionModel(this->model()); - if ( selModel ) { - setSelectionMode( HbAbstractItemView::SingleSelection ); - setSelectionModel( selModel ); + if (selModel) { + setSelectionMode(HbAbstractItemView::SingleSelection); + setSelectionModel(selModel); } - + setScrollDirections(Qt::Vertical); setScrollingStyle(HbScrollArea::PanWithFollowOn); setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff); - + //TODO: KG: Animate item pressed?! HbAbstractItemView::TouchDown - setEnabledAnimations( HbAbstractItemView::None ); - + setEnabledAnimations(HbAbstractItemView::None); + // Get the width of content and fix its size qreal contentWidth = CalenDayUtils::instance()->contentWidth(); setMinimumWidth(contentWidth); setMaximumWidth(contentWidth); - + setupSlots(); setupContextMenu(); } /*! - \brief Destructor -*/ + \brief Destructor + */ CalenDayItemView::~CalenDayItemView() { delete mInfo; } /*! - \brief Scrolls to given index -*/ -void CalenDayItemView::scrollTo(const QModelIndex &index, HbAbstractItemView::ScrollHint hint) + \brief Scrolls to given index + */ +void CalenDayItemView::scrollTo( + const QModelIndex &index, + HbAbstractItemView::ScrollHint hint) { HbAbstractItemView::scrollTo(index, hint); } /*! - \brief Currently empty implementation. -*/ + \brief Currently empty implementation. + */ void CalenDayItemView::reset() { } - /*! - \brief Handles signal that is emitted when reset() is called, before the model's - internal state (e.g. persistent model indexes) has been invalidated. -*/ + \brief Handles signal that is emitted when reset() is called, before the model's + internal state (e.g. persistent model indexes) has been invalidated. + */ void CalenDayItemView::modelAboutToBeReset() { - + } /*! - \brief Handles signal that is emitted when reset() is called, before the model's - internal state (e.g. persistent model indexes) has been invalidated. -*/ + \brief Handles signal that is emitted when reset() is called, before the model's + internal state (e.g. persistent model indexes) has been invalidated. + */ void CalenDayItemView::modelReset() { - if ( !mInfo ) { + if (!mInfo) { return; } //reset day info mInfo->Reset(); CalenDayModel* model(0); - model = static_cast(this->model()); - if ( !model ) { + model = static_cast (this->model()); + if (!model) { return; } - + mContainer->setDate(model->modelDate().date()); - int rowCount = model->rowCount( ); - SCalenApptInfo apptInfo; - for( int row = 0; row < rowCount; row++ ) { - QModelIndex idx = model->index( row, 0 ); - QVariant variant = idx.data( CalenDayEntry ); - AgendaEntry entry = variant.value(); + int rowCount = model->rowCount(); + SCalenApptInfo apptInfo; + for (int row = 0; row < rowCount; row++) { + QModelIndex idx = model->index(row, 0); + QVariant variant = idx.data(CalenDayEntry); + AgendaEntry entry = variant.value (); apptInfo.iIndex = idx; - + QDateTime start; QDateTime end; - QDateTime currDate( model->modelDate() ); - CalenDayUtils::instance()->getEventValidStartEndTime( start, end, - entry, currDate ); + QDateTime currDate(model->modelDate()); + CalenDayUtils::instance()->getEventValidStartEndTime(start, end, entry, + currDate); apptInfo.iStartTime = start; apptInfo.iEndTime = end; - + TCalenInstanceId id = TCalenInstanceId::nullInstanceId();//index.row() - temporary ID id.mEntryLocalUid = row; - id.mInstanceTime = apptInfo.iStartTime; + id.mInstanceTime = apptInfo.iStartTime; apptInfo.iId = id; apptInfo.iColor = 0xffff; - - if ( entry.isTimedEntry() && !CalenAgendaUtils::isAlldayEvent(entry)) - { + + if (entry.isTimedEntry() && !CalenAgendaUtils::isAlldayEvent(entry)) { apptInfo.iAllDay = false; - mInfo->InsertTimedEvent( apptInfo ); - } - else if(CalenAgendaUtils::isAlldayEvent(entry)) //all-day event - { - apptInfo.iAllDay = true; - mInfo->InsertAlldayEvent( apptInfo ); - } + mInfo->InsertTimedEvent(apptInfo); + } + else + if (CalenAgendaUtils::isAlldayEvent(entry)) //all-day event + { + apptInfo.iAllDay = true; + mInfo->InsertAlldayEvent(apptInfo); + } } - + HbAbstractItemView::reset(); } /*! - \brief Scrolls view vertically to the given position. - - \param newPosition position to scroll to. -*/ -void CalenDayItemView::scrollVertically( const QPointF &newPosition ) + \brief Scrolls view vertically to the given position. + + \param newPosition position to scroll to. + */ +void CalenDayItemView::scrollVertically(const QPointF &newPosition) { QPointF currentPos = contentWidget()->pos(); if (abs(newPosition.y()) != abs(currentPos.y())) { @@ -173,107 +176,106 @@ } /*! - \brief This function is called when a touch press event is received - within Abstract view item that is representing index. - Currently it does nothing. -*/ -void CalenDayItemView::itemPressed( const QPointF &position ) + \brief This function is called when a touch press event is received + within Abstract view item that is representing index. + Currently it does nothing. + */ +void CalenDayItemView::itemPressed(const QModelIndex &index) { - Q_UNUSED( position ) + Q_UNUSED( index ) } /*! - \brief This function is called when a touch release event is received - within Abstract view item that is representing index. - Currently it does nothing. -*/ -void CalenDayItemView::itemReleased( const QPointF &position ) + \brief This function is called when a touch release event is received + within Abstract view item that is representing index. + Currently it does nothing. + */ +void CalenDayItemView::itemReleased(const QModelIndex &index) { - Q_UNUSED( position ) + Q_UNUSED( index ) } /*! - \brief This function is called when the item specified by index is activated by the user. - - \param position Not used. -*/ -void CalenDayItemView::itemActivated( const QPointF &position ) + \brief This function is called when the item specified by index is activated by the user. + + \param position Not used. + */ +void CalenDayItemView::itemActivated(const QModelIndex &index) { - Q_UNUSED( position ) - HbAbstractViewItem *item = qobject_cast(sender()); - QModelIndex index = item->modelIndex(); - QItemSelectionModel* selModel( selectionModel() ); - if ( index.isValid() && selModel) { - selModel->select( index, QItemSelectionModel::Current | QItemSelectionModel::Select ); + QItemSelectionModel* selModel(selectionModel()); + if (index.isValid() && selModel) { + selModel->select(index, QItemSelectionModel::Current + | QItemSelectionModel::Select); openSelectedItem(); } } /*! - \brief This function is called when long press event is received within Abstract view item viewItem. + \brief This function is called when long press event is received within Abstract view item viewItem. - \param item Pointer to pressed item. - \param coord Position where item was pressed. -*/ + \param item Pointer to pressed item. + \param coord Position where item was pressed. + */ void CalenDayItemView::itemLongPressed(HbAbstractViewItem* item, QPointF coords) { QModelIndex index = item->modelIndex(); - QItemSelectionModel* selModel( selectionModel() ); - if ( index.isValid() && selModel && mContextMenu) { - selModel->select( index, QItemSelectionModel::Current | QItemSelectionModel::Select ); - mContextMenu->setPreferredPos( coords, HbPopup::BottomRightCorner ); + QItemSelectionModel* selModel(selectionModel()); + if (index.isValid() && selModel && mContextMenu) { + selModel->select(index, QItemSelectionModel::Current + | QItemSelectionModel::Select); + mContextMenu->setPreferredPos(coords, HbPopup::BottomRightCorner); mContextMenu->open(); } } /*! - \brief Slot which is called whenever the orientation of the device changes. + \brief Slot which is called whenever the orientation of the device changes. - \param orientation New orientation. -*/ -void CalenDayItemView::orientationChanged( Qt::Orientation orientation ) + \param orientation New orientation. + */ +void CalenDayItemView::orientationChanged(Qt::Orientation orientation) { // Update the width of screen qreal contentWidth = CalenDayUtils::instance()->contentWidth(); setMinimumWidth(contentWidth); setMaximumWidth(contentWidth); - if( mContainer ) { - mContainer->orientationChanged( orientation ); + if (mContainer) { + mContainer->orientationChanged(orientation); } } /*! - \brief Opens currently selected model item. -*/ + \brief Opens currently selected model item. + */ void CalenDayItemView::openSelectedItem() { - issueCommandOnSelectedItem( ECalenEventView ); + issueCommandOnSelectedItem(ECalenEventView); } /*! - \brief Edits currently selected model item. -*/ + \brief Edits currently selected model item. + */ void CalenDayItemView::editSelectedItem() { - issueCommandOnSelectedItem( ECalenEditCurrentEntry ); + issueCommandOnSelectedItem(ECalenEditCurrentEntry); } /*! - \brief Deletes currently selected model item. -*/ + \brief Deletes currently selected model item. + */ void CalenDayItemView::deleteSelectedItem() { - issueCommandOnSelectedItem( ECalenDeleteCurrentEntry ); + issueCommandOnSelectedItem(ECalenDeleteCurrentEntry); } /*! - \brief Connects item view's slots. -*/ + \brief Connects item view's slots. + */ void CalenDayItemView::setupSlots() { // Connect to main window's orientationChanged signal to handle orientation // switching - QObject::connect(CalenDayUtils::instance()->mainWindow(), + QObject::connect(CalenDayUtils::instance()->mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationChanged(Qt::Orientation))); @@ -289,31 +291,34 @@ QObject::connect(mContainer, SIGNAL(itemCreated(HbAbstractViewItem *)), this, SLOT(itemCreated(HbAbstractViewItem*))); } - QObject::connect(this, SIGNAL(pressed(const QPointF&)), this, - SLOT(itemPressed(const QPointF&))); - QObject::connect(this, SIGNAL(released(const QPointF&)), this, - SLOT(itemReleased(const QPointF&))); - QObject::connect(this, SIGNAL(activated(const QPointF&)), this, - SLOT(const QPointF&)); + QObject::connect(this, SIGNAL(pressed(const QModelIndex&)), this, + SLOT(itemPressed(const QModelIndex&))); + QObject::connect(this, SIGNAL(released(const QModelIndex&)), this, + SLOT(itemReleased(const QModelIndex&))); + QObject::connect(this, SIGNAL(activated(const QModelIndex&)), this, + SLOT(itemActivated(const QModelIndex&))); QObject::connect(this, SIGNAL(longPressed(HbAbstractViewItem*, QPointF)), this, SLOT(itemLongPressed(HbAbstractViewItem*, QPointF))); } /*! - \brief Creates context menu. -*/ + \brief Creates context menu. + */ void CalenDayItemView::setupContextMenu() { mContextMenu = new HbMenu(); - HbAction *openAction = mContextMenu->addAction(hbTrId("txt_common_menu_open")); + HbAction *openAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_open")); if (openAction) { connect(openAction, SIGNAL(triggered()), this, SLOT(openSelectedItem())); } - HbAction *editAction = mContextMenu->addAction(hbTrId("txt_common_menu_edit")); + HbAction *editAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_edit")); if (editAction) { connect(editAction, SIGNAL(triggered()), this, SLOT(editSelectedItem())); } - HbAction *deleteAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); + HbAction *deleteAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_delete")); if (deleteAction) { connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteSelectedItem())); @@ -321,35 +326,35 @@ } /*! - \brief Sets context to currently selected model item and issues calendar command. - - \param command A command to be issued. -*/ -bool CalenDayItemView::issueCommandOnSelectedItem( int command ) + \brief Sets context to currently selected model item and issues calendar command. + + \param command A command to be issued. + */ +bool CalenDayItemView::issueCommandOnSelectedItem(int command) { bool retVal(false); QItemSelectionModel* selModel(selectionModel()); - if (!selModel){ + if (!selModel) { return retVal; } - QModelIndex index( selModel->currentIndex() ); - if( index.isValid() ) { + QModelIndex index(selModel->currentIndex()); + if (index.isValid()) { retVal = true; - QVariant variant = index.data( CalenDayEntry ); - AgendaEntry entry = variant.value(); + QVariant variant = index.data(CalenDayEntry); + AgendaEntry entry = variant.value (); QDateTime start; QDateTime end; CalenDayModel* model(0); - model = static_cast(this->model()); - QDateTime currDate( model->modelDate() ); - CalenDayUtils::instance()->getEventValidStartEndTime( start, end, - entry, currDate ); + model = static_cast (this->model()); + QDateTime currDate(model->modelDate()); + CalenDayUtils::instance()->getEventValidStartEndTime(start, end, entry, + currDate); TRAPD(error, - mServices.Context().setFocusDateAndTimeAndInstance(start, - TCalenInstanceId::create(entry)); - mServices.IssueCommandL( command ); - ); - if( error ) { + mServices.Context().setFocusDateAndTimeAndInstance(start, + TCalenInstanceId::create(entry)); + mServices.IssueCommandL( command ); + ); + if (error) { retVal = false; } clearSelectionInModel(); @@ -358,8 +363,8 @@ } /*! - \brief Clears current selection in Selection Model. -*/ + \brief Clears current selection in Selection Model. + */ void CalenDayItemView::clearSelectionInModel() { QItemSelectionModel* selModel(selectionModel()); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/src/calendaystatusstrip.cpp --- a/calendarui/views/dayview/src/calendaystatusstrip.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/src/calendaystatusstrip.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -22,6 +22,7 @@ // User includes #include "calendaystatusstrip.h" +#include "calendayutils.h" // Constants qreal const CalenDayStatusStrip::mMinute = 60; @@ -123,10 +124,10 @@ } /*! - \brief Reimplemented function... - - Reimplemented function to draw status strip. - It is based on CalenDayStatusStrip::DrawingStyle, range and color + \brief Reimplemented function... + + Reimplemented function to draw status strip. + It is based on CalenDayStatusStrip::DrawingStyle, range and color */ void CalenDayStatusStrip::paint( QPainter *painter, @@ -136,45 +137,39 @@ Q_UNUSED(option); Q_UNUSED(widget); - //calculate bubble start and end time of bubble - QPair startEndEvent = - calculateStartEndPostion(mStartEndEventTime.first, - mStartEndEventTime.second - ); - //calculate how big is Minute - qreal minuteHeight = calculateMinuteHeight(startEndEvent.first, - startEndEvent.second - ); + painter->save();// saves the painter state. - painter->save();// saves the painter state. - - - //calculate how long is event in minutes - qreal eventMinutes = - mStartEndEventTime.first.secsTo(mStartEndEventTime.second) / mMinute; - //calculate height and width of status stripe + // Calculate bubble start and end time of bubble + QPair startEndEvent = calculateStartEndPostion( + mStartEndEventTime.first, mStartEndEventTime.second); + // Calculate how high is Minute + qreal minuteHeight = calculateMinuteHeight(startEndEvent.first, + startEndEvent.second); + // Calculate how long is event in minutes + qreal eventMinutes = mStartEndEventTime.first.secsTo( + mStartEndEventTime.second) / mMinute; + // Calculate height and width of status stripe qreal dx = size().width() - 1; qreal dy = eventMinutes * minuteHeight; - //calculate time from wehre it should be drawed - qreal startTime = - startEndEvent.first.secsTo(mStartEndEventTime.first) / mMinute; - //this is done because bubble can be drawed from half hour - startTime = startTime > 30 ? startTime - 30 : startTime; - //calculate status stripe height + // Calculate time from wehre it should be drawed + qreal startTime = startEndEvent.first.secsTo(mStartEndEventTime.first) + / mMinute; + // This is done because bubble positioning accuracy is 15 minutes + startTime = startTime > 15 ? startTime - 15 : startTime; + // Calculate status stripe height qreal startTimeHeight = startTime * minuteHeight; - //set bounding rect of drawed area + // Set bounding rect of drawed area QRectF bounding(boundingRect()); - //set size smaller by 1px in each side - bounding.setRect(bounding.left() + 1, bounding.top() + startTimeHeight, - dx - 1, dy - 1 - ); + // Set size smaller by 1px in each side + bounding.setRect(bounding.left() + 1, bounding.top() + startTimeHeight, dx + - 1, dy - 1); - //set clip region + // Set clip region painter->setClipRect(bounding, Qt::IntersectClip); - //prepare brush and paint + // Prepare brush and paint QBrush brush(HbColorScheme::color("qtc_cal_month_current_day")); painter->setBrush(brush); QPen pen; @@ -185,7 +180,7 @@ painter->setPen(pen); QPointF startPoint(0, dy + dx); - + switch (mDrawingStyle) { case StripWithLines: for (int i = 0; startPoint.y() > 0; i++) { @@ -197,19 +192,20 @@ break; } - //draw rectangle + // Draw rectangle painter->drawRect(bounding); - // restore the painter + // Restore the painter painter->restore(); } /*! - \brief It preapres points to draw filled polygon when StripWithLines style is - on. + \brief Prepares points to draw filled polygon when StripWithLines style is on. */ -QPolygonF -CalenDayStatusStrip::diagonalLine(QPointF startPoint, qreal dx, qreal dy) +QPolygonF CalenDayStatusStrip::diagonalLine( + QPointF startPoint, + qreal dx, + qreal dy) { QPolygonF polygon; polygon << QPointF(startPoint.x(), startPoint.y()); @@ -220,53 +216,82 @@ } /*! - Returns time for position 0 and height in widget - - \param startTime Start of event - \param endTime End of event - \return Draw region of bubble - */ - QPair CalenDayStatusStrip::calculateStartEndPostion( - const QTime &startTime, - const QTime &endTime - ) + \brief Returns time for position 0 and height in widget + + \param startTime Start of event + \param endTime End of event + \return Draw region of bubble + */ +QPair CalenDayStatusStrip::calculateStartEndPostion( + const QTime &startTime, + const QTime &endTime) { - QTime start; QTime end; - if (startTime.minute() < 30) { + if (startTime.minute() < 15) { start = QTime(startTime.hour(), 0); } - else { - start = QTime(startTime.hour(), 30); - } + else + if (startTime.minute() < 30) { + start = QTime(startTime.hour(), 15); + } + else + if (startTime.minute() < 45) { + start = QTime(startTime.hour(), 30); + } + else { + start = QTime(startTime.hour(), 45); + } if (endTime.minute() == 0) { end = endTime; } - else if (endTime.hour() == 23 and endTime.minute() > 30) { - end = QTime(endTime.hour(), 59); - } - else if (endTime.minute() <= 30) { - end = QTime(endTime.hour(), 30); - } - else { - end = QTime(endTime.hour() + 1, 0); - } + else + if (endTime.hour() == 23 and endTime.minute() > 45) { + end = QTime(endTime.hour(), 59); + } + else + if (endTime.minute() <= 15) { + end = QTime(endTime.hour(), 15); + } + else + if (endTime.minute() <= 30) { + end = QTime(endTime.hour(), 30); + } + else + if (endTime.minute() <= 45) { + end = QTime(endTime.hour(), 45); + } + else { + end = QTime(endTime.hour() + 1, 0); + } return QPair (start, end); } /*! - Calculates height of one minute from widget height, and start/end time. + Calculates height of one minute from widget height, and start/end time. */ -qreal CalenDayStatusStrip::calculateMinuteHeight(const QTime &start, - const QTime &end) +qreal CalenDayStatusStrip::calculateMinuteHeight( + const QTime &start, + const QTime &end) { qreal min = start.secsTo(end) / mMinute; - qreal height = size().height(); + // Events shorter than 30 minutes have bubble higher than 30 minutes, + // so calculate minute's height using real hour-element slot height + qreal height = 0.0; + if (min > 30) { + height = size().height(); + } + else + if (min > 15) { + height = CalenDayUtils::instance()->hourElementHeight() / 2; + } + else { + height = CalenDayUtils::instance()->hourElementHeight() / 4; + } return height / min; } diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/src/calendayutils.cpp --- a/calendarui/views/dayview/src/calendayutils.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/src/calendayutils.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -97,6 +97,16 @@ } /*! + \brief minEventHeight + + \return Minimum height of event bubble + */ +qreal CalenDayUtils::minEventHeight() const +{ + return mMinEventHeight; +} + +/*! \brief contentWidth \return Width of content area @@ -160,6 +170,7 @@ } mHourElementWidth = calculateHourElementWidth(); mHourElementHeight = calculateHourElementHeight(); + mMinEventHeight = calculateMinEventHeight(); } /*! @@ -215,3 +226,27 @@ return prefHeight; } + +/*! + \brief Calculates the height of hour element according to UI spec. + + \return Calculated minimum height of event bubble + */ +qreal CalenDayUtils::calculateMinEventHeight() const +{ + HbStyle style; + HbDeviceProfile deviceProfile; + + // Calculate minimum height of event bubble + qreal textHeight = 0.0; + qreal topSpacing = 0.0; + qreal bottomSpacing = 0.0; + style.parameter(QString("hb-param-text-height-secondary"), textHeight, + deviceProfile); + style.parameter(QString("hb-param-margin-gene-top"), topSpacing, + deviceProfile); + style.parameter(QString("hb-param-margin-gene-bottom"), bottomSpacing, + deviceProfile); + + return (topSpacing + textHeight + bottomSpacing); +} diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/src/calendayview.cpp --- a/calendarui/views/dayview/src/calendayview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/src/calendayview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -60,7 +60,8 @@ mDocLoader(NULL), mIsLaunching(true), mSettingsManager(NULL), mRegionalInfoKey(XQSettingsKey::TargetCentralRepository, KCRUidCalendar, KCalendarShowRegionalInfo), mServices(services), - mRegionalInfoGroupBox(NULL), mGoToTodayMenuAction(NULL), mBg(NULL) + mRegionalInfoGroupBox(NULL), mGoToTodayMenuAction(NULL), mBg(NULL), + mGesturesAbsorber(NULL) { setupMenu(); @@ -143,6 +144,16 @@ } else { setupViewport(); } + + //Set gestures absorber + if (!mGesturesAbsorber) { + mGesturesAbsorber = new HbWidget(this); + mGesturesAbsorber->setZValue(100); + mGesturesAbsorber->grabGesture(Qt::SwipeGesture); + mGesturesAbsorber->grabGesture(Qt::PanGesture); + mGesturesAbsorber->setGeometry(rect()); + mGesturesAbsorber->installEventFilter(mContentScrollArea); + } populationComplete(); } @@ -156,17 +167,6 @@ } /*! - \brief Reimplemented from MCalenNotificationHandler. The function handles calendar notifications - - \param notification notification type -*/ -void CalenDayView::HandleNotification(const TCalenNotification notification) -{ - Q_UNUSED( notification ) -} - - -/*! \brief Sets up the view accroding to the 'xml' \param docLoader Pointer to document loader @@ -284,20 +284,23 @@ */ void CalenDayView::setupMenu() { - menu()->addAction(hbTrId("txt_calendar_opt_new_event"), this, SLOT(runNewMeeting())); - //get pointer to this position, because need to change visibility - mGoToTodayMenuAction = menu()->addAction(hbTrId("txt_calendar_opt_go_to_today"), this, SLOT(runGoToToday())); - menu()->addAction(hbTrId("txt_calendar_opt_go_to_date"), this, SLOT(goToDate())); - //TODO: Add id for this text - //"Switch to Agenda view" - menu()->addAction(hbTrId("txt_calendar_opt_switch_to_agenda_view"), this, SLOT(runChangeToAgendaView())); - //TODO: Add id for this text (lunar data) - //"Show lunar data" - if (pluginEnabled()) - { + menu()->addAction(hbTrId("txt_calendar_opt_new_event"), this, SLOT(runNewMeeting())); + //get pointer to this position, because need to change visibility + mGoToTodayMenuAction = menu()->addAction(hbTrId("txt_calendar_opt_go_to_today"), this, SLOT(runGoToToday())); + menu()->addAction(hbTrId("txt_calendar_opt_go_to_date"), this, SLOT(goToDate())); + //TODO: Add id for this text + //"Switch to Agenda view" + menu()->addAction(hbTrId("txt_calendar_opt_switch_to_agenda_view"), this, SLOT(runChangeToAgendaView())); + //TODO: Add id for this text (lunar data) + //"Show lunar data" + if (pluginEnabled()) + { menu()->addAction(hbTrId("txt_calendar_opt_show_lunar_data"), this, SLOT(runLunarData())); - } - menu()->addAction(hbTrId("txt_calendar_opt_settings"), this, SLOT(launchSettingsView())); + } + menu()->addAction(hbTrId("txt_calendar_opt_settings"), this, SLOT(launchSettingsView())); + + // Close the menu once closeDialogs() is received + connect(this, SIGNAL(closeDialogs()), menu(), SLOT(close())); } /*! diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/HbInstance --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/HbInstance Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,1 @@ +#include "hbinstance.h" \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/hbinstance.h --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/hbinstance.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/hbinstance.h Mon Sep 06 10:12:45 2010 +0530 @@ -11,56 +11,15 @@ * * Contributors: * -* Description: Mocked classes for testing CalenDayUtils class +* Description: Mocked classes for testing CalenDayContainer class * */ -#ifndef HBMAINWINDOW_H -#define HBMAINWINDOW_H - -#include - -// Test variables -extern QRectF gTestWindowRect; -extern Qt::Orientation gTestOrientation; - -/*! - Mocked class HbMainWindow (simulating window in unittests) - */ -class HbMainWindow -{ -public: - HbMainWindow() { - mView = new HbView(); - } - - ~HbMainWindow() { - if (mView) { - delete mView; - mView = 0; - } - } - - QRectF layoutRect() const { - return gTestWindowRect; - } - - Qt::Orientation orientation() const { - return gTestOrientation; - } - - HbView *HbMainWindow::currentView() const { - return mView; - } - - HbView *mView; -}; - -#endif // HBMAINWINDOW_H #ifndef HBINSTANCE_H #define HBINSTANCE_H +#include "hbmainwindow.h" #include /*! diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/hbmainwindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/hbmainwindow.h Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,59 @@ +/* +* 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 classes for testing CalenDayUtils class +* +*/ + +#ifndef HBMAINWINDOW_H +#define HBMAINWINDOW_H + +#include + +// Test variables +extern QRectF gTestWindowRect; +extern Qt::Orientation gTestOrientation; + +/*! + Mocked class HbMainWindow (simulating window in unittests) + */ +class HbMainWindow +{ +public: + HbMainWindow() { + mView = new HbView(); + } + + ~HbMainWindow() { + if (mView) { + delete mView; + mView = 0; + } + } + + QRectF layoutRect() const { + return gTestWindowRect; + } + + Qt::Orientation orientation() const { + return gTestOrientation; + } + + HbView *HbMainWindow::currentView() const { + return mView; + } + + HbView *mView; +}; + +#endif // HBMAINWINDOW_H diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro Mon Sep 06 10:12:45 2010 +0530 @@ -37,11 +37,14 @@ # Input HEADERS += calendaycontainertest.h \ calendaycontainer.h \ + hbinstance.h \ + hbmainwindow.h \ calendayutils.h \ calendayeventspane.h \ calendayitem.h \ calendaystatusstrip.h \ - calendaymodel.h + calendaymodel.h + SOURCES += unittest_calendaycontainer.cpp \ calendaycontainer.cpp \ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/HbInstance --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/HbInstance Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,1 @@ +#include "hbinstance.h" \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/HbSwipeGesture --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/HbSwipeGesture Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,1 @@ +#include "hbswipegesture.h" \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbinstance.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbinstance.h Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,59 @@ +/* + * 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 classes for testing CalenDayContainer class + * + */ + +#ifndef HBINSTANCE_H +#define HBINSTANCE_H + +#include "hbmainwindow.h" +#include + +/*! + Mocked class HbInstance (simulating hbinstance in unittests) + */ +class HbInstance +{ +public: + + static HbInstance *instance() + { + return new HbInstance(); + } + + QList allMainWindows() const + { + return mMainWindows; + } + + HbInstance() + { + HbMainWindow* window = new HbMainWindow(); + mMainWindows.append(window); + } + + ~HbInstance() + { + for (int i = 0; i < mMainWindows.count(); i++) { + delete mMainWindows[i]; + } + mMainWindows.clear(); + } + + QList mMainWindows; +}; + +#endif // HBINSTANCE_H +// End of File diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbmainwindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbmainwindow.h Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,67 @@ +/* + * 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 classes for testing CalenDayUtils class + * + */ + +#ifndef HBMAINWINDOW_H +#define HBMAINWINDOW_H + +#include + +// Test variables +extern QRectF gTestWindowRect; +extern Qt::Orientation gTestOrientation; + +/*! + Mocked class HbMainWindow (simulating window in unittests) + */ +class HbMainWindow : public QObject +{ +public: + HbMainWindow() + { + mView = new HbView(); + } + + ~HbMainWindow() + { + if (mView) { + delete mView; + mView = 0; + } + } + + QRectF layoutRect() const + { + return gTestWindowRect; + } + + Qt::Orientation orientation() const + { + return gTestOrientation; + } + + HbView *HbMainWindow::currentView() const + { + return mView; + } + + HbView *mView; + +signals: + void orientationChanged(Qt::Orientation orientation); +}; + +#endif // HBMAINWINDOW_H diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbswipegesture.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbswipegesture.h Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,54 @@ +/* + * 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 classes for testing CalenDayContentScrollArea class + * + */ + +#ifndef HBSWIPEGESTURE_H_ +#define HBSWIPEGESTURE_H_ + +#include + +// Test variables +extern Qt::GestureState gTestGestureState; +extern qreal gTestSceneSwipeAngle; +extern QSwipeGesture::SwipeDirection gTestSceneHorizontalDirection; + +/*! + Mocked class HbSwipeGesture + */ +class HbSwipeGesture : public QSwipeGesture +{ + Q_OBJECT + +public: + explicit HbSwipeGesture(QObject *parent = 0) { + Q_UNUSED(parent) + } + ~HbSwipeGesture() {} + + qreal sceneSwipeAngle() const { + return gTestSceneSwipeAngle; + } + + SwipeDirection sceneHorizontalDirection() const { + return gTestSceneHorizontalDirection; + } + + Qt::GestureState state() const { + return gTestGestureState; + } +}; + +#endif /* HBSWIPEGESTURE_H_ */ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/rom/unittest_calendaycontentscrollarea.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/rom/unittest_calendaycontentscrollarea.iby Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 2006-2007 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: Image description file for test project +* +*/ + +#ifndef UNITTEST_CALENDAYCONTENTSCROLLAREA_IBY +#define UNITTEST_CALENDAYCONTENTSCROLLAREA_IBY + +S60_APP_EXE(unittest_calendaycontentscrollarea) +S60_APP_RESOURCE(unittest_calendaycontentscrollarea) + +// Application registration file. +data=DATAZ_\private\10003a3f\import\apps\unittest_calendaycontentscrollarea_reg.rsc \private\10003a3f\import\apps\unittest_calendaycontentscrollarea_reg.rsc + + +#endif // UNITTEST_CALENDAYCONTENTSCROLLAREA_IBY \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/unittest_calendaycontentscrollarea.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/unittest_calendaycontentscrollarea.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,463 @@ +/* + * 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: Test class for CalenDayContentScrollArea + * + */ +#include +#include +#include +#include +#include + +#include +#include +#include + +#define private public +#define protected public + +#include "calendaycontentscrollarea.h" + +// Test variables +qreal gTestScrollAreaWidth = 300; +qreal gTestScrollAreaHeight = 200; +QRectF gTestWindowRect = QRectF(0, 0, gTestScrollAreaWidth, gTestScrollAreaHeight); +Qt::Orientation gTestOrientation = Qt::Vertical; +Qt::GestureState gTestGestureState = Qt::NoGesture; +qreal gTestSceneSwipeAngle = 0.0; +QSwipeGesture::SwipeDirection gTestSceneHorizontalDirection = QSwipeGesture::NoDirection; + +class TestCalenDayContentScrollArea : public QObject +{ +Q_OBJECT + +public: + TestCalenDayContentScrollArea(); + virtual ~TestCalenDayContentScrollArea(); + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void testConstructors(); + void testScrollToMiddleWidget(); + void testScrollByAmount(); + void testGestureEvent(); + void testEventFilter(); + void testEvent(); + void testMoveTo(); + void testHorizontalSwipe(); + void testMoveFinished(); + void testOrientationChanged(); + +private: + CalenDayContentScrollArea *mContentScrollArea; +}; + +/*! + Constructor + */ +TestCalenDayContentScrollArea::TestCalenDayContentScrollArea() : + mContentScrollArea(NULL) +{ + +} + +/*! + Destructor + */ +TestCalenDayContentScrollArea::~TestCalenDayContentScrollArea() +{ + +} + +/*! + Called before testcase + */ +void TestCalenDayContentScrollArea::initTestCase() +{ + HbStyleLoader::registerFilePath(":/calendayhourelement.css"); + HbStyleLoader::registerFilePath(":/calendayhourelement.widgetml"); + HbStyleLoader::registerFilePath(":/calendayitem.css"); + HbStyleLoader::registerFilePath(":/calendayitem.widgetml"); + HbStyleLoader::registerFilePath(":/calendayeventspane.css"); +} + +/*! + Called after testcase + */ +void TestCalenDayContentScrollArea::cleanupTestCase() +{ + +} + +/*! + Called before every function + */ +void TestCalenDayContentScrollArea::init() +{ + // Create and configure scroll area + mContentScrollArea = new CalenDayContentScrollArea(); + mContentScrollArea->setScrollDirections(Qt::Horizontal | Qt::Vertical); + mContentScrollArea->resize(gTestScrollAreaWidth, gTestScrollAreaHeight); + + // Create and set content widget + qreal contentWidth = mContentScrollArea->mContentWidth; + HbWidget *contentWidget = new HbWidget(); + contentWidget->resize(3*contentWidth, 2*gTestScrollAreaHeight); + mContentScrollArea->setContentWidget(contentWidget); +} + +/*! + Called after everyfunction + */ +void TestCalenDayContentScrollArea::cleanup() +{ + if (mContentScrollArea) { + delete mContentScrollArea; + mContentScrollArea = NULL; + } +} + +/*! + Test function for constructors + 1. Test if content scroll area is not initialized + 2. Test if content scroll area is correcty created + */ +void TestCalenDayContentScrollArea::testConstructors() +{ + //1) + CalenDayContentScrollArea *testContentScrollArea = 0; + QVERIFY(!testContentScrollArea); + + testContentScrollArea = new CalenDayContentScrollArea(); + QVERIFY(testContentScrollArea); + + delete testContentScrollArea; +} + +/*! + Test function for scrollToMiddleWidget + 1. Test if content widget is available + 2. Test initial position of content widget + 3. Test the position of content widget after scrolling + */ +void TestCalenDayContentScrollArea::testScrollToMiddleWidget() +{ + //1) + QVERIFY(mContentScrollArea->contentWidget()); + + //2) + QPointF pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(pos.x(), abs(0.0)); + QCOMPARE(pos.y(), abs(0.0)); + + //3) + qreal contentWidth = mContentScrollArea->mContentWidth; + mContentScrollArea->scrollToMiddleWidget(); + pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(abs(pos.x()), abs(contentWidth)); + QCOMPARE(abs(pos.y()), abs(0.0)); +} + +/*! + Test function for scrollToMiddleWidget + 1. Test if content widget is available + 2. Test initial position of content widget + 3. Test the position of content widget after vertical gesture + 4. Test the position of content widget after horizontal gesture + 5. Test the position of content widget after non-specified gesture + */ +void TestCalenDayContentScrollArea::testScrollByAmount() +{ + //1) + QVERIFY(mContentScrollArea->contentWidget()); + + //2) + QPointF pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(abs(pos.x()), abs(0.0)); + QCOMPARE(abs(pos.y()), abs(0.0)); + + //3) + QPointF delta(50.0, 25.0); + mContentScrollArea->mPanDayDirection + = CalenDayContentScrollArea::ECalenPanVertical; + mContentScrollArea->scrollByAmount(delta); + pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(abs(pos.x()), abs(0.0)); + QCOMPARE(abs(pos.y()), abs(delta.y())); + + //4) + mContentScrollArea->mPanDayDirection + = CalenDayContentScrollArea::ECalenPanHorizontal; + mContentScrollArea->scrollByAmount(delta); + pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(abs(pos.x()), abs(delta.x())); + QCOMPARE(abs(pos.y()), abs(delta.y())); + + //5) + QPointF newDelta(5.0, 5.0); + delta += newDelta; + mContentScrollArea->mPanDayDirection + = CalenDayContentScrollArea::ECalenPanNotSet; + mContentScrollArea->scrollByAmount(newDelta); + pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(abs(pos.x()), abs(delta.x())); + QCOMPARE(abs(pos.y()), abs(delta.y())); +} + +/*! + Test function for gestureEvent + 1. Call gestureEvent with QPanGesture (nothing should happen) + 2. Call gestureEvent with HbSwipeGesture, vertical movement + KCalenSwipeAngle < angle < 180 - KCalenSwipeAngle + 3. Call gestureEvent with HbSwipeGesture, horizontal movement right + angle < KCalenSwipeAngle + 4. Call gestureEvent with HbSwipeGesture, horizontal movement left + 180.0 - KCalenSwipeAngle < angle < 180.0 + */ +void TestCalenDayContentScrollArea::testGestureEvent() +{ + QGestureEvent *gestureEvent = NULL; + mContentScrollArea->mMoveDirection = ECalenScrollNoDayChange; + + //1) + QList list; + QPanGesture *panGesture = new QPanGesture(); + list.append(panGesture); + gestureEvent = new QGestureEvent(list); + mContentScrollArea->gestureEvent(gestureEvent); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange); + + delete gestureEvent; + gestureEvent = NULL; + + //2) + HbSwipeGesture *swipeGesture = new HbSwipeGesture(); + list.append(swipeGesture); + gTestGestureState = Qt::GestureStarted; + gTestSceneSwipeAngle = KCalenSwipeAngle + 1.0; + gestureEvent = new QGestureEvent(list); + mContentScrollArea->gestureEvent(gestureEvent); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange); + + //3) + gTestGestureState = Qt::GestureStarted; + gTestSceneSwipeAngle = KCalenSwipeAngle - 1.0; + gTestSceneHorizontalDirection = QSwipeGesture::Right; + mContentScrollArea->gestureEvent(gestureEvent); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollToPrev); + + //4) + gTestGestureState = Qt::GestureStarted; + gTestSceneSwipeAngle = 180.0 - KCalenSwipeAngle + 1.0; + gTestSceneHorizontalDirection = QSwipeGesture::Left; + mContentScrollArea->gestureEvent(gestureEvent); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollToNext); + + delete gestureEvent; +} + +/*! + Test function for eventFilter + 1. Call eventFilter with event type: None + 2. Call eventFilter with event type: Gesture, scroll area is moving + 3. Call eventFilter with event type: Gesture, scroll area area not moving, + swipe gesture + */ +void TestCalenDayContentScrollArea::testEventFilter() +{ + bool result = false; + + //1) + QEvent noneEvent(QEvent::None); + result = mContentScrollArea->eventFilter(NULL, &noneEvent); + QVERIFY(!result); //false + + //2) + QEvent gestureEvent(QEvent::Gesture); + mContentScrollArea->mIsMoving = true; + result = mContentScrollArea->eventFilter(NULL, &gestureEvent); + QVERIFY(result); //true + + //3) + QSwipeGesture *swipeGesture = new QSwipeGesture(); + QList list; + list.append(swipeGesture); + QGestureEvent *gesture = new QGestureEvent(list); + QEvent *swipeGestureEvent = static_cast (gesture); + + mContentScrollArea->mIsMoving = false; + result = mContentScrollArea->eventFilter(NULL, swipeGestureEvent); + QVERIFY(result); //true + + delete gesture; +} + +/*! + Test function for event + 1. Test event type: Gesture, scroll area not moving + 2. Test event type: Gesture, scroll area is moving + 3. Test event type: FocusOut, scroll area not moving + 4. Test event type: FocusOut, scroll area is moving + 5. Test event type: FocusIn, scroll area not moving + 6. Test event type: FocusIn, scroll area is moving + 7. Test event type: LayoutRequest + */ +void TestCalenDayContentScrollArea::testEvent() +{ + bool result = false; + + //1) + QEvent gestureEvent(QEvent::Gesture); + mContentScrollArea->mIsMoving = false; + result = mContentScrollArea->event(&gestureEvent); + QVERIFY(!result); //false + + //2) + mContentScrollArea->mIsMoving = true; + result = mContentScrollArea->event(&gestureEvent); + QVERIFY(result); //true + + //3) + QEvent focusOutEvent(QEvent::FocusOut); + mContentScrollArea->mIsMoving = false; + result = mContentScrollArea->event(&focusOutEvent); + QVERIFY(!result); //false + + //4) + mContentScrollArea->mIsMoving = true; + result = mContentScrollArea->event(&focusOutEvent); + QVERIFY(result); //true + + //5) + QEvent focusInEvent(QEvent::FocusIn); + mContentScrollArea->mIsMoving = false; + result = mContentScrollArea->event(&focusInEvent); + QVERIFY(!result); //false + + //6) + mContentScrollArea->mIsMoving = true; + result = mContentScrollArea->event(&focusInEvent); + QVERIFY(result); //true + + //7) + QEvent layoutReqEvent(QEvent::LayoutRequest); + QPointF oldPos = mContentScrollArea->contentWidget()->pos(); + mContentScrollArea->event(&layoutReqEvent); + QPointF pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(oldPos == pos, false); +} + +/*! + Test function for moveTo + 1. Test moveTo, day not changed + 2. Test moveTo, day changed to next + 3. Test moveTo, day changed to prev + */ +void TestCalenDayContentScrollArea::testMoveTo() +{ +#ifndef __WINSCW__ + //1) + mContentScrollArea->mMoveDirection = ECalenScrollNoDayChange; + QPointF newPos(10,0); + mContentScrollArea->moveTo(newPos); + QPointF pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(abs(pos.x()), abs(mContentScrollArea->contentWidget()->pos().x())); + QCOMPARE(abs(pos.y()), abs(mContentScrollArea->contentWidget()->pos().y())); + + //2) + newPos = QPointF(20,0); + mContentScrollArea->mMoveDirection = ECalenScrollToNext; + mContentScrollArea->moveTo(newPos); + pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(abs(pos.x()), abs(mContentScrollArea->contentWidget()->pos().x())); + QCOMPARE(abs(pos.y()), abs(mContentScrollArea->contentWidget()->pos().y())); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange); + + //2) + newPos = QPointF(-20,0); + mContentScrollArea->mMoveDirection = ECalenScrollToNext; + mContentScrollArea->moveTo(newPos); + pos = mContentScrollArea->contentWidget()->pos(); + QCOMPARE(abs(mContentScrollArea->contentWidget()->pos().x()), abs(pos.x())); + QCOMPARE(abs(mContentScrollArea->contentWidget()->pos().y()), abs(pos.y())); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange); +#endif /* __WINSCW__ */ +} + +/*! + Test function for checking if swipe is horizontal or not + 1) test Horizontal swipe + 2) test no horizontal swipe + */ +void TestCalenDayContentScrollArea::testHorizontalSwipe() +{ +#ifndef __WINSCW__ + //1) + QCOMPARE(mContentScrollArea->isHorizontalSwipe(KCalenSwipeAngle - 5), true); + + //2) + QCOMPARE(mContentScrollArea->isHorizontalSwipe(KCalenSwipeAngle + 5), false); +#endif /* __WINSCW__ */ +} + +/*! + Test moveFinished slot + 1) test moveFinished, no day change + 2) test moveFinished, day changed to next + 3) test moveFinished, day changed to prev + */ +void TestCalenDayContentScrollArea::testMoveFinished() +{ +#ifndef __WINSCW__ + //1) + mContentScrollArea->mMoveDirection = ECalenScrollNoDayChange; + mContentScrollArea->moveFinished(); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange); + + //2) + mContentScrollArea->mMoveDirection = ECalenScrollToNext; + mContentScrollArea->moveFinished(); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange); + + //3) + mContentScrollArea->mMoveDirection = ECalenScrollToPrev; + mContentScrollArea->moveFinished(); + QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange); +#endif /* __WINSCW__ */ +} + +/*! + Test orientationChanged slot + 1) test orientation changed to horizontal + 2) test orientation changed to vertical + */ +void TestCalenDayContentScrollArea::testOrientationChanged() +{ +#ifndef __WINSCW__ + //1) + mContentScrollArea->orientationChanged(Qt::Horizontal); + QCOMPARE(mContentScrollArea->mOrientation, Qt::Horizontal); + + //2) + mContentScrollArea->orientationChanged(Qt::Vertical); + QCOMPARE(mContentScrollArea->mOrientation, Qt::Vertical); +#endif /* __WINSCW__ */ +} + +QTEST_MAIN(TestCalenDayContentScrollArea); +#include "unittest_calendaycontentscrollarea.moc" diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/unittest_calendaycontentscrollarea.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/unittest_calendaycontentscrollarea.pro Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,65 @@ +# +# 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: calendaycontentscrollarea test project file +# + +TEMPLATE = app +TARGET = unittest_calendaycontentscrollarea + +DEFINES += CALENVIEWS_DLL + +MOC_DIR = moc + +CONFIG += qtestlib +CONFIG += symbian_test +CONFIG += hb + +INCLUDEPATH += . \ + ../../../inc/ \ + ./../../../../inc/ \ + ./../../../../../inc/ + +DEPENDPATH += . \ + ../../../inc/ \ + ../../../src/ \ + ./../../../../inc/ \ + ./../../../../../inc/ + +# Input +HEADERS += calendaycontentscrollarea.h \ + calendayutils.h \ + hbinstance.h \ + hbmainwindow.h \ + hbswipegesture.h + +SOURCES += unittest_calendaycontentscrollarea.cpp \ + calendaycontentscrollarea.cpp \ + calendayutils.cpp + +RESOURCES += ../../../resources/calendaywidgets.qrc + +symbian : { + TARGET.CAPABILITY = CAP_APPLICATION + MMP_RULES += "USERINCLUDE ." + + BLD_INF_RULES.prj_testexports += \ + "./rom/unittest_calendaycontentscrollarea.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendaycontentscrollarea.iby)" + + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE + + LIBS += -lagendainterface \ + -lcalencommonutils +} + +# End of file --Don't remove this. diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/HbInstance --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/HbInstance Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,1 @@ +#include "hbinstance.h" diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayitemtest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayitemtest.h Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,80 @@ +/* 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: Test class for CalenDayItem + * + */ + +#ifndef CALENDAYITEMTEST_H +#define CALENDAYITEMTEST_H + +// System includes +#include +#include +#include +#include +#include +#include + +// User includes +#include "calendaycommonheaders.h" +#include "calendayitem.h" +#include "calendaystatusstrip.h" +#include "calendaymodel.h" +#include "calendayutils.h" +#include "calenagendautils.h" +#include "calendaycontainer.h" + +#ifndef __WINSCW__ +#define private public +#define protected public +#endif + +#include "calendayitem.h" + +class CalenDayItemTest : public CalenDayItem +{ +public: + CalenDayItemTest::CalenDayItemTest(const CalenDayContainer *container) : + CalenDayItem(container) + { +#ifndef __WINSCW__ + mBg = new HbFrameItem("qtg_fr_cal_meeting_bg", HbFrameDrawer::NinePieces, + this); + mEventDesc = new HbTextItem(this); + // TODO: probably ElideLeft needed for mirrored layout + mEventDesc->setElideMode(Qt::ElideRight); + mEventDesc->setTextWrapping(Hb::TextWrapAnywhere); + mColorStripe = new CalenDayStatusStrip(this); + + HbStyle::setItemName(mBg, QLatin1String("backgroundFrame")); + HbStyle::setItemName(mEventDesc, QLatin1String("eventDescription")); + HbStyle::setItemName(static_cast (mColorStripe), + QLatin1String("colorStripe")); + + HbDeviceProfile deviceProfile; + qreal stripeWidth = KCalenTimeStripWidth * deviceProfile.unitValue(); + mColorStripe->setPreferredWidth(stripeWidth); + + // Minimum size of event frame (without/with description) + mFrameMinWidth = KCalenMinEventWidth * deviceProfile.unitValue(); + mEventDescMinWidth = KCalenMinTouchableEventWidth + * deviceProfile.unitValue(); + + // Minimum width is assured by widgetml and css, additionally called here + // to prevent minimum size hint caching inside effectiveSizeHint + setMinimumWidth(stripeWidth); +#endif + } +}; + +#endif diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -23,10 +23,28 @@ #include "agendaentry.h" #include "calendaycontainer.h" +// System includes +#include +#include +#include +#include +#include + +// User includes +#include "calendaycommonheaders.h" +#include "calendaystatusstrip.h" +#include "calendaymodel.h" +#include "calendayutils.h" +#include "calenagendautils.h" +#include "calendaycontainer.h" + +#ifndef __WINSCW__ #define private public #define protected public +#endif #include "calendayitem.h" +#include "calendayitemtest.h" QRectF gTestWindowRect; @@ -53,15 +71,14 @@ void testConstructors(); private: - CalenDayItem *mItem; + CalenDayItemTest *mItem; CalenDayContainer *mContainer; }; /*! Constructor */ -TestCalenDayItem::TestCalenDayItem() : - mItem(NULL), mContainer(NULL) +TestCalenDayItem::TestCalenDayItem() : mItem(NULL), mContainer(NULL) { } @@ -95,10 +112,11 @@ void TestCalenDayItem::init() { mContainer = new CalenDayContainer(); - mItem = new CalenDayItem(mContainer); - + mItem = new CalenDayItemTest(mContainer); +#ifndef __WINSCW__ mItem->mBg = new HbFrameItem(); mItem->mEventDesc = new HbTextItem(0); +#endif } /*! @@ -125,11 +143,11 @@ void TestCalenDayItem::testConstructors() { //1) - CalenDayItem *testItem = 0; + CalenDayItemTest *testItem = 0; QVERIFY(!testItem); //2) - testItem = new CalenDayItem(mContainer); + testItem = new CalenDayItemTest(mContainer); QVERIFY(testItem); delete testItem; } @@ -140,59 +158,61 @@ 2. Test if is the same as orginal. */ void TestCalenDayItem::testCreateItem() - { - HbAbstractViewItem *testItem = mItem->createItem(); - QVERIFY(testItem); - delete testItem; - } +{ + HbAbstractViewItem *testItem = mItem->createItem(); + QVERIFY(testItem); + delete testItem; +} void TestCalenDayItem::testUpdateChildItems() - { - - } +{ + +} void TestCalenDayItem::testHasEventDescription() - { - QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent(); - qreal width = mItem->rect().width(); - - qDebug() << "inited"; - - mItem->mEventDescMinWidth = width - 4; - - qDebug() << "before resize"; - - mItem->resizeEvent(event); - - qDebug() << "resize called"; - - QVERIFY(mItem->hasEventDescription() == true); - - - mItem->mEventDescMinWidth = width + 8; - mItem->resizeEvent(event); - - qDebug() << "resize 2 called"; - - QVERIFY(mItem->hasEventDescription() == false); - } +{ +#ifndef __WINSCW__ + QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent(); + qreal width = mItem->rect().width(); + + qDebug() << "inited"; + + mItem->mEventDescMinWidth = width - 4; + + qDebug() << "before resize"; + + mItem->resizeEvent(event); + + qDebug() << "resize called"; + + QVERIFY(mItem->hasEventDescription() == true); + + mItem->mEventDescMinWidth = width + 8; + mItem->resizeEvent(event); + + qDebug() << "resize 2 called"; + + QVERIFY(mItem->hasEventDescription() == false); +#endif +} void TestCalenDayItem::testHasBackgroundFrame() - { - QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent(); - qreal width = mItem->rect().width(); +{ +#ifndef __WINSCW__ + QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent(); + qreal width = mItem->rect().width(); + mItem->mFrameMinWidth = width - 4; + mItem->resizeEvent(event); - mItem->mFrameMinWidth = width - 4; - mItem->resizeEvent(event); - - QVERIFY(mItem->hasBackgroundFrame() == true); - - mItem->mFrameMinWidth = width + 8; - mItem->resizeEvent(event); - - QVERIFY(mItem->hasBackgroundFrame() == false); - } + QVERIFY(mItem->hasBackgroundFrame() == true); + + mItem->mFrameMinWidth = width + 8; + mItem->resizeEvent(event); + + QVERIFY(mItem->hasBackgroundFrame() == false); +#endif +} QTEST_MAIN(TestCalenDayItem); #include "unittest_calendayitem.moc" diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Mon Sep 06 10:12:45 2010 +0530 @@ -35,7 +35,8 @@ ./../../../../../inc/ # Input -HEADERS += calendayitem.h \ +HEADERS += calendayitemtest.h \ + calendayitem.h \ calendaystatusstrip.h \ calendaycontainer.h \ calendayutils.h \ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/HbInstance --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/HbInstance Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,1 @@ +#include "hbinstance.h" \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/calendayutils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/calendayutils.h Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,46 @@ +/*! + Mocked class CalenDayUtils + */ +/* + * 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: CalenDayUtils utility class header. + * + */ + +#ifndef CALENDAYUTILS_H_ +#define CALENDAYUTILS_H_ + +class CalenDayUtils +{ +public: + static CalenDayUtils *instance() + { + return new CalenDayUtils(); + } + ~CalenDayUtils() + { + } + + qreal hourElementHeight() + { + return 30; + } + +protected: + CalenDayUtils() + { + } +}; + +#endif /* CALENDAYUTILS_H_ */ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -242,26 +242,51 @@ QTest::addColumn("testStartValue"); QTest::addColumn("testEndValue"); - QTest::newRow("Full time start and end") << QTime(10,00,00) - << QTime(11,00,00) - << QTime(10,00,00) - << QTime(11,00,00); - QTest::newRow("Exactly 30min time start and end") << QTime(10,30,00) - << QTime(11,30,00) - << QTime(10,30,00) - << QTime(11,30,00); - QTest::newRow("More than 30min time start and end") << QTime(10,40,00) - << QTime(12,35,00) - << QTime(10,30,00) - << QTime(13,00,00); - QTest::newRow("time start > 30m and end > 23h30m") << QTime(20,35,00) - << QTime(23,35,00) - << QTime(20,30,00) - << QTime(23,59,00); - QTest::newRow("time start < 30m and end > 23h00m") << QTime(11,19,00) - << QTime(23,10,00) - << QTime(11,00,00) - << QTime(23,30,00); + QTest::newRow("Full time start and end") + << QTime(10,00,00) + << QTime(11,00,00) + << QTime(10,00,00) + << QTime(11,00,00); + QTest::newRow("Exactly 15m time start and end") + << QTime(10, 15, 00) + << QTime(11, 15, 00) + << QTime(10, 15, 00) + << QTime(11, 15, 00); + QTest::newRow("More than 15m, less than 30m time start and end") + << QTime(10,18,00) + << QTime(10,24,00) + << QTime(10,15,00) + << QTime(10,30,00); + QTest::newRow("Exactly 30m time start and end") + << QTime(9, 30, 00) + << QTime(10, 30, 00) + << QTime(9, 30, 00) + << QTime(10, 30, 00); + QTest::newRow("More than 30m, less than 45m time start and end") + << QTime(10,32,00) + << QTime(10,43,00) + << QTime(10,30,00) + << QTime(10,45,00); + QTest::newRow("Exactly 45m time start and end") + << QTime(9, 45, 00) + << QTime(10, 45, 00) + << QTime(9, 45, 00) + << QTime(10, 45, 00); + QTest::newRow("More than 45m, less than 60m time start and end") + << QTime(10,48,00) + << QTime(10,57,00) + << QTime(10,45,00) + << QTime(11,00,00); + QTest::newRow("time start > 45m and end > 23h45m") + << QTime(20,47,00) + << QTime(23,55,00) + << QTime(20,45,00) + << QTime(23,59,00); + QTest::newRow("time start < 30m and (23h30m < end < 23h45m") + << QTime(11,19,00) + << QTime(23,38,00) + << QTime(11,15,00) + << QTime(23,45,00); } /*! @@ -279,7 +304,7 @@ //run function QPair testStartEndValue = mStatusStrip->calculateStartEndPostion(testedStartValue, - testedEndValue); + testedEndValue); //check data QCOMPARE(testStartEndValue.first,testStartValue); QCOMPARE(testStartEndValue.second,testEndValue); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.pro --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.pro Mon Sep 06 10:12:45 2010 +0530 @@ -36,7 +36,8 @@ # Input HEADERS += calendaystatusstrip.h \ - calendaystatusstriptest.h + calendaystatusstriptest.h \ + calendayutils.h SOURCES += unittest_calendaystatusstrip.cpp \ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/HbInstance --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/HbInstance Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,1 @@ +#include "hbinstance.h" \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/HbStyle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/HbStyle Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,1 @@ +#include "hbstyle.h" \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -129,7 +129,7 @@ { qreal hEH = mUtils->hourElementHeight(); - qreal myHeight = mUnit * 3 + param_value * 4; + qreal myHeight = mUnit* 4.1 + param_value * 2 + param_value * 2; QCOMPARE(hEH, myHeight); } diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/dayview/tsrc/unittests/unittests.pro --- a/calendarui/views/dayview/tsrc/unittests/unittests.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittests.pro Mon Sep 06 10:12:45 2010 +0530 @@ -28,7 +28,8 @@ unittest_calendaymodel \ unittest_calendayitemview \ unittest_calendaymodelmanager \ - unittest_calendayview + unittest_calendayview \ + unittest_calendaycontentscrollarea CONFIG += symbian_test diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/eabi/calenviewsu.def --- a/calendarui/views/eabi/calenviewsu.def Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/eabi/calenviewsu.def Mon Sep 06 10:12:45 2010 +0530 @@ -18,254 +18,253 @@ _ZN14CalenMonthGrid15getCurrentIndexEv @ 17 NONAME _ZN14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 18 NONAME _ZN14CalenMonthGrid16staticMetaObjectE @ 19 NONAME DATA 16 - _ZN14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 20 NONAME - _ZN14CalenMonthGrid17scrollingFinishedEv @ 21 NONAME - _ZN14CalenMonthGrid18orientationChangedEN2Qt11OrientationE @ 22 NONAME - _ZN14CalenMonthGrid19getStaticMetaObjectEv @ 23 NONAME - _ZN14CalenMonthGrid19handleAppendingRowsER5QListI14CalenMonthDataE @ 24 NONAME - _ZN14CalenMonthGrid19setFocusToProperDayEv @ 25 NONAME - _ZN14CalenMonthGrid20handlePrependingRowsER5QListI14CalenMonthDataE @ 26 NONAME - _ZN14CalenMonthGrid20updateMonthGridModelER5QListI14CalenMonthDataEib @ 27 NONAME - _ZN14CalenMonthGrid24handlePanGestureFinishedEv @ 28 NONAME - _ZN14CalenMonthGrid33updateMonthGridWithInActiveMonthsER5QListI14CalenMonthDataE @ 29 NONAME - _ZN14CalenMonthGrid34updateMonthGridWithEventIndicatorsER5QListI14CalenMonthDataE @ 30 NONAME - _ZN14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 31 NONAME - _ZN14CalenMonthGrid7setViewEP14CalenMonthView @ 32 NONAME - _ZN14CalenMonthGrid9upGestureEv @ 33 NONAME - _ZN14CalenMonthGridC1EP13QGraphicsItem @ 34 NONAME - _ZN14CalenMonthGridC2EP13QGraphicsItem @ 35 NONAME - _ZN14CalenMonthGridD0Ev @ 36 NONAME - _ZN14CalenMonthGridD1Ev @ 37 NONAME - _ZN14CalenMonthGridD2Ev @ 38 NONAME - _ZN14CalenMonthView10createGridEv @ 39 NONAME - _ZN14CalenMonthView11qt_metacallEN11QMetaObject4CallEiPPv @ 40 NONAME - _ZN14CalenMonthView11qt_metacastEPKc @ 41 NONAME - _ZN14CalenMonthView12createEditorEv @ 42 NONAME - _ZN14CalenMonthView12doPopulationEv @ 43 NONAME - _ZN14CalenMonthView12getActiveDayEv @ 44 NONAME - _ZN14CalenMonthView12setActiveDayE9QDateTime @ 45 NONAME - _ZN14CalenMonthView13doLazyLoadingEv @ 46 NONAME - _ZN14CalenMonthView13getCurrentDayEv @ 47 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 - _ZN14CalenMonthView17populateNextMonthEv @ 64 NONAME - _ZN14CalenMonthView17populatePrevMonthEv @ 65 NONAME - _ZN14CalenMonthView17removeWeekNumbersEv @ 66 NONAME - _ZN14CalenMonthView18addBackgroundFrameEv @ 67 NONAME - _ZN14CalenMonthView18completePopulationEv @ 68 NONAME - _ZN14CalenMonthView19getStaticMetaObjectEv @ 69 NONAME - _ZN14CalenMonthView19populatePreviewPaneER9QDateTime @ 70 NONAME - _ZN14CalenMonthView20prepareForPopulationEv @ 71 NONAME - _ZN14CalenMonthView21refreshViewOnGoToDateEv @ 72 NONAME - _ZN14CalenMonthView22addRemoveActionsInMenuEv @ 73 NONAME - _ZN14CalenMonthView22setContextForActiveDayEi @ 74 NONAME - _ZN14CalenMonthView22updateWeekNumGridModelEv @ 75 NONAME - _ZN14CalenMonthView23handleChangeOrientationEv @ 76 NONAME - _ZN14CalenMonthView23handleGridItemActivatedEv @ 77 NONAME - _ZN14CalenMonthView24handlePreviewPaneGestureEb @ 78 NONAME - _ZN14CalenMonthView24populateWithInstanceViewEv @ 79 NONAME - _ZN14CalenMonthView24updateModelWithPrevMonthEv @ 80 NONAME - _ZN14CalenMonthView25handleLeftEffectCompletedERKN8HbEffect12EffectStatusE @ 81 NONAME - _ZN14CalenMonthView26fetchEntriesAndUpdateModelEv @ 82 NONAME - _ZN14CalenMonthView26handleRightEffectCompletedERKN8HbEffect12EffectStatusE @ 83 NONAME - _ZN14CalenMonthView26updateModelWithFutureMonthEv @ 84 NONAME - _ZN14CalenMonthView27showHideRegionalInformationEv @ 85 NONAME - _ZN14CalenMonthView35updateMonthDataArrayWithActiveDatesEv @ 86 NONAME - _ZN14CalenMonthView7setDateEv @ 87 NONAME - _ZN14CalenMonthView9goToTodayEv @ 88 NONAME - _ZN14CalenMonthView9setupViewEP14CalenDocLoader @ 89 NONAME - _ZN14CalenMonthViewC1ER14MCalenServices @ 90 NONAME - _ZN14CalenMonthViewC2ER14MCalenServices @ 91 NONAME - _ZN14CalenMonthViewD0Ev @ 92 NONAME - _ZN14CalenMonthViewD1Ev @ 93 NONAME - _ZN14CalenMonthViewD2Ev @ 94 NONAME - _ZN15CalenAgendaView12doPopulationEv @ 95 NONAME - _ZN15CalenAgendaView14clearListModelEv @ 96 NONAME - _ZN15CalenAgendaView18HandleNotificationE18TCalenNotification @ 97 NONAME - _ZN15CalenAgendaView26disconnectAboutToQuitEventEv @ 98 NONAME - _ZN15CalenAgendaView9docLoaderEv @ 99 NONAME - _ZN15CalenAgendaView9setupViewEP14CalenDocLoader @ 100 NONAME - _ZN15CalenAgendaViewC1ER14MCalenServices @ 101 NONAME - _ZN15CalenAgendaViewC2ER14MCalenServices @ 102 NONAME - _ZN15CalenAgendaViewD0Ev @ 103 NONAME - _ZN15CalenAgendaViewD1Ev @ 104 NONAME - _ZN15CalenAgendaViewD2Ev @ 105 NONAME - _ZN15CalenNativeView17captureScreenshotEb @ 106 NONAME - _ZN16CalenPluginLabelC1ER14MCalenServicesP13QGraphicsItem @ 107 NONAME - _ZN16CalenPluginLabelC2ER14MCalenServicesP13QGraphicsItem @ 108 NONAME - _ZN16CalenPluginLabelD0Ev @ 109 NONAME - _ZN16CalenPluginLabelD1Ev @ 110 NONAME - _ZN16CalenPluginLabelD2Ev @ 111 NONAME - _ZN16CalenPreviewPane11qt_metacallEN11QMetaObject4CallEiPPv @ 112 NONAME - _ZN16CalenPreviewPane11qt_metacastEPKc @ 113 NONAME - _ZN16CalenPreviewPane12gestureEventEP13QGestureEvent @ 114 NONAME - _ZN16CalenPreviewPane13populateLabelE9QDateTime @ 115 NONAME - _ZN16CalenPreviewPane13stopScrollingEv @ 116 NONAME - _ZN16CalenPreviewPane15startAutoScrollEv @ 117 NONAME - _ZN16CalenPreviewPane16GetInstanceListLEv @ 118 NONAME - _ZN16CalenPreviewPane16staticMetaObjectE @ 119 NONAME DATA 16 - _ZN16CalenPreviewPane17scrollingFinishedEv @ 120 NONAME - _ZN16CalenPreviewPane17setNoEntriesLabelEP7HbLabel @ 121 NONAME - _ZN16CalenPreviewPane19getStaticMetaObjectEv @ 122 NONAME - _ZN16CalenPreviewPane19onTwoSecondsTimeoutEv @ 123 NONAME - _ZN16CalenPreviewPane21checkStartTimeOfEventER9QDateTime @ 124 NONAME - _ZN16CalenPreviewPane4DateEv @ 125 NONAME - _ZN16CalenPreviewPane7setViewEP14CalenMonthView @ 126 NONAME - _ZN16CalenPreviewPaneC1ER14MCalenServicesP13QGraphicsItem @ 127 NONAME - _ZN16CalenPreviewPaneC2ER14MCalenServicesP13QGraphicsItem @ 128 NONAME - _ZN16CalenPreviewPaneD0Ev @ 129 NONAME - _ZN16CalenPreviewPaneD1Ev @ 130 NONAME - _ZN16CalenPreviewPaneD2Ev @ 131 NONAME - _ZN17CalenSettingsView11qt_metacallEN11QMetaObject4CallEiPPv @ 132 NONAME - _ZN17CalenSettingsView11qt_metacastEPKc @ 133 NONAME - _ZN17CalenSettingsView11refreshViewEv @ 134 NONAME - _ZN17CalenSettingsView14initializeFormEv @ 135 NONAME - _ZN17CalenSettingsView16staticMetaObjectE @ 136 NONAME DATA 16 - _ZN17CalenSettingsView18launchPreviousViewEv @ 137 NONAME - _ZN17CalenSettingsView19getStaticMetaObjectEv @ 138 NONAME - _ZN17CalenSettingsViewC1ER14MCalenServicesP13QGraphicsItem @ 139 NONAME - _ZN17CalenSettingsViewC2ER14MCalenServicesP13QGraphicsItem @ 140 NONAME - _ZN17CalenSettingsViewD0Ev @ 141 NONAME - _ZN17CalenSettingsViewD1Ev @ 142 NONAME - _ZN17CalenSettingsViewD2Ev @ 143 NONAME - _ZN21CalenAgendaViewWidgetC1ER14MCalenServicesP14CalenDocLoader @ 144 NONAME - _ZN21CalenAgendaViewWidgetC2ER14MCalenServicesP14CalenDocLoader @ 145 NONAME - _ZN21CalenAgendaViewWidgetD0Ev @ 146 NONAME - _ZN21CalenAgendaViewWidgetD1Ev @ 147 NONAME - _ZN21CalenAgendaViewWidgetD2Ev @ 148 NONAME - _ZN21CalenThickLinesDrawer11qt_metacallEN11QMetaObject4CallEiPPv @ 149 NONAME - _ZN21CalenThickLinesDrawer11qt_metacastEPKc @ 150 NONAME - _ZN21CalenThickLinesDrawer16staticMetaObjectE @ 151 NONAME DATA 16 - _ZN21CalenThickLinesDrawer19getStaticMetaObjectEv @ 152 NONAME - _ZN21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 153 NONAME - _ZN21CalenThickLinesDrawerC1EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 154 NONAME - _ZN21CalenThickLinesDrawerC2EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 155 NONAME - _ZN21CalenThickLinesDrawerD0Ev @ 156 NONAME - _ZN21CalenThickLinesDrawerD1Ev @ 157 NONAME - _ZN21CalenThickLinesDrawerD2Ev @ 158 NONAME - _ZNK14CalenMonthGrid10metaObjectEv @ 159 NONAME - _ZNK14CalenMonthView10metaObjectEv @ 160 NONAME - _ZNK16CalenPreviewPane10metaObjectEv @ 161 NONAME - _ZNK17CalenSettingsView10metaObjectEv @ 162 NONAME - _ZNK21CalenThickLinesDrawer10metaObjectEv @ 163 NONAME - _ZTI14CalenMonthGrid @ 164 NONAME - _ZTI14CalenMonthView @ 165 NONAME - _ZTI16CalenPreviewPane @ 166 NONAME - _ZTI17CalenSettingsView @ 167 NONAME - _ZTI21CalenThickLinesDrawer @ 168 NONAME - _ZTV14CalenMonthGrid @ 169 NONAME - _ZTV14CalenMonthView @ 170 NONAME - _ZTV16CalenPreviewPane @ 171 NONAME - _ZTV17CalenSettingsView @ 172 NONAME - _ZTV21CalenThickLinesDrawer @ 173 NONAME - _ZThn16_N12CalenDayViewD0Ev @ 174 NONAME - _ZThn16_N12CalenDayViewD1Ev @ 175 NONAME - _ZThn16_N14CalenMonthGridD0Ev @ 176 NONAME - _ZThn16_N14CalenMonthGridD1Ev @ 177 NONAME - _ZThn16_N14CalenMonthViewD0Ev @ 178 NONAME - _ZThn16_N14CalenMonthViewD1Ev @ 179 NONAME - _ZThn16_N15CalenAgendaViewD0Ev @ 180 NONAME - _ZThn16_N15CalenAgendaViewD1Ev @ 181 NONAME - _ZThn16_N16CalenPluginLabelD0Ev @ 182 NONAME - _ZThn16_N16CalenPluginLabelD1Ev @ 183 NONAME - _ZThn16_N16CalenPreviewPaneD0Ev @ 184 NONAME - _ZThn16_N16CalenPreviewPaneD1Ev @ 185 NONAME - _ZThn16_N17CalenSettingsViewD0Ev @ 186 NONAME - _ZThn16_N17CalenSettingsViewD1Ev @ 187 NONAME - _ZThn16_N21CalenAgendaViewWidgetD0Ev @ 188 NONAME - _ZThn16_N21CalenAgendaViewWidgetD1Ev @ 189 NONAME - _ZThn16_N21CalenThickLinesDrawerD0Ev @ 190 NONAME - _ZThn16_N21CalenThickLinesDrawerD1Ev @ 191 NONAME - _ZThn28_N15CalenAgendaView18HandleNotificationE18TCalenNotification @ 192 NONAME - _ZThn8_N12CalenDayViewD0Ev @ 193 NONAME - _ZThn8_N12CalenDayViewD1Ev @ 194 NONAME - _ZThn8_N14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 195 NONAME - _ZThn8_N14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 196 NONAME - _ZThn8_N14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 197 NONAME - _ZThn8_N14CalenMonthGridD0Ev @ 198 NONAME - _ZThn8_N14CalenMonthGridD1Ev @ 199 NONAME - _ZThn8_N14CalenMonthViewD0Ev @ 200 NONAME - _ZThn8_N14CalenMonthViewD1Ev @ 201 NONAME - _ZThn8_N15CalenAgendaViewD0Ev @ 202 NONAME - _ZThn8_N15CalenAgendaViewD1Ev @ 203 NONAME - _ZThn8_N16CalenPluginLabelD0Ev @ 204 NONAME - _ZThn8_N16CalenPluginLabelD1Ev @ 205 NONAME - _ZThn8_N16CalenPreviewPaneD0Ev @ 206 NONAME - _ZThn8_N16CalenPreviewPaneD1Ev @ 207 NONAME - _ZThn8_N17CalenSettingsViewD0Ev @ 208 NONAME - _ZThn8_N17CalenSettingsViewD1Ev @ 209 NONAME - _ZThn8_N21CalenAgendaViewWidgetD0Ev @ 210 NONAME - _ZThn8_N21CalenAgendaViewWidgetD1Ev @ 211 NONAME - _ZThn8_N21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 212 NONAME - _ZThn8_N21CalenThickLinesDrawerD0Ev @ 213 NONAME - _ZThn8_N21CalenThickLinesDrawerD1Ev @ 214 NONAME - _ZN22CalenDayHourScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 215 NONAME - _ZN22CalenDayHourScrollArea11qt_metacastEPKc @ 216 NONAME - _ZN22CalenDayHourScrollArea11setDateTimeERK9QDateTime @ 217 NONAME - _ZN22CalenDayHourScrollArea12scrollToHourEi @ 218 NONAME - _ZN22CalenDayHourScrollArea16scrollVerticallyERK7QPointF @ 219 NONAME - _ZN22CalenDayHourScrollArea16staticMetaObjectE @ 220 NONAME DATA 16 - _ZN22CalenDayHourScrollArea19getStaticMetaObjectEv @ 221 NONAME - _ZN22CalenDayHourScrollAreaC1EP13QGraphicsItem @ 222 NONAME - _ZN22CalenDayHourScrollAreaC2EP13QGraphicsItem @ 223 NONAME - _ZN22CalenDayHourScrollAreaD0Ev @ 224 NONAME - _ZN22CalenDayHourScrollAreaD1Ev @ 225 NONAME - _ZN22CalenDayHourScrollAreaD2Ev @ 226 NONAME - _ZN25CalenDayContentScrollArea11eventFilterEP7QObjectP6QEvent @ 227 NONAME - _ZN25CalenDayContentScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 228 NONAME - _ZN25CalenDayContentScrollArea11qt_metacastEPKc @ 229 NONAME - _ZN25CalenDayContentScrollArea12gestureEventEP13QGestureEvent @ 230 NONAME - _ZN25CalenDayContentScrollArea12moveFinishedEv @ 231 NONAME - _ZN25CalenDayContentScrollArea14scrollByAmountERK7QPointF @ 232 NONAME - _ZN25CalenDayContentScrollArea16staticMetaObjectE @ 233 NONAME DATA 16 - _ZN25CalenDayContentScrollArea17checkPanDirectionEP11QPanGesture @ 234 NONAME - _ZN25CalenDayContentScrollArea18orientationChangedEN2Qt11OrientationE @ 235 NONAME - _ZN25CalenDayContentScrollArea19getStaticMetaObjectEv @ 236 NONAME - _ZN25CalenDayContentScrollArea20scrollToMiddleWidgetEv @ 237 NONAME - _ZN25CalenDayContentScrollArea21scrollAreaMoveStartedE20CalenScrollDirection @ 238 NONAME - _ZN25CalenDayContentScrollArea22scrollAreaMoveFinishedE20CalenScrollDirection @ 239 NONAME - _ZN25CalenDayContentScrollArea5eventEP6QEvent @ 240 NONAME - _ZN25CalenDayContentScrollArea6moveToERK7QPointFi @ 241 NONAME - _ZN25CalenDayContentScrollAreaC1EP13QGraphicsItem @ 242 NONAME - _ZN25CalenDayContentScrollAreaC2EP13QGraphicsItem @ 243 NONAME - _ZN25CalenDayContentScrollAreaD0Ev @ 244 NONAME - _ZN25CalenDayContentScrollAreaD1Ev @ 245 NONAME - _ZN25CalenDayContentScrollAreaD2Ev @ 246 NONAME - _ZNK22CalenDayHourScrollArea10metaObjectEv @ 247 NONAME - _ZNK22CalenDayHourScrollArea8dateTimeEv @ 248 NONAME - _ZNK25CalenDayContentScrollArea10metaObjectEv @ 249 NONAME - _ZTI22CalenDayHourScrollArea @ 250 NONAME - _ZTI25CalenDayContentScrollArea @ 251 NONAME - _ZTV22CalenDayHourScrollArea @ 252 NONAME - _ZTV25CalenDayContentScrollArea @ 253 NONAME - _ZThn16_N22CalenDayHourScrollAreaD0Ev @ 254 NONAME - _ZThn16_N22CalenDayHourScrollAreaD1Ev @ 255 NONAME - _ZThn16_N25CalenDayContentScrollAreaD0Ev @ 256 NONAME - _ZThn16_N25CalenDayContentScrollAreaD1Ev @ 257 NONAME - _ZThn8_N22CalenDayHourScrollAreaD0Ev @ 258 NONAME - _ZThn8_N22CalenDayHourScrollAreaD1Ev @ 259 NONAME - _ZThn8_N25CalenDayContentScrollAreaD0Ev @ 260 NONAME - _ZThn8_N25CalenDayContentScrollAreaD1Ev @ 261 NONAME - _ZN14CalenMonthGrid17handleThemeChangeEv @ 262 NONAME - _ZN14CalenMonthView17handleThemeChangeEv @ 263 NONAME - _ZN16CalenPreviewPane13effectStartedEv @ 264 NONAME - _ZN16CalenPreviewPane14effectFinishedEv @ 265 NONAME - _ZN21CalenThickLinesDrawer17handleThemeChangeEv @ 266 NONAME - _ZN16CalenPreviewPane17handleThemeChangeEv @ 267 NONAME - _ZNK25CalenDayContentScrollArea17isHorizontalSwipeEf @ 268 NONAME - _ZN14CalenMonthView26disconnectAboutToQuitEventEv @ 269 NONAME + _ZN14CalenMonthGrid17handleThemeChangeEv @ 20 NONAME + _ZN14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 21 NONAME + _ZN14CalenMonthGrid17scrollingFinishedEv @ 22 NONAME + _ZN14CalenMonthGrid18orientationChangedEN2Qt11OrientationE @ 23 NONAME + _ZN14CalenMonthGrid19getStaticMetaObjectEv @ 24 NONAME + _ZN14CalenMonthGrid19handleAppendingRowsER5QListI14CalenMonthDataE @ 25 NONAME + _ZN14CalenMonthGrid19setFocusToProperDayEv @ 26 NONAME + _ZN14CalenMonthGrid20handlePrependingRowsER5QListI14CalenMonthDataE @ 27 NONAME + _ZN14CalenMonthGrid20updateMonthGridModelER5QListI14CalenMonthDataEib @ 28 NONAME + _ZN14CalenMonthGrid24handlePanGestureFinishedEv @ 29 NONAME + _ZN14CalenMonthGrid33updateMonthGridWithInActiveMonthsER5QListI14CalenMonthDataE @ 30 NONAME + _ZN14CalenMonthGrid34updateMonthGridWithEventIndicatorsER5QListI14CalenMonthDataE @ 31 NONAME + _ZN14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 32 NONAME + _ZN14CalenMonthGrid7setViewEP14CalenMonthView @ 33 NONAME + _ZN14CalenMonthGrid9upGestureEv @ 34 NONAME + _ZN14CalenMonthGridC1EP13QGraphicsItem @ 35 NONAME + _ZN14CalenMonthGridC2EP13QGraphicsItem @ 36 NONAME + _ZN14CalenMonthGridD0Ev @ 37 NONAME + _ZN14CalenMonthGridD1Ev @ 38 NONAME + _ZN14CalenMonthGridD2Ev @ 39 NONAME + _ZN14CalenMonthView10createGridEv @ 40 NONAME + _ZN14CalenMonthView11qt_metacallEN11QMetaObject4CallEiPPv @ 41 NONAME + _ZN14CalenMonthView11qt_metacastEPKc @ 42 NONAME + _ZN14CalenMonthView12createEditorEv @ 43 NONAME + _ZN14CalenMonthView12doPopulationEv @ 44 NONAME + _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 + _ZN21CalenThickLinesDrawerC1EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 161 NONAME + _ZN21CalenThickLinesDrawerC2EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 162 NONAME + _ZN21CalenThickLinesDrawerD0Ev @ 163 NONAME + _ZN21CalenThickLinesDrawerD1Ev @ 164 NONAME + _ZN21CalenThickLinesDrawerD2Ev @ 165 NONAME + _ZN22CalenDayHourScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 166 NONAME + _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 diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/inc/calenagendaview.h --- a/calendarui/views/inc/calenagendaview.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/inc/calenagendaview.h Mon Sep 06 10:12:45 2010 +0530 @@ -75,13 +75,6 @@ CALENAGENDAVIEW_EXPORT virtual void doPopulation(); /** - * @brief Callback function for any notifications that has been - * subscribed by this view - * @param notification The event for which notification is being sent - */ - CALENAGENDAVIEW_EXPORT void HandleNotification(const TCalenNotification notification); - - /** * @brief Getter function for the document loader. Called from the content * widget in order get its children */ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/inc/calenagendaviewwidget.h --- a/calendarui/views/inc/calenagendaviewwidget.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/inc/calenagendaviewwidget.h Mon Sep 06 10:12:45 2010 +0530 @@ -103,25 +103,6 @@ */ void createNewEvent(); - /** - * @brief check if property has to set - */ - bool hasAllDayIcon(); - - /** - * @brief check if all day icon is present - */ - void checkEntryIcons(); - - /** - * @brief return true if all day icon is present - */ - bool isAllDayIcon(); - - - - - private: /** @@ -372,10 +353,6 @@ * @brief Holds notes editor plugin load info. */ bool mNotesPluginLoaded; - int mIndex; - bool mIconCheck; - bool mNextEntry; - bool mLeftAllDayIcon; }; diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/inc/caleneventlistviewitem.h --- a/calendarui/views/inc/caleneventlistviewitem.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/inc/caleneventlistviewitem.h Mon Sep 06 10:12:45 2010 +0530 @@ -20,19 +20,17 @@ // System includes #include -#include "calenagendaviewwidget.h" class CalenEventListViewItem : public HbListViewItem { Q_OBJECT - Q_PROPERTY(bool leftAllDayIcon READ hasAllDayIcon WRITE setAllDayLeftIcon) - + public: /** * @brief Constructor * @param CalenAgendaViewWidget */ - CalenEventListViewItem(CalenAgendaViewWidget *parent = 0); + CalenEventListViewItem(QGraphicsItem *parent = 0); /** * @brief Destructor @@ -49,19 +47,6 @@ */ void updateChildItems(); - /** - * @brief check if all day icon is present - */ - bool hasAllDayIcon(); - - /** - * @brief sets teh all day icon - */ - void setAllDayLeftIcon(bool icon = false); - -private: - CalenAgendaViewWidget* mParent; - bool mAllDayIcon ; }; #endif // __CALEN_EVENT_LIST_VIEW_ITEM_H__ diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/inc/calenmonthgrid.h --- a/calendarui/views/inc/calenmonthgrid.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/inc/calenmonthgrid.h Mon Sep 06 10:12:45 2010 +0530 @@ -106,6 +106,7 @@ QPointF mStartPos; QColor mGridLineColor; bool mActiveDatesSet; + bool mIsGridAdjusting; }; #endif // CALENMONTHGRID_H diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/inc/calennativeview.h --- a/calendarui/views/inc/calennativeview.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/inc/calennativeview.h Mon Sep 06 10:12:45 2010 +0530 @@ -64,7 +64,10 @@ void HandleNotification( const TCalenNotification notification ); virtual void onLocaleChanged(int reason)=0; virtual void onContextChanged() {}; - + + signals: + void closeDialogs(); + protected slots: void goToDate(); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/inc/calenpreviewpane.h --- a/calendarui/views/inc/calenpreviewpane.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/inc/calenpreviewpane.h Mon Sep 06 10:12:45 2010 +0530 @@ -60,6 +60,7 @@ private: void GetInstanceListL(); void checkStartTimeOfEvent(QDateTime &dateTime); + void tapTriggered(); public slots: void onTwoSecondsTimeout(); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/resources/caleneventlistviewitem.css --- a/calendarui/views/resources/caleneventlistviewitem.css Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/resources/caleneventlistviewitem.css Mon Sep 06 10:12:45 2010 +0530 @@ -1,9 +1,8 @@ -CalenEventListViewItem[leftAllDayIcon="false"]{ +CalenEventListViewItem{ layout: custom; } - -CalenEventListViewItem[leftAllDayIcon="true"]{ - layout: custom-subjecticon; +CalenEventListViewItem[customstretch="true"]{ + layout: custom-stretch; } @@ -34,7 +33,7 @@ } CalenEventListViewItem::text-1{ - top: -var(hb-param-margin-gene-top); + left: -var(hb-param-margin-gene-left); font-variant: secondary; text-height: var(hb-param-text-height-secondary); @@ -72,3 +71,26 @@ } +CalenEventListViewItem::text-2:landscape[customstretch="true"]{ + top: -var(hb-param-margin-gene-top); + bottom: var(hb-param-margin-gene-bottom); + left: -var(hb-param-margin-gene-middle-horizontal); + right: var(hb-param-margin-gene-middle-horizontal); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + +} + +CalenEventListViewItem::icon-3:landscape[customstretch="true"]{ + right: var(hb-param-margin-gene-middle-horizontal); + fixed-width: var(hb-param-graphic-size-secondary); + fixed-height: var(hb-param-graphic-size-secondary); +} + +CalenEventListViewItem::text-3:landscape[customstretch="true"]{ + fixed-width: 40un; + font-variant: secondary; + text-height: var(hb-param-text-height-secondary); + text-align: left; +} \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/resources/caleneventlistviewitem.widgetml --- a/calendarui/views/resources/caleneventlistviewitem.widgetml Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/resources/caleneventlistviewitem.widgetml Mon Sep 06 10:12:45 2010 +0530 @@ -1,61 +1,69 @@ + + + + - - + + + + + + - - - - + + + + - - - - + + + - - - + - - + - - + + + - - - + + + - - - - + + + + + + - - - - - - - - - + - + + + - + + + - - - - + + + + + \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/src/calenagendaview.cpp --- a/calendarui/views/src/calenagendaview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/src/calenagendaview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -18,6 +18,7 @@ // System includes #include #include +#include #include #include #include @@ -217,20 +218,6 @@ } // ---------------------------------------------------------------------------- -// CalenAgendaView::HandleNotification -// Rest of the details are commented in the header -// ---------------------------------------------------------------------------- -// -void CalenAgendaView::HandleNotification(const TCalenNotification notification) -{ - OstTraceFunctionEntry0( CALENAGENDAVIEW_HANDLENOTIFICATION_ENTRY ); - - Q_UNUSED(notification) - // No implementation yet - OstTraceFunctionExit0( CALENAGENDAVIEW_HANDLENOTIFICATION_EXIT ); -} - -// ---------------------------------------------------------------------------- // CalenAgendaView::docLoader // Rest of the details are commented in the header // ---------------------------------------------------------------------------- @@ -315,6 +302,8 @@ // Connect to the signal triggered by settings action connect(settingsAction, SIGNAL(triggered()), this, SLOT(launchSettingsView())); + // Close the menu once closeDialogs() is received + connect(this, SIGNAL(closeDialogs()), menu(), SLOT(close())); OstTraceFunctionExit0( CALENAGENDAVIEW_SETUPACTIONS_EXIT ); } diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/src/calenagendaviewwidget.cpp --- a/calendarui/views/src/calenagendaviewwidget.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/src/calenagendaviewwidget.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -58,7 +58,7 @@ const QString space(" "); const QString singleHyphen("-"); const QString customLayout("custom"); -const char *stretchLayout("stretchItem"); +const char *stretchLayout("customstretch"); const QString toDoIcon("qtg_small_todo"); const QString reminderIcon("qtg_mono_alarm"); const QString locationIcon("qtg_mono_location"); @@ -79,9 +79,7 @@ mDocLoader(docLoader), mRegionalInfoGroupBox(NULL), mLongTapEventFlag(false), -mNotesPluginLoaded(false), -mIndex(0), -mIconCheck(false) +mNotesPluginLoaded(false) { OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY ); @@ -374,12 +372,7 @@ // of items in the list. Remove the extra rows mListModel->removeRows(0, mListModel->rowCount() - mInstanceArray.count()); } - //to set the index to first item of the list , when view refresh - mIndex = 0; - //status reset for not setting any property - mIconCheck = false; mListModel->setColumnCount(singleColumn); - mIconCheck = true; // Add all the events to the list for (int index = 0; index < mInstanceArray.count(); index++) { // Get each of the entry details @@ -447,10 +440,11 @@ // Append a single space dayString.append(singleSpace); // Set the heading - // Append the date which is formatted as per the locale - mHeadingLabel->setHeading(hbTrId( - "txt_calendar_subhead_1_2").arg(dayString).arg( - systemLocale.format(mDate.date(), r_qtn_date_usual_with_zero))); + + // Append the date which is formatted as per the locale + mHeadingLabel->setHeading(QString("%1 %2").arg(dayString).arg( + systemLocale.format(mDate.date(), r_qtn_date_usual_with_zero))); + OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_SETHEADINGTEXT_EXIT ); } @@ -629,12 +623,7 @@ }else { textData<index(index, 0); - mNextEntry = false; - mListModel->setData(listIndex, textData, Qt::DisplayRole); - mNextEntry = true; - mListModel->setData(listIndex, iconData, Qt::DecorationRole); + // Disable item stretching by removing the dynamic property HbListViewItem *listViewItem = static_cast @@ -642,7 +631,10 @@ if (listViewItem) { listViewItem->setProperty(stretchLayout, false); } - + // Get the list model index and set the text and icon data + QModelIndex listIndex = mListModel->index(index, 0); + mListModel->setData(listIndex, textData, Qt::DisplayRole); + mListModel->setData(listIndex, iconData, Qt::DecorationRole); OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ADDTIMEDEVENTTOLIST_EXIT ); } @@ -795,14 +787,6 @@ } } } - - // Get the list model index and set the text and icon data - QModelIndex listIndex = mListModel->index(index, 0); - mNextEntry = false; - mListModel->setData(listIndex, textData, Qt::DisplayRole); - mNextEntry = true; - mListModel->setData(listIndex, iconData, Qt::DecorationRole); - // Enable item stretching by adding the dynamic property HbListViewItem *listViewItem = static_cast (mEventsList->itemByIndex(mListModel->index(index, 0))); @@ -815,6 +799,10 @@ listViewItem->setProperty(stretchLayout, false); } } + // Get the list model index and set the text and icon data + QModelIndex listIndex = mListModel->index(index, 0); + mListModel->setData(listIndex, textData, Qt::DisplayRole); + mListModel->setData(listIndex, iconData, Qt::DecorationRole); OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ADDNONTIMEDEVENTTOLIST_EXIT ); } @@ -862,6 +850,12 @@ // css file, else wierd things might happen listItem->setProperty(stretchLayout, true); } + if (orientation == Qt::Vertical) { + // Set a dynamic property to indicate that this list item + // NOTE: Property name MUST match the name specified in + // css file, else wierd things might happen + listItem->setProperty(stretchLayout, false); + } } } break; @@ -1033,9 +1027,7 @@ // Set the context setContextFromHighlight(entry); - - //for not setting any property again - mIconCheck = false; + // Launch the event viewer. mServices.IssueCommandL(ECalenEventView); @@ -1154,6 +1146,9 @@ this, SLOT(contextMenuClosed())); + // Close the context menu once closeDialogs() is received + connect(mView, SIGNAL(closeDialogs()), contextMenu, SLOT(close())); + contextMenu->open(this, SLOT(contextManuTriggered(HbAction *))); OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_EXIT ); @@ -1279,53 +1274,5 @@ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_EXIT ); } -// ---------------------------------------------------------------------------- -// CalenAgendaViewWidget::hasAllDayIcon -// return true if property for all day icon to set -// ---------------------------------------------------------------------------- -// -bool CalenAgendaViewWidget::hasAllDayIcon() - { - return mIconCheck; - } - - -// ---------------------------------------------------------------------------- -// CalenAgendaViewWidget::checkEntryIcons -// check if all day icon is present -// ---------------------------------------------------------------------------- -// -void CalenAgendaViewWidget::checkEntryIcons() - { - int index = 0; - //check the number of entries - index = mInstanceArray.count(); - // Get each of the entry details - AgendaEntry entry; - if(mIndex < index ) - entry = mInstanceArray[mIndex]; - - mLeftAllDayIcon = false; - - if(!entry.isTimedEntry() || CalenAgendaUtils::isAlldayEvent(entry)){ - //all day icon is not there if its a timed entry - mLeftAllDayIcon = true; - } - - //check if shift to next entry - if(mNextEntry) - mIndex++; - - } - -// ---------------------------------------------------------------------------- -// CalenAgendaViewWidget::isAllDayIcon -// retirn true if all day icon is present -// ---------------------------------------------------------------------------- -// -bool CalenAgendaViewWidget::isAllDayIcon() - { - return mLeftAllDayIcon; - } // End of file --Don't remove this. diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/src/caleneventlistviewitem.cpp --- a/calendarui/views/src/caleneventlistviewitem.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/src/caleneventlistviewitem.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -30,8 +30,8 @@ // constructor // ---------------------------------------------------------------------------- // -CalenEventListViewItem::CalenEventListViewItem(CalenAgendaViewWidget *parent) : -HbListViewItem(parent),mParent(parent),mAllDayIcon(false) +CalenEventListViewItem::CalenEventListViewItem(QGraphicsItem *parent) : +HbListViewItem(parent) { OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY ); @@ -72,35 +72,10 @@ void CalenEventListViewItem::updateChildItems() { OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_ENTRY ); - if(mParent->hasAllDayIcon()) - { - mParent->checkEntryIcons(); - mAllDayIcon = mParent->isAllDayIcon(); - } - HbListViewItem::updateChildItems(); OstTraceFunctionExit0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_EXIT ); } -// ---------------------------------------------------------------------------- -// CalenEventListViewItem::hasAllDayIcon -// check if all day icon is there in item -// ---------------------------------------------------------------------------- -// -bool CalenEventListViewItem::hasAllDayIcon() - { - return mAllDayIcon ; - } - -// ---------------------------------------------------------------------------- -// CalenEventListViewItem::setAllDayLeftIcon -// set the all day icon -// ---------------------------------------------------------------------------- -// -void CalenEventListViewItem::setAllDayLeftIcon(bool icon) - { - mAllDayIcon = icon; - } // End of file diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/src/calenmonthgrid.cpp --- a/calendarui/views/src/calenmonthgrid.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/src/calenmonthgrid.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -66,7 +66,8 @@ mIsNonActiveDayFocused(false), mIgnoreItemActivated(false), mGridLineColor(HbColorScheme::color("qtc_cal_grid_line")), - mActiveDatesSet(false) + mActiveDatesSet(false), + mIsGridAdjusting(false) { OstTraceFunctionEntry0( CALENMONTHGRID_CALENMONTHGRID_ENTRY ); @@ -340,7 +341,7 @@ void CalenMonthGrid::downGesture() { OstTraceFunctionEntry0( CALENMONTHGRID_DOWNGESTURE_ENTRY ); - + mIsGridAdjusting = true; // Make sure that content widget is properly placed // We are doing this as tapping on inactive date of previous month is leading to // position the grid at wrong place after scrolling down. Hence, set the grid @@ -380,8 +381,9 @@ void CalenMonthGrid::upGesture() { OstTraceFunctionEntry0( CALENMONTHGRID_UPGESTURE_ENTRY ); - - + + mIsGridAdjusting = true; + // Set the required flags mDirection = up; mIsAtomicScroll = false; @@ -444,6 +446,15 @@ { OstTraceFunctionEntry0( CALENMONTHGRID_GESTUREEVENT_ENTRY ); + // Dont listem for any gesture when grid is getting adjusted as listening to those was causing + // grid to stop abruptly i between + if (mIsGridAdjusting) { + // consume the event and return + qDebug()<<"RETURNING BACK"; + event->ignore(); + return; + } + if(HbPanGesture *gesture = qobject_cast(event->gesture(Qt::PanGesture))) { if (gesture->state() == Qt::GestureStarted) { mIsAtomicScroll = false; @@ -542,10 +553,19 @@ void CalenMonthGrid::scrollingFinished() { OstTraceFunctionEntry0( CALENMONTHGRID_SCROLLINGFINISHED_ENTRY ); - + + mIsGridAdjusting = false; if (mIsPanGesture) { handlePanGestureFinished(); - } else if(!mIsAtomicScroll) { + // Check if still request has been made for scrolling + // if yes, then simply return + if (mDirection != invalid) { + mIgnoreItemActivated = false; + return; + } + } + + if(!mIsAtomicScroll) { QDateTime activeDate = mView->getActiveDay(); if(mDirection == down) { // down gesture if (!mActiveDatesSet) { @@ -579,6 +599,8 @@ OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEPANGESTUREFINISHED_ENTRY ); mIsPanGesture = false; + // Reset the mDirection flag + mDirection = invalid; // Get the first item that is visible QList list = visibleItems(); HbAbstractViewItem* item = list[0]; @@ -613,8 +635,8 @@ // first visible item belongs to previous month // Check if the date is more than half of the previous month if (date.date().day() > (prevMonth.date().daysInMonth()) / 2) { - // we should again show the current month by scrolling upwards - mDirection = up; + // we should again show the current month by scrolling downwards + mDirection = down; mIsAtomicScroll = true; scrollContentsTo(-mStartPos,500); } else { @@ -634,12 +656,17 @@ } else { // we should again show the current month by scrolling upwards mDirection = up; + mIsAtomicScroll = true; scrollContentsTo(-mStartPos,500); } } else if (month == nextMonth.addMonths(1).date().month()) { // first visible date belongs to next to next month // hence, scroll up to show the next month upGesture(); + } else { + // User has panned so that exact month has been scrolled + // no need for any adjustment here, just append/prepend the rows + mIsAtomicScroll = false; } OstTraceFunctionExit0( CALENMONTHGRID_HANDLEPANGESTUREFINISHED_EXIT ); diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/src/calenmonthview.cpp --- a/calendarui/views/src/calenmonthview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/src/calenmonthview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -328,7 +328,10 @@ // Connect to the signal when options menu is shown // This is required to add/remove dynamically some options connect(menu(), SIGNAL(aboutToShow ()), this, - SLOT(addRemoveActionsInMenu())); + SLOT(addRemoveActionsInMenu())); + // Close the menu once closeDialogs() is received + connect(this, SIGNAL(closeDialogs()), menu(), SLOT(close())); + //add "show lunar data" action item ,if regional plugin is present //regional plugin will add the option itself and handles it accordingly //use this api after adding all action item to the menu diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/src/calennativeview.cpp --- a/calendarui/views/src/calennativeview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/src/calennativeview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -65,6 +65,7 @@ notificationArray.Append(ECalenNotifySystemTimeChanged); notificationArray.Append(ECalenNotifySystemLocaleChanged); notificationArray.Append(ECalenNotifyContextChanged); + notificationArray.Append(ECalenNotifyCloseDialogs); mServices.RegisterForNotificationsL(this, notificationArray); @@ -130,6 +131,7 @@ // Create a popup with datepicker for the user to select date. HbDialog *popUp = new HbDialog(); + popUp->setParent(this); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); popUp->setAttribute( Qt::WA_DeleteOnClose, true ); @@ -149,6 +151,10 @@ popUp->addAction(okAction); connect(okAction, SIGNAL(triggered()), this, SLOT(goToSelectedDate())); popUp->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popUp)); + + // Close the popup once closeDialogs() is received + connect(this, SIGNAL(closeDialogs()), popUp, SLOT(close())); + popUp->open(); OstTraceFunctionExit0( CALENNATIVEVIEW_GOTODATE_EXIT ); @@ -236,6 +242,11 @@ onContextChanged(); } break; + case ECalenNotifyCloseDialogs: { + // Emit the signal to close the dialogs which are already opened + emit closeDialogs(); + } + break; default: break; } diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/src/calenpreviewpane.cpp --- a/calendarui/views/src/calenpreviewpane.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/src/calenpreviewpane.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -421,6 +421,9 @@ event->accept(Qt::PanGesture); } else { event->accept(Qt::PanGesture); + // Since user tried to tap and ended up giving low pan + // hence, handle it as tap + tapTriggered(); OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_GESTUREEVENT_EXIT ); return; } @@ -437,6 +440,9 @@ event->accept(Qt::PanGesture); }else { event->accept(Qt::PanGesture); + // Since user tried to tap and ended up giving low pan + // hence, handle it as tap + tapTriggered(); OstTraceFunctionExit0( DUP2_CALENPREVIEWPANE_GESTUREEVENT_EXIT ); return; } @@ -444,14 +450,15 @@ } } else if(QTapGesture *tapGesture = qobject_cast(event->gesture(Qt::TapGesture))) { if (tapGesture && tapGesture->state() == Qt::GestureFinished) { - HbInstantFeedback::play(HbFeedback::Basic); - // Preview pane tapped - // Stop the scrolling first - stopScrolling(); - // Issue command to launch agenda view - mServices.IssueCommandL(ECalenAgendaView); - mView->disconnectAboutToQuitEvent(); - event->accept(Qt::TapGesture); + event->accept(Qt::TapGesture); + // Handle the tap + tapTriggered(); + } + } else if(QTapAndHoldGesture *tapGesture = qobject_cast(event->gesture(Qt::TapAndHoldGesture))) { + if (tapGesture && tapGesture->state() == Qt::GestureFinished) { + event->accept(Qt::TapAndHoldGesture); + // Handle the tap + tapTriggered(); } } @@ -459,6 +466,24 @@ } /*! + Handles the tap and launches the agendaview + */ +void CalenPreviewPane::tapTriggered() +{ + OstTraceFunctionEntry0( CALENPREVIEWPANE_TAPTRIGGERED_ENTRY ); + + HbInstantFeedback::play(HbFeedback::Basic); + // Preview pane tapped + // Stop the scrolling first + stopScrolling(); + // Issue command to launch agenda view + mServices.IssueCommandL(ECalenAgendaView); + mView->disconnectAboutToQuitEvent(); + + OstTraceFunctionExit0( CALENPREVIEWPANE_TAPTRIGGERED_EXIT ); +} + +/*! Set monthview pointer */ void CalenPreviewPane::setView(CalenMonthView* view) diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/traces/calenpreviewpaneTraces.h --- a/calendarui/views/traces/calenpreviewpaneTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/traces/calenpreviewpaneTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -38,6 +38,8 @@ #define DUP3_CALENPREVIEWPANE_GESTUREEVENT_EXIT 0x8a0182 #define CALENPREVIEWPANE_HANDLETHEMECHANGE_ENTRY 0x8a0189 #define CALENPREVIEWPANE_HANDLETHEMECHANGE_EXIT 0x8a018a +#define CALENPREVIEWPANE_TAPTRIGGERED_ENTRY 0x8a018d +#define CALENPREVIEWPANE_TAPTRIGGERED_EXIT 0x8a018e #endif diff -r 1881ad52dc45 -r a5ed90760192 calendarui/views/traces/fixed_id.definitions --- a/calendarui/views/traces/fixed_id.definitions Tue Aug 31 18:15:13 2010 +0530 +++ b/calendarui/views/traces/fixed_id.definitions Mon Sep 06 10:12:45 2010 +0530 @@ -320,6 +320,8 @@ [TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_STARTAUTOSCROLL_EXIT=0x158 [TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_STOPSCROLLING_ENTRY=0x165 [TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_STOPSCROLLING_EXIT=0x166 +[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_TAPTRIGGERED_ENTRY=0x18d +[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_TAPTRIGGERED_EXIT=0x18e [TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_CALENSETTINGSVIEW_ENTRY=0x167 [TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_CALENSETTINGSVIEW_EXIT=0x168 [TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_INITIALIZEFORM_ENTRY=0x16d diff -r 1881ad52dc45 -r a5ed90760192 clock/clock.pro --- a/clock/clock.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clock.pro Mon Sep 06 10:12:45 2010 +0530 @@ -32,8 +32,24 @@ "./conf/clockapp.confml APP_LAYER_CONFML(clockapp.confml)" \ "./conf/clockapp_101F874D.crml APP_LAYER_CRML(clockapp_101F874D.crml)" \ "./conf/clockapp_101F8876.crml APP_LAYER_CRML(clockapp_101F8876.crml)" \ + # splashml + "data/xml/clockapplication.docml /epoc32/data/z/resource/hb/splashml/clockapplication.docml" \ + "data/xml/clockapplication.splashml /epoc32/data/z/resource/hb/splashml/clockapplication.splashml" \ # stubsis is added to provide IAD - "./stubsis/clock_stub.sis /epoc32/data/z/system/install/clock_stub.sis" + "./stubsis/clock_stub.sis /epoc32/data/z/system/install/clock_stub.sis" \ + # Backup registration file +# Date Time Settings +"data/backup_registration.xml /epoc32/data/z/private/10005906/backup_registration.xml" \ +"data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10005906/backup_registration.xml" \ +"data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10005906/backup_registration.xml" \ + # Clockserver +"data/backup_registration.xml /epoc32/data/z/private/200159A2/backup_registration.xml" \ +"data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/200159A2/backup_registration.xml" \ +"data/backup_registration.xml /epoc32/release/winscw/urel/z/private/200159A2/backup_registration.xml" \ + # Clock +"data/backup_registration.xml /epoc32/data/z/private/10005903/backup_registration.xml" \ +"data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10005903/backup_registration.xml" \ +"data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10005903/backup_registration.xml } # End of file --Don't remove this. diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp --- a/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -139,7 +139,7 @@ mAlarmEditorForm = qobject_cast ( loader->findWidget("alarmEditorForm")); - + mAlarmEditorForm->setItemPixmapCacheEnabled(true); // Create the alarm info structure with desired values. initAlarmInfo(); diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clockcityselectionlist/data/xml/clockaddcitydialog.docml --- a/clock/clockui/clockcityselectionlist/data/xml/clockaddcitydialog.docml Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clockcityselectionlist/data/xml/clockaddcitydialog.docml Mon Sep 06 10:12:45 2010 +0530 @@ -1,10 +1,10 @@ - + - + @@ -16,7 +16,7 @@ - + @@ -27,13 +27,13 @@ - + - + @@ -61,24 +61,24 @@ - + - - - - - + - - - + + + - - - - + + + + + + + + @@ -104,19 +104,21 @@ - + + + + - + - - - - + + + diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp --- a/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -280,6 +280,13 @@ qFatal("Unable to load the document."); } + if (Qt::Horizontal == window->orientation()) { + mAddCityDocloader->load(":/xml/clockaddcitydialog.docml", + "landscape", &success); + } else if (Qt::Vertical == window->orientation()) { + mAddCityDocloader->load(":/xml/clockaddcitydialog.docml", + "portrait", &success); + } // Get the dialog. mAddOwnCityDialog = static_cast (mAddCityDocloader->findWidget("dialog")); if (!mAddOwnCityDialog) { @@ -511,7 +518,7 @@ // Set the model to the list. mListView->setModel(mProxyModel); - + mListView->setItemPixmapCacheEnabled(true); // Listen for list item activated signal. connect( mListView, SIGNAL(activated(QModelIndex)), diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp --- a/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -73,7 +73,9 @@ CpItemDataHelper &itemDataHelper) const { OstTraceFunctionEntry0( DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_ENTRY ); - HbIcon icon ; + + QString datetimeIconString = "qtg_large_date_time"; + HbIcon datetimeIcon(datetimeIconString) ; HbExtendedLocale locale = HbExtendedLocale::system(); QString timeInfo = locale.format( @@ -88,7 +90,7 @@ QList entryItemList; CpSettingFormItemData *entryItem = new DateTimeSettingsView( itemDataHelper, hbTrId("txt_cp_main_view_list_time_date"), - displayString,icon, 0, mTranslator); + displayString,datetimeIcon, 0, mTranslator); entryItemList.append(entryItem); OstTraceFunctionExit0( DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_EXIT ); return entryItemList; diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/inc/clockregionalsettingsview.h --- a/clock/clockui/clocksettingsview/inc/clockregionalsettingsview.h Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/inc/clockregionalsettingsview.h Mon Sep 06 10:12:45 2010 +0530 @@ -52,6 +52,7 @@ CLOCKSETTINGSVIEW_EXPORT void showView(); public slots: void updateWeekStartOn(); + void updateOnLocaleChanges(); private slots: void handleBackAction(); void handleItemDisplayed(const QModelIndex &index); @@ -68,6 +69,10 @@ void populateFormModel(); QStringList weekdayList(); void updateWeekDays(); + void updateTimeFormatField(); + void updateTimeSeparatorField(); + void updateDateFormatField(); + void updateDateSeparatorField(); private: diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/inc/clocksettingsview.h --- a/clock/clockui/clocksettingsview/inc/clocksettingsview.h Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/inc/clocksettingsview.h Mon Sep 06 10:12:45 2010 +0530 @@ -64,6 +64,7 @@ void handleAlarmSnoozeTimeChanged(int index); void handleClockTypeChanged(); void eventMonitor(const XQSettingsKey& key, const QVariant& value); + void updateClockType(); private: void setupView(); diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp --- a/clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -129,6 +129,7 @@ if (!mForm) { qFatal("Unable to find the form"); } + mForm->setItemPixmapCacheEnabled(true); connect( mForm, SIGNAL(itemShown(QModelIndex)), this, SLOT(handleItemDisplayed(QModelIndex))); @@ -523,6 +524,22 @@ } /*! + update on locale changes. + */ + +void ClockRegionalSettingsView::updateOnLocaleChanges() +{ + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_ENTRY ); + + updateTimeFormatField(); + updateTimeSeparatorField(); + updateDateFormatField(); + updateDateSeparatorField(); + + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_EXIT ); +} + +/*! update the week days . */ void ClockRegionalSettingsView::updateWeekDays() @@ -556,4 +573,69 @@ } OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT ); } + +/*! + update the time format field. + */ +void ClockRegionalSettingsView::updateTimeFormatField() +{ + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_ENTRY ); + //for time format change + int index = mSettingsUtility->timeFormat(mTimeFormatStringList); + if (0 == index) { + mTimeFormatItem->setContentWidgetData("text", mTimeFormatStringList[0]); + mTimeFormatItem->setContentWidgetData("additionalText", mTimeFormatStringList[1]); + } else { + mTimeFormatItem->setContentWidgetData("text", mTimeFormatStringList[1]); + mTimeFormatItem->setContentWidgetData("additionalText", mTimeFormatStringList[0]); + } + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_EXIT ); +} + +/*! + update the time separator field. + */ +void ClockRegionalSettingsView::updateTimeSeparatorField() +{ + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_ENTRY ); + // for time separator change + int index = mSettingsUtility->timeSeparator(mTimeSeparatorStringList); + if (0 == index) { + mTimeSeparatorItem->setContentWidgetData("text", mTimeSeparatorStringList[0]); + mTimeSeparatorItem->setContentWidgetData( + "additionalText", mTimeSeparatorStringList[1]); + } else { + mTimeSeparatorItem->setContentWidgetData("text", mTimeSeparatorStringList[1]); + mTimeSeparatorItem->setContentWidgetData( + "additionalText", mTimeSeparatorStringList[0]); + } + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_EXIT ); +} + +/*! + update the date format field. + */ +void ClockRegionalSettingsView::updateDateFormatField() +{ + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_ENTRY ); + + int index = mSettingsUtility->dateFormat(mDateFormatStringList); + mDateFormatItem->setContentWidgetData("currentIndex",index); + + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_EXIT ); +} + +/*! + update the date separator field. + */ +void ClockRegionalSettingsView::updateDateSeparatorField() +{ + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_ENTRY ); + + int index = mSettingsUtility->dateSeparator(mDateSeparatorStringList); + mDateSeparatorItem->setContentWidgetData("currentIndex",index); + + OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_EXIT ); +} + // End of file --Don't remove this. diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/src/clocksettingsview.cpp --- a/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -87,6 +87,9 @@ connect( mTimezoneClient, SIGNAL(cityUpdated()), this, SLOT(updatePlaceItem())); + connect( + mTimezoneClient, SIGNAL(timechanged()), + this, SLOT(updateClockType())); // Start a timer. For updating the remaining alarm time. mTickTimer = new QTimer(this); @@ -313,7 +316,7 @@ // Get the data form. mSettingsForm = static_cast ( mDocLoader->findWidget(CLOCK_SETTINGS_DATA_FORM)); - + mSettingsForm->setItemPixmapCacheEnabled(true); // Create the custom prototype. QList prototypes = mSettingsForm->itemPrototypes(); SettingsCustomItem *customPrototype = new SettingsCustomItem(mSettingsForm, mLaunchedByClock); @@ -586,4 +589,23 @@ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT ); } +/*! + Slot for updating the clock type on locale change. + */ +void ClockSettingsView::updateClockType() +{ + OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_ENTRY ); + QStringList clockTypeList; + int clockType = mSettingsUtility->clockType(clockTypeList); + int zeroIndex(0); + if( zeroIndex == clockType ){ + mClockTypeItem->setContentWidgetData("text", clockTypeList[0]); + mClockTypeItem->setContentWidgetData("additionalText", clockTypeList[1]); + } else { + mClockTypeItem->setContentWidgetData("text", clockTypeList[1]); + mClockTypeItem->setContentWidgetData("additionalText", clockTypeList[0]); + } + OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_EXIT ); +} + // End of file --Don't remove this. diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/src/settingscustomitem.cpp --- a/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -439,6 +439,10 @@ connect(mTimezoneClient, SIGNAL(timechanged()), view, SLOT(updateWeekStartOn())); + connect(mTimezoneClient, SIGNAL(timechanged()), + view, SLOT(updateOnLocaleChanges())); + + view->showView(); OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_EXIT ); diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/traces/OstTraceDefinitions.h --- a/clock/clockui/clocksettingsview/traces/OstTraceDefinitions.h Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/traces/OstTraceDefinitions.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,3 +1,20 @@ +/* +* This is Default Licence added by TraceCompiler +* 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: +* +*/ #ifndef __OSTTRACEDEFINITIONS_H__ #define __OSTTRACEDEFINITIONS_H__ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/traces/clockregionalsettingsviewTraces.h --- a/clock/clockui/clocksettingsview/traces/clockregionalsettingsviewTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/traces/clockregionalsettingsviewTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,21 @@ -// Created by TraceCompiler 2.2.3 +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Definition file for class ClockRegionalSettingsView. +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __CLOCKREGIONALSETTINGSVIEWTRACES_H__ @@ -38,6 +55,16 @@ #define DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT 0x8a001e #define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY 0x8a001f #define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT 0x8a0020 +#define CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_ENTRY 0x8a0066 +#define CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_EXIT 0x8a0067 +#define CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_ENTRY 0x8a0068 +#define CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_EXIT 0x8a0069 +#define CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_ENTRY 0x8a006a +#define CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_EXIT 0x8a006b +#define CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_ENTRY 0x8a006c +#define CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_EXIT 0x8a006d +#define CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_ENTRY 0x8a006e +#define CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_EXIT 0x8a006f #endif diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/traces/clocksettingsdocloaderTraces.h --- a/clock/clockui/clocksettingsview/traces/clocksettingsdocloaderTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/traces/clocksettingsdocloaderTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,21 @@ -// Created by TraceCompiler 2.2.3 +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Implementation file for class ClockSettingsDocLoader. +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __CLOCKSETTINGSDOCLOADERTRACES_H__ diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/traces/clocksettingsviewTraces.h --- a/clock/clockui/clocksettingsview/traces/clocksettingsviewTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/traces/clocksettingsviewTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,21 @@ -// Created by TraceCompiler 2.2.3 +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Implementation file for class ClockSettingsView. +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __CLOCKSETTINGSVIEWTRACES_H__ @@ -38,8 +55,8 @@ #define CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_EXIT 0x8a003f #define CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY 0x8a0040 #define CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT 0x8a0041 -#define CLOCKSETTINGSVIEW_GETVIEW_ENTRY 0x8a0064 -#define CLOCKSETTINGSVIEW_GETVIEW_EXIT 0x8a0065 +#define CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_ENTRY 0x8a0070 +#define CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_EXIT 0x8a0071 #endif diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/traces/fixed_id.definitions --- a/clock/clockui/clocksettingsview/traces/fixed_id.definitions Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/traces/fixed_id.definitions Mon Sep 06 10:12:45 2010 +0530 @@ -1,3 +1,20 @@ +## +# This is Default Licence added by TraceCompiler +# 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: +# +## #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. [GROUP]TRACE_FLOW=0x8a [TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY=0x1 @@ -22,6 +39,16 @@ [TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_EXIT=0x19 [TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_ENTRY=0x5 [TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_ENTRY=0x6c +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_EXIT=0x6d +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_ENTRY=0x6e +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_EXIT=0x6f +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_ENTRY=0x66 +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_ENTRY=0x6a +[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_EXIT=0x6b [TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY=0x1f [TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT=0x20 [TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY=0x1c @@ -35,8 +62,6 @@ [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CREATEMODEL_EXIT=0x37 [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY=0x40 [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT=0x41 -[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_GETVIEW_ENTRY=0x64 -[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_GETVIEW_EXIT=0x65 [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_ENTRY=0x3c [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_EXIT=0x3d [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_ENTRY=0x3a @@ -55,6 +80,8 @@ [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_POPULATEMODEL_EXIT=0x39 [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_SETUPVIEW_ENTRY=0x34 [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_SETUPVIEW_EXIT=0x35 +[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_ENTRY=0x70 +[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_EXIT=0x71 [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEDATEITEM_ENTRY=0x2c [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEDATEITEM_EXIT=0x2d [TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEPLACEITEM_ENTRY=0x2a @@ -101,3 +128,5 @@ [TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_UPDATEPLACEITEM_EXIT=0x5d [TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_WORKDAYSSETTING_ENTRY=0x62 [TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_WORKDAYSSETTING_EXIT=0x63 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_GETVIEW_ENTRY=0x64 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_GETVIEW_EXIT=0x65 diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clocksettingsview/traces/settingscustomitemTraces.h --- a/clock/clockui/clocksettingsview/traces/settingscustomitemTraces.h Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clocksettingsview/traces/settingscustomitemTraces.h Mon Sep 06 10:12:45 2010 +0530 @@ -1,4 +1,21 @@ -// Created by TraceCompiler 2.2.3 +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Definition file for class ClockSettingsView. +* +*/ +// Created by TraceCompiler 2.2.4 // DO NOT EDIT, CHANGES WILL BE LOST #ifndef __SETTINGSCUSTOMITEMTRACES_H__ diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clockviewmanager/clockviewmanager.pro --- a/clock/clockui/clockviewmanager/clockviewmanager.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clockviewmanager/clockviewmanager.pro Mon Sep 06 10:12:45 2010 +0530 @@ -51,8 +51,5 @@ clockviewmanager.h \ clockdocloader.h \ clockviewmanagerdefines.h - -RESOURCES += \ - ../../data/clock.qrc # End of file --Don't remove this. diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clockviews/src/clockmainview.cpp --- a/clock/clockui/clockviews/src/clockmainview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clockviews/src/clockmainview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -156,7 +156,7 @@ // Get the alarm's list. mAlarmList = qobject_cast ( mDocLoader->findWidget(CLOCK_ALARMLIST)); - + mAlarmList->setItemPixmapCacheEnabled(true); connect( mAlarmList, SIGNAL(activated(const QModelIndex &)), this, SLOT(handleActivated(const QModelIndex &))); diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clockviews/src/clockworldview.cpp --- a/clock/clockui/clockviews/src/clockworldview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clockviews/src/clockworldview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -143,7 +143,7 @@ HbStyleLoader::registerFilePath(":/style/hblistviewitem_color.css"); mCityListView->setLayoutName("citylist"); mCityListView->setModel(mCityListModel); - + mCityListView->setItemPixmapCacheEnabled(true); // Get the toolbar/menu actions. mAddCityAction = static_cast ( mDocLoader->findObject("addCityAction")); diff -r 1881ad52dc45 -r a5ed90760192 clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css --- a/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css Mon Sep 06 10:12:45 2010 +0530 @@ -14,7 +14,7 @@ AnalogClockWidget::clock_hour_hand { size-policy:expanding expanding; - zvalue: 2; + zvalue: 3; } AnalogClockWidget::clock_second_hand { diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/0_qtg_graf_clock_day_bg.svg --- a/clock/data/analog/0_qtg_graf_clock_day_bg.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/0_qtg_graf_clock_day_hour.svg --- a/clock/data/analog/0_qtg_graf_clock_day_hour.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/0_qtg_graf_clock_day_min.svg --- a/clock/data/analog/0_qtg_graf_clock_day_min.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/0_qtg_graf_clock_night_bg.svg --- a/clock/data/analog/0_qtg_graf_clock_night_bg.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/0_qtg_graf_clock_night_hour.svg --- a/clock/data/analog/0_qtg_graf_clock_night_hour.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/0_qtg_graf_clock_night_min.svg --- a/clock/data/analog/0_qtg_graf_clock_night_min.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/1_qtg_graf_clock_day_bg.svg --- a/clock/data/analog/1_qtg_graf_clock_day_bg.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/1_qtg_graf_clock_day_hour.svg --- a/clock/data/analog/1_qtg_graf_clock_day_hour.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/1_qtg_graf_clock_day_min.svg --- a/clock/data/analog/1_qtg_graf_clock_day_min.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/1_qtg_graf_clock_day_overlay.svg --- a/clock/data/analog/1_qtg_graf_clock_day_overlay.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/1_qtg_graf_clock_night_bg.svg --- a/clock/data/analog/1_qtg_graf_clock_night_bg.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/1_qtg_graf_clock_night_hour.svg --- a/clock/data/analog/1_qtg_graf_clock_night_hour.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/1_qtg_graf_clock_night_min.svg --- a/clock/data/analog/1_qtg_graf_clock_night_min.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/1_qtg_graf_clock_night_overlay.svg --- a/clock/data/analog/1_qtg_graf_clock_night_overlay.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/2_qtg_graf_clock_day_bg.svg --- a/clock/data/analog/2_qtg_graf_clock_day_bg.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/2_qtg_graf_clock_day_hour.svg --- a/clock/data/analog/2_qtg_graf_clock_day_hour.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/2_qtg_graf_clock_day_min.svg --- a/clock/data/analog/2_qtg_graf_clock_day_min.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/2_qtg_graf_clock_day_sec.svg --- a/clock/data/analog/2_qtg_graf_clock_day_sec.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/2_qtg_graf_clock_night_bg.svg --- a/clock/data/analog/2_qtg_graf_clock_night_bg.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/2_qtg_graf_clock_night_hour.svg --- a/clock/data/analog/2_qtg_graf_clock_night_hour.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/2_qtg_graf_clock_night_min.svg --- a/clock/data/analog/2_qtg_graf_clock_night_min.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/2_qtg_graf_clock_night_sec.svg --- a/clock/data/analog/2_qtg_graf_clock_night_sec.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_day_bg.svg --- a/clock/data/analog/3_qtg_graf_clock_day_bg.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_day_hour.svg --- a/clock/data/analog/3_qtg_graf_clock_day_hour.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_day_min.svg --- a/clock/data/analog/3_qtg_graf_clock_day_min.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_day_overlay.svg --- a/clock/data/analog/3_qtg_graf_clock_day_overlay.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_day_sec.svg --- a/clock/data/analog/3_qtg_graf_clock_day_sec.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_night_bg.svg --- a/clock/data/analog/3_qtg_graf_clock_night_bg.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_night_hour.svg --- a/clock/data/analog/3_qtg_graf_clock_night_hour.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_night_min.svg --- a/clock/data/analog/3_qtg_graf_clock_night_min.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_night_overlay.svg --- a/clock/data/analog/3_qtg_graf_clock_night_overlay.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/analog/3_qtg_graf_clock_night_sec.svg --- a/clock/data/analog/3_qtg_graf_clock_night_sec.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/backup_registration.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/data/backup_registration.xml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,8 @@ + + + + + + + + diff -r 1881ad52dc45 -r a5ed90760192 clock/data/clock.qrc --- a/clock/data/clock.qrc Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - worldclock/qtg_test_day.svg - worldclock/qtg_test_night.svg - - effects/hide_widget.fxml - effects/show_widget.fxml - - effects/appear.fxml - effects/disappear.fxml - - effects/fade_out.fxml - effects/fade_in.fxml - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/clockwidget.qrc --- a/clock/data/clockwidget.qrc Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ - - - analog/0_qtg_graf_clock_day_bg.svg - analog/0_qtg_graf_clock_day_hour.svg - analog/0_qtg_graf_clock_day_min.svg - - digital/qsn_cp_clock_digital_new_colon.svg - digital/qsn_cp_clock_digital_new_stop.svg - digital/qsn_cp_clock_digital_new_zero.svg - digital/qsn_cp_clock_digital_new_one.svg - digital/qsn_cp_clock_digital_new_two.svg - digital/qsn_cp_clock_digital_new_three.svg - digital/qsn_cp_clock_digital_new_four.svg - digital/qsn_cp_clock_digital_new_five.svg - digital/qsn_cp_clock_digital_new_six.svg - digital/qsn_cp_clock_digital_new_seven.svg - digital/qsn_cp_clock_digital_new_eight.svg - digital/qsn_cp_clock_digital_new_nine.svg - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_colon.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_colon.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_colon_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_colon_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_eight.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_eight.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_eight_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_eight_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_five.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_five.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_five_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_five_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_four.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_four.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_four_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_four_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_nine.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_nine.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_nine_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_nine_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_one.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_one.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_one_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_one_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_seven.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_seven.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_seven_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_seven_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_six.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_six.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_six_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_six_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_stop.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_stop.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_stop_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_stop_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_three.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_three.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_three_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_three_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_two.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_two.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_two_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_two_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_zero.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_zero.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/digital/qsn_cp_clock_digital_new_zero_shape.svg --- a/clock/data/digital/qsn_cp_clock_digital_new_zero_shape.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/effects/appear.fxml --- a/clock/data/effects/appear.fxml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - 1.0 - - 0.0 - 1.0 - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/effects/disappear.fxml --- a/clock/data/effects/disappear.fxml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - 1.0 - - 1.0 - 0.0 - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/effects/fade_in.fxml --- a/clock/data/effects/fade_in.fxml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - 0.7 - - 0.0 - 1.0 - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/effects/fade_out.fxml --- a/clock/data/effects/fade_out.fxml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - 0.7 - - 1.0 - 0.0 - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/effects/hide_widget.fxml --- a/clock/data/effects/hide_widget.fxml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - - 0.5 - 0 - 90 - - - 0.5 - 0.5 - -1 - - - 0.5 - 1.0 - 0.5 - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/effects/show_widget.fxml --- a/clock/data/effects/show_widget.fxml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - - 0.5 - - 90 - 0 - - - 0.5 - 0.5 - -1 - - - 0.5 - - 0.5 - 1.0 - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/effects/timerknob_appear.fxml --- a/clock/data/effects/timerknob_appear.fxml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ - - - - 1.0 - 0.0 - 1.0 - - - - 1.0 - 0.0 - 1.0 - - - 0.5 - 0.5 - - - 1.0 - - 0.2 - 1.0 - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/effects/timerknob_disappear.fxml --- a/clock/data/effects/timerknob_disappear.fxml Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ - - - - 1.0 - 1.0 - 0.0 - - - - 1.0 - 1.0 - 0.0 - - - 0.5 - 0.5 - - - 1.0 - - 1.0 - 0.0 - - - \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/worldclock/qtg_test_day.svg --- a/clock/data/worldclock/qtg_test_day.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/worldclock/qtg_test_night.svg --- a/clock/data/worldclock/qtg_test_night.svg Tue Aug 31 18:15:13 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - diff -r 1881ad52dc45 -r a5ed90760192 clock/data/xml/clockapplication.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/data/xml/clockapplication.docml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/data/xml/clockapplication.splashml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/data/xml/clockapplication.splashml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,6 @@ + + clockapplication.docml + view + 0x10005903 + clock + \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 clock/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/group/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,33 @@ +// Copyright (c) 2006-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: Build exports for clock +// + + +PRJ_EXPORTS + +../rom/clock.iby CORE_APP_LAYER_IBY_EXPORT_PATH(clock.iby) +../rom/clockengines.iby CORE_APP_LAYER_IBY_EXPORT_PATH(clockengines.iby) +../rom/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) + +// stubsis is added to provide IAD +../stubsis/clock_stub.sis /epoc32/data/z/system/install/clock_stub.sis + + +// End of File + diff -r 1881ad52dc45 -r a5ed90760192 clock/rom/clock.iby --- a/clock/rom/clock.iby Tue Aug 31 18:15:13 2010 +0530 +++ b/clock/rom/clock.iby Mon Sep 06 10:12:45 2010 +0530 @@ -22,6 +22,11 @@ // Clock application executables. S60_APP_EXE(clock) +// Backup registration file +data = ZPRIVATE\10005906\backup_registration.xml PRIVATE\10005906\backup_registration.xml +data = ZPRIVATE\200159A2\backup_registration.xml PRIVATE\200159A2\backup_registration.xml +data = ZPRIVATE\10005903\backup_registration.xml PRIVATE\10005903\backup_registration.xml + // Clock application registration file. data=DATAZ_\private\10003a3f\import\apps\clock_reg.rsc \private\10003a3f\import\apps\clock_reg.rsc @@ -44,6 +49,9 @@ // Stub sis data=DATAZ_\system\install\clock_stub.sis \System\Install\clock_stub.sis +data=ZRESOURCE\hb\splashml\clockapplication.splashml RESOURCE_FILES_DIR\hb\splashml\clockapplication.splashml +data=ZRESOURCE\hb\splashml\clockapplication.docml RESOURCE_FILES_DIR\hb\splashml\clockapplication.docml + // Binaries. file=ABI_DIR\BUILD_DIR\clockalarmclient.dll SHARED_LIB_DIR\clockalarmclient.dll file=ABI_DIR\BUILD_DIR\timezoneclient.dll SHARED_LIB_DIR\timezoneclient.dll diff -r 1881ad52dc45 -r a5ed90760192 notes/data/xml/notesmainview.docml --- a/notes/data/xml/notesmainview.docml Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/data/xml/notesmainview.docml Mon Sep 06 10:12:45 2010 +0530 @@ -26,10 +26,10 @@ - - - + + + diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesapplication/data/xml/notesapplication.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesapplication/data/xml/notesapplication.docml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesapplication/data/xml/notesapplication.splashml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesapplication/data/xml/notesapplication.splashml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,6 @@ + + notesapplication.docml + view + 0x20029F80 + notes + diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesapplication/notesapplication.pro --- a/notes/notesui/notesapplication/notesapplication.pro Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/notesapplication/notesapplication.pro Mon Sep 06 10:12:45 2010 +0530 @@ -51,6 +51,11 @@ DEPLOYMENT += notes SKINICON = qtg_large_notes + BLD_INF_RULES.prj_exports += \ + # splashml + "data/xml/notesapplication.docml /epoc32/data/z/resource/hb/splashml/notesapplication.docml" \ + "data/xml/notesapplication.splashml /epoc32/data/z/resource/hb/splashml/notesapplication.splashml" + } SOURCES += \ diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/noteseditor/data/xml/notesnoteeditor.docml --- a/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml Mon Sep 06 10:12:45 2010 +0530 @@ -31,6 +31,7 @@ + diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/noteseditor/src/notesnoteeditor.cpp --- a/notes/notesui/noteseditor/src/notesnoteeditor.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/noteseditor/src/notesnoteeditor.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -332,7 +332,7 @@ // Add delete and cancel actions. mDeleteNoteAction = new HbAction( - hbTrId("txt_notes_button_dialog_delete")); + hbTrId("txt_common_button_delete")); mCancelDeleteAction = new HbAction( hbTrId("txt_common_button_cancel")); confirmationQuery->addAction(mDeleteNoteAction); diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/noteseditor/src/notestodoeditor.cpp --- a/notes/notesui/noteseditor/src/notestodoeditor.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/noteseditor/src/notestodoeditor.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -98,7 +98,7 @@ mDataForm = static_cast ( mDocLoader->findWidget(TODO_EDITOR_DATA_FORM)); - + mDataForm->setItemPixmapCacheEnabled(true); // Initialize the data form model. initFormModel(); @@ -714,7 +714,7 @@ // Add delete and cancel actions. mDeleteTodoAction = new HbAction( - hbTrId("txt_notes_button_dialog_delete")); + hbTrId("txt_common_button_delete")); mCancelDeleteAction = new HbAction( hbTrId("txt_common_button_cancel")); confirmationQuery->addAction(mDeleteTodoAction); diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesviewmanager/inc/notesviewmanager.h --- a/notes/notesui/notesviewmanager/inc/notesviewmanager.h Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/notesviewmanager/inc/notesviewmanager.h Mon Sep 06 10:12:45 2010 +0530 @@ -58,6 +58,7 @@ void loadTodoView(); void loadFavoritesView(); void loadNoteView(); + void updateOtherViews(); private slots: void loadOtherViews(); @@ -78,6 +79,8 @@ HbAction *mDeleteAction; HbAction *mCancelAction; ulong mEntryId; + + bool instanceViewCreated; private: Q_DISABLE_COPY(NotesViewManager) diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesviewmanager/src/notesviewmanager.cpp --- a/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -60,7 +60,13 @@ NotesViewManager::NotesViewManager( NotesAppControllerIf &controllerIf, QObject *parent) :QObject(parent), - mAppControllerIf(controllerIf) + mAppControllerIf(controllerIf), + mMainView(0), + mCollectionView(0), + mTodoView(0), + mFavoriteView(0), + mNoteView(0), + instanceViewCreated(false) { OstTraceFunctionEntry0( NOTESVIEWMANAGER_NOTESVIEWMANAGER_ENTRY ); HbMainWindow *window = hbInstance->allMainWindows().first(); @@ -202,16 +208,12 @@ // Load the application xml. docLoader->load(NOTES_MAIN_VIEW_XML, &loadSuccess); - Q_ASSERT_X( - loadSuccess, - "notesviewmanager.cpp", - "Unable to load the main view app xml"); - + // Find the main view. mMainView = static_cast ( docLoader->findWidget(NOTES_MAIN_VIEW)); - Q_ASSERT_X( - mMainView, "notesviewmanager.cpp", "Unable to find the main view."); + mMainView->setParent(this); + // Setup the view. mMainView->setupView(mAppControllerIf, docLoader); // Connect to main view signal for entry deletion. @@ -241,6 +243,8 @@ // Find the collection view. mCollectionView = static_cast ( docLoader->findWidget(NOTES_COLLECTION_VIEW)); + mCollectionView->setParent(this); + // Setup the view. mCollectionView->setupView(mAppControllerIf, docLoader); OstTraceFunctionExit0( NOTESVIEWMANAGER_LOADNOTESCOLLECTIONVIEW_EXIT ); @@ -264,6 +268,8 @@ // Find the to-do view. mTodoView = static_cast ( docLoader->findWidget(NOTES_TODO_VIEW)); + mTodoView->setParent(this); + // Setup the view. mTodoView->setupView(mAppControllerIf, docLoader); // Connect to to-do view signal for entry deletion. @@ -290,6 +296,7 @@ // Find the favorites view. mFavoriteView = static_cast ( docLoader->findWidget(NOTES_FAVORITES_VIEW)); + mFavoriteView->setParent(this); // Setup the view. mFavoriteView->setupView(mAppControllerIf, docLoader); @@ -317,6 +324,8 @@ // Find the note view. mNoteView = static_cast ( docLoader->findWidget(NOTES_NOTE_VIEW)); + mNoteView->setParent(this); + // Setup the view. mNoteView->setupView(mAppControllerIf, docLoader); @@ -327,6 +336,33 @@ } /*! + Update all the other views. + */ +void NotesViewManager::updateOtherViews() +{ + if (mCollectionView) { + // Populate collections view. + mCollectionView->populateListView(); + } + + if (mTodoView) { + // Update the title for to-do view. + mTodoView->updateTitle(); + } + + if (mNoteView) { + // Update the plain notes view. + mNoteView->updateNoteView(); + } + + if (mFavoriteView) { + // Update the favorites view. + mFavoriteView->updateFavoriteView(); + } + +} + +/*! Loads other views from the docml file. */ void NotesViewManager::loadOtherViews() @@ -343,6 +379,10 @@ // Load the recent notes view. loadNoteView(); + if (instanceViewCreated) { + // update other views. + updateOtherViews(); + } // Disconnect the signal viewReady as all the views are loaded. HbMainWindow *window = hbInstance->allMainWindows().first(); disconnect( @@ -383,7 +423,7 @@ defaultActions.clear(); // Add delete and cancel actions - mDeleteAction = new HbAction(hbTrId("txt_notes_button_dialog_delete")); + mDeleteAction = new HbAction(hbTrId("txt_common_button_delete")); mCancelAction = new HbAction(hbTrId("txt_common_button_cancel")); confirmationQuery->addAction(mDeleteAction); @@ -413,22 +453,17 @@ { OstTraceFunctionEntry0( NOTESVIEWMANAGER_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY ); Q_UNUSED(status) - - // Update the title for main view. - mMainView->updateTitle(); - - // Populate collections view. - mCollectionView->populateListView(); + + instanceViewCreated = true; + + if (mMainView) { + // Update the title for main view. + mMainView->updateTitle(); + } - // Update the title for to-do view. - mTodoView->updateTitle(); - - // Update the plain notes view. - mNoteView->updateNoteView(); - - // Update the favorites view. - mFavoriteView->updateFavoriteView(); - + // update other views. + updateOtherViews(); + // Need to emit this signal after the view is fully constructed & populated // with actual data and ready to be used. So entry view & instance view // needs to be created so that a new entry can also be created. Finally diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesviews/src/notescollectionview.cpp --- a/notes/notesui/notesviews/src/notescollectionview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/notesviews/src/notescollectionview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -30,6 +30,7 @@ #include #include #include +#include // User includes #include @@ -123,6 +124,7 @@ // Get the list view from the document and update the model. mListView = static_cast ( mDocLoader->findWidget("listView")); + mListView->setItemPixmapCacheEnabled(true); connect( mListView, SIGNAL(activated(const QModelIndex &)), this, SLOT(handleActivated(const QModelIndex &))); @@ -174,13 +176,14 @@ QStandardItemModel *model = new QStandardItemModel(this); model->setColumnCount(1); - QString countString(hbTrId("txt_notes_list_note_count")); - // Add To-do's item. QStandardItem *item = new QStandardItem(); QStringList todoStringList; todoStringList.append(hbTrId("txt_notes_list_todos")); - todoStringList.append(countString.arg(QString::number(todosCount()))); + todoStringList.append( + HbParameterLengthLimiter( + hbTrId("txt_notes_list_note_count")).arg(QString::number( + todosCount()))); item->setData(todoStringList, Qt::DisplayRole); model->appendRow(item); @@ -188,7 +191,10 @@ item = new QStandardItem(); QStringList favStringList; favStringList.append(hbTrId("txt_notes_list_favorites")); - favStringList.append(countString.arg(mFavouriteModel->rowCount())); + favStringList.append( + HbParameterLengthLimiter( + hbTrId("txt_notes_list_note_count")).arg(QString::number( + mFavouriteModel->rowCount()))); item->setData(favStringList, Qt::DisplayRole); model->appendRow(item); @@ -197,7 +203,9 @@ QStringList notesStringList; notesStringList.append(hbTrId("txt_notes_list_plain_notes")); notesStringList.append( - countString.arg(QString::number(recentNotesCount()))); + HbParameterLengthLimiter( + hbTrId("txt_notes_list_note_count")).arg(QString::number( + recentNotesCount()))); item->setData(notesStringList, Qt::DisplayRole); model->appendRow(item); @@ -224,13 +232,15 @@ void NotesCollectionView::resetCollectionView() { OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_ENTRY ); - QString countString(hbTrId("txt_notes_list_note_count")); // Update the count of to-do's. QModelIndex mdlIndex = mListView->model()->index(0, 0); QStringList todoStringList; todoStringList.append(hbTrId("txt_notes_list_todos")); - todoStringList.append(countString.arg(QString::number(todosCount()))); + todoStringList.append( + HbParameterLengthLimiter( + hbTrId("txt_notes_list_note_count")).arg(QString::number( + todosCount()))); mListView->model()->setData(mdlIndex, todoStringList, Qt::DisplayRole); // Update the count of notes in the view. @@ -238,7 +248,9 @@ QStringList notesStringList; notesStringList.append(hbTrId("txt_notes_list_plain_notes")); notesStringList.append( - countString.arg(QString::number(recentNotesCount()))); + HbParameterLengthLimiter( + hbTrId("txt_notes_list_note_count")).arg(QString::number( + recentNotesCount()))); mListView->model()->setData(mdlIndex, notesStringList, Qt::DisplayRole); OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_EXIT ); } @@ -369,11 +381,13 @@ if( mListView->model()) { // Update the count of notes in the view. - QString countString(hbTrId("txt_notes_list_note_count")); QModelIndex mdlIndex = mListView->model()->index(1, 0); QStringList favStringList; favStringList.append(hbTrId("txt_notes_list_favorites")); - favStringList.append(countString.arg(mFavouriteModel->rowCount())); + favStringList.append( + HbParameterLengthLimiter( + hbTrId("txt_notes_list_note_count")).arg( + QString::number(mFavouriteModel->rowCount()))); mListView->model()->setData(mdlIndex, favStringList, Qt::DisplayRole); } OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_UPDATEFAVOURITESCOUNT_EXIT ); diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesviews/src/notesfavoriteview.cpp --- a/notes/notesui/notesviews/src/notesfavoriteview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/notesviews/src/notesfavoriteview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -118,6 +118,7 @@ (mDocLoader->findWidget("favoritesListView")); // Update the list view model. mListView->setModel(subModel); + mListView->setItemPixmapCacheEnabled(true); // Setup the operations that can be done with a list view. connect( mListView, SIGNAL(released(const QModelIndex &)), diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesviews/src/notesmainview.cpp --- a/notes/notesui/notesviews/src/notesmainview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/notesviews/src/notesmainview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -116,6 +116,7 @@ // Get the list object from the document and update the model. mListView = static_cast (mDocLoader->findWidget("listView")); + mListView->setItemPixmapCacheEnabled(true); Q_ASSERT_X( mListView, "notesmainview.cpp", @@ -496,7 +497,9 @@ void NotesMainView::scrollTo(QModelIndex index) { OstTraceFunctionEntry0( NOTESMAINVIEW_SCROLLTO_ENTRY ); - mListView->scrollTo(index, HbAbstractItemView::EnsureVisible); + QModelIndex modelIndex = mListView->model()->index( + index.row(), index.column()); + mListView->scrollTo(modelIndex, HbAbstractItemView::EnsureVisible); OstTraceFunctionExit0( NOTESMAINVIEW_SCROLLTO_EXIT ); } diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesviews/src/notesnoteview.cpp --- a/notes/notesui/notesviews/src/notesnoteview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/notesviews/src/notesnoteview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -115,6 +115,7 @@ // Update the list view model. mListView->setModel(subModel); + mListView->setItemPixmapCacheEnabled(true); // Setup the operations that can be done with a list view. connect( mListView, SIGNAL(released(const QModelIndex &)), diff -r 1881ad52dc45 -r a5ed90760192 notes/notesui/notesviews/src/notestodoview.cpp --- a/notes/notesui/notesviews/src/notestodoview.cpp Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/notesui/notesviews/src/notestodoview.cpp Mon Sep 06 10:12:45 2010 +0530 @@ -116,6 +116,7 @@ (mDocLoader->findWidget("todoListView")); // Update the list view model. mListView->setModel(subModel); + mListView->setItemPixmapCacheEnabled(true); // Setup the operations that can be done with a list view. connect( mListView, SIGNAL(activated(const QModelIndex &)), diff -r 1881ad52dc45 -r a5ed90760192 notes/rom/notes.iby --- a/notes/rom/notes.iby Tue Aug 31 18:15:13 2010 +0530 +++ b/notes/rom/notes.iby Mon Sep 06 10:12:45 2010 +0530 @@ -27,6 +27,10 @@ // Stub sis data=DATAZ_\system\install\notes_stub.sis \System\Install\notes_stub.sis +// Splashml +data=ZRESOURCE\hb\splashml\notesapplication.splashml RESOURCE_FILES_DIR\hb\splashml\notesapplication.splashml +data=ZRESOURCE\hb\splashml\notesapplication.docml RESOURCE_FILES_DIR\hb\splashml\notesapplication.docml + file=ABI_DIR\BUILD_DIR\notesmodel.dll SHARED_LIB_DIR\notesmodel.dll file=ABI_DIR\BUILD_DIR\noteseditor.dll SHARED_LIB_DIR\noteseditor.dll file=ABI_DIR\BUILD_DIR\notesviews.dll SHARED_LIB_DIR\notesviews.dll diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/agenda_interface_api/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/agenda_interface_api/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,33 @@ +/* +* 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: File that exports the files belonging to +: agenda interface API +* +*/ + + + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +inc/agendaentry.h APP_LAYER_PLATFORM_EXPORT_PATH(agendaentry.h) +inc/AgendaEntry APP_LAYER_PLATFORM_EXPORT_PATH(AgendaEntry) +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) + diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_editor_api/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/calendar_editor_api/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,26 @@ +/* +* 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: Project specification file for calendar_editor_api +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +inc/caleneditor.h APP_LAYER_PLATFORM_EXPORT_PATH(caleneditor.h) +inc/CalenEditor APP_LAYER_PLATFORM_EXPORT_PATH(CalenEditor) diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_exporter_api/group/bld.inf --- a/organizer_plat/calendar_exporter_api/group/bld.inf Tue Aug 31 18:15:13 2010 +0530 +++ b/organizer_plat/calendar_exporter_api/group/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -26,3 +26,4 @@ PRJ_EXPORTS ../inc/CalenExporter.h APP_LAYER_PLATFORM_EXPORT_PATH(CalenExporter.h) +../inc/CalenExporter APP_LAYER_PLATFORM_EXPORT_PATH(CalenExporter) diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_exporter_api/tsrc/bwins/calenexportertestu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/calendar_exporter_api/tsrc/bwins/calenexportertestu.def Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,3 @@ +EXPORTS + ?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &) + diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_exporter_api/tsrc/conf/calenexportertest.cfg --- a/organizer_plat/calendar_exporter_api/tsrc/conf/calenexportertest.cfg Tue Aug 31 18:15:13 2010 +0530 +++ b/organizer_plat/calendar_exporter_api/tsrc/conf/calenexportertest.cfg Mon Sep 06 10:12:45 2010 +0530 @@ -1,14 +1,14 @@ #1 [Test] title CalenExporter: Test Exporting VCal. -create testcalenexporter testObject +create CCalenExporterTest testObject testObject TestExporterVCal delete testObject [Endtest] #2 [Test] title CalenExporter: Test Exporting ICal. -create testcalenexporter testObject +create CCalenExporterTest testObject testObject TestExporterICal delete testObject [Endtest] \ No newline at end of file diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_exporter_api/tsrc/eabi/calenexportertestu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/calendar_exporter_api/tsrc/eabi/calenexportertestu.def Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,3 @@ +EXPORTS + _Z9LibEntryLR13CTestModuleIf @ 1 NONAME + diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_exporter_api/tsrc/group/calenexporter.pkg --- a/organizer_plat/calendar_exporter_api/tsrc/group/calenexporter.pkg Tue Aug 31 18:15:13 2010 +0530 +++ b/organizer_plat/calendar_exporter_api/tsrc/group/calenexporter.pkg Mon Sep 06 10:12:45 2010 +0530 @@ -34,7 +34,7 @@ ; ; calenexporter data input files -"\epoc32\release\armv5\urel\calenexportertest.dll"-"$:\sys\bin\testcalenexportertest.dll" +"\epoc32\release\armv5\urel\calenexportertest.dll"-"$:\sys\bin\calenexportertest.dll" "/epoc32/winscw/C/testframework/calenexportertest.cfg" - "c:/testframework/calenexportertest.cfg" ;"/epoc32/winscw/C/testframework/TestFramework.ini" - "c:/testframework/TestFramework.ini" diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_exporter_api/tsrc/group/calenexportertest.mmp --- a/organizer_plat/calendar_exporter_api/tsrc/group/calenexportertest.mmp Tue Aug 31 18:15:13 2010 +0530 +++ b/organizer_plat/calendar_exporter_api/tsrc/group/calenexportertest.mmp Mon Sep 06 10:12:45 2010 +0530 @@ -17,7 +17,7 @@ #include -TARGET testcalenexporter.dll +TARGET calenexportertest.dll TARGETTYPE dll UID 0x1000af5a 0x01700000 @@ -25,7 +25,7 @@ VENDORID VID_DEFAULT //TARGETPATH ?target_path -DEFFILE testcalenexporter.def +DEFFILE calenexportertest.def SOURCEPATH ../src SOURCE calenexportertest.cpp diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_importer_api/group/bld.inf --- a/organizer_plat/calendar_importer_api/group/bld.inf Tue Aug 31 18:15:13 2010 +0530 +++ b/organizer_plat/calendar_importer_api/group/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -26,3 +26,4 @@ PRJ_EXPORTS ../inc/CalenImporter.h APP_LAYER_PLATFORM_EXPORT_PATH(CalenImporter.h) +../inc/CalenImporter APP_LAYER_PLATFORM_EXPORT_PATH(CalenImporter) diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_launcher_api/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/calendar_launcher_api/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,30 @@ +/* +* 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: File that exports the files belonging to +: Calendar Launcher API +* +*/ + + + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +inc/calenlauncher.h APP_LAYER_PLATFORM_EXPORT_PATH(calenlauncher.h) +inc/CalenLauncher APP_LAYER_PLATFORM_EXPORT_PATH(CalenLauncher) + diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/calendar_settings_keys_api/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/calendar_settings_keys_api/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Project specification file for clock_settings_keys_api +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +inc/calendardomaincrkeys.h APP_LAYER_PLATFORM_EXPORT_PATH(calendardomaincrkeys.h) + diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/clock_settings_keys_api/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/clock_settings_keys_api/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Project specification file for clock_settings_keys_api +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +inc/clockdomaincrkeys.h APP_LAYER_PLATFORM_EXPORT_PATH(clockdomaincrkeys.h) diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/clock_settingsview_plugin_api/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/clock_settingsview_plugin_api/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,27 @@ +/* +* Copyright (c) 2005-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: Project specification file for clock_settingsview_plugin_api +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +inc/clocksettingsviewinterface.h APP_LAYER_PLATFORM_EXPORT_PATH(clocksettingsviewinterface.h) +inc/ClockSettingsViewInterface APP_LAYER_PLATFORM_EXPORT_PATH(ClockSettingsViewInterface) + diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/eventviewer_plugin_api/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/eventviewer_plugin_api/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2005-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: Project specification file for eventviewer_plugin_api +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +inc/eventviewerplugininterface.h APP_LAYER_PLATFORM_EXPORT_PATH(eventviewerplugininterface.h) +inc/EventViewerPluginInterface APP_LAYER_PLATFORM_EXPORT_PATH(EventViewerPluginInterface) diff -r 1881ad52dc45 -r a5ed90760192 organizer_plat/notes_editor_api/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/organizer_plat/notes_editor_api/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2005-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: Project specification file for notes_editor_api +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +inc/noteseditorinterface.h APP_LAYER_PLATFORM_EXPORT_PATH(noteseditorinterface.h) +inc/NotesEditorInterface APP_LAYER_PLATFORM_EXPORT_PATH(NotesEditorInterface) diff -r 1881ad52dc45 -r a5ed90760192 organizer_pub/calendar_interim_utils2_api/group/bld.inf --- a/organizer_pub/calendar_interim_utils2_api/group/bld.inf Tue Aug 31 18:15:13 2010 +0530 +++ b/organizer_pub/calendar_interim_utils2_api/group/bld.inf Mon Sep 06 10:12:45 2010 +0530 @@ -26,3 +26,4 @@ PRJ_EXPORTS ../inc/CalenInterimUtils2.h APP_LAYER_PUBLIC_EXPORT_PATH(CalenInterimUtils2.h) +../inc/CalenInterimUtils2 APP_LAYER_PUBLIC_EXPORT_PATH(CalenInterimUtils2) diff -r 1881ad52dc45 -r a5ed90760192 organizer_pub/calendar_interim_utils2_api/tsrc/stiff/group/CalenInterimUtils2Test.pkg --- a/organizer_pub/calendar_interim_utils2_api/tsrc/stiff/group/CalenInterimUtils2Test.pkg Tue Aug 31 18:15:13 2010 +0530 +++ b/organizer_pub/calendar_interim_utils2_api/tsrc/stiff/group/CalenInterimUtils2Test.pkg Mon Sep 06 10:12:45 2010 +0530 @@ -46,7 +46,7 @@ ; None ; Install files -"/epoc32/release/armv5/udeb/CalendarCommonUtilsTest.dll" - "!:/Sys/Bin/CalendarCommonUtilsTest.dll" +"/epoc32/release/armv5/udeb/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" diff -r 1881ad52dc45 -r a5ed90760192 package_definition.xml --- a/package_definition.xml Tue Aug 31 18:15:13 2010 +0530 +++ b/package_definition.xml Mon Sep 06 10:12:45 2010 +0530 @@ -1,200 +1,174 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 1881ad52dc45 -r a5ed90760192 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Mon Sep 06 10:12:45 2010 +0530 @@ -0,0 +1,1 @@ +