--- a/agendainterface/agendautil/agendautil.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/agendainterface/agendautil/agendautil.pro Mon Aug 23 16:00:50 2010 +0100
@@ -39,9 +39,9 @@
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
}
-HEADERS += ../inc/agendautil.h \
+HEADERS += ../../organizer_plat/agenda_interface_api/inc/agendautil.h \
agendautil_p.h \
- ../inc/agendaentry.h \
+ ../../organizer_plat/agenda_interface_api/inc/agendaentry.h \
agendaentry_p.h
SOURCES += agendautil.cpp \
--- a/agendainterface/agendautil/bwins/agendainterfaceu.def Mon Jul 19 15:12:16 2010 +0100
+++ b/agendainterface/agendautil/bwins/agendainterfaceu.def Mon Aug 23 16:00:50 2010 +0100
@@ -1,184 +1,180 @@
EXPORTS
?minTime@AgendaUtil@@SA?AVQDateTime@@XZ @ 1 NONAME ; class QDateTime AgendaUtil::minTime(void)
??4AgendaCategory@@QAEAAV0@ABV0@@Z @ 2 NONAME ; class AgendaCategory & AgendaCategory::operator=(class AgendaCategory const &)
- ?addEntry@AgendaUtil@@QAEKABVAgendaEntry@@@Z @ 3 NONAME ; unsigned long AgendaUtil::addEntry(class AgendaEntry const &)
- ??_EAgendaEntry@@UAE@I@Z @ 4 NONAME ; AgendaEntry::~AgendaEntry(unsigned int)
- ??8AgendaEntry@@QBE_NABV0@@Z @ 5 NONAME ; bool AgendaEntry::operator==(class AgendaEntry const &) const
- ??1AgendaAlarm@@QAE@XZ @ 6 NONAME ; AgendaAlarm::~AgendaAlarm(void)
- ?setAlarm@AgendaEntry@@QAEXABVAgendaAlarm@@@Z @ 7 NONAME ; void AgendaEntry::setAlarm(class AgendaAlarm const &)
- ?isNull@AgendaEntry@@QBE_NXZ @ 8 NONAME ; bool AgendaEntry::isNull(void) const
- ?isNull@AgendaCategory@@QBE_NXZ @ 9 NONAME ; bool AgendaCategory::isNull(void) const
- ??8AgendaRepeatRule@@QBE_NABV0@@Z @ 10 NONAME ; bool AgendaRepeatRule::operator==(class AgendaRepeatRule const &) const
- ?entryUpdated@AgendaUtil@@IAEXK@Z @ 11 NONAME ; void AgendaUtil::entryUpdated(unsigned long)
- ?alarmSoundName@AgendaAlarm@@QBE?AVQString@@XZ @ 12 NONAME ; class QString AgendaAlarm::alarmSoundName(void) const
- ?alarm@AgendaEntry@@QBE?AVAgendaAlarm@@XZ @ 13 NONAME ; class AgendaAlarm AgendaEntry::alarm(void) const
- ?responseRequested@AgendaAttendee@@QBE_NXZ @ 14 NONAME ; bool AgendaAttendee::responseRequested(void) const
- ?startTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 15 NONAME ; class QDateTime AgendaEntry::startTime(void) const
- ?geoValue@AgendaEntry@@QBE?AVAgendaGeoValue@@XZ @ 16 NONAME ; class AgendaGeoValue AgendaEntry::geoValue(void) const
- ?getNextInstanceTimes@AgendaUtil@@QAEXAAVAgendaEntry@@AAVQDateTime@@1@Z @ 17 NONAME ; void AgendaUtil::getNextInstanceTimes(class AgendaEntry &, class QDateTime &, class QDateTime &)
- ?exportAsvCalendar@AgendaUtil@@QAE_NABVQString@@J@Z @ 18 NONAME ; bool AgendaUtil::exportAsvCalendar(class QString const &, long)
- ??_EAgendaAttendee@@UAE@I@Z @ 19 NONAME ; AgendaAttendee::~AgendaAttendee(unsigned int)
- ??9AgendaAlarm@@QBE_NABV0@@Z @ 20 NONAME ; bool AgendaAlarm::operator!=(class AgendaAlarm const &) const
- ?isNull@AgendaAlarm@@QBE_NXZ @ 21 NONAME ; bool AgendaAlarm::isNull(void) const
- ?extendedCategoryName@AgendaCategory@@QBE?AVQString@@XZ @ 22 NONAME ; class QString AgendaCategory::extendedCategoryName(void) const
- ?entryIds@AgendaUtil@@QAE?AV?$QList@K@@W4FilterFlags@1@@Z @ 23 NONAME ; class QList<unsigned long> AgendaUtil::entryIds(enum AgendaUtil::FilterFlags)
- ?isRepeating@AgendaEntry@@QAE_NXZ @ 24 NONAME ; bool AgendaEntry::isRepeating(void)
- ?clearRepeatingProperties@AgendaUtil@@QAEXAAVAgendaEntry@@@Z @ 25 NONAME ; void AgendaUtil::clearRepeatingProperties(class AgendaEntry &)
- ?deleteRepeatedEntry@AgendaUtil@@QAEXAAVAgendaEntry@@W4RecurrenceRange@1@@Z @ 26 NONAME ; void AgendaUtil::deleteRepeatedEntry(class AgendaEntry &, enum AgendaUtil::RecurrenceRange)
- ?tr@AgendaUtil@@SA?AVQString@@PBD0H@Z @ 27 NONAME ; class QString AgendaUtil::tr(char const *, char const *, int)
- ?description@AgendaEntry@@QBE?AVQString@@XZ @ 28 NONAME ; class QString AgendaEntry::description(void) const
- ??0AgendaUtil@@QAE@PAVQObject@@@Z @ 29 NONAME ; AgendaUtil::AgendaUtil(class QObject *)
- ?categories@AgendaEntry@@QAEAAV?$QList@VAgendaCategory@@@@XZ @ 30 NONAME ; class QList<class AgendaCategory> & AgendaEntry::categories(void)
- ?entriesChanged@AgendaUtil@@IAEXV?$QList@K@@@Z @ 31 NONAME ; void AgendaUtil::entriesChanged(class QList<unsigned long>)
- ??0AgendaGeoValue@@QAE@XZ @ 32 NONAME ; AgendaGeoValue::AgendaGeoValue(void)
- ?status@AgendaAttendee@@QBE?AW4StatusType@1@XZ @ 33 NONAME ; enum AgendaAttendee::StatusType AgendaAttendee::status(void) const
- ?markDatesWithEvents@AgendaUtil@@QAEXVQDateTime@@0W4FilterFlags@1@AAV?$QList@VQDate@@@@@Z @ 34 NONAME ; void AgendaUtil::markDatesWithEvents(class QDateTime, class QDateTime, enum AgendaUtil::FilterFlags, class QList<class QDate> &)
- ??9AgendaGeoValue@@QBE_NABV0@@Z @ 35 NONAME ; bool AgendaGeoValue::operator!=(class AgendaGeoValue const &) const
- ??0AgendaAlarm@@QAE@XZ @ 36 NONAME ; AgendaAlarm::AgendaAlarm(void)
- ?byMonth@AgendaRepeatRule@@QBE?AV?$QList@W4Month@AgendaRepeatRule@@@@XZ @ 37 NONAME ; class QList<enum AgendaRepeatRule::Month> AgendaRepeatRule::byMonth(void) const
- ?isNull@AgendaAttendee@@QBE_NXZ @ 38 NONAME ; bool AgendaAttendee::isNull(void) const
- ?areNoEntriesInCalendar@AgendaUtil@@QAE_NXZ @ 39 NONAME ; bool AgendaUtil::areNoEntriesInCalendar(void)
- ?clearGeoValue@AgendaEntry@@QBEXXZ @ 40 NONAME ; void AgendaEntry::clearGeoValue(void) const
- ?setAddress@AgendaAttendee@@QAEXABVQString@@@Z @ 41 NONAME ; void AgendaAttendee::setAddress(class QString const &)
- ?setRepeatRuleStart@AgendaRepeatRule@@QAEXABVQDateTime@@@Z @ 42 NONAME ; void AgendaRepeatRule::setRepeatRuleStart(class QDateTime const &)
- ?trUtf8@AgendaUtil@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString AgendaUtil::trUtf8(char const *, char const *, int)
- ?setLastModifiedDateTime@AgendaEntry@@QAEXABVQDateTime@@@Z @ 44 NONAME ; void AgendaEntry::setLastModifiedDateTime(class QDateTime const &)
- ??0AgendaAlarm@@QAE@ABV0@@Z @ 45 NONAME ; AgendaAlarm::AgendaAlarm(class AgendaAlarm const &)
- ?setSummary@AgendaEntry@@QAEXABVQString@@@Z @ 46 NONAME ; void AgendaEntry::setSummary(class QString const &)
- ?setByMonthDay@AgendaRepeatRule@@QAEXABV?$QList@H@@@Z @ 47 NONAME ; void AgendaRepeatRule::setByMonthDay(class QList<int> const &)
- ??1AgendaEntry@@UAE@XZ @ 48 NONAME ; AgendaEntry::~AgendaEntry(void)
- ?setResponseRequested@AgendaAttendee@@QAEX_N@Z @ 49 NONAME ; void AgendaAttendee::setResponseRequested(bool)
- ??1AgendaRepeatRule@@QAE@XZ @ 50 NONAME ; AgendaRepeatRule::~AgendaRepeatRule(void)
- ?byMonthDay@AgendaRepeatRule@@QBE?AV?$QList@H@@XZ @ 51 NONAME ; class QList<int> AgendaRepeatRule::byMonthDay(void) const
- ?detach@AgendaGeoValue@@AAEXXZ @ 52 NONAME ; void AgendaGeoValue::detach(void)
- ?detach@AgendaEntry@@AAEXXZ @ 53 NONAME ; void AgendaEntry::detach(void)
- ??9AgendaAttendee@@QBE_NABV0@@Z @ 54 NONAME ; bool AgendaAttendee::operator!=(class AgendaAttendee const &) const
- ??9AgendaRepeatRule@@QBE_NABV0@@Z @ 55 NONAME ; bool AgendaRepeatRule::operator!=(class AgendaRepeatRule const &) const
- ?weekStart@AgendaRepeatRule@@QBE?AW4Day@1@XZ @ 56 NONAME ; enum AgendaRepeatRule::Day AgendaRepeatRule::weekStart(void) const
- ??4AgendaAlarm@@QAEAAV0@ABV0@@Z @ 57 NONAME ; class AgendaAlarm & AgendaAlarm::operator=(class AgendaAlarm const &)
- ?lastModifiedDateTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 58 NONAME ; class QDateTime AgendaEntry::lastModifiedDateTime(void) const
- ?attendees@AgendaEntry@@QBEABV?$QList@VAgendaAttendee@@@@XZ @ 59 NONAME ; class QList<class AgendaAttendee> const & AgendaEntry::attendees(void) const
- ?setInterval@AgendaRepeatRule@@QAEXH@Z @ 60 NONAME ; void AgendaRepeatRule::setInterval(int)
- ?updateEntry@AgendaUtil@@QAE_NABVAgendaEntry@@_N@Z @ 61 NONAME ; bool AgendaUtil::updateEntry(class AgendaEntry const &, bool)
- ??8AgendaGeoValue@@QBE_NABV0@@Z @ 62 NONAME ; bool AgendaGeoValue::operator==(class AgendaGeoValue const &) const
- ?id@AgendaEntry@@QBEKXZ @ 63 NONAME ; unsigned long AgendaEntry::id(void) const
- ?setByDay@AgendaRepeatRule@@QAEXABV?$QList@W4Day@AgendaRepeatRule@@@@@Z @ 64 NONAME ; void AgendaRepeatRule::setByDay(class QList<enum AgendaRepeatRule::Day> const &)
- ?setUntil@AgendaRepeatRule@@QAEXABVQDateTime@@@Z @ 65 NONAME ; void AgendaRepeatRule::setUntil(class QDateTime const &)
- ?setType@AgendaRepeatRule@@QAEXW4RuleType@1@@Z @ 66 NONAME ; void AgendaRepeatRule::setType(enum AgendaRepeatRule::RuleType)
- ?interval@AgendaRepeatRule@@QBEHXZ @ 67 NONAME ; int AgendaRepeatRule::interval(void) const
- ?rDates@AgendaEntry@@QBE?AV?$QList@VQDate@@@@XZ @ 68 NONAME ; class QList<class QDate> AgendaEntry::rDates(void) const
- ?repeatRuleStart@AgendaRepeatRule@@QBE?AVQDateTime@@XZ @ 69 NONAME ; class QDateTime AgendaRepeatRule::repeatRuleStart(void) const
- ??8AgendaAlarm@@QBE_NABV0@@Z @ 70 NONAME ; bool AgendaAlarm::operator==(class AgendaAlarm const &) const
- ?storeRepeatingEntry@AgendaUtil@@QAE_NABVAgendaEntry@@_N@Z @ 71 NONAME ; bool AgendaUtil::storeRepeatingEntry(class AgendaEntry const &, bool)
- ??0AgendaRepeatRule@@QAE@ABV0@@Z @ 72 NONAME ; AgendaRepeatRule::AgendaRepeatRule(class AgendaRepeatRule const &)
- ?setStatus@AgendaAttendee@@QAEXW4StatusType@1@@Z @ 73 NONAME ; void AgendaAttendee::setStatus(enum AgendaAttendee::StatusType)
- ?setStatus@AgendaEntry@@QAEXW4Status@1@@Z @ 74 NONAME ; void AgendaEntry::setStatus(enum AgendaEntry::Status)
- ?setExtendedCategoryName@AgendaCategory@@QAEXABVQString@@@Z @ 75 NONAME ; void AgendaCategory::setExtendedCategoryName(class QString const &)
- ?setDescription@AgendaEntry@@QAEXABVQString@@@Z @ 76 NONAME ; void AgendaEntry::setDescription(class QString const &)
- ?recurrenceId@AgendaEntry@@QAE?AVQDateTime@@XZ @ 77 NONAME ; class QDateTime AgendaEntry::recurrenceId(void)
- ?until@AgendaRepeatRule@@QBE?AVQDateTime@@XZ @ 78 NONAME ; class QDateTime AgendaRepeatRule::until(void) const
- ?setByMonth@AgendaRepeatRule@@QAEXABV?$QList@W4Month@AgendaRepeatRule@@@@@Z @ 79 NONAME ; void AgendaRepeatRule::setByMonth(class QList<enum AgendaRepeatRule::Month> const &)
- ?qt_metacall@AgendaUtil@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 80 NONAME ; int AgendaUtil::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?qt_metacast@AgendaUtil@@UAEPAXPBD@Z @ 81 NONAME ; void * AgendaUtil::qt_metacast(char const *)
- ?isNull@AgendaRepeatRule@@QBE_NXZ @ 82 NONAME ; bool AgendaRepeatRule::isNull(void) const
- ?getStaticMetaObject@AgendaUtil@@SAABUQMetaObject@@XZ @ 83 NONAME ; struct QMetaObject const & AgendaUtil::getStaticMetaObject(void)
- ??8AgendaAttendee@@QBE_NABV0@@Z @ 84 NONAME ; bool AgendaAttendee::operator==(class AgendaAttendee const &) const
- ?addCategory@AgendaEntry@@QAEXABVAgendaCategory@@@Z @ 85 NONAME ; void AgendaEntry::addCategory(class AgendaCategory const &)
- ?setLocation@AgendaEntry@@QAEXABVQString@@@Z @ 86 NONAME ; void AgendaEntry::setLocation(class QString const &)
- ?isTimedEntry@AgendaEntry@@QAE_NXZ @ 87 NONAME ; bool AgendaEntry::isTimedEntry(void)
- ?favourite@AgendaEntry@@QBEIXZ @ 88 NONAME ; unsigned int AgendaEntry::favourite(void) const
- ?entryViewCreationCompleted@AgendaUtil@@IAEXH@Z @ 89 NONAME ; void AgendaUtil::entryViewCreationCompleted(int)
- ?durationInSecs@AgendaEntry@@QBEHXZ @ 90 NONAME ; int AgendaEntry::durationInSecs(void) const
- ??1AgendaUtil@@UAE@XZ @ 91 NONAME ; AgendaUtil::~AgendaUtil(void)
- ?category@AgendaCategory@@QBE?AW4CategoryType@1@XZ @ 92 NONAME ; enum AgendaCategory::CategoryType AgendaCategory::category(void) const
- ?entryAdded@AgendaUtil@@IAEXK@Z @ 93 NONAME ; void AgendaUtil::entryAdded(unsigned long)
- ?role@AgendaAttendee@@QBE?AW4ParticipantRole@1@XZ @ 94 NONAME ; enum AgendaAttendee::ParticipantRole AgendaAttendee::role(void) const
- ?type@AgendaEntry@@QBE?AW4Type@1@XZ @ 95 NONAME ; enum AgendaEntry::Type AgendaEntry::type(void) const
- ??0AgendaEntry@@QAE@W4Type@0@@Z @ 96 NONAME ; AgendaEntry::AgendaEntry(enum AgendaEntry::Type)
- ?detach@AgendaRepeatRule@@AAEXXZ @ 97 NONAME ; void AgendaRepeatRule::detach(void)
- ?error@AgendaUtil@@QBE?AW4Error@1@XZ @ 98 NONAME ; enum AgendaUtil::Error AgendaUtil::error(void) const
- ?trUtf8@AgendaUtil@@SA?AVQString@@PBD0@Z @ 99 NONAME ; class QString AgendaUtil::trUtf8(char const *, char const *)
- ?status@AgendaEntry@@QBE?AW4Status@1@XZ @ 100 NONAME ; enum AgendaEntry::Status AgendaEntry::status(void) const
- ??0AgendaEntry@@QAE@ABV0@@Z @ 101 NONAME ; AgendaEntry::AgendaEntry(class AgendaEntry const &)
- ??4AgendaAttendee@@QAEAAV0@ABV0@@Z @ 102 NONAME ; class AgendaAttendee & AgendaAttendee::operator=(class AgendaAttendee const &)
- ?address@AgendaAttendee@@QBE?AVQString@@XZ @ 103 NONAME ; class QString AgendaAttendee::address(void) const
- ?entryDeleted@AgendaUtil@@IAEXK@Z @ 104 NONAME ; void AgendaUtil::entryDeleted(unsigned long)
- ?summary@AgendaEntry@@QBE?AVQString@@XZ @ 105 NONAME ; class QString AgendaEntry::summary(void) const
- ?priority@AgendaEntry@@QBEHXZ @ 106 NONAME ; int AgendaEntry::priority(void) const
- ?fetchById@AgendaUtil@@QAE?AVAgendaEntry@@K@Z @ 107 NONAME ; class AgendaEntry AgendaUtil::fetchById(unsigned long)
- ?setCommonName@AgendaAttendee@@QAEXABVQString@@@Z @ 108 NONAME ; void AgendaAttendee::setCommonName(class QString const &)
- ?setMethod@AgendaEntry@@QAEXW4Method@1@@Z @ 109 NONAME ; void AgendaEntry::setMethod(enum AgendaEntry::Method)
- ?setRDates@AgendaEntry@@QAEXABV?$QList@VQDate@@@@@Z @ 110 NONAME ; void AgendaEntry::setRDates(class QList<class QDate> const &)
- ?parentEntry@AgendaUtil@@QAE?AVAgendaEntry@@AAV2@@Z @ 111 NONAME ; class AgendaEntry AgendaUtil::parentEntry(class AgendaEntry &)
- ?addAttendee@AgendaEntry@@QAEXABVAgendaAttendee@@@Z @ 112 NONAME ; void AgendaEntry::addAttendee(class AgendaAttendee const &)
- ?setCompleted@AgendaUtil@@QAEXAAVAgendaEntry@@_NAAVQDateTime@@@Z @ 113 NONAME ; void AgendaUtil::setCompleted(class AgendaEntry &, bool, class QDateTime &)
- ??0AgendaCategory@@QAE@XZ @ 114 NONAME ; AgendaCategory::AgendaCategory(void)
- ?timeOffset@AgendaAlarm@@QBEHXZ @ 115 NONAME ; int AgendaAlarm::timeOffset(void) const
- ??0AgendaAttendee@@QAE@XZ @ 116 NONAME ; AgendaAttendee::AgendaAttendee(void)
- ?setAlarmSoundName@AgendaAlarm@@QAEXABVQString@@@Z @ 117 NONAME ; void AgendaAlarm::setAlarmSoundName(class QString const &)
- ?fetchEntriesInRange@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@VQDateTime@@0W4FilterFlags@1@@Z @ 118 NONAME ; class QList<class AgendaEntry> AgendaUtil::fetchEntriesInRange(class QDateTime, class QDateTime, enum AgendaUtil::FilterFlags)
- ?detach@AgendaAlarm@@AAEXXZ @ 119 NONAME ; void AgendaAlarm::detach(void)
- ?setWeekStart@AgendaRepeatRule@@QAEXW4Day@1@@Z @ 120 NONAME ; void AgendaRepeatRule::setWeekStart(enum AgendaRepeatRule::Day)
- ?setFavourite@AgendaEntry@@QAEXI@Z @ 121 NONAME ; void AgendaEntry::setFavourite(unsigned int)
- ?setDTStamp@AgendaEntry@@QAEXABVQDateTime@@@Z @ 122 NONAME ; void AgendaEntry::setDTStamp(class QDateTime const &)
- ?cloneEntry@AgendaUtil@@QAEKABVAgendaEntry@@W4Type@2@@Z @ 123 NONAME ; unsigned long AgendaUtil::cloneEntry(class AgendaEntry const &, enum AgendaEntry::Type)
- ?setRepeatRule@AgendaEntry@@QAEXABVAgendaRepeatRule@@@Z @ 124 NONAME ; void AgendaEntry::setRepeatRule(class AgendaRepeatRule const &)
- ?categories@AgendaEntry@@QBEABV?$QList@VAgendaCategory@@@@XZ @ 125 NONAME ; class QList<class AgendaCategory> const & AgendaEntry::categories(void) const
- ?tr@AgendaUtil@@SA?AVQString@@PBD0@Z @ 126 NONAME ; class QString AgendaUtil::tr(char const *, char const *)
- ??4AgendaRepeatRule@@QAEAAV0@ABV0@@Z @ 127 NONAME ; class AgendaRepeatRule & AgendaRepeatRule::operator=(class AgendaRepeatRule const &)
- ?setCompletedDateTime@AgendaEntry@@QAEXABVQDateTime@@@Z @ 128 NONAME ; void AgendaEntry::setCompletedDateTime(class QDateTime const &)
- ??0AgendaRepeatRule@@QAE@XZ @ 129 NONAME ; AgendaRepeatRule::AgendaRepeatRule(void)
- ?dtStamp@AgendaEntry@@QBE?AVQDateTime@@XZ @ 130 NONAME ; class QDateTime AgendaEntry::dtStamp(void) const
- ?method@AgendaEntry@@QBE?AW4Method@1@XZ @ 131 NONAME ; enum AgendaEntry::Method AgendaEntry::method(void) const
- ?type@AgendaRepeatRule@@QBE?AW4RuleType@1@XZ @ 132 NONAME ; enum AgendaRepeatRule::RuleType AgendaRepeatRule::type(void) const
- ??4AgendaGeoValue@@QAEAAV0@ABV0@@Z @ 133 NONAME ; class AgendaGeoValue & AgendaGeoValue::operator=(class AgendaGeoValue const &)
- ??0AgendaCategory@@QAE@W4CategoryType@0@@Z @ 134 NONAME ; AgendaCategory::AgendaCategory(enum AgendaCategory::CategoryType)
- ?commonName@AgendaAttendee@@QBE?AVQString@@XZ @ 135 NONAME ; class QString AgendaAttendee::commonName(void) const
- ?detach@AgendaCategory@@AAEXXZ @ 136 NONAME ; void AgendaCategory::detach(void)
- ??0AgendaGeoValue@@QAE@ABV0@@Z @ 137 NONAME ; AgendaGeoValue::AgendaGeoValue(class AgendaGeoValue const &)
- ?isWorkdaysRepeatingEntry@AgendaUtil@@SA_NABVAgendaRepeatRule@@@Z @ 138 NONAME ; bool AgendaUtil::isWorkdaysRepeatingEntry(class AgendaRepeatRule const &)
- ?setRole@AgendaAttendee@@QAEXW4ParticipantRole@1@@Z @ 139 NONAME ; void AgendaAttendee::setRole(enum AgendaAttendee::ParticipantRole)
- ?detach@AgendaAttendee@@AAEXXZ @ 140 NONAME ; void AgendaAttendee::detach(void)
- ?getLatLong@AgendaGeoValue@@QBEXAAN0@Z @ 141 NONAME ; void AgendaGeoValue::getLatLong(double &, double &) const
- ?maxTime@AgendaUtil@@SA?AVQDateTime@@XZ @ 142 NONAME ; class QDateTime AgendaUtil::maxTime(void)
- ?setCategory@AgendaCategory@@QAEXW4CategoryType@1@@Z @ 143 NONAME ; void AgendaCategory::setCategory(enum AgendaCategory::CategoryType)
- ?endTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 144 NONAME ; class QDateTime AgendaEntry::endTime(void) const
- ??9AgendaEntry@@QBE_NABV0@@Z @ 145 NONAME ; bool AgendaEntry::operator!=(class AgendaEntry const &) const
- ??0AgendaRepeatRule@@QAE@W4RuleType@0@@Z @ 146 NONAME ; AgendaRepeatRule::AgendaRepeatRule(enum AgendaRepeatRule::RuleType)
- ??9AgendaCategory@@QBE_NABV0@@Z @ 147 NONAME ; bool AgendaCategory::operator!=(class AgendaCategory const &) const
- ??0AgendaAttendee@@QAE@ABV0@@Z @ 148 NONAME ; AgendaAttendee::AgendaAttendee(class AgendaAttendee const &)
- ??0AgendaAttendee@@QAE@ABVQString@@@Z @ 149 NONAME ; AgendaAttendee::AgendaAttendee(class QString const &)
- ?importvCalendar@AgendaUtil@@QAEHABVQString@@AAVAgendaEntry@@@Z @ 150 NONAME ; int AgendaUtil::importvCalendar(class QString const &, class AgendaEntry &)
- ?instanceViewCreationCompleted@AgendaUtil@@IAEXH@Z @ 151 NONAME ; void AgendaUtil::instanceViewCreationCompleted(int)
- ??_EAgendaUtil@@UAE@I@Z @ 152 NONAME ; AgendaUtil::~AgendaUtil(unsigned int)
- ?setGeoValue@AgendaEntry@@QAEXABVAgendaGeoValue@@@Z @ 153 NONAME ; void AgendaEntry::setGeoValue(class AgendaGeoValue const &)
- ?getPreviousInstanceTimes@AgendaUtil@@QAEXAAVAgendaEntry@@AAVQDateTime@@1@Z @ 154 NONAME ; void AgendaUtil::getPreviousInstanceTimes(class AgendaEntry &, class QDateTime &, class QDateTime &)
- ?attendees@AgendaEntry@@QAEAAV?$QList@VAgendaAttendee@@@@XZ @ 155 NONAME ; class QList<class AgendaAttendee> & AgendaEntry::attendees(void)
- ?staticMetaObject@AgendaUtil@@2UQMetaObject@@B @ 156 NONAME ; struct QMetaObject const AgendaUtil::staticMetaObject
- ?entriesDeleted@AgendaUtil@@IAEXH@Z @ 157 NONAME ; void AgendaUtil::entriesDeleted(int)
- ?fetchAllEntries@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@W4FilterFlags@1@@Z @ 158 NONAME ; class QList<class AgendaEntry> AgendaUtil::fetchAllEntries(enum AgendaUtil::FilterFlags)
- ?setTimeOffset@AgendaAlarm@@QAEXH@Z @ 159 NONAME ; void AgendaAlarm::setTimeOffset(int)
- ??0AgendaEntry@@QAE@XZ @ 160 NONAME ; AgendaEntry::AgendaEntry(void)
- ?setPriority@AgendaEntry@@QAEXH@Z @ 161 NONAME ; void AgendaEntry::setPriority(int)
- ?setType@AgendaEntry@@QAEXW4Type@1@@Z @ 162 NONAME ; void AgendaEntry::setType(enum AgendaEntry::Type)
- ?setStartAndEndTime@AgendaEntry@@QAE_NABVQDateTime@@0@Z @ 163 NONAME ; bool AgendaEntry::setStartAndEndTime(class QDateTime const &, class QDateTime const &)
- ?deleteEntries@AgendaUtil@@QAEXAAVQDateTime@@0W4FilterFlags@1@@Z @ 164 NONAME ; void AgendaUtil::deleteEntries(class QDateTime &, class QDateTime &, enum AgendaUtil::FilterFlags)
- ?metaObject@AgendaUtil@@UBEPBUQMetaObject@@XZ @ 165 NONAME ; struct QMetaObject const * AgendaUtil::metaObject(void) const
- ?location@AgendaEntry@@QBE?AVQString@@XZ @ 166 NONAME ; class QString AgendaEntry::location(void) const
- ??8AgendaCategory@@QBE_NABV0@@Z @ 167 NONAME ; bool AgendaCategory::operator==(class AgendaCategory const &) const
- ??0AgendaCategory@@QAE@ABV0@@Z @ 168 NONAME ; AgendaCategory::AgendaCategory(class AgendaCategory const &)
- ??1AgendaGeoValue@@QAE@XZ @ 169 NONAME ; AgendaGeoValue::~AgendaGeoValue(void)
- ??4AgendaEntry@@QAEAAV0@ABV0@@Z @ 170 NONAME ; class AgendaEntry & AgendaEntry::operator=(class AgendaEntry const &)
- ??_EAgendaCategory@@UAE@I@Z @ 171 NONAME ; AgendaCategory::~AgendaCategory(unsigned int)
- ?createEntryIdListForDay@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@VQDateTime@@W4FilterFlags@1@@Z @ 172 NONAME ; class QList<class AgendaEntry> AgendaUtil::createEntryIdListForDay(class QDateTime, enum AgendaUtil::FilterFlags)
- ?createException@AgendaUtil@@QAE_NABVAgendaEntry@@VQDateTime@@@Z @ 173 NONAME ; bool AgendaUtil::createException(class AgendaEntry const &, class QDateTime)
- ?repeatRule@AgendaEntry@@QBE?AVAgendaRepeatRule@@XZ @ 174 NONAME ; class AgendaRepeatRule AgendaEntry::repeatRule(void) const
- ??1AgendaCategory@@UAE@XZ @ 175 NONAME ; AgendaCategory::~AgendaCategory(void)
- ?deleteEntry@AgendaUtil@@QAE_NK@Z @ 176 NONAME ; bool AgendaUtil::deleteEntry(unsigned long)
- ??1AgendaAttendee@@UAE@XZ @ 177 NONAME ; AgendaAttendee::~AgendaAttendee(void)
- ?byDay@AgendaRepeatRule@@QBE?AV?$QList@W4Day@AgendaRepeatRule@@@@XZ @ 178 NONAME ; class QList<enum AgendaRepeatRule::Day> AgendaRepeatRule::byDay(void) const
- ?setLatLong@AgendaGeoValue@@QAEXNN@Z @ 179 NONAME ; void AgendaGeoValue::setLatLong(double, double)
- ?completedDateTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 180 NONAME ; class QDateTime AgendaEntry::completedDateTime(void) const
- ?setRecurrenceId@AgendaEntry@@QAEXAAVQDateTime@@@Z @ 181 NONAME ; void AgendaEntry::setRecurrenceId(class QDateTime &)
- ?isNull@AgendaGeoValue@@QBE_NXZ @ 182 NONAME ; bool AgendaGeoValue::isNull(void) const
+ ??_EAgendaEntry@@UAE@I@Z @ 3 NONAME ; AgendaEntry::~AgendaEntry(unsigned int)
+ ??8AgendaEntry@@QBE_NABV0@@Z @ 4 NONAME ; bool AgendaEntry::operator==(class AgendaEntry const &) const
+ ??1AgendaAlarm@@QAE@XZ @ 5 NONAME ; AgendaAlarm::~AgendaAlarm(void)
+ ?setAlarm@AgendaEntry@@QAEXABVAgendaAlarm@@@Z @ 6 NONAME ; void AgendaEntry::setAlarm(class AgendaAlarm const &)
+ ?isNull@AgendaEntry@@QBE_NXZ @ 7 NONAME ; bool AgendaEntry::isNull(void) const
+ ?isNull@AgendaCategory@@QBE_NXZ @ 8 NONAME ; bool AgendaCategory::isNull(void) const
+ ??8AgendaRepeatRule@@QBE_NABV0@@Z @ 9 NONAME ; bool AgendaRepeatRule::operator==(class AgendaRepeatRule const &) const
+ ?entryUpdated@AgendaUtil@@IAEXK@Z @ 10 NONAME ; void AgendaUtil::entryUpdated(unsigned long)
+ ?alarmSoundName@AgendaAlarm@@QBE?AVQString@@XZ @ 11 NONAME ; class QString AgendaAlarm::alarmSoundName(void) const
+ ?alarm@AgendaEntry@@QBE?AVAgendaAlarm@@XZ @ 12 NONAME ; class AgendaAlarm AgendaEntry::alarm(void) const
+ ?responseRequested@AgendaAttendee@@QBE_NXZ @ 13 NONAME ; bool AgendaAttendee::responseRequested(void) const
+ ?startTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 14 NONAME ; class QDateTime AgendaEntry::startTime(void) const
+ ?geoValue@AgendaEntry@@QBE?AVAgendaGeoValue@@XZ @ 15 NONAME ; class AgendaGeoValue AgendaEntry::geoValue(void) const
+ ?getNextInstanceTimes@AgendaUtil@@QAEXAAVAgendaEntry@@AAVQDateTime@@1@Z @ 16 NONAME ; void AgendaUtil::getNextInstanceTimes(class AgendaEntry &, class QDateTime &, class QDateTime &)
+ ?exportAsvCalendar@AgendaUtil@@QAE_NABVQString@@J@Z @ 17 NONAME ; bool AgendaUtil::exportAsvCalendar(class QString const &, long)
+ ??_EAgendaAttendee@@UAE@I@Z @ 18 NONAME ; AgendaAttendee::~AgendaAttendee(unsigned int)
+ ??9AgendaAlarm@@QBE_NABV0@@Z @ 19 NONAME ; bool AgendaAlarm::operator!=(class AgendaAlarm const &) const
+ ?isNull@AgendaAlarm@@QBE_NXZ @ 20 NONAME ; bool AgendaAlarm::isNull(void) const
+ ?extendedCategoryName@AgendaCategory@@QBE?AVQString@@XZ @ 21 NONAME ; class QString AgendaCategory::extendedCategoryName(void) const
+ ?entryIds@AgendaUtil@@QAE?AV?$QList@K@@W4FilterFlags@1@@Z @ 22 NONAME ; class QList<unsigned long> AgendaUtil::entryIds(enum AgendaUtil::FilterFlags)
+ ?isRepeating@AgendaEntry@@QAE_NXZ @ 23 NONAME ; bool AgendaEntry::isRepeating(void)
+ ?deleteRepeatedEntry@AgendaUtil@@QAEXAAVAgendaEntry@@W4RecurrenceRange@1@@Z @ 24 NONAME ; void AgendaUtil::deleteRepeatedEntry(class AgendaEntry &, enum AgendaUtil::RecurrenceRange)
+ ?tr@AgendaUtil@@SA?AVQString@@PBD0H@Z @ 25 NONAME ; class QString AgendaUtil::tr(char const *, char const *, int)
+ ?description@AgendaEntry@@QBE?AVQString@@XZ @ 26 NONAME ; class QString AgendaEntry::description(void) const
+ ??0AgendaUtil@@QAE@PAVQObject@@@Z @ 27 NONAME ; AgendaUtil::AgendaUtil(class QObject *)
+ ?categories@AgendaEntry@@QAEAAV?$QList@VAgendaCategory@@@@XZ @ 28 NONAME ; class QList<class AgendaCategory> & AgendaEntry::categories(void)
+ ?entriesChanged@AgendaUtil@@IAEXV?$QList@K@@@Z @ 29 NONAME ; void AgendaUtil::entriesChanged(class QList<unsigned long>)
+ ??0AgendaGeoValue@@QAE@XZ @ 30 NONAME ; AgendaGeoValue::AgendaGeoValue(void)
+ ?status@AgendaAttendee@@QBE?AW4StatusType@1@XZ @ 31 NONAME ; enum AgendaAttendee::StatusType AgendaAttendee::status(void) const
+ ?markDatesWithEvents@AgendaUtil@@QAEXVQDateTime@@0W4FilterFlags@1@AAV?$QList@VQDate@@@@@Z @ 32 NONAME ; void AgendaUtil::markDatesWithEvents(class QDateTime, class QDateTime, enum AgendaUtil::FilterFlags, class QList<class QDate> &)
+ ??9AgendaGeoValue@@QBE_NABV0@@Z @ 33 NONAME ; bool AgendaGeoValue::operator!=(class AgendaGeoValue const &) const
+ ??0AgendaAlarm@@QAE@XZ @ 34 NONAME ; AgendaAlarm::AgendaAlarm(void)
+ ?byMonth@AgendaRepeatRule@@QBE?AV?$QList@W4Month@AgendaRepeatRule@@@@XZ @ 35 NONAME ; class QList<enum AgendaRepeatRule::Month> AgendaRepeatRule::byMonth(void) const
+ ?isNull@AgendaAttendee@@QBE_NXZ @ 36 NONAME ; bool AgendaAttendee::isNull(void) const
+ ?areNoEntriesInCalendar@AgendaUtil@@QAE_NXZ @ 37 NONAME ; bool AgendaUtil::areNoEntriesInCalendar(void)
+ ?clearGeoValue@AgendaEntry@@QBEXXZ @ 38 NONAME ; void AgendaEntry::clearGeoValue(void) const
+ ?setAddress@AgendaAttendee@@QAEXABVQString@@@Z @ 39 NONAME ; void AgendaAttendee::setAddress(class QString const &)
+ ?setRepeatRuleStart@AgendaRepeatRule@@QAEXABVQDateTime@@@Z @ 40 NONAME ; void AgendaRepeatRule::setRepeatRuleStart(class QDateTime const &)
+ ?trUtf8@AgendaUtil@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString AgendaUtil::trUtf8(char const *, char const *, int)
+ ?setLastModifiedDateTime@AgendaEntry@@QAEXABVQDateTime@@@Z @ 42 NONAME ; void AgendaEntry::setLastModifiedDateTime(class QDateTime const &)
+ ??0AgendaAlarm@@QAE@ABV0@@Z @ 43 NONAME ; AgendaAlarm::AgendaAlarm(class AgendaAlarm const &)
+ ?setSummary@AgendaEntry@@QAEXABVQString@@@Z @ 44 NONAME ; void AgendaEntry::setSummary(class QString const &)
+ ?setByMonthDay@AgendaRepeatRule@@QAEXABV?$QList@H@@@Z @ 45 NONAME ; void AgendaRepeatRule::setByMonthDay(class QList<int> const &)
+ ??1AgendaEntry@@UAE@XZ @ 46 NONAME ; AgendaEntry::~AgendaEntry(void)
+ ?setResponseRequested@AgendaAttendee@@QAEX_N@Z @ 47 NONAME ; void AgendaAttendee::setResponseRequested(bool)
+ ??1AgendaRepeatRule@@QAE@XZ @ 48 NONAME ; AgendaRepeatRule::~AgendaRepeatRule(void)
+ ?byMonthDay@AgendaRepeatRule@@QBE?AV?$QList@H@@XZ @ 49 NONAME ; class QList<int> AgendaRepeatRule::byMonthDay(void) const
+ ?detach@AgendaGeoValue@@AAEXXZ @ 50 NONAME ; void AgendaGeoValue::detach(void)
+ ?detach@AgendaEntry@@AAEXXZ @ 51 NONAME ; void AgendaEntry::detach(void)
+ ??9AgendaAttendee@@QBE_NABV0@@Z @ 52 NONAME ; bool AgendaAttendee::operator!=(class AgendaAttendee const &) const
+ ??9AgendaRepeatRule@@QBE_NABV0@@Z @ 53 NONAME ; bool AgendaRepeatRule::operator!=(class AgendaRepeatRule const &) const
+ ?weekStart@AgendaRepeatRule@@QBE?AW4Day@1@XZ @ 54 NONAME ; enum AgendaRepeatRule::Day AgendaRepeatRule::weekStart(void) const
+ ??4AgendaAlarm@@QAEAAV0@ABV0@@Z @ 55 NONAME ; class AgendaAlarm & AgendaAlarm::operator=(class AgendaAlarm const &)
+ ?lastModifiedDateTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 56 NONAME ; class QDateTime AgendaEntry::lastModifiedDateTime(void) const
+ ?attendees@AgendaEntry@@QBEABV?$QList@VAgendaAttendee@@@@XZ @ 57 NONAME ; class QList<class AgendaAttendee> const & AgendaEntry::attendees(void) const
+ ?setInterval@AgendaRepeatRule@@QAEXH@Z @ 58 NONAME ; void AgendaRepeatRule::setInterval(int)
+ ?store@AgendaUtil@@QAEKAAVAgendaEntry@@W4RecurrenceRange@1@@Z @ 59 NONAME ; unsigned long AgendaUtil::store(class AgendaEntry &, enum AgendaUtil::RecurrenceRange)
+ ??8AgendaGeoValue@@QBE_NABV0@@Z @ 60 NONAME ; bool AgendaGeoValue::operator==(class AgendaGeoValue const &) const
+ ?id@AgendaEntry@@QBEKXZ @ 61 NONAME ; unsigned long AgendaEntry::id(void) const
+ ?setByDay@AgendaRepeatRule@@QAEXABV?$QList@W4Day@AgendaRepeatRule@@@@@Z @ 62 NONAME ; void AgendaRepeatRule::setByDay(class QList<enum AgendaRepeatRule::Day> const &)
+ ?setUntil@AgendaRepeatRule@@QAEXABVQDateTime@@@Z @ 63 NONAME ; void AgendaRepeatRule::setUntil(class QDateTime const &)
+ ?setType@AgendaRepeatRule@@QAEXW4RuleType@1@@Z @ 64 NONAME ; void AgendaRepeatRule::setType(enum AgendaRepeatRule::RuleType)
+ ?interval@AgendaRepeatRule@@QBEHXZ @ 65 NONAME ; int AgendaRepeatRule::interval(void) const
+ ?rDates@AgendaEntry@@QBE?AV?$QList@VQDate@@@@XZ @ 66 NONAME ; class QList<class QDate> AgendaEntry::rDates(void) const
+ ?repeatRuleStart@AgendaRepeatRule@@QBE?AVQDateTime@@XZ @ 67 NONAME ; class QDateTime AgendaRepeatRule::repeatRuleStart(void) const
+ ??8AgendaAlarm@@QBE_NABV0@@Z @ 68 NONAME ; bool AgendaAlarm::operator==(class AgendaAlarm const &) const
+ ??0AgendaRepeatRule@@QAE@ABV0@@Z @ 69 NONAME ; AgendaRepeatRule::AgendaRepeatRule(class AgendaRepeatRule const &)
+ ?setStatus@AgendaAttendee@@QAEXW4StatusType@1@@Z @ 70 NONAME ; void AgendaAttendee::setStatus(enum AgendaAttendee::StatusType)
+ ?setStatus@AgendaEntry@@QAEXW4Status@1@@Z @ 71 NONAME ; void AgendaEntry::setStatus(enum AgendaEntry::Status)
+ ?setExtendedCategoryName@AgendaCategory@@QAEXABVQString@@@Z @ 72 NONAME ; void AgendaCategory::setExtendedCategoryName(class QString const &)
+ ?setDescription@AgendaEntry@@QAEXABVQString@@@Z @ 73 NONAME ; void AgendaEntry::setDescription(class QString const &)
+ ?recurrenceId@AgendaEntry@@QAE?AVQDateTime@@XZ @ 74 NONAME ; class QDateTime AgendaEntry::recurrenceId(void)
+ ?until@AgendaRepeatRule@@QBE?AVQDateTime@@XZ @ 75 NONAME ; class QDateTime AgendaRepeatRule::until(void) const
+ ?setByMonth@AgendaRepeatRule@@QAEXABV?$QList@W4Month@AgendaRepeatRule@@@@@Z @ 76 NONAME ; void AgendaRepeatRule::setByMonth(class QList<enum AgendaRepeatRule::Month> const &)
+ ?qt_metacall@AgendaUtil@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int AgendaUtil::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?qt_metacast@AgendaUtil@@UAEPAXPBD@Z @ 78 NONAME ; void * AgendaUtil::qt_metacast(char const *)
+ ?isNull@AgendaRepeatRule@@QBE_NXZ @ 79 NONAME ; bool AgendaRepeatRule::isNull(void) const
+ ?getStaticMetaObject@AgendaUtil@@SAABUQMetaObject@@XZ @ 80 NONAME ; struct QMetaObject const & AgendaUtil::getStaticMetaObject(void)
+ ??8AgendaAttendee@@QBE_NABV0@@Z @ 81 NONAME ; bool AgendaAttendee::operator==(class AgendaAttendee const &) const
+ ?addCategory@AgendaEntry@@QAEXABVAgendaCategory@@@Z @ 82 NONAME ; void AgendaEntry::addCategory(class AgendaCategory const &)
+ ?setLocation@AgendaEntry@@QAEXABVQString@@@Z @ 83 NONAME ; void AgendaEntry::setLocation(class QString const &)
+ ?isTimedEntry@AgendaEntry@@QAE_NXZ @ 84 NONAME ; bool AgendaEntry::isTimedEntry(void)
+ ?favourite@AgendaEntry@@QBEIXZ @ 85 NONAME ; unsigned int AgendaEntry::favourite(void) const
+ ?entryViewCreationCompleted@AgendaUtil@@IAEXH@Z @ 86 NONAME ; void AgendaUtil::entryViewCreationCompleted(int)
+ ?durationInSecs@AgendaEntry@@QBEHXZ @ 87 NONAME ; int AgendaEntry::durationInSecs(void) const
+ ??1AgendaUtil@@UAE@XZ @ 88 NONAME ; AgendaUtil::~AgendaUtil(void)
+ ?category@AgendaCategory@@QBE?AW4CategoryType@1@XZ @ 89 NONAME ; enum AgendaCategory::CategoryType AgendaCategory::category(void) const
+ ?entryAdded@AgendaUtil@@IAEXK@Z @ 90 NONAME ; void AgendaUtil::entryAdded(unsigned long)
+ ?role@AgendaAttendee@@QBE?AW4ParticipantRole@1@XZ @ 91 NONAME ; enum AgendaAttendee::ParticipantRole AgendaAttendee::role(void) const
+ ?type@AgendaEntry@@QBE?AW4Type@1@XZ @ 92 NONAME ; enum AgendaEntry::Type AgendaEntry::type(void) const
+ ??0AgendaEntry@@QAE@W4Type@0@@Z @ 93 NONAME ; AgendaEntry::AgendaEntry(enum AgendaEntry::Type)
+ ?detach@AgendaRepeatRule@@AAEXXZ @ 94 NONAME ; void AgendaRepeatRule::detach(void)
+ ?error@AgendaUtil@@QBE?AW4Error@1@XZ @ 95 NONAME ; enum AgendaUtil::Error AgendaUtil::error(void) const
+ ?trUtf8@AgendaUtil@@SA?AVQString@@PBD0@Z @ 96 NONAME ; class QString AgendaUtil::trUtf8(char const *, char const *)
+ ?status@AgendaEntry@@QBE?AW4Status@1@XZ @ 97 NONAME ; enum AgendaEntry::Status AgendaEntry::status(void) const
+ ??0AgendaEntry@@QAE@ABV0@@Z @ 98 NONAME ; AgendaEntry::AgendaEntry(class AgendaEntry const &)
+ ??4AgendaAttendee@@QAEAAV0@ABV0@@Z @ 99 NONAME ; class AgendaAttendee & AgendaAttendee::operator=(class AgendaAttendee const &)
+ ?address@AgendaAttendee@@QBE?AVQString@@XZ @ 100 NONAME ; class QString AgendaAttendee::address(void) const
+ ?entryDeleted@AgendaUtil@@IAEXK@Z @ 101 NONAME ; void AgendaUtil::entryDeleted(unsigned long)
+ ?summary@AgendaEntry@@QBE?AVQString@@XZ @ 102 NONAME ; class QString AgendaEntry::summary(void) const
+ ?priority@AgendaEntry@@QBEHXZ @ 103 NONAME ; int AgendaEntry::priority(void) const
+ ?fetchById@AgendaUtil@@QAE?AVAgendaEntry@@K@Z @ 104 NONAME ; class AgendaEntry AgendaUtil::fetchById(unsigned long)
+ ?setCommonName@AgendaAttendee@@QAEXABVQString@@@Z @ 105 NONAME ; void AgendaAttendee::setCommonName(class QString const &)
+ ?setMethod@AgendaEntry@@QAEXW4Method@1@@Z @ 106 NONAME ; void AgendaEntry::setMethod(enum AgendaEntry::Method)
+ ?setRDates@AgendaEntry@@QAEXABV?$QList@VQDate@@@@@Z @ 107 NONAME ; void AgendaEntry::setRDates(class QList<class QDate> const &)
+ ?parentEntry@AgendaUtil@@QAE?AVAgendaEntry@@AAV2@@Z @ 108 NONAME ; class AgendaEntry AgendaUtil::parentEntry(class AgendaEntry &)
+ ?addAttendee@AgendaEntry@@QAEXABVAgendaAttendee@@@Z @ 109 NONAME ; void AgendaEntry::addAttendee(class AgendaAttendee const &)
+ ?setCompleted@AgendaUtil@@QAEXAAVAgendaEntry@@_NAAVQDateTime@@@Z @ 110 NONAME ; void AgendaUtil::setCompleted(class AgendaEntry &, bool, class QDateTime &)
+ ??0AgendaCategory@@QAE@XZ @ 111 NONAME ; AgendaCategory::AgendaCategory(void)
+ ?timeOffset@AgendaAlarm@@QBEHXZ @ 112 NONAME ; int AgendaAlarm::timeOffset(void) const
+ ??0AgendaAttendee@@QAE@XZ @ 113 NONAME ; AgendaAttendee::AgendaAttendee(void)
+ ?setAlarmSoundName@AgendaAlarm@@QAEXABVQString@@@Z @ 114 NONAME ; void AgendaAlarm::setAlarmSoundName(class QString const &)
+ ?fetchEntriesInRange@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@VQDateTime@@0W4FilterFlags@1@@Z @ 115 NONAME ; class QList<class AgendaEntry> AgendaUtil::fetchEntriesInRange(class QDateTime, class QDateTime, enum AgendaUtil::FilterFlags)
+ ?detach@AgendaAlarm@@AAEXXZ @ 116 NONAME ; void AgendaAlarm::detach(void)
+ ?setWeekStart@AgendaRepeatRule@@QAEXW4Day@1@@Z @ 117 NONAME ; void AgendaRepeatRule::setWeekStart(enum AgendaRepeatRule::Day)
+ ?setFavourite@AgendaEntry@@QAEXI@Z @ 118 NONAME ; void AgendaEntry::setFavourite(unsigned int)
+ ?setDTStamp@AgendaEntry@@QAEXABVQDateTime@@@Z @ 119 NONAME ; void AgendaEntry::setDTStamp(class QDateTime const &)
+ ?cloneEntry@AgendaUtil@@QAEKABVAgendaEntry@@W4Type@2@@Z @ 120 NONAME ; unsigned long AgendaUtil::cloneEntry(class AgendaEntry const &, enum AgendaEntry::Type)
+ ?setRepeatRule@AgendaEntry@@QAEXABVAgendaRepeatRule@@@Z @ 121 NONAME ; void AgendaEntry::setRepeatRule(class AgendaRepeatRule const &)
+ ?categories@AgendaEntry@@QBEABV?$QList@VAgendaCategory@@@@XZ @ 122 NONAME ; class QList<class AgendaCategory> const & AgendaEntry::categories(void) const
+ ?tr@AgendaUtil@@SA?AVQString@@PBD0@Z @ 123 NONAME ; class QString AgendaUtil::tr(char const *, char const *)
+ ??4AgendaRepeatRule@@QAEAAV0@ABV0@@Z @ 124 NONAME ; class AgendaRepeatRule & AgendaRepeatRule::operator=(class AgendaRepeatRule const &)
+ ?setCompletedDateTime@AgendaEntry@@QAEXABVQDateTime@@@Z @ 125 NONAME ; void AgendaEntry::setCompletedDateTime(class QDateTime const &)
+ ??0AgendaRepeatRule@@QAE@XZ @ 126 NONAME ; AgendaRepeatRule::AgendaRepeatRule(void)
+ ?dtStamp@AgendaEntry@@QBE?AVQDateTime@@XZ @ 127 NONAME ; class QDateTime AgendaEntry::dtStamp(void) const
+ ?method@AgendaEntry@@QBE?AW4Method@1@XZ @ 128 NONAME ; enum AgendaEntry::Method AgendaEntry::method(void) const
+ ?type@AgendaRepeatRule@@QBE?AW4RuleType@1@XZ @ 129 NONAME ; enum AgendaRepeatRule::RuleType AgendaRepeatRule::type(void) const
+ ??4AgendaGeoValue@@QAEAAV0@ABV0@@Z @ 130 NONAME ; class AgendaGeoValue & AgendaGeoValue::operator=(class AgendaGeoValue const &)
+ ??0AgendaCategory@@QAE@W4CategoryType@0@@Z @ 131 NONAME ; AgendaCategory::AgendaCategory(enum AgendaCategory::CategoryType)
+ ?commonName@AgendaAttendee@@QBE?AVQString@@XZ @ 132 NONAME ; class QString AgendaAttendee::commonName(void) const
+ ?detach@AgendaCategory@@AAEXXZ @ 133 NONAME ; void AgendaCategory::detach(void)
+ ??0AgendaGeoValue@@QAE@ABV0@@Z @ 134 NONAME ; AgendaGeoValue::AgendaGeoValue(class AgendaGeoValue const &)
+ ?isWorkdaysRepeatingEntry@AgendaUtil@@SA_NABVAgendaRepeatRule@@@Z @ 135 NONAME ; bool AgendaUtil::isWorkdaysRepeatingEntry(class AgendaRepeatRule const &)
+ ?setRole@AgendaAttendee@@QAEXW4ParticipantRole@1@@Z @ 136 NONAME ; void AgendaAttendee::setRole(enum AgendaAttendee::ParticipantRole)
+ ?detach@AgendaAttendee@@AAEXXZ @ 137 NONAME ; void AgendaAttendee::detach(void)
+ ?getLatLong@AgendaGeoValue@@QBEXAAN0@Z @ 138 NONAME ; void AgendaGeoValue::getLatLong(double &, double &) const
+ ?maxTime@AgendaUtil@@SA?AVQDateTime@@XZ @ 139 NONAME ; class QDateTime AgendaUtil::maxTime(void)
+ ?setCategory@AgendaCategory@@QAEXW4CategoryType@1@@Z @ 140 NONAME ; void AgendaCategory::setCategory(enum AgendaCategory::CategoryType)
+ ?endTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 141 NONAME ; class QDateTime AgendaEntry::endTime(void) const
+ ??9AgendaEntry@@QBE_NABV0@@Z @ 142 NONAME ; bool AgendaEntry::operator!=(class AgendaEntry const &) const
+ ??0AgendaRepeatRule@@QAE@W4RuleType@0@@Z @ 143 NONAME ; AgendaRepeatRule::AgendaRepeatRule(enum AgendaRepeatRule::RuleType)
+ ??9AgendaCategory@@QBE_NABV0@@Z @ 144 NONAME ; bool AgendaCategory::operator!=(class AgendaCategory const &) const
+ ??0AgendaAttendee@@QAE@ABV0@@Z @ 145 NONAME ; AgendaAttendee::AgendaAttendee(class AgendaAttendee const &)
+ ??0AgendaAttendee@@QAE@ABVQString@@@Z @ 146 NONAME ; AgendaAttendee::AgendaAttendee(class QString const &)
+ ?importvCalendar@AgendaUtil@@QAEHABVQString@@AAVAgendaEntry@@@Z @ 147 NONAME ; int AgendaUtil::importvCalendar(class QString const &, class AgendaEntry &)
+ ?instanceViewCreationCompleted@AgendaUtil@@IAEXH@Z @ 148 NONAME ; void AgendaUtil::instanceViewCreationCompleted(int)
+ ??_EAgendaUtil@@UAE@I@Z @ 149 NONAME ; AgendaUtil::~AgendaUtil(unsigned int)
+ ?setGeoValue@AgendaEntry@@QAEXABVAgendaGeoValue@@@Z @ 150 NONAME ; void AgendaEntry::setGeoValue(class AgendaGeoValue const &)
+ ?getPreviousInstanceTimes@AgendaUtil@@QAEXAAVAgendaEntry@@AAVQDateTime@@1@Z @ 151 NONAME ; void AgendaUtil::getPreviousInstanceTimes(class AgendaEntry &, class QDateTime &, class QDateTime &)
+ ?attendees@AgendaEntry@@QAEAAV?$QList@VAgendaAttendee@@@@XZ @ 152 NONAME ; class QList<class AgendaAttendee> & AgendaEntry::attendees(void)
+ ?staticMetaObject@AgendaUtil@@2UQMetaObject@@B @ 153 NONAME ; struct QMetaObject const AgendaUtil::staticMetaObject
+ ?entriesDeleted@AgendaUtil@@IAEXH@Z @ 154 NONAME ; void AgendaUtil::entriesDeleted(int)
+ ?fetchAllEntries@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@W4FilterFlags@1@@Z @ 155 NONAME ; class QList<class AgendaEntry> AgendaUtil::fetchAllEntries(enum AgendaUtil::FilterFlags)
+ ?setTimeOffset@AgendaAlarm@@QAEXH@Z @ 156 NONAME ; void AgendaAlarm::setTimeOffset(int)
+ ??0AgendaEntry@@QAE@XZ @ 157 NONAME ; AgendaEntry::AgendaEntry(void)
+ ?setPriority@AgendaEntry@@QAEXH@Z @ 158 NONAME ; void AgendaEntry::setPriority(int)
+ ?setType@AgendaEntry@@QAEXW4Type@1@@Z @ 159 NONAME ; void AgendaEntry::setType(enum AgendaEntry::Type)
+ ?setStartAndEndTime@AgendaEntry@@QAE_NABVQDateTime@@0@Z @ 160 NONAME ; bool AgendaEntry::setStartAndEndTime(class QDateTime const &, class QDateTime const &)
+ ?deleteEntries@AgendaUtil@@QAEXAAVQDateTime@@0W4FilterFlags@1@@Z @ 161 NONAME ; void AgendaUtil::deleteEntries(class QDateTime &, class QDateTime &, enum AgendaUtil::FilterFlags)
+ ?metaObject@AgendaUtil@@UBEPBUQMetaObject@@XZ @ 162 NONAME ; struct QMetaObject const * AgendaUtil::metaObject(void) const
+ ?location@AgendaEntry@@QBE?AVQString@@XZ @ 163 NONAME ; class QString AgendaEntry::location(void) const
+ ??8AgendaCategory@@QBE_NABV0@@Z @ 164 NONAME ; bool AgendaCategory::operator==(class AgendaCategory const &) const
+ ??0AgendaCategory@@QAE@ABV0@@Z @ 165 NONAME ; AgendaCategory::AgendaCategory(class AgendaCategory const &)
+ ??1AgendaGeoValue@@QAE@XZ @ 166 NONAME ; AgendaGeoValue::~AgendaGeoValue(void)
+ ??4AgendaEntry@@QAEAAV0@ABV0@@Z @ 167 NONAME ; class AgendaEntry & AgendaEntry::operator=(class AgendaEntry const &)
+ ??_EAgendaCategory@@UAE@I@Z @ 168 NONAME ; AgendaCategory::~AgendaCategory(unsigned int)
+ ?createEntryIdListForDay@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@VQDateTime@@W4FilterFlags@1@@Z @ 169 NONAME ; class QList<class AgendaEntry> AgendaUtil::createEntryIdListForDay(class QDateTime, enum AgendaUtil::FilterFlags)
+ ?repeatRule@AgendaEntry@@QBE?AVAgendaRepeatRule@@XZ @ 170 NONAME ; class AgendaRepeatRule AgendaEntry::repeatRule(void) const
+ ??1AgendaCategory@@UAE@XZ @ 171 NONAME ; AgendaCategory::~AgendaCategory(void)
+ ?deleteEntry@AgendaUtil@@QAE_NK@Z @ 172 NONAME ; bool AgendaUtil::deleteEntry(unsigned long)
+ ??1AgendaAttendee@@UAE@XZ @ 173 NONAME ; AgendaAttendee::~AgendaAttendee(void)
+ ?byDay@AgendaRepeatRule@@QBE?AV?$QList@W4Day@AgendaRepeatRule@@@@XZ @ 174 NONAME ; class QList<enum AgendaRepeatRule::Day> AgendaRepeatRule::byDay(void) const
+ ?setLatLong@AgendaGeoValue@@QAEXNN@Z @ 175 NONAME ; void AgendaGeoValue::setLatLong(double, double)
+ ?completedDateTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 176 NONAME ; class QDateTime AgendaEntry::completedDateTime(void) const
+ ?setRecurrenceId@AgendaEntry@@QAEXAAVQDateTime@@@Z @ 177 NONAME ; void AgendaEntry::setRecurrenceId(class QDateTime &)
+ ?isNull@AgendaGeoValue@@QBE_NXZ @ 178 NONAME ; bool AgendaGeoValue::isNull(void) const
--- a/agendainterface/agendautil/eabi/agendainterfaceu.def Mon Jul 19 15:12:16 2010 +0100
+++ b/agendainterface/agendautil/eabi/agendainterfaceu.def Mon Aug 23 16:00:50 2010 +0100
@@ -5,208 +5,204 @@
_ZN10AgendaUtil11parentEntryER11AgendaEntry @ 4 NONAME
_ZN10AgendaUtil11qt_metacallEN11QMetaObject4CallEiPPv @ 5 NONAME
_ZN10AgendaUtil11qt_metacastEPKc @ 6 NONAME
- _ZN10AgendaUtil11updateEntryERK11AgendaEntryb @ 7 NONAME
- _ZN10AgendaUtil12entryDeletedEm @ 8 NONAME
- _ZN10AgendaUtil12entryUpdatedEm @ 9 NONAME
- _ZN10AgendaUtil12setCompletedER11AgendaEntrybR9QDateTime @ 10 NONAME
- _ZN10AgendaUtil13deleteEntriesER9QDateTimeS1_NS_11FilterFlagsE @ 11 NONAME
- _ZN10AgendaUtil14entriesChangedE5QListImE @ 12 NONAME
- _ZN10AgendaUtil14entriesDeletedEi @ 13 NONAME
- _ZN10AgendaUtil15createExceptionERK11AgendaEntry9QDateTime @ 14 NONAME
- _ZN10AgendaUtil15fetchAllEntriesENS_11FilterFlagsE @ 15 NONAME
- _ZN10AgendaUtil15importvCalendarERK7QStringR11AgendaEntry @ 16 NONAME
- _ZN10AgendaUtil16staticMetaObjectE @ 17 NONAME DATA 16
- _ZN10AgendaUtil17exportAsvCalendarERK7QStringl @ 18 NONAME
- _ZN10AgendaUtil19deleteRepeatedEntryER11AgendaEntryNS_15RecurrenceRangeE @ 19 NONAME
- _ZN10AgendaUtil19fetchEntriesInRangeE9QDateTimeS0_NS_11FilterFlagsE @ 20 NONAME
- _ZN10AgendaUtil19getStaticMetaObjectEv @ 21 NONAME
- _ZN10AgendaUtil19markDatesWithEventsE9QDateTimeS0_NS_11FilterFlagsER5QListI5QDateE @ 22 NONAME
- _ZN10AgendaUtil19storeRepeatingEntryERK11AgendaEntryb @ 23 NONAME
- _ZN10AgendaUtil20getNextInstanceTimesER11AgendaEntryR9QDateTimeS3_ @ 24 NONAME
- _ZN10AgendaUtil22areNoEntriesInCalendarEv @ 25 NONAME
- _ZN10AgendaUtil23createEntryIdListForDayE9QDateTimeNS_11FilterFlagsE @ 26 NONAME
- _ZN10AgendaUtil24clearRepeatingPropertiesER11AgendaEntry @ 27 NONAME
- _ZN10AgendaUtil24getPreviousInstanceTimesER11AgendaEntryR9QDateTimeS3_ @ 28 NONAME
- _ZN10AgendaUtil24isWorkdaysRepeatingEntryERK16AgendaRepeatRule @ 29 NONAME
- _ZN10AgendaUtil26entryViewCreationCompletedEi @ 30 NONAME
- _ZN10AgendaUtil29instanceViewCreationCompletedEi @ 31 NONAME
- _ZN10AgendaUtil7maxTimeEv @ 32 NONAME
- _ZN10AgendaUtil7minTimeEv @ 33 NONAME
- _ZN10AgendaUtil8addEntryERK11AgendaEntry @ 34 NONAME
- _ZN10AgendaUtil8entryIdsENS_11FilterFlagsE @ 35 NONAME
- _ZN10AgendaUtil9fetchByIdEm @ 36 NONAME
- _ZN10AgendaUtilC1EP7QObject @ 37 NONAME
- _ZN10AgendaUtilC2EP7QObject @ 38 NONAME
- _ZN10AgendaUtilD0Ev @ 39 NONAME
- _ZN10AgendaUtilD1Ev @ 40 NONAME
- _ZN10AgendaUtilD2Ev @ 41 NONAME
- _ZN11AgendaAlarm13setTimeOffsetEi @ 42 NONAME
- _ZN11AgendaAlarm17setAlarmSoundNameERK7QString @ 43 NONAME
- _ZN11AgendaAlarm6detachEv @ 44 NONAME
- _ZN11AgendaAlarmC1ERKS_ @ 45 NONAME
- _ZN11AgendaAlarmC1Ev @ 46 NONAME
- _ZN11AgendaAlarmC2ERKS_ @ 47 NONAME
- _ZN11AgendaAlarmC2Ev @ 48 NONAME
- _ZN11AgendaAlarmD1Ev @ 49 NONAME
- _ZN11AgendaAlarmD2Ev @ 50 NONAME
- _ZN11AgendaAlarmaSERKS_ @ 51 NONAME
- _ZN11AgendaEntry10categoriesEv @ 52 NONAME
- _ZN11AgendaEntry10setDTStampERK9QDateTime @ 53 NONAME
- _ZN11AgendaEntry10setSummaryERK7QString @ 54 NONAME
- _ZN11AgendaEntry11addAttendeeERK14AgendaAttendee @ 55 NONAME
- _ZN11AgendaEntry11addCategoryERK14AgendaCategory @ 56 NONAME
- _ZN11AgendaEntry11isRepeatingEv @ 57 NONAME
- _ZN11AgendaEntry11setGeoValueERK14AgendaGeoValue @ 58 NONAME
- _ZN11AgendaEntry11setLocationERK7QString @ 59 NONAME
- _ZN11AgendaEntry11setPriorityEi @ 60 NONAME
- _ZN11AgendaEntry12isTimedEntryEv @ 61 NONAME
- _ZN11AgendaEntry12recurrenceIdEv @ 62 NONAME
- _ZN11AgendaEntry12setFavouriteEj @ 63 NONAME
- _ZN11AgendaEntry13setRepeatRuleERK16AgendaRepeatRule @ 64 NONAME
- _ZN11AgendaEntry14setDescriptionERK7QString @ 65 NONAME
- _ZN11AgendaEntry15setRecurrenceIdER9QDateTime @ 66 NONAME
- _ZN11AgendaEntry18setStartAndEndTimeERK9QDateTimeS2_ @ 67 NONAME
- _ZN11AgendaEntry20setCompletedDateTimeERK9QDateTime @ 68 NONAME
- _ZN11AgendaEntry23setLastModifiedDateTimeERK9QDateTime @ 69 NONAME
- _ZN11AgendaEntry6detachEv @ 70 NONAME
- _ZN11AgendaEntry7setTypeENS_4TypeE @ 71 NONAME
- _ZN11AgendaEntry8setAlarmERK11AgendaAlarm @ 72 NONAME
- _ZN11AgendaEntry9attendeesEv @ 73 NONAME
- _ZN11AgendaEntry9setMethodENS_6MethodE @ 74 NONAME
- _ZN11AgendaEntry9setRDatesERK5QListI5QDateE @ 75 NONAME
- _ZN11AgendaEntry9setStatusENS_6StatusE @ 76 NONAME
- _ZN11AgendaEntryC1ENS_4TypeE @ 77 NONAME
- _ZN11AgendaEntryC1ERKS_ @ 78 NONAME
- _ZN11AgendaEntryC1Ev @ 79 NONAME
- _ZN11AgendaEntryC2ENS_4TypeE @ 80 NONAME
- _ZN11AgendaEntryC2ERKS_ @ 81 NONAME
- _ZN11AgendaEntryC2Ev @ 82 NONAME
- _ZN11AgendaEntryD0Ev @ 83 NONAME
- _ZN11AgendaEntryD1Ev @ 84 NONAME
- _ZN11AgendaEntryD2Ev @ 85 NONAME
- _ZN11AgendaEntryaSERKS_ @ 86 NONAME
- _ZN14AgendaAttendee10setAddressERK7QString @ 87 NONAME
- _ZN14AgendaAttendee13setCommonNameERK7QString @ 88 NONAME
- _ZN14AgendaAttendee20setResponseRequestedEb @ 89 NONAME
- _ZN14AgendaAttendee6detachEv @ 90 NONAME
- _ZN14AgendaAttendee7setRoleENS_15ParticipantRoleE @ 91 NONAME
- _ZN14AgendaAttendee9setStatusENS_10StatusTypeE @ 92 NONAME
- _ZN14AgendaAttendeeC1ERK7QString @ 93 NONAME
- _ZN14AgendaAttendeeC1ERKS_ @ 94 NONAME
- _ZN14AgendaAttendeeC1Ev @ 95 NONAME
- _ZN14AgendaAttendeeC2ERK7QString @ 96 NONAME
- _ZN14AgendaAttendeeC2ERKS_ @ 97 NONAME
- _ZN14AgendaAttendeeC2Ev @ 98 NONAME
- _ZN14AgendaAttendeeD0Ev @ 99 NONAME
- _ZN14AgendaAttendeeD1Ev @ 100 NONAME
- _ZN14AgendaAttendeeD2Ev @ 101 NONAME
- _ZN14AgendaAttendeeaSERKS_ @ 102 NONAME
- _ZN14AgendaCategory11setCategoryENS_12CategoryTypeE @ 103 NONAME
- _ZN14AgendaCategory23setExtendedCategoryNameERK7QString @ 104 NONAME
- _ZN14AgendaCategory6detachEv @ 105 NONAME
- _ZN14AgendaCategoryC1ENS_12CategoryTypeE @ 106 NONAME
- _ZN14AgendaCategoryC1ERKS_ @ 107 NONAME
- _ZN14AgendaCategoryC1Ev @ 108 NONAME
- _ZN14AgendaCategoryC2ENS_12CategoryTypeE @ 109 NONAME
- _ZN14AgendaCategoryC2ERKS_ @ 110 NONAME
- _ZN14AgendaCategoryC2Ev @ 111 NONAME
- _ZN14AgendaCategoryD0Ev @ 112 NONAME
- _ZN14AgendaCategoryD1Ev @ 113 NONAME
- _ZN14AgendaCategoryD2Ev @ 114 NONAME
- _ZN14AgendaCategoryaSERKS_ @ 115 NONAME
- _ZN14AgendaGeoValue10setLatLongEdd @ 116 NONAME
- _ZN14AgendaGeoValue6detachEv @ 117 NONAME
- _ZN14AgendaGeoValueC1ERKS_ @ 118 NONAME
- _ZN14AgendaGeoValueC1Ev @ 119 NONAME
- _ZN14AgendaGeoValueC2ERKS_ @ 120 NONAME
- _ZN14AgendaGeoValueC2Ev @ 121 NONAME
- _ZN14AgendaGeoValueD1Ev @ 122 NONAME
- _ZN14AgendaGeoValueD2Ev @ 123 NONAME
- _ZN14AgendaGeoValueaSERKS_ @ 124 NONAME
- _ZN16AgendaRepeatRule10setByMonthERK5QListINS_5MonthEE @ 125 NONAME
- _ZN16AgendaRepeatRule11setIntervalEi @ 126 NONAME
- _ZN16AgendaRepeatRule12setWeekStartENS_3DayE @ 127 NONAME
- _ZN16AgendaRepeatRule13setByMonthDayERK5QListIiE @ 128 NONAME
- _ZN16AgendaRepeatRule18setRepeatRuleStartERK9QDateTime @ 129 NONAME
- _ZN16AgendaRepeatRule6detachEv @ 130 NONAME
- _ZN16AgendaRepeatRule7setTypeENS_8RuleTypeE @ 131 NONAME
- _ZN16AgendaRepeatRule8setByDayERK5QListINS_3DayEE @ 132 NONAME
- _ZN16AgendaRepeatRule8setUntilERK9QDateTime @ 133 NONAME
- _ZN16AgendaRepeatRuleC1ENS_8RuleTypeE @ 134 NONAME
- _ZN16AgendaRepeatRuleC1ERKS_ @ 135 NONAME
- _ZN16AgendaRepeatRuleC1Ev @ 136 NONAME
- _ZN16AgendaRepeatRuleC2ENS_8RuleTypeE @ 137 NONAME
- _ZN16AgendaRepeatRuleC2ERKS_ @ 138 NONAME
- _ZN16AgendaRepeatRuleC2Ev @ 139 NONAME
- _ZN16AgendaRepeatRuleD1Ev @ 140 NONAME
- _ZN16AgendaRepeatRuleD2Ev @ 141 NONAME
- _ZN16AgendaRepeatRuleaSERKS_ @ 142 NONAME
- _ZNK10AgendaUtil10metaObjectEv @ 143 NONAME
- _ZNK10AgendaUtil5errorEv @ 144 NONAME
- _ZNK11AgendaAlarm10timeOffsetEv @ 145 NONAME
- _ZNK11AgendaAlarm14alarmSoundNameEv @ 146 NONAME
- _ZNK11AgendaAlarm6isNullEv @ 147 NONAME
- _ZNK11AgendaAlarmeqERKS_ @ 148 NONAME
- _ZNK11AgendaAlarmneERKS_ @ 149 NONAME
- _ZNK11AgendaEntry10categoriesEv @ 150 NONAME
- _ZNK11AgendaEntry10repeatRuleEv @ 151 NONAME
- _ZNK11AgendaEntry11descriptionEv @ 152 NONAME
- _ZNK11AgendaEntry14durationInSecsEv @ 153 NONAME
- _ZNK11AgendaEntry17completedDateTimeEv @ 154 NONAME
- _ZNK11AgendaEntry20lastModifiedDateTimeEv @ 155 NONAME
- _ZNK11AgendaEntry2idEv @ 156 NONAME
- _ZNK11AgendaEntry4typeEv @ 157 NONAME
- _ZNK11AgendaEntry5alarmEv @ 158 NONAME
- _ZNK11AgendaEntry6isNullEv @ 159 NONAME
- _ZNK11AgendaEntry6methodEv @ 160 NONAME
- _ZNK11AgendaEntry6rDatesEv @ 161 NONAME
- _ZNK11AgendaEntry6statusEv @ 162 NONAME
- _ZNK11AgendaEntry7dtStampEv @ 163 NONAME
- _ZNK11AgendaEntry7endTimeEv @ 164 NONAME
- _ZNK11AgendaEntry7summaryEv @ 165 NONAME
- _ZNK11AgendaEntry8geoValueEv @ 166 NONAME
- _ZNK11AgendaEntry8locationEv @ 167 NONAME
- _ZNK11AgendaEntry8priorityEv @ 168 NONAME
- _ZNK11AgendaEntry9attendeesEv @ 169 NONAME
- _ZNK11AgendaEntry9favouriteEv @ 170 NONAME
- _ZNK11AgendaEntry9startTimeEv @ 171 NONAME
- _ZNK11AgendaEntryeqERKS_ @ 172 NONAME
- _ZNK11AgendaEntryneERKS_ @ 173 NONAME
- _ZNK14AgendaAttendee10commonNameEv @ 174 NONAME
- _ZNK14AgendaAttendee17responseRequestedEv @ 175 NONAME
- _ZNK14AgendaAttendee4roleEv @ 176 NONAME
- _ZNK14AgendaAttendee6isNullEv @ 177 NONAME
- _ZNK14AgendaAttendee6statusEv @ 178 NONAME
- _ZNK14AgendaAttendee7addressEv @ 179 NONAME
- _ZNK14AgendaAttendeeeqERKS_ @ 180 NONAME
- _ZNK14AgendaAttendeeneERKS_ @ 181 NONAME
- _ZNK14AgendaCategory20extendedCategoryNameEv @ 182 NONAME
- _ZNK14AgendaCategory6isNullEv @ 183 NONAME
- _ZNK14AgendaCategory8categoryEv @ 184 NONAME
- _ZNK14AgendaCategoryeqERKS_ @ 185 NONAME
- _ZNK14AgendaCategoryneERKS_ @ 186 NONAME
- _ZNK14AgendaGeoValue10getLatLongERdS0_ @ 187 NONAME
- _ZNK14AgendaGeoValue6isNullEv @ 188 NONAME
- _ZNK14AgendaGeoValueeqERKS_ @ 189 NONAME
- _ZNK14AgendaGeoValueneERKS_ @ 190 NONAME
- _ZNK16AgendaRepeatRule10byMonthDayEv @ 191 NONAME
- _ZNK16AgendaRepeatRule15repeatRuleStartEv @ 192 NONAME
- _ZNK16AgendaRepeatRule4typeEv @ 193 NONAME
- _ZNK16AgendaRepeatRule5byDayEv @ 194 NONAME
- _ZNK16AgendaRepeatRule5untilEv @ 195 NONAME
- _ZNK16AgendaRepeatRule6isNullEv @ 196 NONAME
- _ZNK16AgendaRepeatRule7byMonthEv @ 197 NONAME
- _ZNK16AgendaRepeatRule8intervalEv @ 198 NONAME
- _ZNK16AgendaRepeatRule9weekStartEv @ 199 NONAME
- _ZNK16AgendaRepeatRuleeqERKS_ @ 200 NONAME
- _ZNK16AgendaRepeatRuleneERKS_ @ 201 NONAME
- _ZTI10AgendaUtil @ 202 NONAME
- _ZTI11AgendaEntry @ 203 NONAME
- _ZTI14AgendaAttendee @ 204 NONAME
- _ZTI14AgendaCategory @ 205 NONAME
- _ZTV10AgendaUtil @ 206 NONAME
- _ZTV11AgendaEntry @ 207 NONAME
- _ZTV14AgendaAttendee @ 208 NONAME
- _ZTV14AgendaCategory @ 209 NONAME
- _ZNK11AgendaEntry13clearGeoValueEv @ 210 NONAME
+ _ZN10AgendaUtil12entryDeletedEm @ 7 NONAME
+ _ZN10AgendaUtil12entryUpdatedEm @ 8 NONAME
+ _ZN10AgendaUtil12setCompletedER11AgendaEntrybR9QDateTime @ 9 NONAME
+ _ZN10AgendaUtil13deleteEntriesER9QDateTimeS1_NS_11FilterFlagsE @ 10 NONAME
+ _ZN10AgendaUtil14entriesChangedE5QListImE @ 11 NONAME
+ _ZN10AgendaUtil14entriesDeletedEi @ 12 NONAME
+ _ZN10AgendaUtil15fetchAllEntriesENS_11FilterFlagsE @ 13 NONAME
+ _ZN10AgendaUtil15importvCalendarERK7QStringR11AgendaEntry @ 14 NONAME
+ _ZN10AgendaUtil16staticMetaObjectE @ 15 NONAME DATA 16
+ _ZN10AgendaUtil17exportAsvCalendarERK7QStringl @ 16 NONAME
+ _ZN10AgendaUtil19deleteRepeatedEntryER11AgendaEntryNS_15RecurrenceRangeE @ 17 NONAME
+ _ZN10AgendaUtil19fetchEntriesInRangeE9QDateTimeS0_NS_11FilterFlagsE @ 18 NONAME
+ _ZN10AgendaUtil19getStaticMetaObjectEv @ 19 NONAME
+ _ZN10AgendaUtil19markDatesWithEventsE9QDateTimeS0_NS_11FilterFlagsER5QListI5QDateE @ 20 NONAME
+ _ZN10AgendaUtil20getNextInstanceTimesER11AgendaEntryR9QDateTimeS3_ @ 21 NONAME
+ _ZN10AgendaUtil22areNoEntriesInCalendarEv @ 22 NONAME
+ _ZN10AgendaUtil23createEntryIdListForDayE9QDateTimeNS_11FilterFlagsE @ 23 NONAME
+ _ZN10AgendaUtil24getPreviousInstanceTimesER11AgendaEntryR9QDateTimeS3_ @ 24 NONAME
+ _ZN10AgendaUtil24isWorkdaysRepeatingEntryERK16AgendaRepeatRule @ 25 NONAME
+ _ZN10AgendaUtil26entryViewCreationCompletedEi @ 26 NONAME
+ _ZN10AgendaUtil29instanceViewCreationCompletedEi @ 27 NONAME
+ _ZN10AgendaUtil5storeER11AgendaEntryNS_15RecurrenceRangeE @ 28 NONAME
+ _ZN10AgendaUtil7maxTimeEv @ 29 NONAME
+ _ZN10AgendaUtil7minTimeEv @ 30 NONAME
+ _ZN10AgendaUtil8entryIdsENS_11FilterFlagsE @ 31 NONAME
+ _ZN10AgendaUtil9fetchByIdEm @ 32 NONAME
+ _ZN10AgendaUtilC1EP7QObject @ 33 NONAME
+ _ZN10AgendaUtilC2EP7QObject @ 34 NONAME
+ _ZN10AgendaUtilD0Ev @ 35 NONAME
+ _ZN10AgendaUtilD1Ev @ 36 NONAME
+ _ZN10AgendaUtilD2Ev @ 37 NONAME
+ _ZN11AgendaAlarm13setTimeOffsetEi @ 38 NONAME
+ _ZN11AgendaAlarm17setAlarmSoundNameERK7QString @ 39 NONAME
+ _ZN11AgendaAlarm6detachEv @ 40 NONAME
+ _ZN11AgendaAlarmC1ERKS_ @ 41 NONAME
+ _ZN11AgendaAlarmC1Ev @ 42 NONAME
+ _ZN11AgendaAlarmC2ERKS_ @ 43 NONAME
+ _ZN11AgendaAlarmC2Ev @ 44 NONAME
+ _ZN11AgendaAlarmD1Ev @ 45 NONAME
+ _ZN11AgendaAlarmD2Ev @ 46 NONAME
+ _ZN11AgendaAlarmaSERKS_ @ 47 NONAME
+ _ZN11AgendaEntry10categoriesEv @ 48 NONAME
+ _ZN11AgendaEntry10setDTStampERK9QDateTime @ 49 NONAME
+ _ZN11AgendaEntry10setSummaryERK7QString @ 50 NONAME
+ _ZN11AgendaEntry11addAttendeeERK14AgendaAttendee @ 51 NONAME
+ _ZN11AgendaEntry11addCategoryERK14AgendaCategory @ 52 NONAME
+ _ZN11AgendaEntry11isRepeatingEv @ 53 NONAME
+ _ZN11AgendaEntry11setGeoValueERK14AgendaGeoValue @ 54 NONAME
+ _ZN11AgendaEntry11setLocationERK7QString @ 55 NONAME
+ _ZN11AgendaEntry11setPriorityEi @ 56 NONAME
+ _ZN11AgendaEntry12isTimedEntryEv @ 57 NONAME
+ _ZN11AgendaEntry12recurrenceIdEv @ 58 NONAME
+ _ZN11AgendaEntry12setFavouriteEj @ 59 NONAME
+ _ZN11AgendaEntry13setRepeatRuleERK16AgendaRepeatRule @ 60 NONAME
+ _ZN11AgendaEntry14setDescriptionERK7QString @ 61 NONAME
+ _ZN11AgendaEntry15setRecurrenceIdER9QDateTime @ 62 NONAME
+ _ZN11AgendaEntry18setStartAndEndTimeERK9QDateTimeS2_ @ 63 NONAME
+ _ZN11AgendaEntry20setCompletedDateTimeERK9QDateTime @ 64 NONAME
+ _ZN11AgendaEntry23setLastModifiedDateTimeERK9QDateTime @ 65 NONAME
+ _ZN11AgendaEntry6detachEv @ 66 NONAME
+ _ZN11AgendaEntry7setTypeENS_4TypeE @ 67 NONAME
+ _ZN11AgendaEntry8setAlarmERK11AgendaAlarm @ 68 NONAME
+ _ZN11AgendaEntry9attendeesEv @ 69 NONAME
+ _ZN11AgendaEntry9setMethodENS_6MethodE @ 70 NONAME
+ _ZN11AgendaEntry9setRDatesERK5QListI5QDateE @ 71 NONAME
+ _ZN11AgendaEntry9setStatusENS_6StatusE @ 72 NONAME
+ _ZN11AgendaEntryC1ENS_4TypeE @ 73 NONAME
+ _ZN11AgendaEntryC1ERKS_ @ 74 NONAME
+ _ZN11AgendaEntryC1Ev @ 75 NONAME
+ _ZN11AgendaEntryC2ENS_4TypeE @ 76 NONAME
+ _ZN11AgendaEntryC2ERKS_ @ 77 NONAME
+ _ZN11AgendaEntryC2Ev @ 78 NONAME
+ _ZN11AgendaEntryD0Ev @ 79 NONAME
+ _ZN11AgendaEntryD1Ev @ 80 NONAME
+ _ZN11AgendaEntryD2Ev @ 81 NONAME
+ _ZN11AgendaEntryaSERKS_ @ 82 NONAME
+ _ZN14AgendaAttendee10setAddressERK7QString @ 83 NONAME
+ _ZN14AgendaAttendee13setCommonNameERK7QString @ 84 NONAME
+ _ZN14AgendaAttendee20setResponseRequestedEb @ 85 NONAME
+ _ZN14AgendaAttendee6detachEv @ 86 NONAME
+ _ZN14AgendaAttendee7setRoleENS_15ParticipantRoleE @ 87 NONAME
+ _ZN14AgendaAttendee9setStatusENS_10StatusTypeE @ 88 NONAME
+ _ZN14AgendaAttendeeC1ERK7QString @ 89 NONAME
+ _ZN14AgendaAttendeeC1ERKS_ @ 90 NONAME
+ _ZN14AgendaAttendeeC1Ev @ 91 NONAME
+ _ZN14AgendaAttendeeC2ERK7QString @ 92 NONAME
+ _ZN14AgendaAttendeeC2ERKS_ @ 93 NONAME
+ _ZN14AgendaAttendeeC2Ev @ 94 NONAME
+ _ZN14AgendaAttendeeD0Ev @ 95 NONAME
+ _ZN14AgendaAttendeeD1Ev @ 96 NONAME
+ _ZN14AgendaAttendeeD2Ev @ 97 NONAME
+ _ZN14AgendaAttendeeaSERKS_ @ 98 NONAME
+ _ZN14AgendaCategory11setCategoryENS_12CategoryTypeE @ 99 NONAME
+ _ZN14AgendaCategory23setExtendedCategoryNameERK7QString @ 100 NONAME
+ _ZN14AgendaCategory6detachEv @ 101 NONAME
+ _ZN14AgendaCategoryC1ENS_12CategoryTypeE @ 102 NONAME
+ _ZN14AgendaCategoryC1ERKS_ @ 103 NONAME
+ _ZN14AgendaCategoryC1Ev @ 104 NONAME
+ _ZN14AgendaCategoryC2ENS_12CategoryTypeE @ 105 NONAME
+ _ZN14AgendaCategoryC2ERKS_ @ 106 NONAME
+ _ZN14AgendaCategoryC2Ev @ 107 NONAME
+ _ZN14AgendaCategoryD0Ev @ 108 NONAME
+ _ZN14AgendaCategoryD1Ev @ 109 NONAME
+ _ZN14AgendaCategoryD2Ev @ 110 NONAME
+ _ZN14AgendaCategoryaSERKS_ @ 111 NONAME
+ _ZN14AgendaGeoValue10setLatLongEdd @ 112 NONAME
+ _ZN14AgendaGeoValue6detachEv @ 113 NONAME
+ _ZN14AgendaGeoValueC1ERKS_ @ 114 NONAME
+ _ZN14AgendaGeoValueC1Ev @ 115 NONAME
+ _ZN14AgendaGeoValueC2ERKS_ @ 116 NONAME
+ _ZN14AgendaGeoValueC2Ev @ 117 NONAME
+ _ZN14AgendaGeoValueD1Ev @ 118 NONAME
+ _ZN14AgendaGeoValueD2Ev @ 119 NONAME
+ _ZN14AgendaGeoValueaSERKS_ @ 120 NONAME
+ _ZN16AgendaRepeatRule10setByMonthERK5QListINS_5MonthEE @ 121 NONAME
+ _ZN16AgendaRepeatRule11setIntervalEi @ 122 NONAME
+ _ZN16AgendaRepeatRule12setWeekStartENS_3DayE @ 123 NONAME
+ _ZN16AgendaRepeatRule13setByMonthDayERK5QListIiE @ 124 NONAME
+ _ZN16AgendaRepeatRule18setRepeatRuleStartERK9QDateTime @ 125 NONAME
+ _ZN16AgendaRepeatRule6detachEv @ 126 NONAME
+ _ZN16AgendaRepeatRule7setTypeENS_8RuleTypeE @ 127 NONAME
+ _ZN16AgendaRepeatRule8setByDayERK5QListINS_3DayEE @ 128 NONAME
+ _ZN16AgendaRepeatRule8setUntilERK9QDateTime @ 129 NONAME
+ _ZN16AgendaRepeatRuleC1ENS_8RuleTypeE @ 130 NONAME
+ _ZN16AgendaRepeatRuleC1ERKS_ @ 131 NONAME
+ _ZN16AgendaRepeatRuleC1Ev @ 132 NONAME
+ _ZN16AgendaRepeatRuleC2ENS_8RuleTypeE @ 133 NONAME
+ _ZN16AgendaRepeatRuleC2ERKS_ @ 134 NONAME
+ _ZN16AgendaRepeatRuleC2Ev @ 135 NONAME
+ _ZN16AgendaRepeatRuleD1Ev @ 136 NONAME
+ _ZN16AgendaRepeatRuleD2Ev @ 137 NONAME
+ _ZN16AgendaRepeatRuleaSERKS_ @ 138 NONAME
+ _ZNK10AgendaUtil10metaObjectEv @ 139 NONAME
+ _ZNK10AgendaUtil5errorEv @ 140 NONAME
+ _ZNK11AgendaAlarm10timeOffsetEv @ 141 NONAME
+ _ZNK11AgendaAlarm14alarmSoundNameEv @ 142 NONAME
+ _ZNK11AgendaAlarm6isNullEv @ 143 NONAME
+ _ZNK11AgendaAlarmeqERKS_ @ 144 NONAME
+ _ZNK11AgendaAlarmneERKS_ @ 145 NONAME
+ _ZNK11AgendaEntry10categoriesEv @ 146 NONAME
+ _ZNK11AgendaEntry10repeatRuleEv @ 147 NONAME
+ _ZNK11AgendaEntry11descriptionEv @ 148 NONAME
+ _ZNK11AgendaEntry13clearGeoValueEv @ 149 NONAME
+ _ZNK11AgendaEntry14durationInSecsEv @ 150 NONAME
+ _ZNK11AgendaEntry17completedDateTimeEv @ 151 NONAME
+ _ZNK11AgendaEntry20lastModifiedDateTimeEv @ 152 NONAME
+ _ZNK11AgendaEntry2idEv @ 153 NONAME
+ _ZNK11AgendaEntry4typeEv @ 154 NONAME
+ _ZNK11AgendaEntry5alarmEv @ 155 NONAME
+ _ZNK11AgendaEntry6isNullEv @ 156 NONAME
+ _ZNK11AgendaEntry6methodEv @ 157 NONAME
+ _ZNK11AgendaEntry6rDatesEv @ 158 NONAME
+ _ZNK11AgendaEntry6statusEv @ 159 NONAME
+ _ZNK11AgendaEntry7dtStampEv @ 160 NONAME
+ _ZNK11AgendaEntry7endTimeEv @ 161 NONAME
+ _ZNK11AgendaEntry7summaryEv @ 162 NONAME
+ _ZNK11AgendaEntry8geoValueEv @ 163 NONAME
+ _ZNK11AgendaEntry8locationEv @ 164 NONAME
+ _ZNK11AgendaEntry8priorityEv @ 165 NONAME
+ _ZNK11AgendaEntry9attendeesEv @ 166 NONAME
+ _ZNK11AgendaEntry9favouriteEv @ 167 NONAME
+ _ZNK11AgendaEntry9startTimeEv @ 168 NONAME
+ _ZNK11AgendaEntryeqERKS_ @ 169 NONAME
+ _ZNK11AgendaEntryneERKS_ @ 170 NONAME
+ _ZNK14AgendaAttendee10commonNameEv @ 171 NONAME
+ _ZNK14AgendaAttendee17responseRequestedEv @ 172 NONAME
+ _ZNK14AgendaAttendee4roleEv @ 173 NONAME
+ _ZNK14AgendaAttendee6isNullEv @ 174 NONAME
+ _ZNK14AgendaAttendee6statusEv @ 175 NONAME
+ _ZNK14AgendaAttendee7addressEv @ 176 NONAME
+ _ZNK14AgendaAttendeeeqERKS_ @ 177 NONAME
+ _ZNK14AgendaAttendeeneERKS_ @ 178 NONAME
+ _ZNK14AgendaCategory20extendedCategoryNameEv @ 179 NONAME
+ _ZNK14AgendaCategory6isNullEv @ 180 NONAME
+ _ZNK14AgendaCategory8categoryEv @ 181 NONAME
+ _ZNK14AgendaCategoryeqERKS_ @ 182 NONAME
+ _ZNK14AgendaCategoryneERKS_ @ 183 NONAME
+ _ZNK14AgendaGeoValue10getLatLongERdS0_ @ 184 NONAME
+ _ZNK14AgendaGeoValue6isNullEv @ 185 NONAME
+ _ZNK14AgendaGeoValueeqERKS_ @ 186 NONAME
+ _ZNK14AgendaGeoValueneERKS_ @ 187 NONAME
+ _ZNK16AgendaRepeatRule10byMonthDayEv @ 188 NONAME
+ _ZNK16AgendaRepeatRule15repeatRuleStartEv @ 189 NONAME
+ _ZNK16AgendaRepeatRule4typeEv @ 190 NONAME
+ _ZNK16AgendaRepeatRule5byDayEv @ 191 NONAME
+ _ZNK16AgendaRepeatRule5untilEv @ 192 NONAME
+ _ZNK16AgendaRepeatRule6isNullEv @ 193 NONAME
+ _ZNK16AgendaRepeatRule7byMonthEv @ 194 NONAME
+ _ZNK16AgendaRepeatRule8intervalEv @ 195 NONAME
+ _ZNK16AgendaRepeatRule9weekStartEv @ 196 NONAME
+ _ZNK16AgendaRepeatRuleeqERKS_ @ 197 NONAME
+ _ZNK16AgendaRepeatRuleneERKS_ @ 198 NONAME
+ _ZTI10AgendaUtil @ 199 NONAME
+ _ZTI11AgendaEntry @ 200 NONAME
+ _ZTI14AgendaAttendee @ 201 NONAME
+ _ZTI14AgendaCategory @ 202 NONAME
+ _ZTV10AgendaUtil @ 203 NONAME
+ _ZTV11AgendaEntry @ 204 NONAME
+ _ZTV14AgendaAttendee @ 205 NONAME
+ _ZTV14AgendaCategory @ 206 NONAME
--- a/agendainterface/agendautil/inc/agendaentry.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,400 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file for AgendaEntry and utility classes.
-*
-*/
-
-#ifndef AGENDAENTRY_H
-#define AGENDAENTRY_H
-
-// System includes
-#include <QObject>
-
-// User includes
-#include "agendainterfacedefines.h"
-
-// Forward declarations
-class QDate;
-class QDateTime;
-class AgendaAlarmPrivate;
-class AgendaAttendeePrivate;
-class AgendaCategoryPrivate;
-class AgendaEntryPrivate;
-class AgendaRepeatRulePrivate;
-class AgendaGeoValuePrivate;
-
-class XQCALENDAR_EXPORT AgendaAttendee
-{
-public:
- enum ParticipantRole {
- RequiredParticipant = 0,
- OptionalParticipant,
- NonParticipant,
- ChairParticipant,
- ParticipantRoleUnknown = -1
- };
-
- enum StatusType {
- StatusNeedsAction = 0,
- StatusAccepted,
- StatusTentative,
- StatusConfirmed,
- StatusDeclined,
- StatusCompleted,
- StatusDelegated,
- StatusInProcess,
- StatusUnknown = -1
- };
-
- AgendaAttendee();
- virtual ~AgendaAttendee();
- AgendaAttendee(const QString& address);
- AgendaAttendee(const AgendaAttendee& other);
-
- void setAddress(const QString& address);
- void setCommonName(const QString& name);
- void setResponseRequested(bool responseRequested);
- void setRole(ParticipantRole role);
- void setStatus(StatusType status);
-
- QString address() const;
- QString commonName() const;
- bool responseRequested() const;
- ParticipantRole role() const;
- StatusType status() const;
-
- bool isNull() const;
-
- AgendaAttendee& operator=(const AgendaAttendee& other);
- bool operator==(const AgendaAttendee& other) const;
- bool operator!=(const AgendaAttendee& other) const;
-
-private:
- void detach();
-
-private:
- AgendaAttendeePrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaCategory
-{
-public:
- enum CategoryType {
- AppointmentCategory,
- BusinessCategory,
- EducationCategory,
- HolidayCategory,
- MeetingCategory,
- MiscellaneousCategory,
- PersonalCategory,
- PhoneCallCategory,
- SickDayCategory,
- SpecialOccasionCategory,
- TravelCategory,
- VacationCategory,
- ExtendedCategory,
- UnknownCategory = -1
- };
-
- AgendaCategory();
- AgendaCategory(CategoryType category);
- AgendaCategory(const AgendaCategory& other);
- virtual ~AgendaCategory();
-
- void setCategory(CategoryType categoryType);
- CategoryType category() const;
-
- void setExtendedCategoryName(const QString& name);
- QString extendedCategoryName() const;
-
- bool isNull() const;
-
- AgendaCategory& operator=(const AgendaCategory& other);
- bool operator==(const AgendaCategory& other) const;
- bool operator!=(const AgendaCategory& other) const;
-
-private:
- void detach();
-
-private:
- AgendaCategoryPrivate* d;
-};
-
-
-class XQCALENDAR_EXPORT AgendaAlarm
-{
-public:
- static const int MaxFileNameLength = 256;
-
- AgendaAlarm();
- AgendaAlarm(const AgendaAlarm& other);
- ~AgendaAlarm();
-
- void setTimeOffset(int minutes);
- void setAlarmSoundName(const QString& alarmSoundName);
- QString alarmSoundName() const;
- int timeOffset() const;
-
- bool isNull() const;
-
- AgendaAlarm& operator=(const AgendaAlarm& other);
- bool operator==(const AgendaAlarm& other) const;
- bool operator!=(const AgendaAlarm& other) const;
-
-private:
- void detach();
-
-private:
- AgendaAlarmPrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaGeoValue
-{
-public:
-
- AgendaGeoValue();
- AgendaGeoValue(const AgendaGeoValue& other);
- ~AgendaGeoValue();
-
- void setLatLong(double latitude, double longitude);
- void getLatLong(double& latitude, double& longitude) const;
-
- bool isNull() const;
-
- AgendaGeoValue& operator=(const AgendaGeoValue& other);
- bool operator==(const AgendaGeoValue& other) const;
- bool operator!=(const AgendaGeoValue& other) const;
-
-private:
- void detach();
-
-private:
- AgendaGeoValuePrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaRepeatRule
-{
-public:
-
- enum RuleType {
- InvalidRule = 0,
- DailyRule,
- WeeklyRule,
- MonthlyRule,
- YearlyRule
- };
-
- enum Day {
- Monday,
- Tuesday,
- Wednesday,
- Thursday,
- Friday,
- Saturday,
- Sunday,
- InvalidDay = -1
- };
-
- enum Month {
- January,
- February,
- March,
- April,
- May,
- June,
- July,
- August,
- September,
- October,
- November,
- December,
- InvalidMonth = -1
- };
-
- AgendaRepeatRule();
- AgendaRepeatRule(RuleType type);
- AgendaRepeatRule(const AgendaRepeatRule& other);
- ~AgendaRepeatRule();
-
- void setType(RuleType type);
- RuleType type() const;
-
- int count() const;
-
- void setInterval(int interval);
- int interval() const;
-
- void setUntil(const QDateTime& date);
- QDateTime until() const;
-
- void setRepeatRuleStart(const QDateTime& dateTime);
- QDateTime repeatRuleStart() const;
-
- void setWeekStart(Day day);
- Day weekStart() const;
-
- void setByDay(const QList<Day>& days);
- QList<Day> byDay() const;
-
- void setByMonthDay(const QList<int>& monthDays);
- QList<int> byMonthDay() const;
-
- void setByMonth(const QList<Month>& months);
- QList<Month> byMonth() const;
-
- bool isNull() const;
- AgendaRepeatRule& operator=(const AgendaRepeatRule& other);
- bool operator==(const AgendaRepeatRule& other) const;
- bool operator!=(const AgendaRepeatRule& other) const;
-
-private:
- void detach();
-
-private:
- AgendaRepeatRulePrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaEntry
-{
-public:
- enum Type {
- TypeAppoinment,
- TypeTodo,
- TypeEvent,
- TypeReminder,
- TypeAnniversary,
- TypeNote,
- TypeUnknown = -1
- };
-
- enum Method {
- MethodNone,
- MethodPublish,
- MethodRequest,
- MethodReply,
- MethodAdd,
- MethodCancel,
- MethodRefresh,
- MethodCounter,
- MethodDeclineCounter,
- MethodUnknown = -1
- };
-
- enum Status {
- Tentative,
- Confirmed,
- Cancelled,
- TodoNeedsAction,
- TodoCompleted,
- TodoInProcess,
- NullStatus,
-
- VCalAccepted,
- VCalNeedsAction,
- VCalSent,
- VCalDeclined,
- VCalDelegated,
-
- StatusUnknown = -1
- };
-
- AgendaEntry();
- AgendaEntry(Type type);
- AgendaEntry(const AgendaEntry& other);
- virtual ~AgendaEntry();
-
- void addAttendee(const AgendaAttendee& attendee);
- void addCategory(const AgendaCategory& category);
-
- bool setStartAndEndTime(
- const QDateTime& startTime, const QDateTime& endTime);
- QDateTime startTime() const;
- QDateTime endTime() const;
-
- QList<AgendaAttendee>& attendees();
- const QList<AgendaAttendee>& attendees() const;
- QList<AgendaCategory>& categories();
- const QList<AgendaCategory>& categories() const;
-
- void setDescription(const QString& description);
- QString description() const;
-
- void setType(Type type);
- Type type() const;
-
- void setAlarm(const AgendaAlarm& alarm);
- AgendaAlarm alarm() const;
-
- void setLocation(const QString& location);
- QString location() const;
-
- void setSummary(const QString& summary);
- QString summary() const;
-
- void setMethod(Method method);
- Method method() const;
-
- void setRepeatRule(const AgendaRepeatRule& repeatRule);
- AgendaRepeatRule repeatRule() const;
-
- void setPriority(int priority);
- int priority() const;
-
- void setRDates(const QList<QDate>& rdates);
- QList<QDate> rDates() const;
-
- void setRecurrenceId(QDateTime& recTime);
- QDateTime recurrenceId();
-
- bool isNull() const;
-
- ulong id() const;
- bool isTimedEntry();
- bool isRepeating();
-
- QDateTime lastModifiedDateTime() const;
- void setLastModifiedDateTime(const QDateTime& dateTime);
-
- Status status() const;
- void setStatus(Status status);
-
- uint favourite() const;
- void setFavourite(uint favourite);
-
- void setCompletedDateTime(const QDateTime& dateTime);
- QDateTime completedDateTime() const;
-
- void setDTStamp(const QDateTime& dateTime);
- QDateTime dtStamp() const;
-
- void setGeoValue(const AgendaGeoValue& geoValue);
- AgendaGeoValue geoValue() const;
- void clearGeoValue() const;
-
- int durationInSecs() const;
- AgendaEntry& operator=(const AgendaEntry& other);
- bool operator==(const AgendaEntry& other) const;
- bool operator!=(const AgendaEntry& other) const;
-
-private:
- void detach();
-
-private:
- AgendaEntryPrivate* d;
- friend class AgendaUtilPrivate;
-};
-
-#endif // AGENDAENTRY_H
-
-// End of file --Don't remove this.
--- a/agendainterface/agendautil/inc/agendaentry_p.h Mon Jul 19 15:12:16 2010 +0100
+++ b/agendainterface/agendautil/inc/agendaentry_p.h Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,7 @@
#include <QTime>
// User includes
-#include "agendaentry.h"
+#include <agendaentry.h>
class AgendaAttendeePrivate
{
--- a/agendainterface/agendautil/inc/agendautil.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file for AgendaUtil class.
-*
-*/
-
-#ifndef AGENDAUTIL_H
-#define AGENDAUTIL_H
-
-// System includes
-#include <QObject>
-#include <QList>
-
-// User includes
-#include "agendaentry.h"
-#include "agendainterfacedefines.h"
-
-// Forward declarations
-class QDateTime;
-class AgendaUtilPrivate;
-
-class XQCALENDAR_EXPORT AgendaUtil : public QObject
-{
- Q_OBJECT
-
-public:
-
- enum Error {
- NoError = 0,
- OutOfMemoryError,
- AlreadyInUse,
- UnknownError = -1
- };
-
- enum FilterFlags {
- IncludeAppointments = 0x01,
- IncludeReminders = 0x02,
- IncludeEvents = 0x04,
- IncludeAnniversaries = 0x08,
- IncludeCompletedTodos = 0x10,
- IncludeIncompletedTodos = 0x20,
- IncludeAlarmedOnly = 0x40,
- IncludeRptsNextInstanceOnly = 0x80,
- IncludeNotes=0x300,
- IncludeAll=IncludeAppointments
- | IncludeReminders
- | IncludeEvents
- | IncludeAnniversaries
- | IncludeCompletedTodos
- | IncludeIncompletedTodos
- | IncludeNotes
- };
-
- enum RecurrenceRange {
- ThisOnly,
- ThisAndAll,
- ThisAndFuture,
- ThisAndPrior
- };
-
- AgendaUtil(QObject* parent = 0);
- ~AgendaUtil();
-
- ulong addEntry(const AgendaEntry& entry);
- ulong cloneEntry(const AgendaEntry& entry, AgendaEntry::Type type);
- bool deleteEntry(ulong id);
- void deleteRepeatedEntry(
- AgendaEntry& entry, AgendaUtil::RecurrenceRange range);
- bool updateEntry(const AgendaEntry& entry, bool isChild = false);
- bool storeRepeatingEntry(const AgendaEntry& entry, bool copyToChildren);
- bool createException(const AgendaEntry& entry,QDateTime instanceOriginalDateTime);
- QList<ulong> entryIds(
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- QList<AgendaEntry> fetchAllEntries(
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- QList<AgendaEntry> fetchEntriesInRange(
- QDateTime rangeStart, QDateTime rangeEnd,
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- QList<AgendaEntry> createEntryIdListForDay(
- QDateTime day,
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- AgendaEntry fetchById(ulong id);
-
- int importvCalendar(const QString& fileName, AgendaEntry& entry);
- bool exportAsvCalendar(const QString& fileName, long int calendarEntryId);
-
- AgendaUtil::Error error() const;
- void setCompleted(AgendaEntry& entry, bool complete, QDateTime& dateTime);
- void deleteEntries(
- QDateTime& start, QDateTime& end,
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- AgendaEntry parentEntry(AgendaEntry& entry);
- void clearRepeatingProperties(AgendaEntry& entry);
- void getPreviousInstanceTimes(AgendaEntry& entry, QDateTime& startTime,
- QDateTime& endTime);
- void getNextInstanceTimes(AgendaEntry& entry, QDateTime& startTime,
- QDateTime& endTime);
- void markDatesWithEvents(QDateTime rangeStart, QDateTime rangeEnd,
- AgendaUtil::FilterFlags filter, QList<QDate>& dates);
- bool areNoEntriesInCalendar();
- static QDateTime minTime();
- static QDateTime maxTime();
-
- static bool isWorkdaysRepeatingEntry(const AgendaRepeatRule& repeatRule);
-
-Q_SIGNALS:
- void entriesChanged(QList<ulong> ids);
- void entryAdded(ulong id);
- void entryDeleted(ulong id);
- void entryUpdated(ulong id);
- void entriesDeleted(int status);
- void entryViewCreationCompleted(int status);
- void instanceViewCreationCompleted(int status);
-
-private:
- friend class AgendaUtilPrivate;
- AgendaUtilPrivate* d;
-};
-
-#endif // AGENDAUTIL_H
-
-// End of file --Don't remove this.
--- a/agendainterface/agendautil/inc/agendautil_p.h Mon Jul 19 15:12:16 2010 +0100
+++ b/agendainterface/agendautil/inc/agendautil_p.h Mon Aug 23 16:00:50 2010 +0100
@@ -29,7 +29,7 @@
#include <calcategory.h>
// User includes
-#include "agendautil.h"
+#include <agendautil.h>
// Forward declarations
class CCalSession;
@@ -61,11 +61,8 @@
AgendaUtilPrivate(AgendaUtil* calendar);
~AgendaUtilPrivate();
- ulong addEntry(const AgendaEntry& entry);
+ ulong store(AgendaEntry &entry, AgendaUtil::RecurrenceRange range);
ulong cloneEntry(const AgendaEntry& entry, AgendaEntry::Type type);
- bool updateEntry(const AgendaEntry& entry, bool isChild = false);
- bool storeRepeatingEntry(const AgendaEntry& entry, bool copyToChildren);
- bool createException(const AgendaEntry& entry, QDateTime instanceOriginalDateTime);
bool deleteEntry(ulong id);
void deleteRepeatedEntry(
@@ -92,7 +89,6 @@
AgendaUtil::Error error() const;
void setCompleted(AgendaEntry& entry, bool complete, QDateTime& dateTime);
AgendaEntry parentEntry(AgendaEntry& entry);
- void clearRepeatingProperties(AgendaEntry& entry);
void getPreviousInstanceTimes(AgendaEntry& entry, QDateTime& startTime,
QDateTime& endTime);
void getNextInstanceTimes(AgendaEntry& entry, QDateTime& startTime,
@@ -114,6 +110,7 @@
private:
AgendaEntry createAgendaEntryFromCalEntry(
CCalEntry& calEntry, CCalInstance* instance = NULL);
+ void createCCalEntryFromAgendaEntry(AgendaEntry &agendaEntry, CCalEntry &calEntry);
bool addAttendeesToEntry(
const QList<AgendaAttendee>& attendees, CCalEntry& entry);
bool addCategoriesToEntry(
@@ -142,17 +139,7 @@
const CalCommon::TCalTimeRange& timeRange);
TTime getNextInstanceForRepeatOther(CCalEntry& aEntry,
const CalCommon::TCalTimeRange& timeRange);
- bool haveRepeatPropertiesChanged(const CCalEntry& newEntry,
- const CCalEntry& oldEntry);
- void copyChildrenExceptionData( CCalEntry& editedEntry,
- RPointerArray<CCalEntry>& oldEntries );
- bool isFieldSame( CCalEntry& entryOne, CCalEntry& entryTwo,
- DifferenceFlag flag);
- void copyField( const CCalEntry& src, CCalEntry& dst,
- DifferenceFlag field );
- void storeEachChildEntry(CCalEntry &entry,
- RPointerArray<CCalEntry> &oldEntries,
- bool resetLocalUid);
+
TCalTime generateRecurrenceIdFromEntry( CCalEntry& entry,
TCalTime instanceDate );
@@ -161,7 +148,7 @@
AgendaRepeatRule createAgendaRRuleFromTCalRRule(TCalRRule &calRRule);
- TCalRRule createTCalRRuleFromAgendaRRule(AgendaRepeatRule &agendaRRule);
+ TCalRRule createTCalRRuleFromAgendaRRule(AgendaRepeatRule &agendaRRule, bool isNonFloating);
private:
@@ -174,6 +161,8 @@
bool mInstanceViewCreated;
mutable int iError;
bool mIsDeleting;
+ bool mIsInstanceViewBeingDeleted;
+ bool mIsEntryViewBeingDeleted;
enum CompareResult {
Equal = 0, // 1. == 2.
--- a/agendainterface/agendautil/src/agendaentry.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/agendainterface/agendautil/src/agendaentry.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -14,7 +14,7 @@
* Description:
*
*/
-#include "agendaentry.h"
+#include <agendaentry.h>
#include "agendaentry_p.h"
#include <calalarm.h>
--- a/agendainterface/agendautil/src/agendautil.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/agendainterface/agendautil/src/agendautil.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -14,7 +14,7 @@
* Description:
*
*/
-#include "agendautil.h"
+#include <agendautil.h>
#include "agendautil_p.h"
#include <QList>
@@ -94,16 +94,17 @@
*/
/*!
- Adds new enty.
+ To store the new entry or update the entry in the Calendar db.
- \param entry The entry to be added
- \return id of the added entry on success; otherwise returns 0.
- \sa deleteEntry(), updateEntry()
+ \param entry The entry to be added/updated
+ \param range The recurrence range of entry
+ \return ulong The local uid of the entry added/updated in the db.
*/
-ulong AgendaUtil::addEntry(const AgendaEntry& entry)
+ulong AgendaUtil::store(AgendaEntry &entry, AgendaUtil::RecurrenceRange range)
{
- return d->addEntry(entry);
+ return d->store(entry, range);
}
+
/*!
Clones the `entry' passed in the argument and saves it as type `type'.
@@ -133,7 +134,7 @@
\param id The id of the entry to be deleted
\return If false is returned, an error has occurred. Call error() to get a value of
AgendaUtil::Error that indicates which error occurred
- \sa addEntry(), updateEntry()
+ \sa store()
*/
bool AgendaUtil::deleteEntry(ulong id)
{
@@ -148,7 +149,7 @@
only specific instances
\return If false is returned, an error has occurred. Call error() to get a value of
AgendaUtil::Error that indicates which error occurred
- \sa addEntry(), updateEntry()
+ \sa store()
*/
void AgendaUtil::deleteRepeatedEntry(
AgendaEntry& entry,
@@ -158,47 +159,6 @@
}
/*!
- Updates the entry
-
- \param entry The entry to be updated
- \return If false is returned, an error has occurred. Call error() to get a value of
- AgendaUtil::Error that indicates which error occurred
- \sa addEntry(), deleteEntry()
- */
-bool AgendaUtil::updateEntry(const AgendaEntry& entry, bool isChild)
-{
- return d->updateEntry(entry, isChild);
-}
-
-/*!
- Store the repeating entry. This needs to be called only when alreay existing
- repeating entry is getting modified and saved. This function takes care of
- copying the relevant fields to its child also
-
- \param entry The entry to be stored
- \return If false is returned, an error has occurred. Call error() to get a value of
- AgendaUtil::Error that indicates which error occurred
- \sa addEntry(), deleteEntry()
- */
-bool AgendaUtil::storeRepeatingEntry(const AgendaEntry& entry,
- bool copyToChildren)
-{
- return d->storeRepeatingEntry(entry, copyToChildren);
-}
-
-/*!
- Creates an exceptional entry
-
- \param entry The entry to be stored
- \return If false is returned, an error has occurred. Call error() to get a value of
- AgendaUtil::Error that indicates which error occurred
- \sa addEntry(), deleteEntry()
- */
-bool AgendaUtil::createException(const AgendaEntry& entry,QDateTime instanceOriginalDateTime)
-{
- return d->createException(entry, instanceOriginalDateTime);
-}
-/*!
Fetches the entry which of id is equal to given \a id.
\param id id of the entry to be returned
@@ -344,21 +304,6 @@
}
/*!
- Clears the repeating properties of the entry. This means
- It will delete all the instances and stores a single entry
- which is non repeating
-
- \param entry The entry for which repeating properties to be cleared
- \return None
- */
-void AgendaUtil::clearRepeatingProperties(AgendaEntry& entry)
-{
- if(d) {
- return d->clearRepeatingProperties(entry);
- }
-}
-
-/*!
Returns the start and end times of previous occurence of a particular
instance
--- a/agendainterface/agendautil/src/agendautil_p.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/agendainterface/agendautil/src/agendautil_p.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,8 +32,8 @@
#include <asshddefs.h>
// User includes
+#include <agendaentry.h>
#include "agendautil_p.h"
-#include "agendaentry.h"
#include "agendaentry_p.h"
#include "CleanupResetAndDestroy.h"
@@ -53,6 +53,8 @@
mEntryViewCreated = false;
mInstanceViewCreated = false;
mIsDeleting = false;
+ mIsEntryViewBeingDeleted = false;
+ mIsInstanceViewBeingDeleted = false;
prepareSession();
}
@@ -95,13 +97,13 @@
endDateArray[0], static_cast<TMonth>(endDateArray[1]),
0, 0, 0, 0, 0);
- startDate.SetTimeLocalL(startTime);
- endDate.SetTimeLocalL(endTime);
- CalCommon::TCalTimeRange searchTimeRange(startDate, startDate);
+ startDate.SetTimeUtcL(startTime);
+ endDate.SetTimeUtcL(endTime);
+ CalCommon::TCalTimeRange searchTimeRange(startDate, endDate);
CCalChangeNotificationFilter* filter = 0;
filter = CCalChangeNotificationFilter::NewL(
- EChangeEntryAll, true, searchTimeRange);
+ MCalChangeCallBack2::EChangeEntryAll, true, searchTimeRange);
iCalSession->StartChangeNotification(*this, *filter);
@@ -124,8 +126,18 @@
AgendaUtilPrivate::~AgendaUtilPrivate()
{
- delete iCalEntryView;
- delete iCalInstanceView;
+ if (iCalEntryView && !mIsEntryViewBeingDeleted) {
+ mIsEntryViewBeingDeleted = true;
+ delete iCalEntryView;
+ iCalEntryView = NULL;
+ }
+
+ if (iCalInstanceView && !mIsInstanceViewBeingDeleted) {
+ mIsInstanceViewBeingDeleted = true;
+ delete iCalInstanceView;
+ iCalInstanceView = NULL;
+ }
+
if (iCalSession) {
iCalSession->StopChangeNotification();
}
@@ -135,8 +147,6 @@
void AgendaUtilPrivate::Completed(TInt aError)
{
iError = aError;
- static bool isInstanceViewDeleted = false;
- static bool isEntryViewDeleted = false;
if (mIsDeleting) {
// If deletion was in progress, then it is completed now
@@ -147,15 +157,17 @@
if (KErrNone != iError) {
// Something has gone wrong, return
- if (iCalEntryView && !isEntryViewDeleted) {
- isEntryViewDeleted = true;
- delete iCalEntryView;
- iCalEntryView = NULL;
+ if (iCalEntryView && !mIsEntryViewBeingDeleted) {
+ mIsEntryViewBeingDeleted = true;
+ delete iCalEntryView;
+ iCalEntryView = NULL;
+ mIsEntryViewBeingDeleted = false;
}
- if (iCalInstanceView && !isInstanceViewDeleted) {
- isInstanceViewDeleted = true;
- delete iCalInstanceView;
- iCalInstanceView = NULL;
+ if (iCalInstanceView && !mIsInstanceViewBeingDeleted) {
+ mIsInstanceViewBeingDeleted = true;
+ delete iCalInstanceView;
+ iCalInstanceView = NULL;
+ mIsInstanceViewBeingDeleted = false;
}
return;
}
@@ -189,209 +201,138 @@
}
/*!
- Adds a new entry with the calendar database.
+ To store the new entry or update the entry in the Calendar db.
- \param entry Reference to a new AgendaEntry to be added.
- \return ulong The local uid of the entry added in the db.
- */
-ulong AgendaUtilPrivate::addEntry(const AgendaEntry& entry)
+ \param entry The entry to be added/updated
+ \param range The recurrence range of entry
+ \return ulong The local uid of the entry added/updated in the db.
+*/
+ulong AgendaUtilPrivate::store(AgendaEntry &entry, AgendaUtil::RecurrenceRange range)
{
// Will be filled with the lUID of the new entry created.
TCalLocalUid localUid = 0;
- int success = 0;
// First check if the session to the calendar database is prepared or not.
if (!mInstanceViewCreated) {
// Something went wrong
return localUid;
}
-
- // Get the global uid.
- CCalenInterimUtils2* calenInterimUtils2 = CCalenInterimUtils2::NewL();
- HBufC8* globalUid = calenInterimUtils2->GlobalUidL();
- if (AgendaEntry::TypeNote == entry.type()) {
- TRAP(
- iError,
-
- RPointerArray<CCalEntry> entryArray;
- CleanupResetAndDestroyPushL(entryArray);
+ CCalEntry *calEntry = 0;
+
+ TRAP(
+ iError,
+ // Get the global uid.
+ CCalenInterimUtils2* calenInterimUtils2 = CCalenInterimUtils2::NewL();
+ bool isChild = !(entry.recurrenceId().isNull());
+
+ //Flag to decide whether entry is added or updated
+ bool entryAdded = false;
+
+ // if the entry id is zero means need to create a new entry
+ if ((AgendaUtil::ThisAndAll == range) && (0 == entry.id())) {
+
+ entryAdded = true;
+
+ HBufC8* globalUid = calenInterimUtils2->GlobalUidL();
CleanupStack::PushL(globalUid);
-
- // Construct a CCalEntry object and start filling the details.
- CCalEntry* newEntry = 0;
- newEntry = CCalEntry::NewL(
- static_cast<CCalEntry::TType>(entry.type()),
- globalUid,
- static_cast<CCalEntry::TMethod>(entry.method()),
- 0);
-
+ calEntry
+ = CCalEntry::NewL(
+ static_cast<CCalEntry::TType> (entry.type()),
+ globalUid,
+ static_cast<CCalEntry::TMethod> (entry.method()),
+ 0);
+
CleanupStack::Pop(globalUid);
-
- // Add description.
- TPtrC description(reinterpret_cast<const TUint16*>(
- entry.description().utf16()));
- newEntry->SetDescriptionL(description);
-
- // Set the favourite property.
- newEntry->SetFavouriteL(entry.favourite());
-
- // Set the last modification time.
- TCalTime calTime;
- QDateTime dateTime = entry.lastModifiedDateTime();
- TDateTime tempDateTime(
- dateTime.date().year(),
- static_cast<TMonth>(dateTime.date().month() - 1),
- dateTime.date().day() - 1, dateTime.time().hour(),
- dateTime.time().minute(), 0, 0);
- TTime tempTime(tempDateTime);
- calTime.SetTimeLocalL(tempTime);
- newEntry->SetLastModifiedDateL(calTime);
-
- // Set the dtstamp time.It is used to set the cretaion time.
- TCalTime creationCalTime;
- QDateTime dtStamp = entry.dtStamp();
- TDateTime creationDateTime(
- dtStamp.date().year(),
- static_cast<TMonth>(dtStamp.date().month() - 1),
- dtStamp.date().day() - 1, dtStamp.time().hour(),
- dtStamp.time().minute(), 0, 0);
- TTime creationTTime(creationDateTime);
- creationCalTime.SetTimeLocalL(creationTTime);
- newEntry->SetDTStampL(creationCalTime);
-
- // Finally set the entry to the database using the entry view.
- entryArray.AppendL(newEntry);
- iCalEntryView->StoreL(entryArray, success);
- localUid = newEntry->LocalUidL();
-
- // Cleanup.
- CleanupStack::PopAndDestroy(&entryArray);
- )
- } else {
- TRAP(
- iError,
-
- RPointerArray<CCalEntry> entryArray;
- CleanupResetAndDestroyPushL(entryArray);
- CleanupStack::PushL(globalUid);
- // Construct a CCalEntry object and start filling the details.
- CCalEntry* newEntry = 0;
- newEntry = CCalEntry::NewL(
- static_cast<CCalEntry::TType>(entry.type()),
- globalUid,
- static_cast<CCalEntry::TMethod>(entry.method()),
- 0);
-
- CleanupStack::Pop(globalUid);
-
- // Add the summary.
- if (!entry.summary().isNull()) {
- TPtrC summary(reinterpret_cast<const TUint16*>(
- entry.summary().utf16()));
- newEntry->SetSummaryL(summary);
+ } else if (((AgendaUtil::ThisOnly == range) && isChild)
+ || ((AgendaUtil::ThisAndAll == range) && (entry.id() > 0))) {
+
+ // Updating the entry/Exceptional entry
+ calEntry = iCalEntryView->FetchL(entry.id());
+
+ CleanupStack::PushL(calEntry);
+ // Repeat rule
+ TCalRRule rrule;
+ TBool isRepeating = calEntry->GetRRuleL( rrule );
+
+ // If the repeat rule is cleared then Clear the Repeat rule from CCalEntry
+ if ((AgendaUtil::ThisAndAll == range)
+ && isRepeating && !(entry.isRepeating())) {
+ calEntry->ClearRepeatingPropertiesL();
}
-
- // Set the entry Start/End Date and time.
- QDate date = entry.startTime().date();
- QTime time = entry.startTime().time();
+ CleanupStack::Pop(calEntry);
+ } else {
+ // Creating a exceptional entry
+ if ((AgendaUtil::ThisOnly == range) && !isChild) {
+ // Get the entry corresponding to the id.
+ CCalEntry *parentEntry = iCalEntryView->FetchL(entry.id());
+ CleanupStack::PushL(parentEntry);
+ // We are creating an exception, hence get the global Uid
+ HBufC8* guid = parentEntry->UidL().AllocLC();
+
+ QDateTime instanceOriginalDateTime = entry.startTime();
+
+ // create new (child) entry
+ // Use original instance time for recurrenceID as this entry hasn't got one.
+ TCalTime originalCalTime;
+ TDateTime originalDateTime(instanceOriginalDateTime.date().year(),
+ TMonth(instanceOriginalDateTime.date().month() - 1),
+ instanceOriginalDateTime.date().day() -1,
+ 0,
+ 0,
+ 0,
+ 0);
+
+ TTime originalDateTimeTTime(originalDateTime);
+ // Use floating time for non-timed entries so that
+ // the time will be same regardless of the timezone
+ if(entry.isTimedEntry()) {
+ originalCalTime.SetTimeLocalL(originalDateTimeTTime);
+ }else {
+ originalCalTime.SetTimeLocalFloatingL(originalDateTimeTTime);
+ }
+ // create the new child now
+ calEntry = CCalEntry::NewL(parentEntry->EntryTypeL(),
+ guid,
+ parentEntry->MethodL(),
+ parentEntry->SequenceNumberL(),
+ originalCalTime,
+ CalCommon::EThisOnly);
+
+ // reset local UID and clear the repeat rule for exceptional entry
+ calEntry->SetLocalUidL(TCalLocalUid(0));
+ calEntry->ClearRepeatingPropertiesL();
+
+ CleanupStack::Pop(guid);
+ CleanupStack::PopAndDestroy(parentEntry);
+
+ // clear repeat rule properties
+ AgendaRepeatRule repeatrule;
+ entry.setRepeatRule(repeatrule);
+ }
+
+ }
+
+ // Converting agenda entry to CCalEntry to store it to database
+ createCCalEntryFromAgendaEntry(entry, *calEntry);
+
+ calenInterimUtils2->StoreL(*iCalEntryView, *calEntry, true);
+ localUid = calEntry->LocalUidL();
+
+ // Emit signal upon successful creation of entry.
+ if (0 < localUid) {
+ // if creating new entry then emit signal entryAdded else entryUpdated
+ if (entryAdded) {
+ emit q->entryAdded(localUid);
+ } else {
+ q->entryUpdated(localUid);
+ }
+ }
+
+ delete calenInterimUtils2;
+ delete calEntry;
+ )
+ return localUid;
- TDateTime startDateTime(
- date.year(), static_cast<TMonth>(date.month() - 1),
- date.day() - 1, time.hour(), time.minute(), 0, 0);
- TTime entryStartTime(startDateTime);
- TCalTime calStartTime;
- calStartTime.SetTimeLocalL(entryStartTime);
-
- date = entry.endTime().date();
- time = entry.endTime().time();
-
- TDateTime endDateTime(
- date.year(), static_cast<TMonth>(date.month() - 1),
- date.day() - 1, time.hour(), time.minute(), 0, 0);
- TTime entryEndTime(endDateTime);
- TCalTime calEndTime;
- calEndTime.SetTimeLocalL(entryEndTime);
- newEntry->SetStartAndEndTimeL(calStartTime, calEndTime);
-
- // Add attendees to the entry.
- addAttendeesToEntry(entry.d->m_attendees, *newEntry);
-
- // Add categories to the entry.
- addCategoriesToEntry(entry.d->m_categories, *newEntry);
-
- // Add description to the entry.
- TPtrC description(reinterpret_cast<const TUint16*>(
- entry.description().utf16()));
- newEntry->SetDescriptionL(description);
-
- // Set the favourite property.
- newEntry->SetFavouriteL(entry.favourite());
-
- // Add Alarm to the entry.
- AgendaAlarm alarm = entry.alarm();
- if (!alarm.isNull()) {
- setAlarmToEntry(alarm, *newEntry);
- }
-
- // Set the priority.
- int priority = entry.priority();
- if (entry.priority() != -1) {
- newEntry->SetPriorityL(priority);
- }
-
- // Set the location.
- if (!entry.location().isNull()) {
- TPtrC location(reinterpret_cast<const TUint16*>(
- entry.location().utf16()));
- newEntry->SetLocationL(location);
- }
-
- // Set the repeat type if applicable.
- if (AgendaRepeatRule::InvalidRule
- != entry.repeatRule().type()) {
- AgendaRepeatRule agendaRepeatRule = entry.repeatRule();
- TCalRRule repeatRule =
- createTCalRRuleFromAgendaRRule(agendaRepeatRule);
- newEntry->SetRRuleL(repeatRule);
- }
-
- // Save the status of the entry.
- newEntry->SetStatusL((CCalEntry::TStatus) entry.status());
- newEntry->SetLastModifiedDateL();
-
- // Save the geo value if any
- AgendaGeoValue entryGeoValue = entry.geoValue();
- if (!entryGeoValue.isNull()) {
- CCalGeoValue* geoValue = CCalGeoValue::NewL();
- double latitude;
- double longitude;
- entryGeoValue.getLatLong(latitude, longitude);
-
- // set the values to symbian geo value
- geoValue->SetLatLongL(latitude, longitude);
-
- // set it to CCalentry
- newEntry->SetGeoValueL(*geoValue);
- delete geoValue;
- }
-
- // Finally set the entry to the database using the entry view.
- entryArray.AppendL(newEntry);
- iCalEntryView->StoreL(entryArray, success);
- localUid = newEntry->LocalUidL();
-
- // Cleanup.
- CleanupStack::PopAndDestroy(&entryArray);
- )
- }
-
- delete calenInterimUtils2;
-
- // Emit signal upon successful creation of entry.
- if (0 < localUid && 1 == success) {
- emit q->entryAdded(localUid);
- }
- return localUid;
}
/*!
@@ -505,7 +446,6 @@
date.day() - 1, time.hour(), time.minute(), 0, 0);
TTime entryStartTime(startDateTime);
TCalTime calStartTime;
- calStartTime.SetTimeLocalL(entryStartTime);
date = entry.endTime().date();
time = entry.endTime().time();
@@ -515,7 +455,19 @@
date.day() - 1, time.hour(), time.minute(), 0, 0);
TTime entryEndTime(endDateTime);
TCalTime calEndTime;
- calEndTime.SetTimeLocalL(entryEndTime);
+
+ bool isNonFloating = false;
+ // Use floating time for non-timed entries so that
+ // the time will be same regardless of the timezone
+ if(type == AgendaEntry::TypeAppoinment|| type == AgendaEntry::TypeReminder) {
+ calStartTime.SetTimeLocalL(entryStartTime);
+ calEndTime.SetTimeLocalL(entryEndTime);
+ isNonFloating = true;
+ }else {
+ calStartTime.SetTimeLocalFloatingL(entryStartTime);
+ calEndTime.SetTimeLocalFloatingL(entryEndTime);
+ isNonFloating = false;
+ }
newEntry->SetStartAndEndTimeL(calStartTime, calEndTime);
// Add attendees to the entry.
@@ -556,7 +508,7 @@
!= entry.repeatRule().type()) {
AgendaRepeatRule agendaRepeatRule = entry.repeatRule();
TCalRRule repeatRule =
- createTCalRRuleFromAgendaRRule(agendaRepeatRule);
+ createTCalRRuleFromAgendaRRule(agendaRepeatRule, isNonFloating);
newEntry->SetRRuleL(repeatRule);
}
@@ -685,684 +637,6 @@
}
/*!
- Updates a given entry in the calendar database.
-
- \param entry The entry to be updated.
- \return bool true if updation was successful, false otherwise.
- */
-bool AgendaUtilPrivate::updateEntry(const AgendaEntry& entry, bool isChild)
-{
- // First prepare the session with agenda server.
- if (!mInstanceViewCreated) {
- // Something went wrong.
- return false;
- }
-
- if (entry.isNull()) {
- // Invalid entry.
- return false;
- }
-
- int success = 0;
-
- if (AgendaEntry::TypeNote == entry.type()) {
- TRAP(
- iError,
-
- // Get the entry corresponding to the id.
- AgendaEntry storedEntry = fetchById(entry.id());
- CCalEntry* calEntry = iCalEntryView->FetchL(entry.id());
-
- // Update the description.
- if (storedEntry.description() != entry.description()
- && !entry.description().isNull()) {
- calEntry->SetDescriptionL(
- TPtrC(reinterpret_cast<const TUint16 *> (
- entry.description().utf16())));
- }
-
- // Update the method.
- if (storedEntry.method() != entry.method() &&
- AgendaEntry::MethodUnknown != entry.method()) {
- calEntry->SetMethodL(
- static_cast<CCalEntry::TMethod> (entry.method()));
- }
-
- // Update the last modification time.
- if (entry.lastModifiedDateTime().isValid()) {
- if (entry.lastModifiedDateTime() !=
- storedEntry.lastModifiedDateTime()) {
- QDateTime dateTime = entry.lastModifiedDateTime();
- QDate lastDate = dateTime.date();
- QTime lastTime = dateTime.time();
-
- TDateTime lastModDateTime(
- lastDate.year(),
- static_cast<TMonth> (lastDate.month() - 1),
- lastDate.day() - 1, lastTime.hour(),
- lastTime.minute(), 0, 0);
-
- TTime lastModTime(lastModDateTime);
- TCalTime lastModCalTime;
- lastModCalTime.SetTimeLocalL(lastModTime);
- calEntry->SetLastModifiedDateL(lastModCalTime);
- }
- }
-
- // Update the DTStamp time as the entry is modified.
- if (entry.dtStamp().isValid()) {
- TCalTime resetCreationTime;
- TTime nullTime = Time::NullTTime();
- resetCreationTime.SetTimeLocalL(nullTime);
- calEntry->SetDTStampL(resetCreationTime);
- }
-
- // Check if the favourite property is changed and update the
- // same.
- if (entry.favourite() != storedEntry.favourite()) {
- calEntry->SetFavouriteL(entry.favourite());
- }
-
- // Update the entry using the CCalEntryView.
- RPointerArray<CCalEntry> entryArray;
- CleanupResetAndDestroyPushL(entryArray);
- entryArray.AppendL(calEntry);
- iCalEntryView->UpdateL(entryArray, success);
-
- // Cleanup.
- CleanupStack::PopAndDestroy( &entryArray );
- )
- } else {
- TRAP(
- iError,
-
- // Get the entry corresponding to the id.
- AgendaEntry storedEntry = fetchById(entry.id());
- CCalEntry* calEntry = iCalEntryView->FetchL(entry.id());
-
- // Update the attendees.
- if (!entry.isNull()
- && (entry.d->m_attendees != storedEntry.attendees())) {
-
- RPointerArray<CCalAttendee>& attendeesArray =
- calEntry->AttendeesL();
- int iterator = 0;
- while (attendeesArray.Count() > iterator) {
- calEntry->DeleteAttendeeL(iterator);
- iterator++;
- }
-
- addAttendeesToEntry(entry.d->m_attendees, *calEntry);
- }
-
- // Update the categories.
- if (entry.d->m_categories != storedEntry.categories()) {
-
- RPointerArray<CCalCategory> categories =
- calEntry->CategoryListL();
- int iterator = 0;
- while (categories.Count() > iterator) {
- calEntry->DeleteCategoryL(iterator);
- iterator++;
- }
-
- addCategoriesToEntry(entry.d->m_categories, *calEntry);
- }
-
- // Update the alarm.
- if (entry.alarm() != storedEntry.alarm()) {
- setAlarmToEntry(entry.alarm(), *calEntry);
- }
-
- // Update the description.
- if ((storedEntry.description() != entry.description()
- && !entry.description().isNull()) || entry.description().isNull() ) {
- calEntry->SetDescriptionL(
- TPtrC(reinterpret_cast<const TUint16 *> (
- entry.description().utf16())));
- }
-
- // Update the location.
- if (storedEntry.location() != entry.location()
- && !entry.location().isNull()) {
- calEntry->SetLocationL(
- TPtrC(reinterpret_cast<const TUint16 *> (
- entry.location().utf16())));
- }
-
- // Update the priority.
- if (storedEntry.priority() != entry.priority()
- && -1 != entry.priority()) {
- calEntry->SetPriorityL(entry.priority());
- }
-
- // Update the summary.
- if (storedEntry.summary() != entry.summary()
- && !entry.summary().isNull()) {
- calEntry->SetSummaryL(
- TPtrC(reinterpret_cast<const TUint16 *> (
- entry.summary().utf16())));
- }
-
- // Update the method.
- if (storedEntry.method() != entry.method() &&
- AgendaEntry::MethodUnknown != entry.method()) {
- calEntry->SetMethodL(
- static_cast<CCalEntry::TMethod> (entry.method()));
- }
-
- // Update the time.
- if (storedEntry.startTime() != entry.startTime()
- || storedEntry.endTime() != entry.endTime()) {
-
- QDateTime startDateTime = entry.startTime();
- QDate startDate = startDateTime.date();
- QTime startTime = startDateTime.time();
-
- TDateTime startCalendarDateTime(
- startDate.year(),
- static_cast<TMonth> (startDate.month() - 1),
- startDate.day() - 1,
- startTime.hour(),
- startTime.minute(),
- 0,
- 0);
-
- TTime startCalTime(startCalendarDateTime);
- TCalTime calTime;
- calTime.SetTimeLocalL(startCalTime);
- QDateTime endDateTime = entry.endTime();
- QDate endDate = endDateTime.date();
- QTime endTime = endDateTime.time();
-
- TDateTime endCalendarDateTime(
- endDate.year(),
- static_cast<TMonth>(endDate.month() - 1),
- endDate.day() - 1,
- endTime.hour(),
- endTime.minute(),
- 0,
- 0);
-
- TTime endCalTime(endCalendarDateTime);
- TCalTime calTime2;
- calTime2.SetTimeLocalL(endCalTime);
-
- calEntry->SetStartAndEndTimeL(calTime, calTime2);
- }
-
- // Update the repeat rule
- if (storedEntry.repeatRule() != entry.repeatRule()) {
-
- calEntry->ClearRepeatingPropertiesL();
-
- if(TCalRRule::EInvalid != entry.repeatRule().type()) {
- AgendaRepeatRule agendaRepeatRule = entry.repeatRule();
- TCalRRule repeatRule =
- createTCalRRuleFromAgendaRRule(agendaRepeatRule);
- calEntry->SetRRuleL(repeatRule);
- }
- }
-
- // Check if the favourite property is changed and update the
- // same.
- if (entry.favourite() != storedEntry.favourite()) {
- calEntry->SetFavouriteL(entry.favourite());
- }
- calEntry->SetLastModifiedDateL();
-
- // Save the geo value if any
- AgendaGeoValue entryGeoValue = entry.geoValue();
- if (!entryGeoValue.isNull() && (entryGeoValue != storedEntry.geoValue())) {
- CCalGeoValue* geoValue = CCalGeoValue::NewL();
- double latitude;
- double longitude;
- entryGeoValue.getLatLong(latitude, longitude);
-
- // set the values to symbian geo value
- geoValue->SetLatLongL(latitude, longitude);
-
- // set it to CCalentry
- calEntry->SetGeoValueL(*geoValue);
- delete geoValue;
- } else if (entryGeoValue.isNull()) {
- // Clear the geo values if any
- calEntry->ClearGeoValueL();
- }
-
- // Update the entry using the calen entry view.
- RPointerArray<CCalEntry> entryArray;
- CleanupResetAndDestroyPushL(entryArray);
- entryArray.AppendL(calEntry);
- if (!isChild) {
- iCalEntryView->UpdateL(entryArray, success);
- } else {
- iCalEntryView->StoreL(entryArray, success);
- }
- // Cleanup.
- CleanupStack::PopAndDestroy( &entryArray );
- )
- }
-
- // Emit the signal to notify the clients.
- if (0 < success) {
- emit q->entryUpdated(entry.id());
- }
- return (success != 0);
-}
-
-bool AgendaUtilPrivate::storeRepeatingEntry(const AgendaEntry& entry,
- bool copyToChildren)
-{
- // First prepare the session with agenda server.
- if (!mInstanceViewCreated) {
- // Something went wrong.
- return false;
- }
-
- if (entry.isNull()) {
- // Invalid entry.
- return false;
- }
-
- int success = 0;
-
- // Get the entry corresponding to the id.
- AgendaEntry storedEntry = fetchById(entry.id());
- CCalEntry* instance = iCalEntryView->FetchL(entry.id());
- CleanupStack::PushL(instance);
-
- CCalEntry* calEntry;
- if (instance) {
- // Get all the entries with same global Uid.
- RPointerArray<CCalEntry> entries;
- CleanupResetAndDestroyPushL(entries);
- iCalEntryView->FetchL(instance->UidL(), entries);
- calEntry = entries[0];
- entries.Remove(0);
- CleanupStack::PopAndDestroy(&entries);
- } else {
- CleanupStack::PopAndDestroy(instance);
- return false;
- }
- CleanupStack::PopAndDestroy(instance);
- CleanupStack::PushL(calEntry);
-
- // This entry is repeating. Does it have EXDATEs which could be due to children?
- RArray<TCalTime> exceptionDates;
- CleanupClosePushL( exceptionDates );
- calEntry->GetExceptionDatesL( exceptionDates );
- TInt exceptionCount = exceptionDates.Count();
- CleanupStack::PopAndDestroy( &exceptionDates );
-
- if (exceptionCount == 0) {
- // No exception dates so do a StoreL().
- // We have no exceptions, so there are no children to re-store
- // Same logic as above applies, we call StoreL rather than check to
- // see if we could have called UpdateL
- success = updateEntry(entry, true);
- CleanupStack::PopAndDestroy( calEntry );
- return success;
- }
-
- //Is this a child entry?
- if (calEntry->RecurrenceIdL().TimeUtcL() != Time::NullTTime()) {
- success = updateEntry(entry, true);
- CleanupStack::PopAndDestroy( calEntry );
- return success;
- }
-
- // Entry is not a child, but does it have any children?
- // Fetch array of entries associated with this UID.
- RPointerArray<CCalEntry> oldEntries;
- CleanupResetAndDestroyPushL(oldEntries);
- iCalEntryView->FetchL(calEntry->UidL(), oldEntries);
- bool hasChildren = oldEntries.Count() > 0;
-
- // Before we proceed further update calEntry with the latest modifications
- // Update only those fields that are required to copy to the children
- // refer to enum DifferenceFlag to know what fields need to be updated
-
- // set the summary
- calEntry->SetSummaryL(TPtrC(reinterpret_cast<const TUint16 *> (
- entry.summary().utf16())));
-
- // set the locaiton
- calEntry->SetLocationL(TPtrC(reinterpret_cast<const TUint16 *> (
- entry.location().utf16())));
-
- // Save the geo value if any
- AgendaGeoValue entryGeoValue = entry.geoValue();
- if (!entryGeoValue.isNull()) {
- CCalGeoValue* geoValue = CCalGeoValue::NewL();
- double latitude;
- double longitude;
- entryGeoValue.getLatLong(latitude, longitude);
-
- // set the values to symbian geo value
- geoValue->SetLatLongL(latitude, longitude);
-
- // set it to CCalentry
- calEntry->SetGeoValueL(*geoValue);
- delete geoValue;
- } else {
- // Clear the geo values
- calEntry->ClearGeoValueL();
- }
-
- // set the description
- calEntry->SetDescriptionL(TPtrC(reinterpret_cast<const TUint16 *> (
- entry.description().utf16())));
-
- // set the instance start and end dates to this
- TCalTime originalStartCalTime = calEntry->StartTimeL();
- TDateTime origStartDateTime = originalStartCalTime.TimeLocalL().DateTime();
-
- QDate date = entry.startTime().date();
- QTime time =entry.startTime().time();
- origStartDateTime.Set(date.year(),
- static_cast<TMonth> (date.month() - 1),
- date.day() - 1,
- time.hour(),
- time.minute(),time.second(), 0);
- TTime originalStartTime(origStartDateTime);
- originalStartCalTime.SetTimeLocalL(originalStartTime);
-
- TCalTime originalEndCalTime = calEntry->EndTimeL();
- TDateTime origEndDateTime = originalEndCalTime.TimeLocalL().DateTime();
- date = entry.endTime().date();
- time = entry.endTime().time();
- origEndDateTime.Set(date.year(),
- static_cast<TMonth> (date.month() - 1),
- date.day() - 1,
- time.hour(),
- time.minute(),time.second(), 0);
- TTime originalEndTime(origEndDateTime);
- originalEndCalTime.SetTimeLocalL(originalEndTime);
-
- calEntry->SetStartAndEndTimeL(originalStartCalTime, originalEndCalTime);
-
- // Set the repeat rules
- calEntry->ClearRepeatingPropertiesL();
-
- if (TCalRRule::EInvalid != entry.repeatRule().type()) {
- AgendaRepeatRule agendaRepeatRule = entry.repeatRule();
- TCalRRule repeatRule =
- createTCalRRuleFromAgendaRRule(agendaRepeatRule);
- calEntry->SetRRuleL(repeatRule);
-
- }
-
- bool hasTimeOrDateCanged = (oldEntries[0]->StartTimeL().TimeUtcL() !=
- calEntry->StartTimeL().TimeUtcL() ||
- oldEntries[0]->EndTimeL().TimeUtcL() != calEntry->EndTimeL().TimeUtcL());
- if (oldEntries.Count() == 0) {
- //This is a new repeating entry, with exceptions
- //This must have come from an external application, as the
- //calendar UI does not allow creation of this type of entry
- success = updateEntry(entry);
- } // Have the RRule or time fields changed
- else if (copyToChildren || hasTimeOrDateCanged
- || haveRepeatPropertiesChanged(*oldEntries[0], *calEntry)) {
- if (hasChildren && copyToChildren)
- {
- copyChildrenExceptionData( *calEntry, oldEntries );
- }
- success = updateEntry(entry, false);
-
- if(hasChildren)
- {
- storeEachChildEntry( *calEntry, oldEntries, !copyToChildren );
- }
- }
- else
- {
- success = this->updateEntry(entry);
- }
- CleanupStack::PopAndDestroy( &oldEntries );
- CleanupStack::PopAndDestroy( calEntry );
-
- return success;
-}
-
-bool AgendaUtilPrivate::createException(const AgendaEntry& entry,
- QDateTime instanceOriginalDateTime)
-{
- // First prepare the session with agenda server.
- if (!mInstanceViewCreated) {
- // Something went wrong.
- return false;
- }
-
- if (entry.isNull()) {
- // Invalid entry.
- return false;
- }
-
- int success = 0;
- TCalLocalUid localUid = 0;
- if (AgendaEntry::TypeNote == entry.type()) {
- TRAP(
- iError,
-
- // Get the entry corresponding to the id.
- CCalEntry* calEntry = iCalEntryView->FetchL(entry.id());
- CleanupStack::PushL(calEntry);
- // We are creating an exception, hence get the global Uid
- HBufC8* guid = calEntry->UidL().AllocLC();
- // create new (child) entry
- // Use original instance time for recurrenceID as this entry hasn't got one.
- TCalTime originalCalTime;
- TDateTime originalDateTime(instanceOriginalDateTime.date().year(),
- TMonth(instanceOriginalDateTime.date().month() - 1),
- instanceOriginalDateTime.date().day() -1, 0, 0, 0, 0);
- TTime originalDateTimeTTime(originalDateTime);
- originalCalTime.SetTimeLocalL(originalDateTimeTTime);
- // create the new child now
- CCalEntry* newEntry = CCalEntry::NewL( calEntry->EntryTypeL(),
- guid,
- calEntry->MethodL(),
- calEntry->SequenceNumberL(),
- originalCalTime,
- CalCommon::EThisOnly );
-
- CleanupStack::Pop(guid);
- CleanupStack::PopAndDestroy(calEntry);
-
- // Update the description.
- if (!entry.description().isNull()) {
- newEntry->SetDescriptionL(
- TPtrC(reinterpret_cast<const TUint16 *> (
- entry.description().utf16())));
- }
-
- // Update the method.
- if (AgendaEntry::MethodUnknown != entry.method()) {
- newEntry->SetMethodL(
- static_cast<CCalEntry::TMethod> (entry.method()));
- }
-
- // Update the last modification time.
- if (entry.lastModifiedDateTime().isValid()) {
- QDateTime dateTime = entry.lastModifiedDateTime();
- QDate lastDate = dateTime.date();
- QTime lastTime = dateTime.time();
-
- TDateTime lastModDateTime(
- lastDate.year(),
- static_cast<TMonth> (lastDate.month() - 1),
- lastDate.day() - 1, lastTime.hour(),
- lastTime.minute(), 0, 0);
-
- TTime lastModTime(lastModDateTime);
- TCalTime lastModCalTime;
- lastModCalTime.SetTimeLocalL(lastModTime);
- newEntry->SetLastModifiedDateL(lastModCalTime);
- }
-
- newEntry->SetFavouriteL(entry.favourite());
-
- // Update the entry using the CCalEntryView.
- RPointerArray<CCalEntry> entryArray;
- CleanupResetAndDestroyPushL(entryArray);
- entryArray.AppendL(newEntry);
- iCalEntryView->StoreL(entryArray, success);
-
- localUid = newEntry->LocalUidL();
- // Cleanup.
- CleanupStack::PopAndDestroy(&entryArray);
- )
- } else {
- TRAP(
- iError,
-
- CCalEntry* calEntry = iCalEntryView->FetchL(entry.id());
- CleanupStack::PushL(calEntry);
- // We are creating an exception, hence get the global Uid
- HBufC8* guid = calEntry->UidL().AllocLC();
- // create new (child) entry
- // Use original instance time for recurrenceID as this entry hasn't got one.
- TCalTime originalCalTime;
- TDateTime originalDateTime(instanceOriginalDateTime.date().year(),
- TMonth(instanceOriginalDateTime.date().month() - 1),
- instanceOriginalDateTime.date().day() -1, 0, 0, 0, 0);
- TTime originalDateTimeTTime(originalDateTime);
- originalCalTime.SetTimeLocalL(originalDateTimeTTime);
- // create the new child now
- CCalEntry* newEntry = CCalEntry::NewL( calEntry->EntryTypeL(),
- guid,
- calEntry->MethodL(),
- calEntry->SequenceNumberL(),
- originalCalTime,
- CalCommon::EThisOnly );
-
- CleanupStack::Pop(guid);
- CleanupStack::PopAndDestroy(calEntry);
- // Store the attendees.
- if (!entry.isNull()) {
- addAttendeesToEntry(entry.d->m_attendees, *newEntry);
- addCategoriesToEntry(entry.d->m_categories, *newEntry);
- }
-
- // Store the alarm.
- if (!entry.alarm().isNull()) {
- setAlarmToEntry(entry.alarm(), *newEntry);
- }
-
- // Store the description.
- if (!entry.description().isNull()) {
- newEntry->SetDescriptionL(
- TPtrC(reinterpret_cast<const TUint16 *> (
- entry.description().utf16())));
- }
-
- // Store the location.
- if (!entry.location().isNull()) {
- newEntry->SetLocationL(
- TPtrC(reinterpret_cast<const TUint16 *> (
- entry.location().utf16())));
- }
-
- // Store the priority.
- if ( -1 != entry.priority()) {
- newEntry->SetPriorityL(entry.priority());
- }
-
- // Store the summary.
- if (!entry.summary().isNull()) {
- newEntry->SetSummaryL(
- TPtrC(reinterpret_cast<const TUint16 *> (
- entry.summary().utf16())));
- }
-
- // Update the method.
- if (AgendaEntry::MethodUnknown != entry.method()) {
- newEntry->SetMethodL(
- static_cast<CCalEntry::TMethod> (entry.method()));
- }
-
- // Store the time.
- QDateTime startDateTime = entry.startTime();
- QDate startDate = startDateTime.date();
- QTime startTime = startDateTime.time();
-
- TDateTime startCalendarDateTime(
- startDate.year(),
- static_cast<TMonth> (startDate.month() - 1),
- startDate.day() - 1,
- startTime.hour(),
- startTime.minute(),
- 0,
- 0);
-
- TTime startCalTime(startCalendarDateTime);
- TCalTime calTime;
- calTime.SetTimeLocalL(startCalTime);
- QDateTime endDateTime = entry.endTime();
- QDate endDate = endDateTime.date();
- QTime endTime = endDateTime.time();
-
- TDateTime endCalendarDateTime(
- endDate.year(),
- static_cast<TMonth>(endDate.month() - 1),
- endDate.day() - 1,
- endTime.hour(),
- endTime.minute(),
- 0,
- 0);
-
- TTime endCalTime(endCalendarDateTime);
- TCalTime calTime2;
- calTime2.SetTimeLocalL(endCalTime);
-
- newEntry->SetStartAndEndTimeL(calTime, calTime2);
-
- // Save the geo value if any
- AgendaGeoValue entryGeoValue = entry.geoValue();
- if (!entryGeoValue.isNull()) {
- CCalGeoValue* geoValue = CCalGeoValue::NewL();
- double latitude;
- double longitude;
- entryGeoValue.getLatLong(latitude, longitude);
-
- // set the values to symbian geo value
- geoValue->SetLatLongL(latitude, longitude);
-
- // set it to CCalentry
- newEntry->SetGeoValueL(*geoValue);
- delete geoValue;
- }
-
- // No need to update the repeat rule as it is an exception
-
- // Store the favourite
- newEntry->SetFavouriteL(entry.favourite());
-
- // reset local UID
- newEntry->SetLocalUidL( TCalLocalUid( 0 ) );
-
- // clear repeat rule properties
- newEntry->ClearRepeatingPropertiesL();
- // Update the entry using the calen entry view.
- RPointerArray<CCalEntry> entryArray;
- CleanupResetAndDestroyPushL(entryArray);
- entryArray.AppendL(newEntry);
- iCalEntryView->StoreL(entryArray, success);
-
- localUid = newEntry->LocalUidL();
- // Cleanup.
- CleanupStack::PopAndDestroy(&entryArray);
- )
- }
-
- // Emit the signal to notify the clients.
- if (0 < success) {
- emit q->entryUpdated(localUid);
- }
- return (success != 0);
-}
-
-/*!
Fetches an AgendaEntry, given the id.
\param id The (ulong) local uid the entry to be fetched.
@@ -1628,21 +902,18 @@
}
}
// Mark the required dates frm start date to end date
- TTimeIntervalDays days ;
int numOfDays = 0;
//check if the start date of the entry is before the start day of the grid
if(startDate < rangeStart.date()){
if(endDate<=rangeEnd.date()){
//if the end date of entry is lying in the grid ,
//then mark the entry from start day of the grid to the end date of the entry
- days = endCalTime.TimeLocalL().DaysFrom(startDateForInstanceSearch.TimeLocalL());
- numOfDays = days.Int();
+ numOfDays = rangeStart.date().daysTo(endDate);
}
else{
//if end date of the entry is greater then the last date of grid,
//then mark all the date of the grid with the entry
- days = endDateForInstanceSearch.TimeLocalL().DaysFrom(startDateForInstanceSearch.TimeLocalL()) ;
- numOfDays = days.Int();
+ numOfDays = rangeStart.daysTo(rangeEnd);
}
// Check if the event is all-day
if (instanceList[i]->Entry().EntryTypeL() == CCalEntry::EEvent) {
@@ -1665,14 +936,12 @@
if(endDate<=rangeEnd.date()){
//if the end date of entry is lying in the grid ,
//then mark the entry from start date of the entry to the end date of the entry
- days = endCalTime.TimeLocalL().DaysFrom(startCalTime.TimeLocalL()) ;
- numOfDays = days.Int();
+ numOfDays = startDate.daysTo(endDate);
}
else{
//if end date of the entry is greater then the last date of grid,
//then mark all the date from start date of the entry to the end date of the grid
- days = endDateForInstanceSearch.TimeLocalL().DaysFrom(startCalTime.TimeLocalL()) ;
- numOfDays = days.Int();
+ numOfDays = startDate.daysTo(rangeEnd.date());
}
// Check if the event is all-day
if (instanceList[i]->Entry().EntryTypeL() == CCalEntry::EEvent) {
@@ -1762,8 +1031,8 @@
iCalInstanceView->FindInstanceL(instanceList, filters, dayRange);
}
- // In this list, check if any all day events are there
- // As all day events end at 12.00AM of next day, we should not show it again on next day
+ // In this list, check if any events are there that end at the start of the day
+ // we should not show it again on next day
TCalTime calTime;
TDateTime dateTime(
day.date().year(),
@@ -1772,11 +1041,12 @@
day.time().minute(), 0, 0);
TTime time(dateTime);
for (int i(0); i < instanceList.Count(); i++) {
- if ((endsAtStartOfDay(instanceList[i], time)) &&
- instanceList[i]->Entry().EntryTypeL() == CCalEntry::EEvent) {
- // Previous day all-day event has been found, we are not supposed to
+ if ((endsAtStartOfDay(instanceList[i], time))) {
+ // Previous day event has been found, we are not supposed to
// show it on current day, hence remove it from the instance list
+ CCalInstance *instance = instanceList[i];
instanceList.Remove(i);
+ delete instance;
i--;
}
}
@@ -2013,30 +1283,6 @@
}
/*!
- Clears the repeating properties of the entry. This means
- It will delete all the instances and stores a single entry
- which is non repeating
-
- \param entry The entry for which repeating properties to be cleared
- \return None
- */
-void AgendaUtilPrivate::clearRepeatingProperties(AgendaEntry& entry)
-{
- // Fetch the parent entry
- // Get the CalEntry equivalent of the entry.
- CCalEntry* calEntry = iCalEntryView->FetchL(entry.id());
-
- if (calEntry) {
- // Get all the entries with same global Uid.
- RPointerArray<CCalEntry> entries;
- CleanupResetAndDestroyPushL(entries);
- iCalEntryView->FetchL(calEntry->UidL(), entries);
- entries[0]->ClearRepeatingPropertiesL();
- CleanupStack::PopAndDestroy(&entries);
- }
-}
-
-/*!
Returns the start and end times of previous occurence of a particular
instance
@@ -2071,8 +1317,15 @@
TTime instStartTime(instStartDateTime);
TTime instEndTime(instEndDateTime);
- instanceStartCalTime.SetTimeLocalL(instStartTime);
- instanceEndCalTime.SetTimeLocalL(instEndTime);
+ // For nontimed entries set the floating time
+ if(entry.isTimedEntry()) {
+ instanceStartCalTime.SetTimeLocalL(instStartTime);
+ instanceEndCalTime.SetTimeLocalL(instEndTime);
+ }else {
+ instanceStartCalTime.SetTimeLocalFloatingL(instStartTime);
+ instanceEndCalTime.SetTimeLocalFloatingL(instEndTime);
+ }
+
calEntry->SetStartAndEndTimeL(instanceStartCalTime,instanceEndCalTime);
// Get the parent entry of this instance
@@ -2272,8 +1525,14 @@
TTime instStartTime(instStartDateTime);
TTime instEndTime(instEndDateTime);
- instanceStartCalTime.SetTimeLocalL(instStartTime);
- instanceEndCalTime.SetTimeLocalL(instEndTime);
+ // For nontimed entries set the floating time
+ if (entry.isTimedEntry()) {
+ instanceStartCalTime.SetTimeLocalL(instStartTime);
+ instanceEndCalTime.SetTimeLocalL(instEndTime);
+ }else {
+ instanceStartCalTime.SetTimeLocalFloatingL(instStartTime);
+ instanceEndCalTime.SetTimeLocalFloatingL(instEndTime);
+ }
calEntry->SetStartAndEndTimeL(instanceStartCalTime,instanceEndCalTime);
// Get the parent entry of this instance
@@ -2448,7 +1707,8 @@
{
// First prepare the session with the agenda server.
if (!mInstanceViewCreated) {
- return false;
+ // database is not ready, so, return that there are no entries
+ return true;
}
bool isEmpty;
@@ -2657,7 +1917,7 @@
entry.setStartAndEndTime(startDateTime, endDateTime);
// Attendees.
- RPointerArray<CCalAttendee>& calAttendees = calEntry.AttendeesL();
+ RPointerArray<CCalAttendee> calAttendees = calEntry.AttendeesL();
for (int i = 0; i < calAttendees.Count(); i++) {
AgendaAttendee attendee;
@@ -2686,7 +1946,7 @@
}
// Categories.
- const RPointerArray<CCalCategory>& calCategories = calEntry.CategoryListL();
+ const RPointerArray<CCalCategory> calCategories = calEntry.CategoryListL();
for (int i = 0; i < calCategories.Count(); i++) {
AgendaCategory category;
@@ -2833,6 +2093,148 @@
return entry;
}
+/*!
+ Copy all the data to CCalEntry from a given AgendaEntry.
+ \param agendaEntry Reference to a AgendaEntry.
+ \param calEntry Reference to a CCalEntry.
+ */
+void AgendaUtilPrivate::createCCalEntryFromAgendaEntry(AgendaEntry &agendaEntry, CCalEntry &calEntry)
+{
+ if (agendaEntry.isNull()) {
+ // Invalid entry.
+ return;
+ }
+
+ TRAP(
+ iError,
+ // Add description to the agendaEntry.
+ TPtrC
+ description(
+ reinterpret_cast<const TUint16*> (agendaEntry.description().utf16()));
+ calEntry.SetDescriptionL(description);
+
+ if(AgendaEntry::MethodUnknown != agendaEntry.method()) {
+ calEntry.SetMethodL(
+ static_cast<CCalEntry::TMethod> (agendaEntry.method()));
+ }
+
+ // Set the favourite property.
+ calEntry.SetFavouriteL(agendaEntry.favourite());
+
+
+ if (AgendaEntry::TypeNote == agendaEntry.type()) {
+ // Set the last modification time.
+ TCalTime calTime;
+ QDateTime dateTime = agendaEntry.lastModifiedDateTime();
+ TDateTime tempDateTime(dateTime.date().year(),
+ static_cast<TMonth> (dateTime.date().month() - 1),
+ dateTime.date().day() - 1, dateTime.time().hour(),
+ dateTime.time().minute(), 0, 0);
+ TTime tempTime(tempDateTime);
+ calTime.SetTimeLocalL(tempTime);
+ calEntry.SetLastModifiedDateL(calTime);
+
+ // Set the dtstamp time.It is used to set the creation time.
+ TCalTime creationCalTime;
+ QDateTime dtStamp = agendaEntry.dtStamp();
+ TDateTime
+ creationDateTime(dtStamp.date().year(),
+ static_cast<TMonth> (dtStamp.date().month() - 1),
+ dtStamp.date().day() - 1, dtStamp.time().hour(),
+ dtStamp.time().minute(), 0, 0);
+ TTime creationTTime(creationDateTime);
+ creationCalTime.SetTimeLocalL(creationTTime);
+ calEntry.SetDTStampL(creationCalTime);
+ } else {
+
+ // Add the summary.
+ TPtrC
+ summary(
+ reinterpret_cast<const TUint16*> (agendaEntry.summary().utf16()));
+ calEntry.SetSummaryL(summary);
+
+ // Set the agendaEntry Start/End Date and time.
+ QDate date = agendaEntry.startTime().date();
+ QTime time = agendaEntry.startTime().time();
+
+ TDateTime startDateTime(date.year(), static_cast<TMonth> (date.month()
+ - 1), date.day() - 1, time.hour(), time.minute(), 0, 0);
+ TTime entryStartTime(startDateTime);
+ TCalTime calStartTime;
+
+ date = agendaEntry.endTime().date();
+ time = agendaEntry.endTime().time();
+
+ TDateTime endDateTime(date.year(), static_cast<TMonth> (date.month()
+ - 1), date.day() - 1, time.hour(), time.minute(), 0, 0);
+ TTime entryEndTime(endDateTime);
+ TCalTime calEndTime;
+
+ // Use floating time for the nontimed entries.
+ if(agendaEntry.isTimedEntry()) {
+ calStartTime.SetTimeLocalL(entryStartTime);
+ calEndTime.SetTimeLocalL(entryEndTime);
+ }else {
+ calStartTime.SetTimeLocalFloatingL(entryStartTime);
+ calEndTime.SetTimeLocalFloatingL(entryEndTime);
+ }
+ calEntry.SetStartAndEndTimeL(calStartTime, calEndTime);
+
+ // Add attendees to the agendaEntry.
+ addAttendeesToEntry(agendaEntry.d->m_attendees, calEntry);
+
+ // Add categories to the agendaEntry.
+ addCategoriesToEntry(agendaEntry.d->m_categories, calEntry);
+
+ // Add Alarm to the agendaEntry.
+ AgendaAlarm alarm = agendaEntry.alarm();
+ setAlarmToEntry(alarm, calEntry);
+
+ // Set the priority.
+ int priority = agendaEntry.priority();
+ if (agendaEntry.priority() != -1) {
+ calEntry.SetPriorityL(priority);
+ }
+
+ // Set the location.
+ TPtrC
+ location(
+ reinterpret_cast<const TUint16*> (agendaEntry.location().utf16()));
+ calEntry.SetLocationL(location);
+
+ // Set the repeat type if applicable.
+ if (AgendaRepeatRule::InvalidRule != agendaEntry.repeatRule().type()) {
+ AgendaRepeatRule agendaRepeatRule = agendaEntry.repeatRule();
+ TCalRRule repeatRule =
+ createTCalRRuleFromAgendaRRule(agendaRepeatRule, agendaEntry.isTimedEntry());
+ calEntry.SetRRuleL(repeatRule);
+ }
+
+ // Save the status of the agendaEntry.
+ calEntry.SetStatusL((CCalEntry::TStatus) agendaEntry.status());
+
+ // Save the geo value if any
+ AgendaGeoValue entryGeoValue = agendaEntry.geoValue();
+ if (!entryGeoValue.isNull()) {
+ CCalGeoValue* geoValue = CCalGeoValue::NewL();
+ double latitude;
+ double longitude;
+ entryGeoValue.getLatLong(latitude, longitude);
+
+ // set the values to symbian geo value
+ geoValue->SetLatLongL(latitude, longitude);
+
+ // set it to CCalentry
+ calEntry.SetGeoValueL(*geoValue);
+ delete geoValue;
+ } else {
+ calEntry.ClearGeoValueL();
+ }
+ }
+ )
+
+}
+
bool AgendaUtilPrivate::addAttendeesToEntry(
const QList<AgendaAttendee>& attendees, CCalEntry& entry)
{
@@ -2984,7 +2386,13 @@
getDayRange(entry.startTime(), entry.startTime(), dayRange);
RPointerArray<CCalInstance> instances;
CleanupResetAndDestroyPushL(instances);
- iCalInstanceView->FindInstanceL(instances, CalCommon::EIncludeAll, dayRange);
+ CalCommon::TCalViewFilter filter =
+ CalCommon::TCalViewFilter(CalCommon::EIncludeAnnivs |
+ CalCommon::EIncludeAppts |
+ CalCommon::EIncludeEvents |
+ CalCommon::EIncludeReminder |
+ CalCommon::EIncludeIncompletedTodos);
+ iCalInstanceView->FindInstanceL(instances, filter, dayRange);
TTime entryStartTime(dayRange.StartTime().TimeLocalL());
CCalInstance* result = 0;
@@ -3498,229 +2906,6 @@
return nextTime;
}
-bool AgendaUtilPrivate::haveRepeatPropertiesChanged(const CCalEntry& newEntry,
- const CCalEntry& oldEntry)
-{
- //Have the RRules Changed?
- TCalRRule newEntryRule;
- newEntry.GetRRuleL(newEntryRule);
-
- TCalRRule oldEntryRule;
- oldEntry.GetRRuleL(oldEntryRule);
-
- if ((newEntryRule.Type() != oldEntryRule.Type()) ||
- (newEntryRule.DtStart().TimeUtcL() != oldEntryRule.DtStart().TimeUtcL()) ||
- (newEntryRule.Until().TimeUtcL() != oldEntryRule.Until().TimeUtcL()) ||
- (newEntryRule.Count() != oldEntryRule.Count()))
- {
- return ETrue;
- }
-
- // Did the RDates change?
- TBool rDatesChanged = EFalse;
- RArray<TCalTime> newRDates;
- RArray<TCalTime> oldRDates;
- CleanupClosePushL(newRDates);
- CleanupClosePushL(oldRDates);
- newEntry.GetRDatesL(newRDates);
- oldEntry.GetRDatesL(oldRDates);
-
- if (newRDates.Count() != oldRDates.Count())
- {
- rDatesChanged = ETrue;
- }
- else
- {
- for (TInt x = 0; x < newRDates.Count(); ++x)
- {
- if (newRDates[x].TimeUtcL() != oldRDates[x].TimeUtcL())
- {
- rDatesChanged = ETrue;
- break;
- }
- }
- }
-
- CleanupStack::PopAndDestroy(&oldRDates);
- CleanupStack::PopAndDestroy(&newRDates);
-
- return rDatesChanged;
-}
-
-void AgendaUtilPrivate::copyChildrenExceptionData( CCalEntry& editedEntry,
- RPointerArray<CCalEntry>& oldEntries )
-{
- // For each oldChild..., 0th index will be parent
- for (int i=1; i<oldEntries.Count(); ++i) {
- // For each field...
- for(DifferenceFlag j=(DifferenceFlag)1; j<EntryDifferenceCount; j=(DifferenceFlag)(j<<1))
- {
- // Where oldChild field == oldParent Field
- // and newParent field != oldParent Field...
- if( isFieldSame(*oldEntries[i], *oldEntries[0], j ) &&
- !isFieldSame(editedEntry, *oldEntries[0], j ) )
- {
- // ...copy newParent field to oldChild.
- copyField(editedEntry, *oldEntries[i], j);
- }
- }
- }
-}
-
-bool AgendaUtilPrivate::isFieldSame(CCalEntry& entryOne,
- CCalEntry& entryTwo,
- DifferenceFlag flag)
-{
- switch( flag ) {
- case EntryDifferentStartTimeAndEndTime: {
- TTime zero(TInt64(0));
- TTime entryOneStartTime = entryOne.StartTimeL().TimeUtcL();
- TTime beginningOfDay = zero + entryOneStartTime.DaysFrom(zero);
- TTimeIntervalMinutes startTimeOne;
- entryOneStartTime.MinutesFrom(beginningOfDay, startTimeOne);
- TTime entryTwoStartTime = entryTwo.StartTimeL().TimeUtcL();
- beginningOfDay = zero + entryTwoStartTime.DaysFrom(zero);
- TTimeIntervalMinutes startTimeTwo;
- entryTwoStartTime.MinutesFrom(beginningOfDay, startTimeTwo);
- TTime entryOneEndTime = entryOne.EndTimeL().TimeUtcL();
- beginningOfDay = zero + entryOneEndTime.DaysFrom(zero);
- TTimeIntervalMinutes endTimeOne;
- entryOneEndTime.MinutesFrom(beginningOfDay, endTimeOne);
- TTime entryTwoEndTime = entryTwo.EndTimeL().TimeUtcL();
- beginningOfDay = zero + entryTwoEndTime.DaysFrom(zero);
- TTimeIntervalMinutes endTimeTwo;
- entryTwoEndTime.MinutesFrom(beginningOfDay, endTimeTwo);
- return ( startTimeOne.Int()
- == startTimeTwo.Int() )
- && ( endTimeOne.Int()
- == endTimeTwo.Int() );
- }
- case EntryDifferentSummary:
- return entryOne.SummaryL() == entryTwo.SummaryL();
- case EntryDifferentDescription:
- return entryOne.DescriptionL() == entryTwo.DescriptionL();
- case EntryDifferentLocation:
- return entryOne.LocationL() == entryTwo.LocationL();
- default:
- break;
- }
- return EFalse; // Never hit.
-}
-
-void AgendaUtilPrivate::copyField( const CCalEntry& src,
- CCalEntry& dst,
- DifferenceFlag field )
-{
- switch( field ) {
- case EntryDifferentStartTimeAndEndTime:
- {
- // START TIME
- // Keep aDst's start date, but copy the start time (h/m/s) from aSrc to aDst.
- TTime zero(TInt64(0));
- TTime srcStartTime = src.StartTimeL().TimeUtcL();
- TTime srcStartDay = zero + src.StartTimeL().TimeUtcL().DaysFrom(zero);
- TTime dstStartDay = zero + dst.StartTimeL().TimeUtcL().DaysFrom(zero);
- TTimeIntervalMinutes dstStartTimeOfDay;
- srcStartTime.MinutesFrom(srcStartDay, dstStartTimeOfDay);
-
- TCalTime startTime;
- startTime.SetTimeUtcL( dstStartDay + (TTimeIntervalMinutes)dstStartTimeOfDay );
-
-
- TTimeIntervalMinutes duration;
- src.EndTimeL().TimeUtcL().MinutesFrom(src.StartTimeL().TimeUtcL(), duration);
-
- // END TIME
- // Calculate the duration of aSrc, and make aDst endtime equal aDst startTime
- // + duration. This will allow for events spanning multiple days.
- TCalTime endTime;
- endTime.SetTimeUtcL(startTime.TimeUtcL() + duration);
-
- dst.SetStartAndEndTimeL(startTime, endTime);
-
- break;
- }
- case EntryDifferentSummary:
- dst.SetSummaryL(src.SummaryL());
- break;
- case EntryDifferentDescription:
- dst.SetDescriptionL(src.DescriptionL());
- break;
- case EntryDifferentLocation:
- {
- dst.SetLocationL(src.LocationL());
- CCalGeoValue* geoValue = src.GeoValueL();
- if (geoValue) {
- dst.SetGeoValueL(*geoValue);
- delete geoValue;
- }
- break;
- }
- default:
- break;
- }
-}
-
-void AgendaUtilPrivate::storeEachChildEntry(CCalEntry &entry,
- RPointerArray<CCalEntry> &oldEntries,
- bool resetLocalUid)
- {
-
- // Start from 1 as we don't want to copy the old parent entry.
- for(int i=1; i<oldEntries.Count(); ++i)
- {
- if (resetLocalUid)
- {
- // Reset the local UID of the exception. When we store the exception, it will
- // be added as a new entry rather than an update.
- oldEntries[i]->SetLocalUidL( TCalLocalUid( 0 ) );
- }
-
- // The RecurrenceId of child (exception) entries should never be a null time by definition.
- // The code below will attempt to generate a RecurrenceId from the start time of the
- // exception if no RecurrenceId is found. This should never actually happen, and
- // will not work if the start time/start date is changed. The if case below should remain
- // until the Symbian defect fix for NULL RecurrenceIds is verified.
-
- if(oldEntries[i]->RecurrenceIdL().TimeUtcL() == Time::NullTTime())
- {
- // This is being hit, but shouldn't be. Hence we create a new Recurrence ID.
- // Without doing this, the SingleStoreL below fails with Agenda Model -35: No agenda server.
- TCalTime recId = generateRecurrenceIdFromEntry( entry, oldEntries[i]->StartTimeL() );
- CCalEntry *exception = CCalEntry::NewL( oldEntries[i]->EntryTypeL(),
- entry.UidL().AllocL(),
- oldEntries[i]->MethodL(),
- oldEntries[i]->SequenceNumberL(),
- recId,
- oldEntries[i]->RecurrenceRangeL() );
- exception->CopyFromL(*oldEntries[i]);
- exception->SetLastModifiedDateL();
- TInt successCount=0;
- RPointerArray<CCalEntry> entries;
- CleanupResetAndDestroyPushL(entries);
- entries.Append( exception );
- iCalEntryView->StoreL( entries, successCount );
- CleanupStack::PopAndDestroy( &entries );
- }
- else
- {
- // If the start time of the series has been changed, the call below will
- // leave with -1, and the child entries will be lost. To prevent this
- // we need to regenerate a new recurrence id for each child, create a copy
- // of the child with the new recurrence id, and store that instead.
- // Fixing this may cause issues with sync though, as some servers delete the
- // children when changing the start time of the series anyway.
- oldEntries[i]->SetLastModifiedDateL();
- TInt successCount=0;
- RPointerArray<CCalEntry> entries;
- CleanupClosePushL(entries);
- entries.Append( oldEntries[i] );
- iCalEntryView->StoreL( entries, successCount );
- CleanupStack::Pop( &entries );
- }
- }
- }
-
TCalTime AgendaUtilPrivate::generateRecurrenceIdFromEntry( CCalEntry& entry,
TCalTime instanceDate )
{
@@ -3804,7 +2989,7 @@
}
TCalRRule AgendaUtilPrivate::createTCalRRuleFromAgendaRRule(
- AgendaRepeatRule &agendaRRule)
+ AgendaRepeatRule &agendaRRule, bool isNonFloating )
{
TCalRRule
repeatRule(
@@ -3818,10 +3003,6 @@
0,
0);
- TCalTime ruleStartCalTime;
- ruleStartCalTime.SetTimeLocalL(TTime(ruleStartCalendarDateTime));
- repeatRule.SetDtStart(ruleStartCalTime);
- repeatRule.SetInterval(agendaRRule.interval());
QDateTime repeatUntilDate = agendaRRule.until();
TDateTime repeatTill(repeatUntilDate.date().year(),
static_cast<TMonth> (repeatUntilDate.date().month() - 1),
@@ -3830,9 +3011,20 @@
repeatUntilDate.time().minute(),
0,
0);
-
+
+ TCalTime ruleStartCalTime;
TCalTime ruleRepeatTillTime;
- ruleRepeatTillTime.SetTimeLocalL(TTime(repeatTill));
+ if(isNonFloating) {
+ // Use Fixed time for timed entries.
+ ruleStartCalTime.SetTimeLocalL(TTime(ruleStartCalendarDateTime));
+ ruleRepeatTillTime.SetTimeLocalL(TTime(repeatTill));
+ }else {
+ // Use Floating time for Non timed entries
+ ruleStartCalTime.SetTimeLocalFloatingL(TTime(ruleStartCalendarDateTime));
+ ruleRepeatTillTime.SetTimeLocalFloatingL(TTime(repeatTill));
+ }
+ repeatRule.SetDtStart(ruleStartCalTime);
+ repeatRule.SetInterval(agendaRRule.interval());
repeatRule.SetUntil(ruleRepeatTillTime);
QList<AgendaRepeatRule::Day> qDays = agendaRRule.byDay();
--- a/agendainterface/inc/agendaentry.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,371 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file for AgendaEntry and utility classes.
-*
-*/
-
-#ifndef AGENDAENTRY_H
-#define AGENDAENTRY_H
-
-// System includes
-#include <QObject>
-
-// User includes
-#include "agendainterfacedefines.h"
-
-// Forward declarations
-class QDate;
-class QDateTime;
-class AgendaAlarmPrivate;
-class AgendaAttendeePrivate;
-class AgendaCategoryPrivate;
-class AgendaEntryPrivate;
-class AgendaRepeatRulePrivate;
-
-class XQCALENDAR_EXPORT AgendaAttendee
-{
-public:
- enum ParticipantRole {
- RequiredParticipant = 0,
- OptionalParticipant,
- NonParticipant,
- ChairParticipant,
- ParticipantRoleUnknown = -1
- };
-
- enum StatusType {
- StatusNeedsAction = 0,
- StatusAccepted,
- StatusTentative,
- StatusConfirmed,
- StatusDeclined,
- StatusCompleted,
- StatusDelegated,
- StatusInProcess,
- StatusUnknown = -1
- };
-
- AgendaAttendee();
- virtual ~AgendaAttendee();
- AgendaAttendee(const QString& address);
- AgendaAttendee(const AgendaAttendee& other);
-
- void setAddress(const QString& address);
- void setCommonName(const QString& name);
- void setResponseRequested(bool responseRequested);
- void setRole(ParticipantRole role);
- void setStatus(StatusType status);
-
- QString address() const;
- QString commonName() const;
- bool responseRequested() const;
- ParticipantRole role() const;
- StatusType status() const;
-
- bool isNull() const;
-
- AgendaAttendee& operator=(const AgendaAttendee& other);
- bool operator==(const AgendaAttendee& other) const;
- bool operator!=(const AgendaAttendee& other) const;
-
-private:
- void detach();
-
-private:
- AgendaAttendeePrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaCategory
-{
-public:
- enum CategoryType {
- AppointmentCategory,
- BusinessCategory,
- EducationCategory,
- HolidayCategory,
- MeetingCategory,
- MiscellaneousCategory,
- PersonalCategory,
- PhoneCallCategory,
- SickDayCategory,
- SpecialOccasionCategory,
- TravelCategory,
- VacationCategory,
- ExtendedCategory,
- UnknownCategory = -1
- };
-
- AgendaCategory();
- AgendaCategory(CategoryType category);
- AgendaCategory(const AgendaCategory& other);
- virtual ~AgendaCategory();
-
- void setCategory(CategoryType categoryType);
- CategoryType category() const;
-
- void setExtendedCategoryName(const QString& name);
- QString extendedCategoryName() const;
-
- bool isNull() const;
-
- AgendaCategory& operator=(const AgendaCategory& other);
- bool operator==(const AgendaCategory& other) const;
- bool operator!=(const AgendaCategory& other) const;
-
-private:
- void detach();
-
-private:
- AgendaCategoryPrivate* d;
-};
-
-
-class XQCALENDAR_EXPORT AgendaAlarm
-{
-public:
- static const int MaxFileNameLength = 256;
-
- AgendaAlarm();
- AgendaAlarm(const AgendaAlarm& other);
- ~AgendaAlarm();
-
- void setTimeOffset(int minutes);
- void setAlarmSoundName(const QString& alarmSoundName);
- QString alarmSoundName() const;
- int timeOffset() const;
-
- bool isNull() const;
-
- AgendaAlarm& operator=(const AgendaAlarm& other);
- bool operator==(const AgendaAlarm& other) const;
- bool operator!=(const AgendaAlarm& other) const;
-
-private:
- void detach();
-
-private:
- AgendaAlarmPrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaRepeatRule
-{
-public:
-
- enum RuleType {
- InvalidRule = 0,
- DailyRule,
- WeeklyRule,
- MonthlyRule,
- YearlyRule
- };
-
- enum Day {
- Monday,
- Tuesday,
- Wednesday,
- Thursday,
- Friday,
- Saturday,
- Sunday,
- InvalidDay = -1
- };
-
- enum Month {
- January,
- February,
- March,
- April,
- May,
- June,
- July,
- August,
- September,
- October,
- November,
- December,
- InvalidMonth = -1
- };
-
- AgendaRepeatRule();
- AgendaRepeatRule(RuleType type);
- AgendaRepeatRule(const AgendaRepeatRule& other);
- ~AgendaRepeatRule();
-
- void setType(RuleType type);
- RuleType type() const;
-
- int count() const;
-
- void setInterval(int interval);
- int interval() const;
-
- void setUntil(const QDateTime& date);
- QDateTime until() const;
-
- void setRepeatRuleStart(const QDateTime& date);
- QDateTime repeatRuleStart() const;
-
- void setWeekStart(Day day);
- Day weekStart() const;
-
- void setByDay(const QList<Day>& days);
- QList<Day> byDay() const;
-
- void setByMonthDay(const QList<int>& monthDays);
- QList<int> byMonthDay() const;
-
- void setByMonth(const QList<Month>& months);
- QList<Month> byMonth() const;
-
- bool isNull() const;
- AgendaRepeatRule& operator=(const AgendaRepeatRule& other);
- bool operator==(const AgendaRepeatRule& other) const;
- bool operator!=(const AgendaRepeatRule& other) const;
-
-private:
- void detach();
-
-private:
- AgendaRepeatRulePrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaEntry
-{
-public:
- enum Type {
- TypeAppoinment,
- TypeTodo,
- TypeEvent,
- TypeReminder,
- TypeAnniversary,
- TypeNote,
- TypeUnknown = -1
- };
-
- enum Method {
- MethodNone,
- MethodPublish,
- MethodRequest,
- MethodReply,
- MethodAdd,
- MethodCancel,
- MethodRefresh,
- MethodCounter,
- MethodDeclineCounter,
- MethodUnknown = -1
- };
-
- enum Status {
- Tentative,
- Confirmed,
- Cancelled,
- TodoNeedsAction,
- TodoCompleted,
- TodoInProcess,
- NullStatus,
-
- VCalAccepted,
- VCalNeedsAction,
- VCalSent,
- VCalDeclined,
- VCalDelegated,
-
- StatusUnknown = -1
- };
-
- AgendaEntry();
- AgendaEntry(Type type);
- AgendaEntry(const AgendaEntry& other);
- virtual ~AgendaEntry();
-
- void addAttendee(const AgendaAttendee& attendee);
- void addCategory(const AgendaCategory& category);
-
- bool setStartAndEndTime(
- const QDateTime& startTime, const QDateTime& endTime);
- QDateTime startTime() const;
- QDateTime endTime() const;
-
- QList<AgendaAttendee>& attendees();
- const QList<AgendaAttendee>& attendees() const;
- QList<AgendaCategory>& categories();
- const QList<AgendaCategory>& categories() const;
-
- void setDescription(const QString& description);
- QString description() const;
-
- void setType(Type type);
- Type type() const;
-
- void setAlarm(const AgendaAlarm& alarm);
- AgendaAlarm alarm() const;
-
- void setLocation(const QString& location);
- QString location() const;
-
- void setSummary(const QString& summary);
- QString summary() const;
-
- void setMethod(Method method);
- Method method() const;
-
- void setRepeatRule(const AgendaRepeatRule& repeatRule);
- AgendaRepeatRule repeatRule() const;
-
- void setPriority(int priority);
- int priority() const;
-
- void setRDates(const QList<QDate>& rdates);
- QList<QDate> rDates() const;
-
- void setRecurrenceId(QDateTime& recTime);
- QDateTime recurrenceId();
-
- bool isNull() const;
-
- ulong id() const;
- bool isTimedEntry();
- bool isRepeating();
-
- QDateTime lastModifiedDateTime() const;
- void setLastModifiedDateTime(const QDateTime& dateTime);
-
- Status status() const;
- void setStatus(Status status);
-
- uint favourite() const;
- void setFavourite(uint favourite);
-
- void setCompletedDateTime(const QDateTime& dateTime);
- QDateTime completedDateTime() const;
-
- void setDTStamp(const QDateTime& dateTime);
- QDateTime dtStamp() const;
-
- int durationInSecs() const;
- AgendaEntry& operator=(const AgendaEntry& other);
- bool operator==(const AgendaEntry& other) const;
- bool operator!=(const AgendaEntry& other) const;
-
-private:
- void detach();
-
-private:
- AgendaEntryPrivate* d;
- friend class AgendaUtilPrivate;
-};
-
-#endif // AGENDAENTRY_H
-
-// End of file --Don't remove this.
--- a/agendainterface/inc/agendainterfacedefines.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: AgendaUtil library definition file.
- *
- */
-
-#ifndef AGENDAINTERFACEDEFINES_H
-#define AGENDAINTERFACEDEFINES_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(XQCALENDAR_LIBRARY)
-# define XQCALENDAR_EXPORT Q_DECL_EXPORT
-#else
-# if defined(XQCALENDAR_NO_LIBRARY)
-# define XQCALENDAR_EXPORT
-# else
-# define XQCALENDAR_EXPORT Q_DECL_IMPORT
-# endif
-#endif
-
-#endif // AGENDAINTERFACEDEFINES_H
--- a/agendainterface/inc/agendautil.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file for AgendaUtil class.
-*
-*/
-
-#ifndef AGENDAUTIL_H
-#define AGENDAUTIL_H
-
-// System includes
-#include <QObject>
-#include <QList>
-
-// User includes
-#include "agendaentry.h"
-#include "agendainterfacedefines.h"
-
-// Forward declarations
-class QDateTime;
-class AgendaUtilPrivate;
-
-class XQCALENDAR_EXPORT AgendaUtil : public QObject
-{
- Q_OBJECT
-
-public:
-
- enum Error {
- NoError = 0,
- OutOfMemoryError,
- AlreadyInUse,
- UnknownError = -1
- };
-
- enum FilterFlags {
- IncludeAppointments = 0x01,
- IncludeReminders = 0x02,
- IncludeEvents = 0x04,
- IncludeAnniversaries = 0x08,
- IncludeCompletedTodos = 0x10,
- IncludeIncompletedTodos = 0x20,
- IncludeAlarmedOnly = 0x40,
- IncludeRptsNextInstanceOnly = 0x80,
- IncludeNotes=0x300,
- IncludeAll=IncludeAppointments
- | IncludeReminders
- | IncludeEvents
- | IncludeAnniversaries
- | IncludeCompletedTodos
- | IncludeIncompletedTodos
- | IncludeNotes
- };
-
- enum RecurrenceRange {
- ThisOnly,
- ThisAndAll,
- ThisAndFuture,
- ThisAndPrior
- };
-
- AgendaUtil(QObject* parent = 0);
- ~AgendaUtil();
-
- ulong addEntry(const AgendaEntry& entry);
- ulong cloneEntry(const AgendaEntry& entry, AgendaEntry::Type type);
- bool deleteEntry(ulong id);
- void deleteRepeatedEntry(
- AgendaEntry& entry, AgendaUtil::RecurrenceRange range);
- bool updateEntry(const AgendaEntry& entry, bool isChild = false);
- bool storeRepeatingEntry(const AgendaEntry& entry, bool copyToChildren);
- bool createException(const AgendaEntry& entry);
- QList<ulong> entryIds(
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- QList<AgendaEntry> fetchAllEntries(
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- QList<AgendaEntry> fetchEntriesInRange(
- QDateTime rangeStart, QDateTime rangeEnd,
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- QList<AgendaEntry> createEntryIdListForDay(
- QDateTime day,
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- AgendaEntry fetchById(ulong id);
-
- int importvCalendar(const QString& fileName, AgendaEntry& entry);
- bool exportAsvCalendar(const QString& fileName, long int calendarEntryId);
-
- AgendaUtil::Error error() const;
- void setCompleted(AgendaEntry& entry, bool complete, QDateTime& dateTime);
- void deleteEntries(
- QDateTime& start, QDateTime& end,
- AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
- AgendaEntry parentEntry(AgendaEntry& entry);
- void clearRepeatingProperties(AgendaEntry& entry);
- void getPreviousInstanceTimes(AgendaEntry& entry, QDateTime& startTime,
- QDateTime& endTime);
- void getNextInstanceTimes(AgendaEntry& entry, QDateTime& startTime,
- QDateTime& endTime);
- void markDatesWithEvents(QDateTime rangeStart, QDateTime rangeEnd,
- AgendaUtil::FilterFlags filter, QList<QDate>& dates);
- bool areNoEntriesInCalendar();
- static QDateTime minTime();
- static QDateTime maxTime();
-
- static bool isWorkdaysRepeatingEntry(const AgendaRepeatRule& repeatRule);
-
-Q_SIGNALS:
- void entriesChanged(QList<ulong> ids);
- void entryAdded(ulong id);
- void entryDeleted(ulong id);
- void entryUpdated(ulong id);
- void entriesDeleted(int status);
- void entryViewCreationCompleted(int status);
- void instanceViewCreationCompleted(int status);
-
-private:
- friend class AgendaUtilPrivate;
- AgendaUtilPrivate* d;
-};
-
-#endif // AGENDAUTIL_H
-
-// End of file --Don't remove this.
--- a/alarmui/alarmalertwidget/alarmalertinterface/alarmalertinterface.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertinterface/alarmalertinterface.pro Mon Aug 23 16:00:50 2010 +0100
@@ -7,7 +7,8 @@
INCLUDEPATH += ./inc \
../alarmalertplugin/inc \
- ../../inc
+ ../../inc \
+ ./traces
DEPENDPATH += ./inc \
./src \
--- a/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,10 @@
#include "alarmalertwidget.h"
#include "alarmalert.h"
#include "alarmalertobserver.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmalertwidgetTraces.h"
+#endif
// Constants.
const TInt KMaxlength=30;
@@ -35,6 +39,8 @@
AlarmAlertWidget::AlarmAlertWidget(AlarmAlertObserver *observer) :
mObserver(observer)
{
+ OstTraceFunctionEntry0( ALARMALERTWIDGET_ALARMALERTWIDGET_ENTRY );
+ OstTraceFunctionExit0( ALARMALERTWIDGET_ALARMALERTWIDGET_EXIT );
}
// ---------------------------------------------------------
@@ -44,6 +50,7 @@
//
AlarmAlertWidget::~AlarmAlertWidget()
{
+ OstTraceFunctionEntry0( DUP1_ALARMALERTWIDGET_ALARMALERTWIDGET_ENTRY );
// Cleanup
if (mAlarmSubject) {
@@ -85,6 +92,7 @@
if (mDeviceDialog) {
delete mDeviceDialog;
}
+ OstTraceFunctionExit0( DUP1_ALARMALERTWIDGET_ALARMALERTWIDGET_EXIT );
}
// ---------------------------------------------------------
@@ -94,6 +102,7 @@
//
bool AlarmAlertWidget::showAlarmDialog(SAlarmInfo *alarmInfo)
{
+ OstTraceFunctionEntry0( ALARMALERTWIDGET_SHOWALARMDIALOG_ENTRY );
// Get the alarm date and time
TBuf<KMaxlength> timeString;
TBuf<KMaxlength> dateString;
@@ -174,8 +183,10 @@
//
void AlarmAlertWidget::dismissAlarmDialog()
{
+ OstTraceFunctionEntry0( ALARMALERTWIDGET_DISMISSALARMDIALOG_ENTRY );
// Dismiss the dialog
mDeviceDialog->Cancel();
+ OstTraceFunctionExit0( ALARMALERTWIDGET_DISMISSALARMDIALOG_EXIT );
}
// ---------------------------------------------------------
@@ -185,10 +196,12 @@
//
bool AlarmAlertWidget::updateAlarmDialog(SAlarmInfo* /*alarmInfo*/)
{
+ OstTraceFunctionEntry0( ALARMALERTWIDGET_UPDATEALARMDIALOG_ENTRY );
// Update the dialog with any new information
// TODO: Pass the updated information sent by the observer
/*CHbSymbianVariantMap params;
mDeviceDialog->Update(params);*/
+ OstTraceFunctionExit0( ALARMALERTWIDGET_UPDATEALARMDIALOG_EXIT );
return false;
}
@@ -199,11 +212,14 @@
//
void AlarmAlertWidget::DataReceived(CHbSymbianVariantMap& aData)
{
+ OstTraceFunctionEntry0( ALARMALERTWIDGET_DATARECEIVED_ENTRY );
if (!aData.Keys().MdcaCount()) {
+ OstTraceFunctionExit0( ALARMALERTWIDGET_DATARECEIVED_EXIT );
return;
}
triggerAction(aData.Get(alarmCommandSymbian));
+ OstTraceFunctionExit0( DUP1_ALARMALERTWIDGET_DATARECEIVED_EXIT );
}
// ---------------------------------------------------------
@@ -213,7 +229,9 @@
//
void AlarmAlertWidget::DeviceDialogClosed(TInt /*aCompletionCode*/)
{
+ OstTraceFunctionEntry0( ALARMALERTWIDGET_DEVICEDIALOGCLOSED_ENTRY );
+ OstTraceFunctionExit0( ALARMALERTWIDGET_DEVICEDIALOGCLOSED_EXIT );
}
// ---------------------------------------------------------
@@ -223,6 +241,7 @@
//
void AlarmAlertWidget::triggerAction(const CHbSymbianVariant* source)
{
+ OstTraceFunctionEntry0( ALARMALERTWIDGET_TRIGGERACTION_ENTRY );
AlarmCommand command(AlarmCmdLast);
if (*source->Value<TInt>() == Stop) {
@@ -234,6 +253,7 @@
} else if (*source->Value<TInt>() == Shown) {
command = AlarmShown;
mObserver->alertDisplayed(command);
+ OstTraceFunctionExit0( ALARMALERTWIDGET_TRIGGERACTION_EXIT );
return;
} else {
command = AlarmCmdLast;
@@ -243,6 +263,7 @@
// Notify the observer with the command
mObserver->alertCompleted(command);
}
+ OstTraceFunctionExit0( DUP1_ALARMALERTWIDGET_TRIGGERACTION_EXIT );
}
// End of file --Don't remove this.
--- a/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwrapper.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwrapper.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,6 +19,10 @@
// User includes
#include "alarmalertwrapper.h"
#include "alarmalertwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmalertwrapperTraces.h"
+#endif
// ---------------------------------------------------------
// AlarmAlert::AlarmAlert
@@ -27,8 +31,10 @@
//
EXPORT_C AlarmAlert::AlarmAlert(AlarmAlertObserver *observer)
{
+ OstTraceFunctionEntry0( ALARMALERT_ALARMALERT_ENTRY );
// Construct the client interface
mAlarmWidget = new AlarmAlertWidget(observer);
+ OstTraceFunctionExit0( ALARMALERT_ALARMALERT_EXIT );
}
// ---------------------------------------------------------
@@ -38,10 +44,12 @@
//
EXPORT_C AlarmAlert::~AlarmAlert()
{
+ OstTraceFunctionEntry0( DUP1_ALARMALERT_ALARMALERT_ENTRY );
// Cleanup
if (mAlarmWidget) {
delete mAlarmWidget;
}
+ OstTraceFunctionExit0( DUP1_ALARMALERT_ALARMALERT_EXIT );
}
// ---------------------------------------------------------
@@ -51,6 +59,7 @@
//
EXPORT_C bool AlarmAlert::showAlarmAlert(SAlarmInfo *alarmInfo)
{
+ OstTraceFunctionEntry0( ALARMALERT_SHOWALARMALERT_ENTRY );
// Forward the call to the client
return mAlarmWidget->showAlarmDialog(alarmInfo);
}
@@ -62,8 +71,10 @@
//
EXPORT_C void AlarmAlert::dismissAlarmAlert()
{
+ OstTraceFunctionEntry0( ALARMALERT_DISMISSALARMALERT_ENTRY );
// Forward the call to the client
mAlarmWidget->dismissAlarmDialog();
+ OstTraceFunctionExit0( ALARMALERT_DISMISSALARMALERT_EXIT );
}
// ---------------------------------------------------------
@@ -73,6 +84,7 @@
//
EXPORT_C bool AlarmAlert::updateAlarmAlert(SAlarmInfo *alarmInfo)
{
+ OstTraceFunctionEntry0( ALARMALERT_UPDATEALARMALERT_ENTRY );
// Forward the call to the client
return mAlarmWidget->updateAlarmDialog(alarmInfo);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertinterface/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertinterface/traces/alarmalertwidgetTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,31 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMALERTWIDGETTRACES_H__
+#define __ALARMALERTWIDGETTRACES_H__
+
+#define KOstTraceComponentID 0xe2eb3dbf
+
+#define ALARMALERTWIDGET_ALARMALERTWIDGET_ENTRY 0x8a0001
+#define ALARMALERTWIDGET_ALARMALERTWIDGET_EXIT 0x8a0002
+#define DUP1_ALARMALERTWIDGET_ALARMALERTWIDGET_ENTRY 0x8a0003
+#define DUP1_ALARMALERTWIDGET_ALARMALERTWIDGET_EXIT 0x8a0004
+#define ALARMALERTWIDGET_SHOWALARMDIALOG_ENTRY 0x8a0005
+#define ALARMALERTWIDGET_DISMISSALARMDIALOG_ENTRY 0x8a0006
+#define ALARMALERTWIDGET_DISMISSALARMDIALOG_EXIT 0x8a0007
+#define ALARMALERTWIDGET_UPDATEALARMDIALOG_ENTRY 0x8a0008
+#define ALARMALERTWIDGET_UPDATEALARMDIALOG_EXIT 0x8a0009
+#define ALARMALERTWIDGET_DATARECEIVED_ENTRY 0x8a000a
+#define ALARMALERTWIDGET_DATARECEIVED_EXIT 0x8a000b
+#define DUP1_ALARMALERTWIDGET_DATARECEIVED_EXIT 0x8a000c
+#define ALARMALERTWIDGET_DEVICEDIALOGCLOSED_ENTRY 0x8a000d
+#define ALARMALERTWIDGET_DEVICEDIALOGCLOSED_EXIT 0x8a000e
+#define ALARMALERTWIDGET_TRIGGERACTION_ENTRY 0x8a000f
+#define ALARMALERTWIDGET_TRIGGERACTION_EXIT 0x8a0010
+#define DUP1_ALARMALERTWIDGET_TRIGGERACTION_EXIT 0x8a0011
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertinterface/traces/alarmalertwrapperTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,22 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMALERTWRAPPERTRACES_H__
+#define __ALARMALERTWRAPPERTRACES_H__
+
+#define KOstTraceComponentID 0xe2eb3dbf
+
+#define ALARMALERT_ALARMALERT_ENTRY 0x8a0012
+#define ALARMALERT_ALARMALERT_EXIT 0x8a0013
+#define DUP1_ALARMALERT_ALARMALERT_ENTRY 0x8a0014
+#define DUP1_ALARMALERT_ALARMALERT_EXIT 0x8a0015
+#define ALARMALERT_SHOWALARMALERT_ENTRY 0x8a0016
+#define ALARMALERT_DISMISSALARMALERT_ENTRY 0x8a0017
+#define ALARMALERT_DISMISSALARMALERT_EXIT 0x8a0018
+#define ALARMALERT_UPDATEALARMALERT_ENTRY 0x8a0019
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertinterface/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,27 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_ALARMALERTWIDGET_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_ALARMALERTWIDGET_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_DATARECEIVED_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_DATARECEIVED_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_DEVICEDIALOGCLOSED_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_DEVICEDIALOGCLOSED_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_DISMISSALARMDIALOG_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_DISMISSALARMDIALOG_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_SHOWALARMDIALOG_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_TRIGGERACTION_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_TRIGGERACTION_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_UPDATEALARMDIALOG_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTWIDGET_UPDATEALARMDIALOG_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERT_ALARMALERT_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERT_ALARMALERT_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERT_DISMISSALARMALERT_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERT_DISMISSALARMALERT_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERT_SHOWALARMALERT_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERT_UPDATEALARMALERT_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTWIDGET_ALARMALERTWIDGET_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTWIDGET_ALARMALERTWIDGET_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTWIDGET_DATARECEIVED_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTWIDGET_TRIGGERACTION_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERT_ALARMALERT_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERT_ALARMALERT_EXIT=0x15
--- a/alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro Mon Aug 23 16:00:50 2010 +0100
@@ -5,6 +5,8 @@
TEMPLATE = lib
TARGET = alarmalertplugin
+INCLUDEPATH += ./traces
+
DEPENDPATH += ./inc \
./src \
./data
@@ -30,6 +32,8 @@
alarmalertwidget_p.cpp \
alarmalertdocloader.cpp
+
+
RESOURCES += alarmalert.qrc
TRANSLATIONS += alarmui.ts
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc Mon Aug 23 16:00:50 2010 +0100
@@ -1,7 +1,4 @@
<!DOCTYPE RCC><RCC version="1.0">
- <qresource prefix="/image">
- <file alias="clockAlarm.svg">icons/pri_small_bell.svg</file>
- </qresource>
<qresource prefix="/xml">
<file alias="alarmalert_calendar_unlocked.docml">xml/alarmalert_calendar_unlocked.docml</file>
<file alias="alarmalert_clock_unlocked.docml">xml/alarmalert_clock_unlocked.docml</file>
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/icons/pri_small_bell.svg Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<defs>
-</defs>
-<path opacity="0.6" d="M29,23.97c0-1.519-0.355-2.619-2-3.567V15c0-5.046-3.42-9.299-8.06-10.589C18.666,3.038,17.453,2,16,2
- s-2.666,1.038-2.94,2.411C8.42,5.701,5,9.954,5,15v5.402c-1.645,0.948-2,2.049-2,3.567V27h7.648c1.054,1.788,3.055,3,5.35,3
- s4.299-1.212,5.354-3H29V23.97z"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="16.0005" y1="29" x2="16.0005" y2="24.2886">
- <stop offset="0" style="stop-color:#F56700"/>
- <stop offset="1" style="stop-color:#EF2D00"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10.857,24.125L10.857,24.125c0,2.689,2.299,4.875,5.141,4.875s5.145-2.186,5.145-4.875l0,0H10.857z"
- />
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5.6108" y1="23.5" x2="25.7434" y2="23.5">
- <stop offset="0" style="stop-color:#FFB533"/>
- <stop offset="0.24" style="stop-color:#FFE692"/>
- <stop offset="0.75" style="stop-color:#ED8C0D"/>
- <stop offset="1" style="stop-color:#FFB81F"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M26,21H6c-1.837,0.868-2,1.729-2,2.97V26h24v-2.03C28,22.729,27.837,21.868,26,21z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="14.2686" y1="6" x2="17.624" y2="6">
- <stop offset="0" style="stop-color:#FFB533"/>
- <stop offset="0.24" style="stop-color:#FFE692"/>
- <stop offset="0.75" style="stop-color:#ED8C0D"/>
- <stop offset="1" style="stop-color:#FFB81F"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" d="M18,7c0,1.1-0.9,2-2,2l0,0c-1.1,0-2-0.9-2-2V5c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2V7z"/>
-<path opacity="0.2" fill="#873900" d="M16,9c1.1,0,2-0.9,2-2V5c0-0.3-0.072-0.582-0.191-0.838C17.219,4.063,16.617,4,16,4
- s-1.219,0.063-1.809,0.162C14.072,4.418,14,4.7,14,5v2C14,8.1,14.9,9,16,9z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="7.3423" y1="13" x2="24.1194" y2="13">
- <stop offset="0" style="stop-color:#FFB533"/>
- <stop offset="0.24" style="stop-color:#FFE692"/>
- <stop offset="0.75" style="stop-color:#ED8C0D"/>
- <stop offset="1" style="stop-color:#FFB81F"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" d="M26,21v-6c0-5.5-4.5-10-10-10S6,9.5,6,15v6H26z"/>
-<path opacity="0.4" fill="#FFFFFF" d="M16,5C10.5,5,6,9.5,6,15v1c0-5.5,4.5-10,10-10s10,4.5,10,10v-1C26,9.5,21.5,5,16,5z"/>
-<rect x="6" y="20" opacity="0.2" fill="#873900" width="20" height="1"/>
-<path opacity="0.5" fill="#FFF6C9" d="M4.556,22h22.889c-0.298-0.346-0.751-0.673-1.444-1H6C5.307,21.327,4.854,21.654,4.556,22z"/>
-<path opacity="0.4" fill="#753200" d="M20.133,27c0.241-0.311,0.454-0.64,0.613-1h-9.492c0.158,0.36,0.371,0.689,0.611,1H20.133z"/>
-<rect x="4" y="25" opacity="0.1" fill="#753200" width="24" height="1"/>
-<rect fill="none" width="32" height="32"/>
-</svg>
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml Mon Aug 23 16:00:50 2010 +0100
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
+<hbdocument version="1.1">
<object name="snoozeAction" type="HbAction">
- <string name="role" value="HbDialog:primaryAction"/>
<string locid="txt_calendar_button_alarm_snooze" name="text" value="Snooze"/>
</object>
<object name="stopAction" type="HbAction">
- <string name="role" value="HbDialog:secondaryAction"/>
- <string locid="txt_calendar_button_alarm_dialog_snooze" name="text" value="Stop"/>
+ <string locid="txt_calendar_button_alarm_stop" name="text" value="Stop"/>
</object>
<widget name="dialog" type="HbDialog">
<widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
@@ -18,13 +16,13 @@
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<real name="z" value="1"/>
<sizehint height="var(hb-param-text-height-primary)" type="MINIMUM"/>
- <string locid="txt_calendar_info_alarm_start_time" name="plainText" value="9:00 am"/>
+ <string name="plainText" value="9:00 am"/>
</widget>
<widget name="alarmDate" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<real name="z" value="2"/>
<sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED"/>
- <string locid="txt_calendar_info_alarm_start_date" name="plainText" value="01/01/2010"/>
+ <string name="plainText" value="01/01/2010"/>
</widget>
<widget name="alarmDescription" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
@@ -50,7 +48,7 @@
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<real name="z" value="1"/>
<sizehint height="var(hb-param-text-height-primary)" type="MINIMUM"/>
- <string locid="txt_calendar_info_alarm_start_date" name="plainText" value="01/01/2010"/>
+ <string name="plainText" value="01/01/2010"/>
</widget>
<layout type="anchor">
<anchoritem dst="alarmTime" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
@@ -70,8 +68,8 @@
<anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
- <ref object="snoozeAction" role="HbDialog:primaryAction"/>
- <ref object="stopAction" role="HbDialog:secondaryAction"/>
+ <ref object="snoozeAction" role="HbWidget:addAction"/>
+ <ref object="stopAction" role="HbWidget:addAction"/>
</widget>
<section name="calendarTimed"/>
<section name="nonTimedAlarm">
@@ -82,7 +80,7 @@
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<real name="z" value="1"/>
<sizehint height="var(hb-param-text-height-primary)" type="MINIMUM"/>
- <string locid="txt_calendar_info_alarm_start_date" name="plainText" value="01/01/2010"/>
+ <string name="plainText" value="01/01/2010"/>
</widget>
<widget name="container" role="HbDialog:contentWidget" type="HbWidget">
<layout type="anchor">
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml Mon Aug 23 16:00:50 2010 +0100
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
+<hbdocument version="1.1">
<object name="snoozeAction" type="HbAction">
- <string name="role" value="HbDialog:primaryAction"/>
<string locid="txt_calendar_button_alarm_snooze" name="text" value="Snooze"/>
</object>
<object name="stopAction" type="HbAction">
- <string name="role" value="HbDialog:secondaryAction"/>
- <string locid="txt_calendar_button_alarm_dialog_snooze" name="text" value="Stop"/>
+ <string locid="txt_calendar_button_alarm_stop" name="text" value="Stop"/>
</object>
<widget name="dialog" type="HbDialog">
<widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
@@ -18,8 +16,8 @@
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<real name="z" value="1"/>
<sizehint height="10un" type="MINIMUM"/>
- <fontspec name="fontSpec" role="Primary" textheight="9.8un"/>
- <string locid="txt_calendar_info_alarm_start_time" name="plainText" value="9:00 am"/>
+ <fontspec name="fontSpec" role="Primary" textheight="9.8un"/>
+ <string name="plainText" value="9:00 am"/>
</widget>
<widget name="alarmDescription" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
@@ -32,7 +30,7 @@
</widget>
<widget name="alarmIcon" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <icon iconName=":/image/clockAlarm.svg" name="icon"/>
+ <icon iconName="qtg_large_bell" name="icon"/>
<real name="z" value="5"/>
<sizehint height="15un" type="PREFERRED" width="15un"/>
</widget>
@@ -48,8 +46,8 @@
<anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
- <ref object="snoozeAction" role="HbDialog:primaryAction"/>
- <ref object="stopAction" role="HbDialog:secondaryAction"/>
+ <ref object="snoozeAction" role="HbWidget:addAction"/>
+ <ref object="stopAction" role="HbWidget:addAction"/>
</widget>
<metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml Mon Aug 23 16:00:50 2010 +0100
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
+<hbdocument version="1.1">
<object name="snoozeAction" type="HbAction">
- <string name="role" value="HbDialog:primaryAction"/>
<string locid="txt_calendar_button_alarm_snooze" name="text" value="Snooze"/>
</object>
<object name="stopAction" type="HbAction">
- <string name="role" value="HbDialog:secondaryAction"/>
- <string locid="txt_calendar_button_alarm_dialog_snooze" name="text" value="Stop"/>
+ <string locid="txt_calendar_button_alarm_stop" name="text" value="Stop"/>
</object>
<widget name="dialog" type="HbDialog">
<widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
@@ -18,7 +16,7 @@
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<real name="z" value="2"/>
<sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
- <string locid="txt_calendar_info_alarm_start_date" name="plainText" value="01/01/2010"/>
+ <string name="plainText" value="01/01/2010"/>
</widget>
<widget name="alarmDescription" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
@@ -47,8 +45,8 @@
<anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
- <ref object="snoozeAction" role="HbDialog:primaryAction"/>
- <ref object="stopAction" role="HbDialog:secondaryAction"/>
+ <ref object="snoozeAction" role="HbWidget:addAction"/>
+ <ref object="stopAction" role="HbWidget:addAction"/>
</widget>
<metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertdocloader.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertdocloader.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -21,25 +21,35 @@
// User includes
#include "alarmalertdocloader.h"
#include "alarmalertwidget_p.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmalertdocloaderTraces.h"
+#endif
AlarmAlertDocLoader::AlarmAlertDocLoader(const QVariantMap ¶meters):
mParameters(parameters)
{
+ OstTraceFunctionEntry0( ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_ENTRY );
+ OstTraceFunctionExit0( ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT );
}
AlarmAlertDocLoader::~AlarmAlertDocLoader()
{
+ OstTraceFunctionEntry0( DUP1_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_ENTRY );
+ OstTraceFunctionExit0( DUP1_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT );
}
QObject* AlarmAlertDocLoader::createObject(const QString &type,
const QString &name)
{
+ OstTraceFunctionEntry0( ALARMALERTDOCLOADER_CREATEOBJECT_ENTRY );
if (name == "dialog"){
QObject *alarmAlertDialogPrivate = new AlarmAlertDialogPrivate(
mParameters);
alarmAlertDialogPrivate->setObjectName(name);
+ OstTraceFunctionExit0( ALARMALERTDOCLOADER_CREATEOBJECT_EXIT );
return alarmAlertDialogPrivate;
}else {
return HbDocumentLoader::createObject(type, name);
--- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,6 +26,10 @@
#include "alarmalertwidget_p.h"
#include "alarmalert.h"
#include "alarmalertdocloader.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmalertpluginTraces.h"
+#endif
// Plugin export
Q_EXPORT_PLUGIN2(alarmalertplugin, AlarmAlertPlugin);
@@ -37,7 +41,9 @@
//
AlarmAlertPlugin::AlarmAlertPlugin()
{
+ OstTraceFunctionEntry0( ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY );
// No implementation yet
+ OstTraceFunctionExit0( ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT );
}
// ---------------------------------------------------------
@@ -47,7 +53,9 @@
//
AlarmAlertPlugin::~AlarmAlertPlugin()
{
+ OstTraceFunctionEntry0( DUP1_ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY );
// No implementation yet
+ OstTraceFunctionExit0( DUP1_ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT );
}
// ---------------------------------------------------------
@@ -59,11 +67,13 @@
const QVariantMap ¶meters,
const QVariantMap &securityInfo) const
{
+ OstTraceFunctionEntry0( ALARMALERTPLUGIN_ACCESSALLOWED_ENTRY );
Q_UNUSED(securityInfo);
Q_UNUSED(parameters);
Q_UNUSED(deviceDialogType);
// No implementation yet
+ OstTraceFunctionExit0( ALARMALERTPLUGIN_ACCESSALLOWED_EXIT );
return true;
}
@@ -76,12 +86,14 @@
const QVariantMap ¶meters,
DeviceDialogInfo *info) const
{
+ OstTraceFunctionEntry0( ALARMALERTPLUGIN_DEVICEDIALOGINFO_ENTRY );
Q_UNUSED(deviceDialogType);
Q_UNUSED(parameters);
info->group = CriticalGroup;
info->priority = DefaultPriority;
info->flags = NoDeviceDialogFlags;
+ OstTraceFunctionExit0( ALARMALERTPLUGIN_DEVICEDIALOGINFO_EXIT );
return true;
}
@@ -92,9 +104,11 @@
//
QStringList AlarmAlertPlugin::deviceDialogTypes() const
{
+ OstTraceFunctionEntry0( ALARMALERTPLUGIN_DEVICEDIALOGTYPES_ENTRY );
// Return the device dialog type this plugin supports
QStringList dialogType;
dialogType.append(ALARM_ALERT_PLUGIN);
+ OstTraceFunctionExit0( ALARMALERTPLUGIN_DEVICEDIALOGTYPES_EXIT );
return dialogType;
}
@@ -105,6 +119,8 @@
//
HbDeviceDialogPlugin::PluginFlags AlarmAlertPlugin::pluginFlags() const
{
+ OstTraceFunctionEntry0( ALARMALERTPLUGIN_PLUGINFLAGS_ENTRY );
+ OstTraceFunctionExit0( ALARMALERTPLUGIN_PLUGINFLAGS_EXIT );
return NoPluginFlags;
}
@@ -115,7 +131,9 @@
//
int AlarmAlertPlugin::error() const
{
+ OstTraceFunctionEntry0( ALARMALERTPLUGIN_ERROR_ENTRY );
// TODO: Need to handle any error that might occur
+ OstTraceFunctionExit0( ALARMALERTPLUGIN_ERROR_EXIT );
return 0;
}
@@ -127,6 +145,7 @@
HbDeviceDialogInterface *AlarmAlertPlugin::createDeviceDialog(const QString &deviceDialogType,
const QVariantMap ¶meters)
{
+ OstTraceFunctionEntry0( ALARMALERTPLUGIN_CREATEDEVICEDIALOG_ENTRY );
Q_UNUSED(deviceDialogType);
// Create and return the alarm alert dialog
@@ -157,5 +176,6 @@
AlarmAlertDialogPrivate *alertDialog = qobject_cast<AlarmAlertDialogPrivate*> (alertDocLoader->findWidget("dialog"));
alertDialog->setupNormalUI(alertDocLoader);
ret = alertDialog;
+ OstTraceFunctionExit0( ALARMALERTPLUGIN_CREATEDEVICEDIALOG_EXIT );
return ret;
}
--- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -35,6 +35,11 @@
#include "alarmalertwidget_p.h"
#include "alarmalert.h"
#include "alarmalertdocloader.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmalertwidget_pTraces.h"
+#endif
+
// ---------------------------------------------------------
// AlarmAlertDialogPrivate::AlarmAlertDialogPrivate
@@ -46,6 +51,7 @@
mClosedByClient(false),
mIsSilenceKey(false)
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_ENTRY );
// Extract all the parameters sent by the client
parseAndFetchParams(parameters);
@@ -61,6 +67,7 @@
// TODO: Gestures not working. Integrate once support is available from Qt
grabGesture(Qt::SwipeGesture);
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT );
}
// ---------------------------------------------------------
@@ -70,6 +77,7 @@
//
AlarmAlertDialogPrivate::~AlarmAlertDialogPrivate()
{
+ OstTraceFunctionEntry0( DUP1_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_ENTRY );
// Cleanup
if (mAlertDocLoader) {
delete mAlertDocLoader;
@@ -86,6 +94,7 @@
delete mTranslator;
mTranslator = 0;
}
+ OstTraceFunctionExit0( DUP1_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT );
}
// ---------------------------------------------------------
@@ -95,9 +104,11 @@
//
bool AlarmAlertDialogPrivate::setDeviceDialogParameters(const QVariantMap ¶meters)
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_SETDEVICEDIALOGPARAMETERS_ENTRY );
Q_UNUSED(parameters);
//TODO: Handle parameters to be set
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SETDEVICEDIALOGPARAMETERS_EXIT );
return 0;
}
@@ -108,7 +119,9 @@
//
int AlarmAlertDialogPrivate::deviceDialogError() const
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_DEVICEDIALOGERROR_ENTRY );
// TODO: Return any errors that might have occured
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_DEVICEDIALOGERROR_EXIT );
return 0;
}
@@ -119,9 +132,11 @@
//
void AlarmAlertDialogPrivate::closeDeviceDialog(bool byClient)
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_CLOSEDEVICEDIALOG_ENTRY );
Q_UNUSED(byClient);
mClosedByClient = byClient;
close();
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_CLOSEDEVICEDIALOG_EXIT );
}
// ---------------------------------------------------------
@@ -131,6 +146,7 @@
//
HbDialog *AlarmAlertDialogPrivate::deviceDialogWidget() const
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_DEVICEDIALOGWIDGET_ENTRY );
return const_cast<AlarmAlertDialogPrivate*> (this);
}
@@ -141,10 +157,12 @@
//
void AlarmAlertDialogPrivate::showEvent(QShowEvent *event)
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_SHOWEVENT_ENTRY );
HbDialog::showEvent(event);
QVariantMap param;
param.insert(alarmCommand, mUserResponse);
emit deviceDialogData(param);
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SHOWEVENT_EXIT );
}
// ---------------------------------------------------------
@@ -154,6 +172,7 @@
//
void AlarmAlertDialogPrivate::closeEvent(QCloseEvent *event)
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY );
// Do not notify the client back if the close was initiated by client itself
if(!mClosedByClient) {
@@ -167,6 +186,7 @@
// Forward the call to the base class
HbDialog::closeEvent(event);
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT );
}
// ---------------------------------------------------------
@@ -176,7 +196,9 @@
//
void AlarmAlertDialogPrivate::handleOrientationChange ()
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_ENTRY );
// TODO: Need to change this as per the UI concept
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_EXIT );
}
// ---------------------------------------------------------
@@ -186,8 +208,10 @@
//
void AlarmAlertDialogPrivate::snoozed()
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_SNOOZED_ENTRY );
mUserResponse = Snooze;
close();
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SNOOZED_EXIT );
}
// ---------------------------------------------------------
@@ -197,6 +221,7 @@
//
void AlarmAlertDialogPrivate::silenced()
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_SILENCED_ENTRY );
if (mIsSilenceKey) {
mUserResponse = Silence;
mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze"));
@@ -208,6 +233,7 @@
mUserResponse = Snooze;
close();
}
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SILENCED_EXIT );
}
// ---------------------------------------------------------
@@ -217,10 +243,12 @@
//
void AlarmAlertDialogPrivate::aboutToDisplay()
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_ABOUTTODISPLAY_ENTRY );
mUserResponse = Shown;
QVariantMap param;
param.insert(alarmCommand, mUserResponse);
emit deviceDialogData(param);
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_ABOUTTODISPLAY_EXIT );
}
// ---------------------------------------------------------
@@ -230,8 +258,10 @@
//
void AlarmAlertDialogPrivate::dismissed()
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_DISMISSED_ENTRY );
mUserResponse = Stop;
close();
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_DISMISSED_EXIT );
}
// ---------------------------------------------------------
@@ -241,6 +271,7 @@
//
void AlarmAlertDialogPrivate::parseAndFetchParams(const QVariantMap ¶meters)
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_ENTRY );
// Iterate thru the list and extract all relevant parameters
QVariantMap::const_iterator iter = parameters.constBegin();
int count = parameters.size();
@@ -267,6 +298,7 @@
}
iter++;
}
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_EXIT );
}
// ---------------------------------------------------------
@@ -277,8 +309,10 @@
void AlarmAlertDialogPrivate::setupNormalUI(AlarmAlertDocLoader *alertDocLoader)
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_ENTRY );
if(!alertDocLoader) {
// Nothing can be done. Simply return
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_EXIT );
return;
}
mAlertDocLoader = alertDocLoader;
@@ -290,6 +324,7 @@
}else if(mAlarmAlertType == CalendarAlarm) {
handleCalendarAlarms();
}
+ OstTraceFunctionExit0( DUP1_ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_EXIT );
}
// ---------------------------------------------------------
@@ -299,6 +334,7 @@
//
void AlarmAlertDialogPrivate::handleClockAlarms()
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLECLOCKALARMS_ENTRY );
QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading");
if (!headingWidget) {
qFatal("Unable to load the heading Widget");
@@ -310,9 +346,9 @@
qFatal("Unable to load the alarmTime label");
}
HbExtendedLocale locale = HbExtendedLocale::system();
- mAlarmDateTime->setPlainText(
- hbTrId("txt_calendar_info_alarm_start_time").arg(mAlarmTime));
+ mAlarmDateTime->setPlainText(mAlarmTime);
+
mAlarmDescription = qobject_cast<HbLabel*> (
mAlertDocLoader->findWidget("alarmDescription"));
if (!mAlarmDescription) {
@@ -325,8 +361,6 @@
if (!mAlarmIcon) {
qFatal("Unable to load the alarm icon");
}
- //TODO: Add the proper icon for clock alarms in the docml
- mAlarmIcon->setIcon(HbIcon(":/image/clockAlarm.svg"));
HbAction *snoozeAction = qobject_cast<HbAction*> (
mAlertDocLoader->findObject("snoozeAction"));
@@ -342,13 +376,14 @@
if (!stopAction) {
qFatal("Unable to load the stopAction softkey");
}
- stopAction->setText(hbTrId("txt_calendar_button_alarm_dialog_snooze"));
+ stopAction->setText(hbTrId("txt_calendar_button_alarm_stop"));
disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close()));
connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed()));
if (!mCanSnooze) {
snoozeAction->setVisible(false);
}
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLECLOCKALARMS_EXIT );
}
// ---------------------------------------------------------
@@ -358,6 +393,7 @@
//
void AlarmAlertDialogPrivate::handleCalendarAlarms()
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_ENTRY );
bool success = false;
HbExtendedLocale locale = HbExtendedLocale::system();
// Check if the alarm has the time info or not.
@@ -374,15 +410,13 @@
if (!mAlarmDateTime) {
qFatal("Unable to find the alarmTime label");
}
- mAlarmDateTime->setPlainText(
- hbTrId("txt_calendar_info_alarm_start_time").arg(mAlarmTime));
+ mAlarmDateTime->setPlainText(mAlarmTime);
HbLabel *alarmDate = qobject_cast<HbLabel*> (
mAlertDocLoader->findWidget("alarmDate"));
if (!alarmDate) {
qFatal("Unable to find the alarmDate label");
}
- alarmDate->setPlainText(
- hbTrId("txt_calendar_info_alarm_start_date").arg(mAlarmDate));
+ alarmDate->setPlainText(mAlarmDate);
HbLabel *alarmDateNonTimed = qobject_cast<HbLabel*> (
mAlertDocLoader->findWidget("nonTimedAlarmDate"));
if (!alarmDateNonTimed) {
@@ -412,8 +446,7 @@
if (!alarmDateNonTimed) {
qFatal("Unable to find the alarmDateNonTimed label");
}
- alarmDateNonTimed->setPlainText(
- hbTrId("txt_calendar_info_alarm_start_date").arg(mAlarmDate));
+ alarmDateNonTimed->setPlainText(mAlarmDate);
}
QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading");
@@ -463,9 +496,10 @@
if (!stopAction) {
qFatal("Unable to find the stopAction softkey");
}
- stopAction->setText(hbTrId("txt_calendar_button_alarm_dialog_snooze"));
+ 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 );
}
// ---------------------------------------------------------
@@ -475,6 +509,7 @@
//
void AlarmAlertDialogPrivate::handleToDoAlarms()
{
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_ENTRY );
QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading");
if (!headingWidget) {
qFatal("Unable to load the heading widget");
@@ -486,8 +521,7 @@
if (!alarmDate) {
qFatal("Unable to load the alarmDate label");
}
- alarmDate->setPlainText(
- hbTrId("txt_calendar_info_alarm_start_date").arg(mAlarmDate));
+ alarmDate->setPlainText(mAlarmDate);
mAlarmDescription = qobject_cast<HbLabel*> (
mAlertDocLoader->findWidget("alarmDescription"));
@@ -524,9 +558,10 @@
if (!stopAction) {
qFatal("Unable to load the stopAction softkey");
}
- stopAction->setText(hbTrId("txt_calendar_button_alarm_dialog_snooze"));
+ 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 );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertdocloaderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMALERTDOCLOADERTRACES_H__
+#define __ALARMALERTDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0xe3ae7edb
+
+#define ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_ENTRY 0x8a0001
+#define ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT 0x8a0002
+#define DUP1_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_ENTRY 0x8a0003
+#define DUP1_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT 0x8a0004
+#define ALARMALERTDOCLOADER_CREATEOBJECT_ENTRY 0x8a0005
+#define ALARMALERTDOCLOADER_CREATEOBJECT_EXIT 0x8a0006
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertpluginTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,30 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMALERTPLUGINTRACES_H__
+#define __ALARMALERTPLUGINTRACES_H__
+
+#define KOstTraceComponentID 0xe3ae7edb
+
+#define ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY 0x8a0007
+#define ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT 0x8a0008
+#define DUP1_ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY 0x8a0009
+#define DUP1_ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT 0x8a000a
+#define ALARMALERTPLUGIN_ACCESSALLOWED_ENTRY 0x8a000b
+#define ALARMALERTPLUGIN_ACCESSALLOWED_EXIT 0x8a000c
+#define ALARMALERTPLUGIN_DEVICEDIALOGINFO_ENTRY 0x8a000d
+#define ALARMALERTPLUGIN_DEVICEDIALOGINFO_EXIT 0x8a000e
+#define ALARMALERTPLUGIN_DEVICEDIALOGTYPES_ENTRY 0x8a000f
+#define ALARMALERTPLUGIN_DEVICEDIALOGTYPES_EXIT 0x8a0010
+#define ALARMALERTPLUGIN_PLUGINFLAGS_ENTRY 0x8a0011
+#define ALARMALERTPLUGIN_PLUGINFLAGS_EXIT 0x8a0012
+#define ALARMALERTPLUGIN_ERROR_ENTRY 0x8a0013
+#define ALARMALERTPLUGIN_ERROR_EXIT 0x8a0014
+#define ALARMALERTPLUGIN_CREATEDEVICEDIALOG_ENTRY 0x8a0015
+#define ALARMALERTPLUGIN_CREATEDEVICEDIALOG_EXIT 0x8a0016
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertwidget_pTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,50 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMALERTWIDGET_PTRACES_H__
+#define __ALARMALERTWIDGET_PTRACES_H__
+
+#define KOstTraceComponentID 0xe3ae7edb
+
+#define ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_ENTRY 0x8a0017
+#define ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT 0x8a0018
+#define DUP1_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_ENTRY 0x8a0019
+#define DUP1_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT 0x8a001a
+#define ALARMALERTDIALOGPRIVATE_SETDEVICEDIALOGPARAMETERS_ENTRY 0x8a001b
+#define ALARMALERTDIALOGPRIVATE_SETDEVICEDIALOGPARAMETERS_EXIT 0x8a001c
+#define ALARMALERTDIALOGPRIVATE_DEVICEDIALOGERROR_ENTRY 0x8a001d
+#define ALARMALERTDIALOGPRIVATE_DEVICEDIALOGERROR_EXIT 0x8a001e
+#define ALARMALERTDIALOGPRIVATE_CLOSEDEVICEDIALOG_ENTRY 0x8a001f
+#define ALARMALERTDIALOGPRIVATE_CLOSEDEVICEDIALOG_EXIT 0x8a0020
+#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
+#define ALARMALERTDIALOGPRIVATE_SNOOZED_EXIT 0x8a0029
+#define ALARMALERTDIALOGPRIVATE_SILENCED_ENTRY 0x8a002a
+#define ALARMALERTDIALOGPRIVATE_SILENCED_EXIT 0x8a002b
+#define ALARMALERTDIALOGPRIVATE_ABOUTTODISPLAY_ENTRY 0x8a002c
+#define ALARMALERTDIALOGPRIVATE_ABOUTTODISPLAY_EXIT 0x8a002d
+#define ALARMALERTDIALOGPRIVATE_DISMISSED_ENTRY 0x8a002e
+#define ALARMALERTDIALOGPRIVATE_DISMISSED_EXIT 0x8a002f
+#define ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_ENTRY 0x8a0030
+#define ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_EXIT 0x8a0031
+#define ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_ENTRY 0x8a0032
+#define ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_EXIT 0x8a0033
+#define DUP1_ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_EXIT 0x8a0034
+#define ALARMALERTDIALOGPRIVATE_HANDLECLOCKALARMS_ENTRY 0x8a0035
+#define ALARMALERTDIALOGPRIVATE_HANDLECLOCKALARMS_EXIT 0x8a0036
+#define ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_ENTRY 0x8a0037
+#define ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_EXIT 0x8a0038
+#define ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_ENTRY 0x8a0039
+#define ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_EXIT 0x8a003a
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,60 @@
+#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
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_ABOUTTODISPLAY_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_ENTRY=0x17
+[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
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_DISMISSED_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_DISMISSED_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLECLOCKALARMS_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLECLOCKALARMS_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_ENTRY=0x26
+[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_PARSEANDFETCHPARAMS_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SETDEVICEDIALOGPARAMETERS_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SETDEVICEDIALOGPARAMETERS_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SHOWEVENT_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SHOWEVENT_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SILENCED_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SILENCED_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SNOOZED_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SNOOZED_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDOCLOADER_CREATEOBJECT_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDOCLOADER_CREATEOBJECT_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_ACCESSALLOWED_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_ACCESSALLOWED_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_CREATEDEVICEDIALOG_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_CREATEDEVICEDIALOG_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_DEVICEDIALOGINFO_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_DEVICEDIALOGINFO_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_DEVICEDIALOGTYPES_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_DEVICEDIALOGTYPES_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_ERROR_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_ERROR_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_PLUGINFLAGS_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTPLUGIN_PLUGINFLAGS_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTDIALOGPRIVATE_SETUPNORMALUI_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_ENTRY=0x3
+[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
--- a/alarmui/rom/AlmAlertResources.iby Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/rom/AlmAlertResources.iby Mon Aug 23 16:00:50 2010 +0100
@@ -19,10 +19,11 @@
#ifndef __ALMALERTRESOURCES_IBY__
#define __ALMALERTRESOURCES_IBY__
+#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\AlmAlert.rsc RESOURCE_FILES_DIR\AlmAlert.rsc
+data=DATAZ_/RESOURCE_FILES_DIR/AlmAlert.rsc RESOURCE_FILES_DIR/AlmAlert.rsc
+data=DATAZ_/QT_TRANSLATIONS_DIR/alarmui.qm QT_TRANSLATIONS_DIR/alarmui.qm
#endif // __ALMALERTRESOURCES_IBY__
--- a/alarmui/src/alarmutils.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/alarmui/src/alarmutils.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -15,14 +15,10 @@
*
*/
-
-
-// INCLUDE FILES
+// User includes.
#include "alarmutils.h"
-
#include "AlmAlertVariant.hrh"
#include "pim_trace.h"
-
#include "AlmAlarmPlayer.h"
#include "AlmAlarmControl.h"
#include "AlmAlarmInfo.h"
@@ -31,9 +27,9 @@
#ifdef RD_ALMALERT__SENSOR_SUPPORT
#include "alarmcontextfwsupport.h"
#endif // RD_ALMALERT__SENSOR_SUPPORT
-
#include "alarmalertwrapper.h"
+// System includes.
// #include <almconst.h>
#include <eikenv.h>
#include <AknCapServer.h>
@@ -45,12 +41,9 @@
#include <ProfileEngineDomainConstants.h>
#include <sbdefs.h>
#include <coreapplicationuisdomainpskeys.h>
-// #include <clockdomaincrkeys.h>
-// #include <CalendarInternalCRKeys.h>
#include <wakeupalarm.h>
#include <calalarm.h> // KUidAgendaModelAlarmCategory - the alarm category id for calendar alarms
#include <AknUtils.h>
-
#ifndef SYMBIAN_CALENDAR_V2
#include <agmalarm.h> // deprecated, use CalAlarm.h when SYMBIAN_CALENDAR_V2 flag is enabled
#endif // SYMBIAN_CALENDAR_V2
@@ -58,37 +51,31 @@
#include <calentryview.h>
#include <clockdomaincrkeys.h>
#include <calendardomaincrkeys.h>
-// #include <calenlauncher.h> // for launching calendar entry view
-
-
-// CONSTANTS AND MACROS
+// Constants
const TInt KAlmAlertMinSnooze( 100 );
const TInt KAlmAlertMaxSnooze( 104 );
-
-const TInt KDefaultSnoozeTime( 5 ); // 5 minutes
-
-const TUint KAlarmAutoHide( 60000000 ); // 60 s
-const TUint KAlarmAutoHideCalendar( 30000000 ); // 30 s
-const TUint KKeyBlockTime( 500000 ); // 0.5 s
-const TUint KShutdownTime( 1500000 ); // 1.5 s
-const TUint KAlarmDelayTime( 1000000 ); // 1.0 s
-const TUint KInactivityResetInterval( 1000000 ); // 1.0 s
-
+const TInt KDefaultSnoozeTime( 5 );
+const TUint KAlarmAutoHide( 60000000 );
+const TUint KAlarmAutoHideCalendar( 30000000 );
+const TUint KKeyBlockTime( 500000 );
+const TUint KShutdownTime( 1500000 );
+const TUint KAlarmDelayTime( 1000000 );
+const TUint KInactivityResetInterval( 1000000 );
const TInt KMaxProfileVolume( 10 );
-const TInt KVolumeRampPeriod( 3000000 ); // 3 seconds
-_LIT( KRngMimeType, "application/vnd.nokia.ringing-tone" );
-//const TUint32 KCalendarSoundFile = 0x00000004;
-//const TUint32 KClockAppSoundFile = 0x00000000;
+const TInt KNoVolume(0);
+const TInt KVolumeRampPeriod( 3000000 );
const TUid KAlarmClockOne = { 0x101F793A };
-
const TUid KCRUidProfileEngine = {0x101F8798};
//const TUint32 KProEngActiveReminderTone = 0x7E00001C;
-//const TUint32 KProEngActiveClockAlarmTone = 0x7E00001D;
+const TUint32 KProEngActiveClockAlarmTone = 0x7E00001D;
//const TUint32 KProEngActiveAlertVibra = 0x7E00001E;
-const TUint32 KProEngActiveRingingType = 0x7E000002;
-const TUint32 KProEngActiveRingingVolume = 0x7E000008;
+const TUint32 KProEngSilenceMode = {0x80000202};
+const TUint32 KProEngActiveRingingType = {0x7E000002};
+const TUint32 KProEngActiveRingingVolume = {0x7E000008};
+// Literals
+_LIT( KRngMimeType, "application/vnd.nokia.ringing-tone" );
// ==========================================================
// ================= MEMBER FUNCTIONS =======================
@@ -467,10 +454,7 @@
}
if( profileRepository )
{
- // TODO: Need to use KProEngActiveReminderTone once its released
- //PIM_ASSERT( profileRepository->Get( KProEngActiveReminderTone, iAlarmData.iAlarmTone ); )
- PIM_ASSERT( repository->Get( KCalendarDefaultSoundFile,
- iAlarmData.iAlarmTone ); )
+ PIM_ASSERT( profileRepository->Get( KProEngActiveClockAlarmTone, iAlarmData.iAlarmTone ); )
}
}
delete repository;
@@ -533,8 +517,20 @@
repository->Get( KProEngActiveRingingType , ringType);
iAlarmData.iRingType = static_cast< TProfileRingingType >( ringType );
+ TBool silentMode;
TInt ringingVolume;
- repository->Get( KProEngActiveRingingVolume , ringingVolume);
+ repository->Get( KProEngSilenceMode, silentMode);
+ if(silentMode)
+ {
+ ringingVolume = KNoVolume;
+ }
+ else
+ {
+ // It seems the wrong key has been associated with calendar alarm tone
+ // settings. It would be changed once it's rectified by profile team.
+ repository->Get( KProEngActiveRingingVolume , ringingVolume );
+ }
+
iAlarmData.iVolume = ringingVolume;
iAlarmData.iVolumeRampTime = 0;
@@ -542,7 +538,7 @@
TInt volumeOn = iAlarmData.iAlarm.ClientData2();
if (!volumeOn) {
iAlarmData.iRingType = EProfileRingingTypeSilent;
- iAlarmData.iVolume = 0;
+ iAlarmData.iVolume = KNoVolume;
}
}
TRACE_EXIT_POINT;
--- a/calendarengines/versit2/group/Versit2.mmp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarengines/versit2/group/Versit2.mmp Mon Aug 23 16:00:50 2010 +0100
@@ -29,6 +29,7 @@
USERINCLUDE ../inc
USERINCLUDE ../../inc
+USERINCLUDE ../../agnversit2/inc
//System include macro
APP_LAYER_SYSTEMINCLUDE
--- a/calendarengines/versit2/src/ICalValue.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarengines/versit2/src/ICalValue.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,6 +26,7 @@
// User includes.
#include "ICalKeyWords.h" // Literals
#include "ICalRuleSegment.h" // CICalRuleSegment
+#include "CleanupPointerArray.h" // For TCleanupPointerArray
// Constants.
@@ -814,7 +815,7 @@
}
TUint charNum(0);
-
+ CleanupPointerArrayPushL(aRuleSegmentArray);
do
{
// Create a rule segment from characters charNum to nextSemiColon
@@ -847,6 +848,7 @@
}
while (charNum < iValue->Length());
+ CleanupStack::Pop(&aRuleSegmentArray);
TRACE_EXIT_POINT;
}
--- a/calendarui/agendaeventviewer/agendaeventviewer.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/agendaeventviewer/agendaeventviewer.pro Mon Aug 23 16:00:50 2010 +0100
@@ -24,7 +24,8 @@
. \
./src \
./inc \
- ../inc
+ ../inc \
+ ./traces
--- a/calendarui/agendaeventviewer/data/agendaeventviewer.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/agendaeventviewer/data/agendaeventviewer.docml Mon Aug 23 16:00:50 2010 +0100
@@ -16,7 +16,7 @@
<widget name="repeatWidget" type="HbWidget"/>
<widget name="descriptionWidget" type="HbWidget"/>
<widget name="maptileWidget" type="HbLabel">
- <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="0un"/>
+ <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" top="0un"/>
</widget>
<layout orientation="Vertical" type="linear">
<contentsmargins bottom="0un" left="0un" top="0un"/>
--- a/calendarui/agendaeventviewer/inc/agendaeventview.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/agendaeventviewer/inc/agendaeventview.h Mon Aug 23 16:00:50 2010 +0100
@@ -66,16 +66,18 @@
void addRepeatData();
void addDescriptionData();
void getPriorityIcon(int priority, QString& priorityIcon);
- QString repeatRule() const;
+ QString repeatRule();
QString alarmTimeText() const;
void removeWidget();
- void updateCompletedReminderData();
+ void updateFieldsforTodoStatus();
void removeAllWidgets();
void addAllWidgets();
void showDeleteOccurencePopup();
void showDeleteConfirmationQuery();
void getSubjectIcon(AgendaEntry::Type type, QString &subjectIcon);
- void getProgressIndicatorstatus(QString &progressIcon);
+ void getProgressIndicatorstatus(QString &progressIcon);
+ void updateSubjectandPriorityData();
+
private slots:
void markTodoStatus();
void edit();
@@ -98,7 +100,7 @@
QPointer<AgendaEventViewerItem> mSubjectWidget;
QPointer<AgendaEventViewerItem> mDateTimeWidget;
QPointer<AgendaEventViewerItem> mLocationWidget;
- HbLabel *mMaptileLabel ;
+ HbLabel *mMaptileLabel ;
QPointer<AgendaEventViewerItem> mReminderWidget;
QPointer<AgendaEventViewerItem> mRepeatWidget;
QPointer<AgendaEventViewerItem> mDescriptionWidget;
@@ -119,11 +121,11 @@
bool mLocationFeatureEnabled;
QString mMaptilePath;
- MapTileService *mMaptileService;
- QTimer *mProgressTimer;
- int mProgressIconCount;
- bool mMaptileStatusReceived;
- int mMaptileStatus;
+ MapTileService *mMaptileService;
+ QTimer *mProgressTimer;
+ int mProgressIconCount;
+ bool mMaptileStatusReceived;
+ int mMaptileStatus;
bool mNotesPluginLoaded;
private:
--- a/calendarui/agendaeventviewer/src/agendaeventview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -45,17 +45,24 @@
#include <maptileservice.h>//maptile service
#include <agendautil.h>
#include <NotesEditorInterface>
-#include <caleneditor.h>
+#include <CalenEditor>
+
+#include "calenagendautils.h"
#include "agendaeventview.h"
#include "agendaeventviewerdocloader.h"
#include "agendaeventviewercommon.h"
#include "agendaeventviewer_p.h"
#include "agendaeventvieweritem.h"
#include "calendateutils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "agendaeventviewTraces.h"
+#endif
+
// Constants
-#define CHARACTER_HYPHEN "-"
#define CHARACTER_SPACE " "
-#define CHARACTER_NEW_LINE "\n"
+#define CHARACTER_HYPHEN " - "
+
//This Property is use for setting a primary left icon
static const char *primaryLeftIconItem("leftPrimaryIconItem");
@@ -89,7 +96,8 @@
mMaptileStatus(-1),
mNotesPluginLoaded(false)
{
-
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY );
+ mTranslator->loadCommon();
mDocLoader = new AgendaEventViewerDocLoader;
// Load to-do viewer's docml.
@@ -148,6 +156,7 @@
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT );
}
/*!
@@ -155,6 +164,7 @@
*/
AgendaEventView::~AgendaEventView()
{
+ OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY );
// Remove the translator
if (mTranslator) {
@@ -188,6 +198,7 @@
mProgressTimer = NULL;
}
+ OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT );
}
/*!
@@ -198,6 +209,7 @@
void AgendaEventView::execute(AgendaEntry entry,
AgendaEventViewer::Actions action)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_EXECUTE_ENTRY );
mOriginalAgendaEntry = entry;
mAgendaEntry = entry;
@@ -247,6 +259,7 @@
connect(mBackAction, SIGNAL(triggered()), this, SLOT(close()));
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_EXECUTE_EXIT );
}
/*!
@@ -254,6 +267,7 @@
*/
void AgendaEventView::addViewerData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDVIEWERDATA_ENTRY );
// Add the title to event viewer.
addGroupBoxData();
@@ -289,6 +303,7 @@
// Set the description.
addDescriptionData();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDVIEWERDATA_EXIT );
}
/*!
@@ -296,6 +311,7 @@
*/
void AgendaEventView::addMenuItem()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDMENUITEM_ENTRY );
if (mAgendaEntry.type() == AgendaEntry::TypeTodo) {
@@ -313,6 +329,7 @@
SLOT(markTodoStatus()));
menu->addAction(mMarkTodoAction);
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDMENUITEM_EXIT );
}
/*!
@@ -320,6 +337,7 @@
*/
void AgendaEventView::addToolBarItem(AgendaEventViewer::Actions action)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDTOOLBARITEM_ENTRY );
HbToolBar *toolBar = qobject_cast<HbToolBar *> (
mDocLoader->findWidget(AGENDA_EVENT_VIEWER_TOOLBAR));
@@ -350,6 +368,7 @@
toolBar->addAction(saveAction);
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDTOOLBARITEM_EXIT );
}
/*!
@@ -357,6 +376,7 @@
*/
void AgendaEventView::addGroupBoxData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDGROUPBOXDATA_ENTRY );
HbGroupBox *groupBox = qobject_cast<HbGroupBox *> (
mDocLoader->findWidget(AGENDA_EVENT_VIEWER_GROUPBOX));
@@ -364,13 +384,13 @@
AgendaEntry::Type entryType = mAgendaEntry.type();
if (entryType == AgendaEntry::TypeTodo) {
groupBox->setHeading(hbTrId("txt_calendar_subhead_to_do"));
+ } else if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+ groupBox->setHeading(hbTrId("txt_calendar_subhead_all_day_event"));
} else if (entryType == AgendaEntry::TypeAppoinment) {
groupBox->setHeading(hbTrId("txt_calendar_subhead_meeting"));
- }else if (entryType == AgendaEntry::TypeEvent) {
- //TODO: Add text id once available
- groupBox->setHeading(hbTrId("All day event"));
- }
+ }
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDGROUPBOXDATA_EXIT );
}
/*!
@@ -378,6 +398,7 @@
*/
void AgendaEventView::addSubjectAndPriorityData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_ENTRY );
QStringList itemList;
itemList.append(hbTrId("txt_calendar_dblist_subject"));
@@ -401,6 +422,7 @@
mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_EXIT );
}
/*!
@@ -408,6 +430,7 @@
*/
void AgendaEventView::addDateTimeData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDDATETIMEDATA_ENTRY );
QStringList itemData;
HbExtendedLocale systemLocale = HbExtendedLocale::system();
@@ -418,7 +441,7 @@
itemData.append(QString::null);
itemData.append("qtg_small_calendar");
- mDateTimeWidget->setProperty(primaryLeftIconItem, false);
+ mDateTimeWidget->setProperty(primaryLeftIconItem, false);
mDateTimeWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
@@ -431,56 +454,61 @@
QString data;
// Add agenda entry specific fields to the viewer
+
switch (mAgendaEntry.type()) {
case AgendaEntry::TypeAppoinment:
-
- startTimeText.append(systemLocale.format(
- startDateTime.time(), r_qtn_time_usual_with_zero));
-
- endTimeText.append(systemLocale.format(endDateTime.time(),
- r_qtn_time_usual_with_zero));
- startDateText.append(
- systemLocale.format(startDateTime.date(),
- r_qtn_date_usual_with_zero));
- if (CalenDateUtils::onSameDay(startDateTime, endDateTime)) {
- data.append(hbTrId("txt_calendar_dblist_start_end_time").arg(
- startTimeText).arg(endTimeText));
- data.append(CHARACTER_SPACE);
- data.append(hbTrId("txt_calendar_dblist_meeting_date").arg(
- startDateText));
- } else {
- data.append(hbTrId("txt_calendar_dblist_start_time_date").arg(
- startTimeText).arg(startDateText));
- QString endDateText;
- endDateText.append(
- systemLocale.format(endDateTime.date(),
- r_qtn_date_usual_with_zero));
- data.append(hbTrId("txt_calendar_dblist_end_time_date").arg(
- endTimeText).arg(endDateText));
- }
+ case AgendaEntry::TypeEvent:
+ // Check if entry is an all-day
+ if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+ dateTimeText.append(systemLocale.format(startDateTime.date(),
+ r_qtn_date_usual_with_zero));
+ if (CalenDateUtils::onSameDay(startDateTime, endDateTime.addSecs(-60))) {
+ data.append(dateTimeText);
+ } else {
+ QString endDate;
+ endDate.append(
+ systemLocale.format(endDateTime.addSecs(-60).date(),
+ r_qtn_date_usual_with_zero));
+ data.append(dateTimeText);
+ data.append(" - ");
+ data.append(endDate);
+ }
+ } else {
+ startTimeText.append(systemLocale.format(
+ startDateTime.time(), r_qtn_time_usual_with_zero));
+
+ endTimeText.append(systemLocale.format(endDateTime.time(),
+ r_qtn_time_usual_with_zero));
+ startDateText.append(
+ systemLocale.format(startDateTime.date(),
+ r_qtn_date_usual_with_zero));
+ if (CalenDateUtils::onSameDay(startDateTime, endDateTime)) {
+ data.append(startTimeText);
+ data.append(CHARACTER_HYPHEN);
+ data.append(endTimeText);
+ data.append(CHARACTER_SPACE);
+ data.append(startDateText);
+ } else {
+ // If both start and end time of a meeting are on different dates
+ data.append(startTimeText);
+ data.append(CHARACTER_SPACE);
+ data.append(startDateText);
+ QString endDateText;
+ endDateText.append(
+ systemLocale.format(endDateTime.date(),
+ r_qtn_date_usual_with_zero));
+ data.append(CHARACTER_HYPHEN);
+ data.append(endTimeText);
+ data.append(CHARACTER_SPACE);
+ data.append(endDateText);
+ }
+ }
break;
case AgendaEntry::TypeAnniversary:
case AgendaEntry::TypeTodo:
dateTimeText.append(systemLocale.format(endDateTime.date(),
- r_qtn_date_usual_with_zero));
- data.append(hbTrId(
- "txt_calendar_dblist_meeting_date").arg(dateTimeText));
- break;
- case AgendaEntry::TypeEvent:
-
- dateTimeText.append(systemLocale.format(startDateTime.date(),
- r_qtn_date_usual_with_zero));
- if (CalenDateUtils::onSameDay(startDateTime, endDateTime.addSecs(-60))) {
- data.append(hbTrId("txt_calendar_dblist_meeting_date").arg(
- dateTimeText));
- } else {
- QString endDate;
- endDate.append(
- systemLocale.format(endDateTime.addSecs(-60).date(),
- r_qtn_date_usual_with_zero));
- data.append(hbTrId("txt_calendar_dblist_start_end_time").arg(
- dateTimeText).arg(endDate));
- }
+ r_qtn_date_usual_with_zero));
+ data.append(dateTimeText);
break;
default:
break;
@@ -488,6 +516,7 @@
itemData.append(data);
mDateTimeWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDDATETIMEDATA_EXIT );
}
/*!
@@ -495,10 +524,11 @@
*/
void AgendaEventView::addLocationData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDLOCATIONDATA_ENTRY );
QStringList itemData;
QString progressIcon(QString::null);
if ( mLocationFeatureEnabled ) {
- getProgressIndicatorstatus(progressIcon);
+ getProgressIndicatorstatus(progressIcon);
}
if( progressIcon.isNull() ) {
itemData.append(QString::null);
@@ -517,6 +547,7 @@
itemData.append(QString::null);
itemData.append(mAgendaEntry.location());
mLocationWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDLOCATIONDATA_EXIT );
}
/*!
@@ -524,18 +555,25 @@
*/
void AgendaEventView::addMapTileImage()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDMAPTILEIMAGE_ENTRY );
if (mLocationFeatureEnabled && !mAgendaEntry.location().isEmpty() && !mMaptilePath.isEmpty()) {
HbIcon maptile(mMaptilePath);
mMaptileLabel->setIcon(maptile);
- mMaptileLabel->setPreferredSize(QSizeF(maptile.width(), maptile.height()));
+ //get the margin size
+ qreal left, bottom;
+ mMaptileLabel->getContentsMargins( &left, 0, 0, &bottom );
+ mMaptileLabel->setPreferredSize(
+ QSizeF( maptile.width() + left, maptile.height() + bottom ) );
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDMAPTILEIMAGE_EXIT );
}
/*!
Add reminder data to Event viewer
*/
void AgendaEventView::addReminderData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDREMINDERDATA_ENTRY );
QStringList itemData;
itemData.append(QString::null);
itemData.append(QString::null);
@@ -546,20 +584,23 @@
itemData.append(QString::null);
itemData.append(alarmTimeText());
mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
- }
+ mReminderWidgetAdded = true;
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDREMINDERDATA_EXIT );
+}
/*!
Add completed to-do data to Event viewer
*/
void AgendaEventView::addCompletedTodoData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_ENTRY );
QStringList itemData;
- QString completedText;
- HbExtendedLocale systemLocale = HbExtendedLocale::system();;
- itemData.append(QString::null);
+ QString completedText;
+ HbExtendedLocale systemLocale = HbExtendedLocale::system();;
itemData.append(QString::null);
itemData.append(QString::null);
- mReminderWidget->setProperty(primaryLeftIconItem, false);
+ itemData.append(QString::null);
+ mReminderWidget->setProperty(primaryLeftIconItem, true);
mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
completedText = systemLocale.format(mAgendaEntry.completedDateTime().date(),
@@ -567,6 +608,7 @@
itemData.append(hbTrId("txt_calendar_dblist_completed_date"));
itemData.append(completedText);
mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_EXIT );
}
/*!
@@ -574,16 +616,22 @@
*/
void AgendaEventView::addRepeatData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDREPEATDATA_ENTRY );
QStringList itemData;
itemData.append(QString::null);
itemData.append(QString::null);
- itemData.append("qtg_small_repeat");
+ if(!mAgendaEntry.recurrenceId().isNull()) {
+ itemData.append("qtg_small_repeat_exception");
+ }else {
+ itemData.append("qtg_small_repeat");
+ }
mRepeatWidget->setProperty(primaryLeftIconItem, false);
mRepeatWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
itemData.append(QString::null);
itemData.append(repeatRule());
mRepeatWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDREPEATDATA_EXIT );
}
/*!
@@ -591,16 +639,18 @@
*/
void AgendaEventView::addDescriptionData()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_ENTRY );
QStringList itemData;
itemData.append(QString::null);
itemData.append(QString::null);
itemData.append(QString::null);
- mDescriptionWidget->setProperty(primaryLeftIconItem, false);
+ mDescriptionWidget->setProperty(primaryLeftIconItem, true);
mDescriptionWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
itemData.append(hbTrId("txt_calendar_dblist_description"));
itemData.append(mAgendaEntry.description());
mDescriptionWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_EXIT );
}
/*!
@@ -608,6 +658,7 @@
*/
void AgendaEventView::getPriorityIcon(int priority, QString &priorityIcon)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETPRIORITYICON_ENTRY );
switch(priority) {
case 1:priorityIcon.append("qtg_small_priority_high");
@@ -618,16 +669,27 @@
break;
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_GETPRIORITYICON_EXIT );
}
/*!
Returns repeat rule
*/
-QString AgendaEventView::repeatRule() const
+QString AgendaEventView::repeatRule()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_REPEATRULE_ENTRY );
QString repeatRule;
- AgendaRepeatRule agendaRepeatRule = mAgendaEntry.repeatRule();
+ AgendaRepeatRule agendaRepeatRule;
+ if (mAgendaEntry.isRepeating()) {
+ agendaRepeatRule = mAgendaEntry.repeatRule();
+ } else {
+ if (!mAgendaEntry.recurrenceId().isNull()) {
+ AgendaEntry parentEntry= mOwner->mAgendaUtil->parentEntry(mAgendaEntry);
+ agendaRepeatRule = parentEntry.repeatRule();
+ }
+ }
+
if (agendaRepeatRule.type() != AgendaRepeatRule::InvalidRule)
{
switch (agendaRepeatRule.type()) {
@@ -636,7 +698,8 @@
break;
case AgendaRepeatRule::WeeklyRule:
if (AgendaUtil::isWorkdaysRepeatingEntry(agendaRepeatRule)) {
- repeatRule.append(hbTrId("txt_calendar_dblist_repeats_workdays"));
+ repeatRule.append(
+ hbTrId("txt_calendar_dblist_repeats_workdays"));
} else {
if (agendaRepeatRule.interval() == 2) {
repeatRule.append(
@@ -658,16 +721,17 @@
default:
break;
}
- repeatRule.append(CHARACTER_NEW_LINE);
+ repeatRule.append(CHARACTER_SPACE);
HbExtendedLocale systemLocale = HbExtendedLocale::system();
QString untilDateString = systemLocale.format(
- mAgendaEntry.repeatRule().until().date(),
- r_qtn_date_usual_with_zero);
+ agendaRepeatRule.until().date(),
+ r_qtn_date_usual_with_zero);
repeatRule.append(
hbTrId("txt_calendar_dblist_repeats_daily_val_until_1").
arg(untilDateString));
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_REPEATRULE_EXIT );
return repeatRule;
}
@@ -678,6 +742,7 @@
*/
QString AgendaEventView::alarmTimeText() const
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ALARMTIMETEXT_ENTRY );
QString alarmDateTimeText;
QDateTime startTime;
@@ -694,14 +759,17 @@
alarmDateTime = startTime.addSecs(-alarmTimeOffsetInMinutes * 60);
HbExtendedLocale systemLocale = HbExtendedLocale::system();
- alarmDateTimeText.append(
- hbTrId("txt_calendar_list_reminder_time_date").arg(
- systemLocale.format(alarmDateTime.time(),
- r_qtn_time_usual_with_zero)).arg(
- systemLocale.format(alarmDateTime.date(),
- r_qtn_date_usual_with_zero)));
+ alarmDateTimeText.append(systemLocale.format(alarmDateTime.time(),
+ r_qtn_time_usual_with_zero));
+ // Show the alarm date only if its not on the same day of the entry
+ if (!CalenDateUtils::onSameDay(alarmDateTime, startTime)) {
+ alarmDateTimeText.append(CHARACTER_SPACE);
+ alarmDateTimeText.append(systemLocale.format(alarmDateTime.date(),
+ r_qtn_date_usual_with_zero));
+ }
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ALARMTIMETEXT_EXIT );
return alarmDateTimeText;
}
@@ -710,6 +778,7 @@
*/
void AgendaEventView::removeWidget()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_REMOVEWIDGET_ENTRY );
if (mAgendaEntry.location().isEmpty()) {
mLocationWidget->hide();
@@ -717,9 +786,9 @@
}
QFile file(mMaptilePath);
- if ( !mLocationFeatureEnabled || !file.exists()
- || mAgendaEntry.location().isEmpty()){
- //code added to hide and remove maptile image
+ if (!mLocationFeatureEnabled || !file.exists()
+ || mAgendaEntry.location().isEmpty()) {
+ //code added to hide and remove maptile image
mMaptileLabel->hide();
mLinearLayout->removeItem(mMaptileLabel);
}
@@ -739,7 +808,16 @@
}
}
- if (mAgendaEntry.repeatRule().type() == AgendaRepeatRule::InvalidRule) {
+ // Check whether the entry is a completed To-do. if so then remove the
+ // time and date widget.
+ if (mAgendaEntry.type() == AgendaEntry::TypeTodo &&
+ AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
+ mDateTimeWidget->hide();
+ mLinearLayout->removeItem(mDateTimeWidget);
+ }
+
+ if ((mAgendaEntry.repeatRule().type() == AgendaRepeatRule::InvalidRule) &&
+ (mAgendaEntry.recurrenceId().isNull())) {
mRepeatWidget->hide();
mLinearLayout->removeItem(mRepeatWidget);
}
@@ -752,16 +830,26 @@
mLinearLayout->invalidate();
mLinearLayout->activate();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_REMOVEWIDGET_EXIT );
}
/*!
- Update the completed to-do or reminder data to event viewer.
+ Update all the fields according to to-do status change..
*/
-void AgendaEventView::updateCompletedReminderData()
+void AgendaEventView::updateFieldsforTodoStatus()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_ENTRY );
if (AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
+
+ // For completed to-do due date and time should be removed.
+ mDateTimeWidget->hide();
+ mLinearLayout->removeItem(mDateTimeWidget);
+
+ // Fill the completed data information.
addCompletedTodoData();
+
+ // Add the completed date to thte viewer.
if (!mReminderWidgetAdded) {
mReminderWidget->show();
mLinearLayout->insertItem(2, mReminderWidget);
@@ -769,6 +857,10 @@
}
} else {
+ // Add the date and time widget to the viewer.
+ mDateTimeWidget->show();
+ mLinearLayout->insertItem(1, mDateTimeWidget);
+
if (!mAgendaEntry.alarm().isNull()) {
addReminderData();
if (!mReminderWidgetAdded) {
@@ -777,6 +869,7 @@
mReminderWidgetAdded = true;
}
} else {
+ // Remove the completed date from the viewer.
if (mReminderWidgetAdded) {
mReminderWidget->hide();
mLinearLayout->removeItem(mReminderWidget);
@@ -785,9 +878,12 @@
}
}
+ // The To-do icon changes according to the To-do status change.
+ updateSubjectandPriorityData();
mLinearLayout->invalidate();
mLinearLayout->activate();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT );
}
/*!
@@ -795,6 +891,7 @@
*/
void AgendaEventView::removeAllWidgets()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_REMOVEALLWIDGETS_ENTRY );
for (int i = 2; i < mLinearLayout->count(); i++) {
mLinearLayout->removeAt(i);
@@ -802,6 +899,7 @@
mLinearLayout->invalidate();
mLinearLayout->activate();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_REMOVEALLWIDGETS_EXIT );
}
/*!
@@ -809,6 +907,7 @@
*/
void AgendaEventView::addAllWidgets()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDALLWIDGETS_ENTRY );
mLinearLayout->addItem(mLocationWidget);
mLocationWidget->show();
@@ -824,6 +923,7 @@
mLinearLayout->invalidate();
mLinearLayout->activate();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDALLWIDGETS_EXIT );
}
/*!
@@ -831,6 +931,7 @@
*/
void AgendaEventView::showDeleteOccurencePopup()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY );
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
@@ -859,11 +960,12 @@
connect(deleteButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
popUp->addAction(new HbAction(
- hbTrId("txt_calendar_button_softkey1_cancel")));
+ hbTrId("txt_common_button_cancel_singledialog")));
// Show the popup
popUp->open();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_EXIT );
}
/*!
@@ -871,6 +973,7 @@
*/
void AgendaEventView::showDeleteConfirmationQuery()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY );
HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
popup->setDismissPolicy(HbDialog::NoDismiss);
@@ -882,9 +985,15 @@
switch (mAgendaEntry.type()) {
case AgendaEntry::TypeAppoinment:
case AgendaEntry::TypeEvent: {
- text.append(hbTrId("txt_calendar_info_delete_meeting"));
- break;
- }
+ // Check for all-day
+ if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+ text.append(hbTrId("txt_calendar_info_delete_allday_event"));
+ } else {
+ text.append(hbTrId("txt_calendar_info_delete_meeting"));
+ }
+
+ break;
+ }
case AgendaEntry::TypeAnniversary: {
text.append(hbTrId("txt_calendar_info_delete_anniversary"));
break;
@@ -910,8 +1019,9 @@
popup->addAction(deleteAction);
connect(deleteAction, SIGNAL(triggered()), this ,
SLOT(handleDeleteAction()));
- popup->addAction(new HbAction(hbTrId("txt_calendar_button_cancel"), popup));
+ popup->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popup));
popup->open();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_EXIT );
}
/*!
@@ -919,6 +1029,7 @@
*/
void AgendaEventView::handleDeleteAction()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEDELETEACTION_ENTRY );
// If delete button is pressed delete the entry
// To notify client that deleting Started
// Calendar Application changing state from viewing to deleting.
@@ -926,6 +1037,7 @@
// Delete the entry.
mOwner->mAgendaUtil->deleteEntry(mAgendaEntry.id());
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEDELETEACTION_EXIT );
}
/*!
@@ -933,6 +1045,7 @@
*/
void AgendaEventView::markTodoStatus()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_MARKTODOSTATUS_ENTRY );
QDateTime currentDateTime = QDateTime::currentDateTime();
@@ -951,8 +1064,9 @@
mOwner->mAgendaUtil->setCompleted(mAgendaEntry, false, currentDateTime);
}
- updateCompletedReminderData();
+ updateFieldsforTodoStatus();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_MARKTODOSTATUS_EXIT );
}
/*!
@@ -960,6 +1074,7 @@
*/
void AgendaEventView::edit()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_EDIT_ENTRY );
mOwner->editingStarted();
@@ -998,6 +1113,7 @@
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_EDIT_EXIT );
}
/*!
@@ -1005,6 +1121,7 @@
*/
void AgendaEventView::deleteAgendaEntry()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_DELETEAGENDAENTRY_ENTRY );
// Before we do anything, check in the entry is repeating
// OR its a child item
@@ -1019,6 +1136,7 @@
showDeleteConfirmationQuery();
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_DELETEAGENDAENTRY_EXIT );
}
/*!
@@ -1026,18 +1144,21 @@
*/
void AgendaEventView::saveAgendaEntry()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_SAVEAGENDAENTRY_ENTRY );
// Save entry to calendar.
- mOwner->mAgendaUtil->addEntry(mAgendaEntry);
+ mOwner->mAgendaUtil->store(mAgendaEntry);
// Close the agenda entry viewer
close();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_SAVEAGENDAENTRY_EXIT );
}
/*!
Closes the event viewer
*/
void AgendaEventView::close()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_CLOSE_ENTRY );
// Remove the view from main window.
HbMainWindow *window = hbInstance->allMainWindows().first();
@@ -1048,8 +1169,13 @@
this, SLOT(close()));
window->removeView(mViewer);
+ if (AgendaEntry::TypeTodo == mAgendaEntry.type()) {
+ mAgendaEntry.setStartAndEndTime(
+ CalenDateUtils::today(), CalenDateUtils::today());
+ }
mOwner->viewingCompleted(mAgendaEntry.startTime().date());
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_CLOSE_EXIT );
}
/*!
@@ -1057,6 +1183,7 @@
*/
void AgendaEventView::handleEntryUpdation(ulong id)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYUPDATION_ENTRY );
AgendaEntry updatedEntry = mOwner->mAgendaUtil->fetchById(id);
@@ -1064,9 +1191,13 @@
if (!updatedEntry.isNull()) {
mAgendaEntry = updatedEntry;
-
- if (updatedEntry.isRepeating() && mAgendaEntry.type()
- != AgendaEntry::TypeTodo) {
+
+ // If the updated entry's & original entry's repeat rule mismatches than
+ // show the parent entry.
+ if (updatedEntry.isRepeating() &&
+ mAgendaEntry.type() != AgendaEntry::TypeTodo &&
+ mOriginalAgendaEntry.repeatRule() ==
+ updatedEntry.repeatRule()) {
// if start date of original entry is between start date of updated
// entry and until date of updated entry then only update time.
if (mOriginalAgendaEntry.startTime().date()
@@ -1102,6 +1233,7 @@
close();
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYUPDATION_EXIT );
}
/*!
@@ -1109,6 +1241,7 @@
*/
void AgendaEventView::handleEntryDeletion(ulong id)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_ENTRY );
if (id == mAgendaEntry.id()) {
// Close the agenda entry viewer
@@ -1116,6 +1249,7 @@
mOwner->deletingCompleted();
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_EXIT );
}
/*!
@@ -1123,6 +1257,7 @@
*/
void AgendaEventView::handleNoteEditorClosed(bool status)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_ENTRY );
Q_UNUSED(status);
// To avoid loading the plugin again for editing,
@@ -1130,6 +1265,7 @@
mOwner->editingCompleted();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_EXIT );
}
/*!
@@ -1137,11 +1273,13 @@
*/
void AgendaEventView::handleCalendarEditorClosed()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_ENTRY );
// Cleanup.
mCalenEditor->deleteLater();
mOwner->editingCompleted();
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_EXIT );
}
/*!
@@ -1149,6 +1287,7 @@
*/
void AgendaEventView::handleDeleteOccurence(int index)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_ENTRY );
// To notify client that deleting Started
// Calendar Application changing state from viewing to deleting.
@@ -1168,6 +1307,7 @@
break;
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_EXIT );
}
/*!
@@ -1175,20 +1315,26 @@
*/
void AgendaEventView::getSubjectIcon(AgendaEntry::Type type, QString &subjectIcon)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETSUBJECTICON_ENTRY );
switch(type) {
case AgendaEntry::TypeAppoinment:
+ case AgendaEntry::TypeEvent:
{
- subjectIcon.append("qtg_small_meeting");
+ // Check for all-day
+ if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+ subjectIcon.append("qtg_small_day");
+ } else {
+ subjectIcon.append("qtg_small_meeting");
+ }
}
break;
case AgendaEntry::TypeTodo:
{
- subjectIcon.append("qtg_small_todo");
+ if (AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
+ subjectIcon.append("qtg_small_todo_done");
+ } else {
+ subjectIcon.append("qtg_small_todo");
}
- break;
- case AgendaEntry::TypeEvent:
- {
- subjectIcon.append("qtg_small_day");
}
break;
case AgendaEntry::TypeAnniversary:
@@ -1200,6 +1346,7 @@
break;
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_GETSUBJECTICON_EXIT );
}
/*!
@@ -1207,6 +1354,7 @@
*/
void AgendaEventView::updateProgressIndicator()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_ENTRY );
if (!mMaptileStatusReceived) {
QString iconName("qtg_anim_small_loading_");
mProgressIconCount = mProgressIconCount % 10 + 1;
@@ -1256,6 +1404,7 @@
}
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_EXIT );
}
/*!
@@ -1263,11 +1412,13 @@
*/
void AgendaEventView::receiveMapTileStatus(int entryid,int addressType, int status)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_RECEIVEMAPTILESTATUS_ENTRY );
if (mAgendaEntry.id() == entryid && addressType == MapTileService::AddressPlain) {
mMaptileStatusReceived = true;
mMaptileStatus = status;
updateProgressIndicator();
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_RECEIVEMAPTILESTATUS_EXIT );
}
/*!
@@ -1275,6 +1426,7 @@
*/
void AgendaEventView::getProgressIndicatorstatus(QString &progressIcon)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_ENTRY );
MapTileService::AddressType addressType;
addressType = MapTileService::AddressPlain;
int eventId = mAgendaEntry.id();
@@ -1305,17 +1457,40 @@
int ,int)), this, SLOT(receiveMapTileStatus(int,int,int)));
progressIcon.append(QString::null);
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_EXIT );
}
+
+/*!
+ Updates the To-do icon for the changes in to-do status.
+ */
+void AgendaEventView::updateSubjectandPriorityData()
+{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY );
+ QStringList itemList;
+ QString priorityIcon(QString::null);
+ QString subjectIcon(QString::null);
+ getPriorityIcon(mAgendaEntry.priority(), priorityIcon);
+ getSubjectIcon(mAgendaEntry.type(),subjectIcon);
+ itemList.append(subjectIcon);
+ itemList.append(priorityIcon);
+ itemList.append(QString::null);
+
+ mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT );
+}
+
/*!
Reload the maptile image on system orientation change.
*/
void AgendaEventView::changedOrientation(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_CHANGEDORIENTATION_ENTRY );
if (mMaptileStatus == MapTileService::MapTileFetchingCompleted) {
mMaptilePath.clear();
mMaptileService->getMapTileImage(mAgendaEntry.id(), MapTileService::AddressPlain, mMaptilePath,orientation);
addMapTileImage();
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_CHANGEDORIENTATION_EXIT );
}
// End of file
--- a/calendarui/agendaeventviewer/src/agendaeventviewer.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/agendaeventviewer/src/agendaeventviewer.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,6 +19,11 @@
#include "agendaeventviewer.h"
#include "agendaeventviewer_p.h"
#include "agendaeventview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "agendaeventviewerTraces.h"
+#endif
+
/*!
\class AgendaEventViewer
@@ -72,7 +77,9 @@
AgendaEventViewer::AgendaEventViewer(QObject *parent)
:QObject(parent), d_ptr(new AgendaEventViewerPrivate(0, this))
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY );
+ OstTraceFunctionExit0( AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT );
}
/*!
@@ -84,7 +91,9 @@
AgendaEventViewer::AgendaEventViewer(AgendaUtil *agendaUtil, QObject *parent)
: QObject(parent), d_ptr(new AgendaEventViewerPrivate(agendaUtil, this))
{
+ OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY );
// Nothing
+ OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT );
}
/*!
@@ -92,9 +101,11 @@
*/
AgendaEventViewer::~AgendaEventViewer()
{
+ OstTraceFunctionEntry0( DUP2_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY );
if (d_ptr) {
delete d_ptr;
}
+ OstTraceFunctionExit0( DUP2_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT );
}
/*!
@@ -105,7 +116,9 @@
*/
void AgendaEventViewer::view(const ulong id, Actions action)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWER_VIEW_ENTRY );
d_ptr->view(id, action);
+ OstTraceFunctionExit0( AGENDAEVENTVIEWER_VIEW_EXIT );
}
/*!
@@ -116,7 +129,9 @@
*/
void AgendaEventViewer::view(const QFile &fileHandle, Actions action)
{
+ OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEWER_VIEW_ENTRY );
d_ptr->view(fileHandle, action);
+ OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEWER_VIEW_EXIT );
}
/*!
@@ -127,7 +142,9 @@
*/
void AgendaEventViewer::view(AgendaEntry entry, Actions action)
{
+ OstTraceFunctionEntry0( DUP2_AGENDAEVENTVIEWER_VIEW_ENTRY );
d_ptr->view(entry, action);
+ OstTraceFunctionExit0( DUP2_AGENDAEVENTVIEWER_VIEW_EXIT );
}
// End of file
--- a/calendarui/agendaeventviewer/src/agendaeventviewer_p.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/agendaeventviewer/src/agendaeventviewer_p.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -25,6 +25,11 @@
#include "agendaeventviewer_p.h"
#include "agendaeventviewer.h"
#include "agendaeventview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "agendaeventviewer_pTraces.h"
+#endif
+
/*!
\class AgendaEventViewerPrivate
@@ -42,8 +47,9 @@
*/
AgendaEventViewerPrivate::AgendaEventViewerPrivate(
AgendaUtil *agendaUtil, QObject *parent)
-: QObject(parent),mShowEventViewById(false),mShowEventViewByFileHandle(false),mFileName(NULL),mAction(AgendaEventViewer::ActionNothing)
+: QObject(parent),mAction(AgendaEventViewer::ActionNothing),mShowEventViewById(false),mShowEventViewByFileHandle(false),mFileName(NULL)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_ENTRY );
// Get the q-pointer.from parent
q_ptr = static_cast<AgendaEventViewer *> (parent);
@@ -69,6 +75,7 @@
mAgendaUtil, SIGNAL(entryViewCreationCompleted(int)),
this, SLOT(viewCreationCompleted(int)));
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_EXIT );
}
/*!
@@ -76,12 +83,14 @@
*/
AgendaEventViewerPrivate::~AgendaEventViewerPrivate()
{
+ OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_ENTRY );
if (mViewerOwnsAgendaUtil) {
delete mAgendaUtil;
mAgendaUtil = 0;
}
+ OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_EXIT );
}
/*!
@@ -93,6 +102,7 @@
void AgendaEventViewerPrivate::view(const ulong id,
AgendaEventViewer::Actions action)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY );
AgendaEntry entry = mAgendaUtil->fetchById(id);
@@ -103,12 +113,14 @@
mId =id;
//to avoid view creation multiple times
mShowEventViewById = true;
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT );
return;
}
// Construct the agenda event view
mAgendaEventView = new AgendaEventView(this);
mAgendaEventView->execute(entry, action);
+ OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT );
}
/*!
@@ -120,6 +132,7 @@
void AgendaEventViewerPrivate::view(const QFile &fileHandle,
AgendaEventViewer::Actions action)
{
+ OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY );
// Using calendar importer read the filehandle and generate agenda entry
QString filePath = fileHandle.fileName();
@@ -136,6 +149,7 @@
mShowEventViewByFileHandle = true;
q_ptr->viewingCompleted(QDateTime::currentDateTime().date());
}
+ OstTraceFunctionExit0( DUP2_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT );
}
/*!
@@ -145,14 +159,17 @@
void AgendaEventViewerPrivate::view(AgendaEntry entry,
AgendaEventViewer::Actions action)
{
+ OstTraceFunctionEntry0( DUP2_AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY );
if (entry.isNull()) {
+ OstTraceFunctionExit0( DUP3_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT );
return;
}
// Construct the agenda event view
mAgendaEventView = new AgendaEventView(this);
mAgendaEventView->execute(entry, action);
+ OstTraceFunctionExit0( DUP4_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT );
}
/*!
@@ -162,6 +179,7 @@
*/
void AgendaEventViewerPrivate::viewingCompleted(const QDate date)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERPRIVATE_VIEWINGCOMPLETED_ENTRY );
emit q_ptr->viewingCompleted(date);
@@ -170,6 +188,7 @@
mAgendaEventView->deleteLater();
}
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERPRIVATE_VIEWINGCOMPLETED_EXIT );
}
/*!
@@ -177,9 +196,11 @@
*/
void AgendaEventViewerPrivate::editingStarted()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERPRIVATE_EDITINGSTARTED_ENTRY );
emit q_ptr->editingStarted();
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERPRIVATE_EDITINGSTARTED_EXIT );
}
/*!
@@ -187,9 +208,11 @@
*/
void AgendaEventViewerPrivate::editingCompleted()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERPRIVATE_EDITINGCOMPLETED_ENTRY );
emit q_ptr->editingCompleted();
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERPRIVATE_EDITINGCOMPLETED_EXIT );
}
/*!
@@ -197,9 +220,11 @@
*/
void AgendaEventViewerPrivate::deletingStarted()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERPRIVATE_DELETINGSTARTED_ENTRY );
emit q_ptr->deletingStarted();
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERPRIVATE_DELETINGSTARTED_EXIT );
}
/*!
@@ -207,9 +232,11 @@
*/
void AgendaEventViewerPrivate::deletingCompleted()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERPRIVATE_DELETINGCOMPLETED_ENTRY );
emit q_ptr->deletingCompleted();
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERPRIVATE_DELETINGCOMPLETED_EXIT );
}
@@ -219,6 +246,7 @@
*/
void AgendaEventViewerPrivate::viewCreationCompleted(int error)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERPRIVATE_VIEWCREATIONCOMPLETED_ENTRY );
if((KErrNone == error))
{
@@ -245,5 +273,6 @@
mShowEventViewById = false;
mShowEventViewByFileHandle = false;
mAction = AgendaEventViewer::ActionNothing;
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERPRIVATE_VIEWCREATIONCOMPLETED_EXIT );
}
// End of file
--- a/calendarui/agendaeventviewer/src/agendaeventviewerdocloader.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/agendaeventviewer/src/agendaeventviewerdocloader.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,6 +19,11 @@
#include "agendaeventviewerdocloader.h"
#include "agendaeventvieweritem.h"
#include "agendaeventviewercommon.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "agendaeventviewerdocloaderTraces.h"
+#endif
+
/*!
\class AgendaEventViewerDocLoader
@@ -38,6 +43,7 @@
QObject* AgendaEventViewerDocLoader::createObject(const QString &type,
const QString &name)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_ENTRY );
if (name == QString(AGENDA_EVENT_VIEWER_SUBJECT_WIDGET)
|| name == QString(AGENDA_EVENT_VIEWER_DATE_TIME_WIDGET)
|| name == QString(AGENDA_EVENT_VIEWER_LOCATION_WIDGET)
@@ -47,8 +53,10 @@
QObject *agendaEventViewerItem = new AgendaEventViewerItem();
agendaEventViewerItem->setObjectName(name);
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_EXIT );
return agendaEventViewerItem;
} else {
+ OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_EXIT );
return HbDocumentLoader::createObject(type, name);
}
}
--- a/calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,6 +26,11 @@
// User Includes.
#include "agendaeventvieweritem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "agendaeventvieweritemTraces.h"
+#endif
+
/*!
\class AgendaEventViewerItem
@@ -43,10 +48,12 @@
mPrimaryIcon(NULL), mSecondaryIcon(NULL),mPrimaryRightIcon(NULL),
mPrimaryLeftIcon(NULL)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY );
// Path for widgetml and css files.
HbStyleLoader::registerFilePath(":/");
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT );
}
/*!
@@ -54,8 +61,10 @@
*/
AgendaEventViewerItem::~AgendaEventViewerItem()
{
+ OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY );
HbStyleLoader::unregisterFilePath(":/");
+ OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT );
}
/*!
@@ -68,6 +77,7 @@
void AgendaEventViewerItem::setEventViewerItemData(const QStringList &itemData,
int role)
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_ENTRY );
if (!itemData.isEmpty()) {
QString firstItemData(QString::null);
QString secondItemData(QString::null);
@@ -163,6 +173,7 @@
}
}
repolish();
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/agendaeventviewer/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,96 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __AGENDAEVENTVIEWTRACES_H__
+#define __AGENDAEVENTVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x2002c367
+
+#define AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY 0x8a0001
+#define AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT 0x8a0002
+#define DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY 0x8a0003
+#define DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT 0x8a0004
+#define AGENDAEVENTVIEW_EXECUTE_ENTRY 0x8a0005
+#define AGENDAEVENTVIEW_EXECUTE_EXIT 0x8a0006
+#define AGENDAEVENTVIEW_ADDVIEWERDATA_ENTRY 0x8a0007
+#define AGENDAEVENTVIEW_ADDVIEWERDATA_EXIT 0x8a0008
+#define AGENDAEVENTVIEW_ADDMENUITEM_ENTRY 0x8a0009
+#define AGENDAEVENTVIEW_ADDMENUITEM_EXIT 0x8a000a
+#define AGENDAEVENTVIEW_ADDTOOLBARITEM_ENTRY 0x8a000b
+#define AGENDAEVENTVIEW_ADDTOOLBARITEM_EXIT 0x8a000c
+#define AGENDAEVENTVIEW_ADDGROUPBOXDATA_ENTRY 0x8a000d
+#define AGENDAEVENTVIEW_ADDGROUPBOXDATA_EXIT 0x8a000e
+#define AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_ENTRY 0x8a000f
+#define AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_EXIT 0x8a0010
+#define AGENDAEVENTVIEW_ADDDATETIMEDATA_ENTRY 0x8a0011
+#define AGENDAEVENTVIEW_ADDDATETIMEDATA_EXIT 0x8a0012
+#define AGENDAEVENTVIEW_ADDLOCATIONDATA_ENTRY 0x8a0013
+#define AGENDAEVENTVIEW_ADDLOCATIONDATA_EXIT 0x8a0014
+#define AGENDAEVENTVIEW_ADDMAPTILEIMAGE_ENTRY 0x8a0015
+#define AGENDAEVENTVIEW_ADDMAPTILEIMAGE_EXIT 0x8a0016
+#define AGENDAEVENTVIEW_ADDREMINDERDATA_ENTRY 0x8a0017
+#define AGENDAEVENTVIEW_ADDREMINDERDATA_EXIT 0x8a0018
+#define AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_ENTRY 0x8a0019
+#define AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_EXIT 0x8a001a
+#define AGENDAEVENTVIEW_ADDREPEATDATA_ENTRY 0x8a001b
+#define AGENDAEVENTVIEW_ADDREPEATDATA_EXIT 0x8a001c
+#define AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_ENTRY 0x8a001d
+#define AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_EXIT 0x8a001e
+#define AGENDAEVENTVIEW_GETPRIORITYICON_ENTRY 0x8a001f
+#define AGENDAEVENTVIEW_GETPRIORITYICON_EXIT 0x8a0020
+#define AGENDAEVENTVIEW_REPEATRULE_ENTRY 0x8a0021
+#define AGENDAEVENTVIEW_REPEATRULE_EXIT 0x8a0022
+#define AGENDAEVENTVIEW_ALARMTIMETEXT_ENTRY 0x8a0023
+#define AGENDAEVENTVIEW_ALARMTIMETEXT_EXIT 0x8a0024
+#define AGENDAEVENTVIEW_REMOVEWIDGET_ENTRY 0x8a0025
+#define AGENDAEVENTVIEW_REMOVEWIDGET_EXIT 0x8a0026
+#define AGENDAEVENTVIEW_REMOVEALLWIDGETS_ENTRY 0x8a0029
+#define AGENDAEVENTVIEW_REMOVEALLWIDGETS_EXIT 0x8a002a
+#define AGENDAEVENTVIEW_ADDALLWIDGETS_ENTRY 0x8a002b
+#define AGENDAEVENTVIEW_ADDALLWIDGETS_EXIT 0x8a002c
+#define AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY 0x8a002d
+#define AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_EXIT 0x8a002e
+#define AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY 0x8a002f
+#define AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_EXIT 0x8a0030
+#define AGENDAEVENTVIEW_HANDLEDELETEACTION_ENTRY 0x8a0031
+#define AGENDAEVENTVIEW_HANDLEDELETEACTION_EXIT 0x8a0032
+#define AGENDAEVENTVIEW_MARKTODOSTATUS_ENTRY 0x8a0033
+#define AGENDAEVENTVIEW_MARKTODOSTATUS_EXIT 0x8a0034
+#define AGENDAEVENTVIEW_EDIT_ENTRY 0x8a0035
+#define AGENDAEVENTVIEW_EDIT_EXIT 0x8a0036
+#define AGENDAEVENTVIEW_DELETEAGENDAENTRY_ENTRY 0x8a0037
+#define AGENDAEVENTVIEW_DELETEAGENDAENTRY_EXIT 0x8a0038
+#define AGENDAEVENTVIEW_SAVEAGENDAENTRY_ENTRY 0x8a0039
+#define AGENDAEVENTVIEW_SAVEAGENDAENTRY_EXIT 0x8a003a
+#define AGENDAEVENTVIEW_CLOSE_ENTRY 0x8a003b
+#define AGENDAEVENTVIEW_CLOSE_EXIT 0x8a003c
+#define AGENDAEVENTVIEW_HANDLEENTRYUPDATION_ENTRY 0x8a003d
+#define AGENDAEVENTVIEW_HANDLEENTRYUPDATION_EXIT 0x8a003e
+#define AGENDAEVENTVIEW_HANDLEENTRYDELETION_ENTRY 0x8a003f
+#define AGENDAEVENTVIEW_HANDLEENTRYDELETION_EXIT 0x8a0040
+#define AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_ENTRY 0x8a0041
+#define AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_EXIT 0x8a0042
+#define AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_ENTRY 0x8a0043
+#define AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_EXIT 0x8a0044
+#define AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_ENTRY 0x8a0045
+#define AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_EXIT 0x8a0046
+#define AGENDAEVENTVIEW_GETSUBJECTICON_ENTRY 0x8a0047
+#define AGENDAEVENTVIEW_GETSUBJECTICON_EXIT 0x8a0048
+#define AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_ENTRY 0x8a0049
+#define AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_EXIT 0x8a004a
+#define AGENDAEVENTVIEW_RECEIVEMAPTILESTATUS_ENTRY 0x8a004b
+#define AGENDAEVENTVIEW_RECEIVEMAPTILESTATUS_EXIT 0x8a004c
+#define AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_ENTRY 0x8a004d
+#define AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_EXIT 0x8a004e
+#define AGENDAEVENTVIEW_CHANGEDORIENTATION_ENTRY 0x8a004f
+#define AGENDAEVENTVIEW_CHANGEDORIENTATION_EXIT 0x8a0050
+#define AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_ENTRY 0x8a007e
+#define AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT 0x8a007f
+#define AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY 0x8a0080
+#define AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT 0x8a0081
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __AGENDAEVENTVIEWERTRACES_H__
+#define __AGENDAEVENTVIEWERTRACES_H__
+
+#define KOstTraceComponentID 0x2002c367
+
+#define AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY 0x8a0051
+#define AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT 0x8a0052
+#define DUP1_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY 0x8a0053
+#define DUP1_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT 0x8a0054
+#define DUP2_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY 0x8a0055
+#define DUP2_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT 0x8a0056
+#define AGENDAEVENTVIEWER_VIEW_ENTRY 0x8a0057
+#define AGENDAEVENTVIEWER_VIEW_EXIT 0x8a0058
+#define DUP1_AGENDAEVENTVIEWER_VIEW_ENTRY 0x8a0059
+#define DUP1_AGENDAEVENTVIEWER_VIEW_EXIT 0x8a005a
+#define DUP2_AGENDAEVENTVIEWER_VIEW_ENTRY 0x8a005b
+#define DUP2_AGENDAEVENTVIEWER_VIEW_EXIT 0x8a005c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewer_pTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,38 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __AGENDAEVENTVIEWER_PTRACES_H__
+#define __AGENDAEVENTVIEWER_PTRACES_H__
+
+#define KOstTraceComponentID 0x2002c367
+
+#define AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_ENTRY 0x8a005d
+#define AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_EXIT 0x8a005e
+#define DUP1_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_ENTRY 0x8a005f
+#define DUP1_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_EXIT 0x8a0060
+#define AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY 0x8a0061
+#define AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT 0x8a0062
+#define DUP1_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT 0x8a0063
+#define DUP1_AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY 0x8a0064
+#define DUP2_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT 0x8a0065
+#define DUP2_AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY 0x8a0066
+#define DUP3_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT 0x8a0067
+#define DUP4_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT 0x8a0068
+#define AGENDAEVENTVIEWERPRIVATE_VIEWINGCOMPLETED_ENTRY 0x8a0069
+#define AGENDAEVENTVIEWERPRIVATE_VIEWINGCOMPLETED_EXIT 0x8a006a
+#define AGENDAEVENTVIEWERPRIVATE_EDITINGSTARTED_ENTRY 0x8a006b
+#define AGENDAEVENTVIEWERPRIVATE_EDITINGSTARTED_EXIT 0x8a006c
+#define AGENDAEVENTVIEWERPRIVATE_EDITINGCOMPLETED_ENTRY 0x8a006d
+#define AGENDAEVENTVIEWERPRIVATE_EDITINGCOMPLETED_EXIT 0x8a006e
+#define AGENDAEVENTVIEWERPRIVATE_DELETINGSTARTED_ENTRY 0x8a006f
+#define AGENDAEVENTVIEWERPRIVATE_DELETINGSTARTED_EXIT 0x8a0070
+#define AGENDAEVENTVIEWERPRIVATE_DELETINGCOMPLETED_ENTRY 0x8a0071
+#define AGENDAEVENTVIEWERPRIVATE_DELETINGCOMPLETED_EXIT 0x8a0072
+#define AGENDAEVENTVIEWERPRIVATE_VIEWCREATIONCOMPLETED_ENTRY 0x8a0073
+#define AGENDAEVENTVIEWERPRIVATE_VIEWCREATIONCOMPLETED_EXIT 0x8a0074
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewerdocloaderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,17 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __AGENDAEVENTVIEWERDOCLOADERTRACES_H__
+#define __AGENDAEVENTVIEWERDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x2002c367
+
+#define AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_ENTRY 0x8a0075
+#define AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_EXIT 0x8a0076
+#define DUP1_AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_EXIT 0x8a0077
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/agendaeventviewer/traces/agendaeventvieweritemTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __AGENDAEVENTVIEWERITEMTRACES_H__
+#define __AGENDAEVENTVIEWERITEMTRACES_H__
+
+#define KOstTraceComponentID 0x2002c367
+
+#define AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY 0x8a0078
+#define AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT 0x8a0079
+#define DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY 0x8a007a
+#define DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT 0x8a007b
+#define AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_ENTRY 0x8a007c
+#define AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT 0x8a007d
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/agendaeventviewer/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,131 @@
+#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
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_EXIT=0x76
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY=0x78
+[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]_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_ENTRY=0x5d
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_EXIT=0x5e
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_DELETINGCOMPLETED_ENTRY=0x71
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_DELETINGCOMPLETED_EXIT=0x72
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_DELETINGSTARTED_ENTRY=0x6f
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_DELETINGSTARTED_EXIT=0x70
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_EDITINGCOMPLETED_ENTRY=0x6d
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_EDITINGCOMPLETED_EXIT=0x6e
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_EDITINGSTARTED_ENTRY=0x6b
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_EDITINGSTARTED_EXIT=0x6c
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_VIEWCREATIONCOMPLETED_ENTRY=0x73
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_VIEWCREATIONCOMPLETED_EXIT=0x74
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_VIEWINGCOMPLETED_ENTRY=0x69
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_VIEWINGCOMPLETED_EXIT=0x6a
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY=0x61
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT=0x62
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY=0x51
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWER_VIEW_ENTRY=0x57
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWER_VIEW_EXIT=0x58
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDALLWIDGETS_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDALLWIDGETS_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDDATETIMEDATA_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDDATETIMEDATA_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDGROUPBOXDATA_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDGROUPBOXDATA_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDLOCATIONDATA_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDLOCATIONDATA_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDMAPTILEIMAGE_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDMAPTILEIMAGE_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDMENUITEM_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDMENUITEM_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDREMINDERDATA_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDREMINDERDATA_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDREPEATDATA_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDREPEATDATA_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDTOOLBARITEM_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDTOOLBARITEM_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDVIEWERDATA_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ADDVIEWERDATA_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ALARMTIMETEXT_ENTRY=0x23
+[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_CLOSE_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSE_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_DELETEAGENDAENTRY_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_DELETEAGENDAENTRY_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_EDIT_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_EDIT_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_EXECUTE_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_EXECUTE_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_GETPRIORITYICON_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_GETPRIORITYICON_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_ENTRY=0x4d
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_EXIT=0x4e
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_GETSUBJECTICON_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_GETSUBJECTICON_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLEDELETEACTION_ENTRY=0x31
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLEDELETEACTION_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_ENTRY=0x45
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_EXIT=0x46
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLEENTRYDELETION_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLEENTRYDELETION_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLEENTRYUPDATION_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLEENTRYUPDATION_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_MARKTODOSTATUS_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_MARKTODOSTATUS_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_RECEIVEMAPTILESTATUS_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_RECEIVEMAPTILESTATUS_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_REMOVEALLWIDGETS_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_REMOVEALLWIDGETS_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_REMOVEWIDGET_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_REMOVEWIDGET_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_REPEATRULE_ENTRY=0x21
+[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_SHOWDELETECONFIRMATIONQUERY_ENTRY=0x2f
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_EXIT=0x30
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_ENTRY=0x7e
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT=0x7f
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY=0x80
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT=0x81
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_EXIT=0x77
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY=0x7a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT=0x7b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_ENTRY=0x5f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_EXIT=0x60
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY=0x64
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT=0x63
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY=0x53
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWER_VIEW_ENTRY=0x59
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWER_VIEW_EXIT=0x5a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP2_AGENDAEVENTVIEWERPRIVATE_VIEW_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_DUP2_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT=0x65
+[TRACE]TRACE_FLOW[0x8A]_DUP2_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_DUP2_AGENDAEVENTVIEWER_AGENDAEVENTVIEWER_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_DUP2_AGENDAEVENTVIEWER_VIEW_ENTRY=0x5b
+[TRACE]TRACE_FLOW[0x8A]_DUP2_AGENDAEVENTVIEWER_VIEW_EXIT=0x5c
+[TRACE]TRACE_FLOW[0x8A]_DUP3_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_DUP4_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT=0x68
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_ENTRY=0x27
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_EXIT=0x28
--- a/calendarui/application/application.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/application/application.pro Mon Aug 23 16:00:50 2010 +0100
@@ -37,7 +37,13 @@
"../conf/calendarUI.confml APP_LAYER_CONFML(calendarUI.confml)" \
"../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"
+ "../stubsis/calendar_stub.sis /epoc32/data/z/system/install/calendar_stub.sis" \
+ # 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" \
+ "data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10005901/backup_registration.xml"
+
+
LIBS += -lcalencontroller \
@@ -49,7 +55,7 @@
TARGET.CAPABILITY = CAP_APPLICATION \
NetworkControl
TARGET.EPOCSTACKSIZE = 0x14000
- TARGET.EPOCHEAPSIZE = 0x200000 0x1000000
+ TARGET.EPOCHEAPSIZE = 0x200000 0x4000000
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
@@ -62,9 +68,11 @@
}
# Input
-HEADERS += calenserviceprovider.h
+HEADERS += calenserviceprovider.h \
+ calenapplication.h
SOURCES += main.cpp \
+ calenapplication.cpp \
calenserviceprovider.cpp
RESOURCES += calendar.qrc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/application/inc/calenapplication.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,51 @@
+/*
+* 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: Header file for class CalenApplication.
+*
+*/
+
+// system includes
+#include <QPointer>
+#include <HbApplication>
+
+// Forward Declarations.
+class CCalenController;
+class CalenServiceProvider;
+
+class CalenApplication : public HbApplication
+{
+
+Q_OBJECT
+
+public:
+ CalenApplication(int &argc, char *argv[]);
+ virtual ~CalenApplication();
+
+signals:
+ void applicationReady();
+
+public:
+ void createController();
+ bool execution();
+ void releaseController();
+
+private slots:
+ void handleAppReady();
+
+private:
+ QPointer<CCalenController> mController;
+ QPointer<CalenServiceProvider> mService;
+};
+
+// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/application/src/calenapplication.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,91 @@
+/*
+* 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 file for class CalenApplication.
+*
+*/
+
+#include "calencontroller.h"
+#include "calenapplication.h"
+#include "calenserviceprovider.h"
+
+/*!
+ CalenApplication
+ Responsible for creating the CalenController object.
+ */
+
+/*!
+ constructor.
+ */
+CalenApplication::CalenApplication(int &argc, char *argv[]):
+ HbApplication(argc, argv)
+{
+
+}
+
+/*!
+ Destructor.
+ */
+CalenApplication::~CalenApplication()
+{
+ if (mController) {
+ delete mController;
+ mController = 0;
+ }
+}
+
+/*!
+ Creates the calencontroller object.
+ */
+void CalenApplication::createController()
+{
+ mController = new CCalenController();
+ if (mController) {
+ mController->constructController();
+ connect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ // Create the Calendar service provider
+ mService = new CalenServiceProvider(mController, this);
+ }
+}
+
+/*!
+ Start the event loop for the application.
+ */
+bool CalenApplication::execution()
+{
+ int ret = 0;
+ ret = exec();
+ return ret;
+}
+
+/*!
+ Deletes the controller.
+ */
+void CalenApplication::releaseController()
+{
+ // delete the controller
+ mController->ReleaseCustomisations();
+ mController->Release();
+
+}
+
+/*
+ Emits the applicationReady signal.
+ */
+void CalenApplication::handleAppReady()
+{
+ emit applicationReady();
+ disconnect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+}
+
+// End of file --Don't remove this.
--- a/calendarui/application/src/calenserviceprovider.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/application/src/calenserviceprovider.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -18,9 +18,9 @@
#include <hbmainwindow.h>
#include <CalenLauncher>
+#include <CalenEditor>
#include "calencontroller.h"
-#include "caleneditor.h"
#include "calenserviceprovider.h"
CalenServiceProvider::CalenServiceProvider(CCalenController *controller, QObject* parent) :
--- a/calendarui/application/src/main.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/application/src/main.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -15,45 +15,51 @@
*
*/
-
+// system includes
#include <QtGui>
-#include <xqserviceutil.h>
-#include <hbapplication.h>
#include <hbmainwindow.h>
#include <hbtranslator.h>
-#include "calencontroller.h"
-#include "calenserviceprovider.h"
+// user includes
+#include "calenapplication.h"
+
+/*!
+ The main() function.
- int main(int argc, char *argv[])
- {
- HbApplication app(argc, argv);
-
- // Main window for providing the scene context
+ Responsible for constructing the CalenApplication object and showing the
+ main window.
+ */
+int main(int argc, char *argv[])
+{
+ // Create and initialize an CalenApplication instance
+ QScopedPointer<CalenApplication> application(
+ new CalenApplication(argc, argv));
+ //CalenApplication *application = new CalenApplication(argc, argv);
+
+ // Main window for providing the scene context
HbMainWindow window;
+ // Flags to gain some optimizations from the framework
+ // TODO: Check if orbit itself is setting these flags in mainwindow
+ // If yes, then we need not set here
+ window.setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
+ window.setRenderHint(QPainter::TextAntialiasing, false);
+
- //For translation, loading and installing translator
+ //For translation, loading and installing translator
HbTranslator translator("calendar");
translator.loadCommon();
- // Backup and restore code need to write here.
+ // Backup and restore code need to write here.
- CCalenController *controller = new CCalenController();
+ application->createController();
int retValue = 0;
- if (controller) {
- controller->constructController();
- // Create the Calendar service provider
- CalenServiceProvider service(controller);
-
- retValue = app.exec();
-
- // delete the controller
- controller->ReleaseCustomisations();
- controller->Release();
- }
- return retValue;
- }
+
+ retValue = application->execution();
+ application->releaseController();
+
+ return retValue;
+}
+//End of file
- //End of file
--- a/calendarui/caleneditor/bwins/caleneditoru.def Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/bwins/caleneditoru.def Mon Aug 23 16:00:50 2010 +0100
@@ -1,25 +1,11 @@
EXPORTS
- ?metaObject@CalenEditor@@UBEPBUQMetaObject@@XZ @ 1 NONAME ; struct QMetaObject const * CalenEditor::metaObject(void) const
- ?edit@CalenEditor@@QAEXVAgendaEntry@@_N@Z @ 2 NONAME ; void CalenEditor::edit(class AgendaEntry, bool)
- ?edit@CalenEditor@@QAEXABVQFile@@_N@Z @ 3 NONAME ; void CalenEditor::edit(class QFile const &, bool)
- ??_ECalenEditor@@UAE@I@Z @ 4 NONAME ; CalenEditor::~CalenEditor(unsigned int)
- ?calendarLaunchFailed@CalenEditor@@IAEXH@Z @ 5 NONAME ; void CalenEditor::calendarLaunchFailed(int)
- ?tr@CalenEditor@@SA?AVQString@@PBD0@Z @ 6 NONAME ; class QString CalenEditor::tr(char const *, char const *)
- ?getStaticMetaObject@CalenEditor@@SAABUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const & CalenEditor::getStaticMetaObject(void)
- ?trUtf8@CalenEditor@@SA?AVQString@@PBD0@Z @ 8 NONAME ; class QString CalenEditor::trUtf8(char const *, char const *)
- ?tr@CalenEditor@@SA?AVQString@@PBD0H@Z @ 9 NONAME ; class QString CalenEditor::tr(char const *, char const *, int)
- ?entrySaved@CalenEditor@@IAEXXZ @ 10 NONAME ; void CalenEditor::entrySaved(void)
- ?qt_metacast@CalenEditor@@UAEPAXPBD@Z @ 11 NONAME ; void * CalenEditor::qt_metacast(char const *)
- ?create@CalenEditor@@QAEXVQDateTime@@_NW4CreateType@1@@Z @ 12 NONAME ; void CalenEditor::create(class QDateTime, bool, enum CalenEditor::CreateType)
- ??0CalenEditor@@QAE@PAVQObject@@@Z @ 13 NONAME ; CalenEditor::CalenEditor(class QObject *)
- ?d_func@CalenEditor@@ABEPBVCalenEditorPrivate@@XZ @ 14 NONAME ; class CalenEditorPrivate const * CalenEditor::d_func(void) const
- ?trUtf8@CalenEditor@@SA?AVQString@@PBD0H@Z @ 15 NONAME ; class QString CalenEditor::trUtf8(char const *, char const *, int)
- ?qt_metacall@CalenEditor@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 16 NONAME ; int CalenEditor::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??0CalenEditor@@QAE@PAVAgendaUtil@@PAVQObject@@@Z @ 17 NONAME ; CalenEditor::CalenEditor(class AgendaUtil *, class QObject *)
- ??1CalenEditor@@UAE@XZ @ 18 NONAME ; CalenEditor::~CalenEditor(void)
- ?staticMetaObject@CalenEditor@@2UQMetaObject@@B @ 19 NONAME ; struct QMetaObject const CalenEditor::staticMetaObject
- ?edit@CalenEditor@@QAEXK_N@Z @ 20 NONAME ; void CalenEditor::edit(unsigned long, bool)
- ?dialogClosed@CalenEditor@@IAEXXZ @ 21 NONAME ; void CalenEditor::dialogClosed(void)
- ?d_func@CalenEditor@@AAEPAVCalenEditorPrivate@@XZ @ 22 NONAME ; class CalenEditorPrivate * CalenEditor::d_func(void)
- ?create@CalenEditor@@QAEXVAgendaEntry@@_NW4CreateType@1@@Z @ 23 NONAME ; void CalenEditor::create(class AgendaEntry, bool, enum CalenEditor::CreateType)
+ ?edit@CalenEditor@@QAEXVAgendaEntry@@_N@Z @ 1 NONAME ; void CalenEditor::edit(class AgendaEntry, bool)
+ ?edit@CalenEditor@@QAEXK_N@Z @ 2 NONAME ; void CalenEditor::edit(unsigned long, bool)
+ ?create@CalenEditor@@QAEXVAgendaEntry@@_NW4CreateType@1@@Z @ 3 NONAME ; void CalenEditor::create(class AgendaEntry, bool, enum CalenEditor::CreateType)
+ ?edit@CalenEditor@@QAEXABVQFile@@_N@Z @ 4 NONAME ; void CalenEditor::edit(class QFile const &, bool)
+ ?create@CalenEditor@@QAEXVQDateTime@@_NW4CreateType@1@@Z @ 5 NONAME ; void CalenEditor::create(class QDateTime, bool, enum CalenEditor::CreateType)
+ ??0CalenEditor@@QAE@PAVAgendaUtil@@PAVQObject@@@Z @ 6 NONAME ; CalenEditor::CalenEditor(class AgendaUtil *, class QObject *)
+ ??1CalenEditor@@UAE@XZ @ 7 NONAME ; CalenEditor::~CalenEditor(void)
+ ??0CalenEditor@@QAE@PAVQObject@@@Z @ 8 NONAME ; CalenEditor::CalenEditor(class QObject *)
+ ?saveAndCloseEditor@CalenEditor@@QAEXXZ @ 9 NONAME ; void CalenEditor::saveAndCloseEditor(void)
--- a/calendarui/caleneditor/caleneditor.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/caleneditor.pro Mon Aug 23 16:00:50 2010 +0100
@@ -21,16 +21,14 @@
DEFINES += CALENEDITOR_LIB
INCLUDEPATH += ./src \
./inc \
+ ./traces \
..\inc
DEPENDPATH += ./src \
./inc \
./data
symbian: {
- BLD_INF_RULES.prj_exports += \
- "./inc/caleneditor.h |../inc/caleneditor.h"
-
-
+
TARGET.UID3 = 0x10207198
TARGET.CAPABILITY += ALL -TCB
TARGET.EPOCALLOWDLLDATA = 1
@@ -51,7 +49,7 @@
caleneditorrepeatfield.cpp \
caleneditordatahandler.cpp
-HEADERS += caleneditor.h \
+HEADERS += ../../organizer_plat/calendar_editor_api/inc/caleneditor.h \
caleneditorcustomitem.h \
caleneditorcommon.h \
caleneditordocloader.h \
--- a/calendarui/caleneditor/eabi/caleneditoru.def Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/eabi/caleneditoru.def Mon Aug 23 16:00:50 2010 +0100
@@ -1,24 +1,15 @@
EXPORTS
- _ZN11CalenEditor10entrySavedEv @ 1 NONAME
- _ZN11CalenEditor11qt_metacallEN11QMetaObject4CallEiPPv @ 2 NONAME
- _ZN11CalenEditor11qt_metacastEPKc @ 3 NONAME
- _ZN11CalenEditor12dialogClosedEv @ 4 NONAME
- _ZN11CalenEditor16staticMetaObjectE @ 5 NONAME DATA 16
- _ZN11CalenEditor19getStaticMetaObjectEv @ 6 NONAME
- _ZN11CalenEditor20calendarLaunchFailedEi @ 7 NONAME
- _ZN11CalenEditor4editE11AgendaEntryb @ 8 NONAME
- _ZN11CalenEditor4editERK5QFileb @ 9 NONAME
- _ZN11CalenEditor4editEmb @ 10 NONAME
- _ZN11CalenEditor6createE11AgendaEntrybNS_10CreateTypeE @ 11 NONAME
- _ZN11CalenEditor6createE9QDateTimebNS_10CreateTypeE @ 12 NONAME
- _ZN11CalenEditorC1EP10AgendaUtilP7QObject @ 13 NONAME
- _ZN11CalenEditorC1EP7QObject @ 14 NONAME
- _ZN11CalenEditorC2EP10AgendaUtilP7QObject @ 15 NONAME
- _ZN11CalenEditorC2EP7QObject @ 16 NONAME
- _ZN11CalenEditorD0Ev @ 17 NONAME
- _ZN11CalenEditorD1Ev @ 18 NONAME
- _ZN11CalenEditorD2Ev @ 19 NONAME
- _ZNK11CalenEditor10metaObjectEv @ 20 NONAME
- _ZTI11CalenEditor @ 21 NONAME
- _ZTV11CalenEditor @ 22 NONAME
+ _ZN11CalenEditor4editE11AgendaEntryb @ 1 NONAME
+ _ZN11CalenEditor4editERK5QFileb @ 2 NONAME
+ _ZN11CalenEditor4editEmb @ 3 NONAME
+ _ZN11CalenEditor6createE11AgendaEntrybNS_10CreateTypeE @ 4 NONAME
+ _ZN11CalenEditor6createE9QDateTimebNS_10CreateTypeE @ 5 NONAME
+ _ZN11CalenEditorC1EP10AgendaUtilP7QObject @ 6 NONAME
+ _ZN11CalenEditorC1EP7QObject @ 7 NONAME
+ _ZN11CalenEditorC2EP10AgendaUtilP7QObject @ 8 NONAME
+ _ZN11CalenEditorC2EP7QObject @ 9 NONAME
+ _ZN11CalenEditorD0Ev @ 10 NONAME
+ _ZN11CalenEditorD1Ev @ 11 NONAME
+ _ZN11CalenEditorD2Ev @ 12 NONAME
+ _ZN11CalenEditor18saveAndCloseEditorEv @ 13 NONAME
--- a/calendarui/caleneditor/inc/caleneditor.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* The header file for CalenEditor class.
-*
-*/
-
-#ifndef CALENEDITOR_H
-#define CALENEDITOR_H
-
-// System includes
-#include <QObject>
-#include <qglobal.h>
-#include <hbview.h>
-
-// Forward declarations
-class QFile;
-class QString;
-class QDateTime;
-class AgendaUtil;
-class AgendaEntry;
-class CalenEditorPrivate;
-
-#ifdef CALENEDITOR_LIB
-# define CALENEDITOR_EXPORT Q_DECL_EXPORT
-#else
-# define CALENEDITOR_EXPORT Q_DECL_IMPORT
-#endif
-
-class CALENEDITOR_EXPORT CalenEditor : public QObject //HbView
-{
- Q_OBJECT
-
-public:
- enum CreateType{
- TypeAppointment = 0,
- // TODO: Need to add more types
- TypeUnKnown = -1
- };
-
- explicit CalenEditor(QObject *parent = 0);
- explicit CalenEditor(AgendaUtil *agendaUtil, QObject *parent = 0);
- virtual ~CalenEditor();
-
-public:
- void edit(const QFile &handle, bool launchCalendar);
- void edit(AgendaEntry entry, bool launchCalendar);
- void edit(ulong id, bool launchCalendar);
- void create(QDateTime newEntryDateTime,
- bool launchCalendar,
- CalenEditor::CreateType type = TypeAppointment);
- void create(AgendaEntry entry,
- bool launchCalendar,
- CalenEditor::CreateType type = TypeAppointment);
-
-signals:
- void entrySaved();
- void dialogClosed();
- void calendarLaunchFailed(int error);
-
-private:
-#ifdef TESTCALENEDITOR
- friend class TestCalenEditor;
-#endif
- CalenEditorPrivate *d_ptr;
- Q_DECLARE_PRIVATE_D(d_ptr, CalenEditor)
- Q_DISABLE_COPY(CalenEditor)
-};
-
-#endif // CALENEDITOR_H
-
-// End of file --Don't remove this.
--- a/calendarui/caleneditor/inc/caleneditor_p.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/inc/caleneditor_p.h Mon Aug 23 16:00:50 2010 +0100
@@ -27,8 +27,8 @@
//user includes
#include <AgendaEntry>
+#include <caleneditor.h>
-#include "caleneditor.h"
#include "caleneditorcommon.h"
//forward declarations
@@ -114,6 +114,7 @@
void setReminderChoices();
bool isEditRangeThisOnly();
bool isAllDayFieldAdded();
+ void forcedSaveEntry();
private:
void edit(const QFile &handle, bool launchCalendar);
void edit(AgendaEntry entry, bool launchCalendar);
@@ -153,6 +154,8 @@
void deleteEntry(bool close = false);
bool handleAllDayToSave();
void enableFromTotimeFileds(bool, QDateTime, QDateTime);
+ QDateTime defaultTimeSameDay( );
+ void refreshTimeForUncheckAllDay();
private slots:
void handleSubjectChange(const QString subject);
--- a/calendarui/caleneditor/inc/caleneditorcommon.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/inc/caleneditorcommon.h Mon Aug 23 16:00:50 2010 +0100
@@ -31,6 +31,11 @@
#define CALEN_EDITOR_ADD_DESCRIPTION_ACTION "addDescriptionAction"
#define CALEN_EDITOR_DELETE_EVENT_ACTION "deleteEventAction"
+// Constants
+const int SecsInOneHour( 3600 );
+const int MaxRowsInTextItem(10);
+const int MaxCharacterLimit(255);
+
enum CustomItemOffset {
CustomWidgetFrom = HbDataFormModelItem::CustomItemBase + 1,
CustomWidgetTo,
--- a/calendarui/caleneditor/inc/caleneditorcustomitem.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/inc/caleneditorcustomitem.h Mon Aug 23 16:00:50 2010 +0100
@@ -25,6 +25,9 @@
#include <hbextendedlocale.h>
#include <hblineedit.h>
+class XQApplicationManager;
+class XQAiwRequest;
+
class HbDateTimePicker;
class HbPushButton;
class HbDataFomViewer;
@@ -53,9 +56,6 @@
protected:
virtual HbWidget* createCustomWidget();
-private:
- void setSelectedLocation( QVariant &aValue );
-
protected slots:
void handleDate();
void handleTime();
@@ -64,6 +64,7 @@
void handleLocationTextChange(QString location);
void launchLocationPicker();
void handleEditingFinished();
+ void setSelectedLocation( const QVariant &aValue );
Q_SIGNALS:
void dateTimeUpdated(QDateTime& fromDateTime);
@@ -78,7 +79,10 @@
QTime mTime;
QTime mMaxTime;
QTime mMinTime;
-
+
+ XQApplicationManager *mAppManager;
+ XQAiwRequest* mRequest;
+
HbPushButton* mPushButtonTime;
HbPushButton* mPushButtonDate;
HbPushButton *mRepeatUntilWidget;
@@ -92,6 +96,7 @@
HbLineEdit *mLocationLineEdit;
HbPushButton* mLocationPushButton;
bool mIsFromItem;
+ bool mRequestPending;
};
--- a/calendarui/caleneditor/inc/caleneditorreminderfield.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/inc/caleneditorreminderfield.h Mon Aug 23 16:00:50 2010 +0100
@@ -38,6 +38,14 @@
Q_OBJECT
public:
+ enum AllDayReminderIndex
+ {
+ ReminderOff = 0,
+ ReminderOnEventDay,
+ ReminderOneDayBefore,
+ ReminderTwoDaysBefore
+ };
+public:
CalenEditorReminderField(CalenEditorPrivate* calenEditor,
HbDataForm* form, HbDataFormModel* model,
QObject *parent = NULL);
--- a/calendarui/caleneditor/inc/caleneditorrepeatfield.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/inc/caleneditorrepeatfield.h Mon Aug 23 16:00:50 2010 +0100
@@ -57,6 +57,7 @@
private:
void insertRepeatUntilItem();
+ void removeRepeatUntilItem();
private slots:
void handleRepeatIndexChanged(int index);
@@ -65,14 +66,22 @@
private:
enum RepeatTypes {
- RepeatOnce,
- RepeatDaily,
- RepeatWorkdays,
- RepeatWeekly,
- RepeatBiWeekly,
- RepeatMonthly,
- RepeatYearly
- };
+ RepeatOnce,
+ RepeatDaily,
+ RepeatWorkdays,
+ RepeatWeekly,
+ RepeatBiWeekly,
+ RepeatMonthly,
+ RepeatYearly
+ };
+ enum RepeatRoles {
+ DailyRole = 1,
+ WorkdaysRole,
+ WeeklyRole,
+ BiWeeklyRole,
+ MonthlyRole,
+ YearlyRole
+ };
CalenEditorPrivate* mCalenEditor;
HbDataForm* mEditorForm;
HbDataFormModel* mCalenEditorModel;
@@ -82,6 +91,7 @@
HbDateTimePicker* mDatePicker;
QDate mRepeatUntilDate;
AgendaRepeatRule::RuleType mRepeatRuleType;
+ int mRepeatRoleValue;
bool mIsBiWeekly;
bool mIsWorkdays;
bool mRepeatUntilItemAdded;
--- a/calendarui/caleneditor/src/caleneditor.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/src/caleneditor.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,9 +22,13 @@
// User includes
#include <agendaentry.h>
#include <agendautil.h>
+#include <caleneditor.h>
-#include "caleneditor.h"
#include "caleneditor_p.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneditorTraces.h"
+#endif
/*!
\class CalenEditor
@@ -37,7 +41,9 @@
CalenEditor::CalenEditor(QObject *parent)
:QObject(parent),d_ptr(new CalenEditorPrivate(0, this))
{
+ OstTraceFunctionEntry0( CALENEDITOR_CALENEDITOR_ENTRY );
+ OstTraceFunctionExit0( CALENEDITOR_CALENEDITOR_EXIT );
}
/*!
@@ -49,7 +55,9 @@
CalenEditor::CalenEditor(AgendaUtil *agendaUtil, QObject *parent)
:QObject(parent), d_ptr(new CalenEditorPrivate(agendaUtil, this))
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITOR_CALENEDITOR_ENTRY );
+ OstTraceFunctionExit0( DUP1_CALENEDITOR_CALENEDITOR_EXIT );
}
/*!
@@ -57,9 +65,11 @@
*/
CalenEditor::~CalenEditor()
{
+ OstTraceFunctionEntry0( DUP2_CALENEDITOR_CALENEDITOR_ENTRY );
if (d_ptr) {
delete d_ptr;
}
+ OstTraceFunctionExit0( DUP2_CALENEDITOR_CALENEDITOR_EXIT );
}
/*!
@@ -70,7 +80,9 @@
*/
void CalenEditor::edit(const QFile &handle, bool launchCalendar)
{
+ OstTraceFunctionEntry0( CALENEDITOR_EDIT_ENTRY );
d_ptr->edit(handle, launchCalendar);
+ OstTraceFunctionExit0( CALENEDITOR_EDIT_EXIT );
}
/*!
@@ -81,10 +93,13 @@
*/
void CalenEditor::edit(AgendaEntry entry, bool launchCalendar)
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITOR_EDIT_ENTRY );
if(entry.isNull()) {
+ OstTraceFunctionExit0( DUP1_CALENEDITOR_EDIT_EXIT );
return;
}
d_ptr->edit(entry, launchCalendar);
+ OstTraceFunctionExit0( DUP2_CALENEDITOR_EDIT_EXIT );
}
/*!
@@ -93,7 +108,9 @@
*/
void CalenEditor::edit(ulong id, bool launchCalendar)
{
+ OstTraceFunctionEntry0( DUP2_CALENEDITOR_EDIT_ENTRY );
d_ptr->edit(id, launchCalendar);
+ OstTraceFunctionExit0( DUP3_CALENEDITOR_EDIT_EXIT );
}
/*!
@@ -107,7 +124,9 @@
void CalenEditor::create(QDateTime newEntryDateTime, bool launchCalendar,
CalenEditor::CreateType type)
{
+ OstTraceFunctionEntry0( CALENEDITOR_CREATE_ENTRY );
d_ptr->create(type, newEntryDateTime, launchCalendar);
+ OstTraceFunctionExit0( CALENEDITOR_CREATE_EXIT );
}
/*!
@@ -121,10 +140,21 @@
void CalenEditor::create(AgendaEntry entry, bool launchCalendar,
CalenEditor::CreateType type)
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITOR_CREATE_ENTRY );
if(entry.isNull()) {
+ OstTraceFunctionExit0( DUP1_CALENEDITOR_CREATE_EXIT );
return;
}
d_ptr->create(type, entry, launchCalendar);
+ OstTraceFunctionExit0( DUP2_CALENEDITOR_CREATE_EXIT );
+}
+/*!
+ Save the entry from editor
+ should be called only if edit or create function of editor has called.
+ */
+void CalenEditor::saveAndCloseEditor()
+{
+ d_ptr->forcedSaveEntry();
}
// End of file --Don't remove this.
--- a/calendarui/caleneditor/src/caleneditor_p.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/src/caleneditor_p.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -50,18 +50,22 @@
#include <CalenLauncher>
#include <agendaentry.h>
#include <agendautil.h>
+#include <caleneditor.h>
#include "caleneditor_p.h"
-#include "caleneditor.h"
-#include "caleneditor_p.h"
#include "caleneditorcustomitem.h"
#include "calendateutils.h"
#include "caleneditordocloader.h"
#include "caleneditorcommon.h"
#include "calendateutils.h"
+#include "calenagendautils.h"
#include "caleneditordatahandler.h"
#include "caleneditorreminderfield.h"
#include "caleneditorrepeatfield.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneditor_pTraces.h"
+#endif
/*!
\class CalenEditorPrivate
@@ -192,20 +196,19 @@
CalenEditorPrivate::CalenEditorPrivate(AgendaUtil *agendaUtil,
QObject *parent) :
QObject(parent),
- mAgendaUtil(NULL),
- mEditorDocLoader(NULL),
- mEditorView(NULL),
+ mEditorDocLoader(0),
+ mEditorView(0),
mDataHandler(NULL),
- mCalenEditorForm(NULL),
- mCalenEditorModel(NULL),
- mSubjectItem(NULL),
- mViewFromItem(NULL),
- mViewToItem(NULL),
- mViewLocationItem(NULL),
- mAllDayCheckBoxItem(NULL),
- mReminderField(NULL),
- mRepeatField(NULL),
- mDescriptionItem(NULL),
+ mCalenEditorForm(0),
+ mCalenEditorModel(0),
+ mSubjectItem(0),
+ mViewFromItem(0),
+ mViewToItem(0),
+ mViewLocationItem(0),
+ mAllDayCheckBoxItem(0),
+ mReminderField(0),
+ mRepeatField(0),
+ mDescriptionItem(0),
mEditRange(ThisAndAll),
mOriginalEntry(NULL),
mEditedEntry(NULL),
@@ -217,9 +220,10 @@
mLaunchCalendar(false),
mMenuItemAdded(false)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_CALENEDITORPRIVATE_ENTRY );
// First get the q-pointer.
q_ptr = static_cast<CalenEditor *> (parent);
- mMainWindow = NULL;
+ mMainWindow = 0;
mTranslator->loadCommon();
if (!agendaUtil) {
@@ -229,6 +233,7 @@
mAgendaUtil = agendaUtil;
mOwnsAgendaUtil = false;
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_CALENEDITORPRIVATE_EXIT );
}
/*!
@@ -236,9 +241,10 @@
*/
CalenEditorPrivate::~CalenEditorPrivate()
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORPRIVATE_CALENEDITORPRIVATE_ENTRY );
if(mOwnsAgendaUtil) {
delete mAgendaUtil;
- mAgendaUtil = NULL;
+ mAgendaUtil = 0;
}
if (mOriginalEntry) {
delete mOriginalEntry;
@@ -250,23 +256,23 @@
}
if(mEditorDocLoader) {
delete mEditorDocLoader;
- mEditorDocLoader = NULL;
+ mEditorDocLoader = 0;
}
if(mReminderField) {
delete mReminderField;
- mReminderField = NULL;
+ mReminderField = 0;
}
if(mRepeatField) {
delete mRepeatField;
- mRepeatField = NULL;
+ mRepeatField = 0;
}
if(mDataHandler) {
delete mDataHandler;
- mDataHandler = NULL;
+ mDataHandler = 0;
}
if (mCalenEditorModel) {
delete mCalenEditorModel;
- mCalenEditorModel = NULL;
+ mCalenEditorModel = 0;
}
// Remove the translator
if (mTranslator) {
@@ -277,8 +283,9 @@
// delete the mainwindow object if created any
if (mMainWindow) {
delete mMainWindow;
- mMainWindow = NULL;
+ mMainWindow = 0;
}
+ OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_CALENEDITORPRIVATE_EXIT );
}
/*!
@@ -288,9 +295,11 @@
*/
void CalenEditorPrivate::edit(const QFile &/*handle*/, bool launchCalendar)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_EDIT_ENTRY );
// TODO: Needs to be implemented using importer.
mNewEntry = false;
mLaunchCalendar = launchCalendar;
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -299,9 +308,11 @@
*/
void CalenEditorPrivate::edit(AgendaEntry entry, bool launchCalendar)
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORPRIVATE_EDIT_ENTRY );
mNewEntry = false;
mLaunchCalendar = launchCalendar;
openEditor(entry);
+ OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -310,12 +321,15 @@
*/
void CalenEditorPrivate::edit(ulong id, bool launchCalendar)
{
+ OstTraceFunctionEntry0( DUP2_CALENEDITORPRIVATE_EDIT_ENTRY );
mNewEntry = false;
AgendaEntry entry = mAgendaUtil->fetchById(id);
if(entry.isNull()) {
+ OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_EDIT_EXIT );
return;
}
edit(entry, launchCalendar);
+ OstTraceFunctionExit0( DUP3_CALENEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -327,6 +341,7 @@
void CalenEditorPrivate::create(CalenEditor::CreateType type,
QDateTime newEntryDateTime, bool launchCalendar)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_CREATE_ENTRY );
mNewEntryDateTime = newEntryDateTime;
mNewEntry = true;
AgendaEntry entry;
@@ -343,6 +358,7 @@
}
mLaunchCalendar = launchCalendar;
openEditor(entry);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_CREATE_EXIT );
}
/*!
@@ -354,6 +370,7 @@
void CalenEditorPrivate::create(CalenEditor::CreateType type,
AgendaEntry entry, bool launchCalendar)
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORPRIVATE_CREATE_ENTRY );
mNewEntry = true;
switch(type){
case CalenEditor::TypeAppointment: {
@@ -369,6 +386,7 @@
mNewEntryDateTime = entry.startTime();
mLaunchCalendar = launchCalendar;
openEditor(entry);
+ OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_CREATE_EXIT );
}
/*!
@@ -376,6 +394,7 @@
*/
void CalenEditorPrivate::showEditOccurencePopup()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_ENTRY );
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
@@ -400,7 +419,7 @@
// Create cancel action
HbAction *cancelAction =
- new HbAction(hbTrId("txt_calendar_button_softkey1_cancel"));
+ 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,
@@ -409,6 +428,7 @@
// Show the popup
popUp->open();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_EXIT );
}
/*!
@@ -416,6 +436,7 @@
*/
void CalenEditorPrivate::handleEditOccurence(int index)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEEDITOCCURENCE_ENTRY );
switch (index) {
case 0:
// User wants to edit only this occurence
@@ -433,6 +454,7 @@
entryToBeEdited = mAgendaUtil->parentEntry(mEntry);
}
showEditor(entryToBeEdited);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEEDITOCCURENCE_EXIT );
}
/*!
@@ -440,10 +462,12 @@
*/
void CalenEditorPrivate::handleCancel()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLECANCEL_ENTRY );
// User has chosen not to edit the event, hence return
mEditRange = UserCancelled;
// Do cleanup and return
emit q_ptr->dialogClosed();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLECANCEL_EXIT );
return;
}
@@ -452,6 +476,7 @@
*/
void CalenEditorPrivate::openEditor(AgendaEntry entry)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_OPENEDITOR_ENTRY );
if (0 < entry.id()) {
mNewEntry = false;
}
@@ -466,12 +491,14 @@
// Query user if he wants to edit whole series
// or just this occurence
showEditOccurencePopup();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_OPENEDITOR_EXIT );
return;
}else {
mEditRange = ThisAndAll;
}
}
showEditor(entry);
+ OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_OPENEDITOR_EXIT );
}
/*!
@@ -479,6 +506,7 @@
*/
void CalenEditorPrivate::showEditor(AgendaEntry entry)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWEDITOR_ENTRY );
mOriginalEntry = new AgendaEntry(entry);
mEditedEntry = new AgendaEntry(entry);
@@ -498,6 +526,7 @@
// Create the data handler
mDataHandler = new CalenEditorDataHandler(this,mEditedEntry, mOriginalEntry);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWEDITOR_EXIT );
}
/*!
@@ -505,6 +534,7 @@
*/
void CalenEditorPrivate::setUpView()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SETUPVIEW_ENTRY );
mEditorDocLoader = new CalenEditorDocLoader();
bool loadSuccess = false;
@@ -546,9 +576,8 @@
AgendaEntry::Type entryType = mEditedEntry->type();
if( entryType == AgendaEntry::TypeAppoinment) {
headingWidget->setHeading(hbTrId("txt_calendar_subhead_meeting"));
- }else if(entryType == AgendaEntry::TypeEvent) {
- //TODO: Add the text id once available
- headingWidget->setHeading(hbTrId("All-day event"));
+ }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"));
}
@@ -578,6 +607,7 @@
window->setCurrentView(mEditorView);
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SETUPVIEW_EXIT );
}
/*!
@@ -585,6 +615,7 @@
*/
void CalenEditorPrivate::addDiscardAction()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ADDDISCARDACTION_ENTRY );
if (!mMenuItemAdded) {
// Set this specific menu
HbMenu *menu = mEditorView->menu();
@@ -596,6 +627,7 @@
mEditorView->setMenu(menu);
mMenuItemAdded = true;
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ADDDISCARDACTION_EXIT );
}
/*!
@@ -603,6 +635,7 @@
*/
void CalenEditorPrivate::initModel()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_INITMODEL_ENTRY );
// Remove the model.
if (mCalenEditorForm->model()) {
delete mCalenEditorForm->model();
@@ -628,6 +661,7 @@
addRepeatItem();
}
mCalenEditorForm->setModel(mCalenEditorModel);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_INITMODEL_EXIT );
}
/*!
@@ -635,12 +669,14 @@
*/
void CalenEditorPrivate::addSubjectItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ADDSUBJECTITEM_ENTRY );
// Creats and appends data form model item to set subject of entry.
mSubjectItem = mCalenEditorModel->appendDataFormItem(
HbDataFormModelItem::TextItem,
hbTrId(
"txt_calendar_formlabel_val_subject"),
mCalenEditorModel->invisibleRootItem());
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ADDSUBJECTITEM_EXIT );
}
/*!
@@ -648,10 +684,12 @@
*/
void CalenEditorPrivate::addAllDayCheckBoxItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ADDALLDAYCHECKBOXITEM_ENTRY );
mAllDayCheckBoxItem = new HbDataFormModelItem();
mAllDayCheckBoxItem->setType(HbDataFormModelItem::CheckBoxItem);
mCalenEditorModel->appendDataFormItem(mAllDayCheckBoxItem);
mIsAllDayItemAdded = true;
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ADDALLDAYCHECKBOXITEM_EXIT );
}
/*!
@@ -659,11 +697,13 @@
*/
void CalenEditorPrivate::addCustomItemFrom()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ADDCUSTOMITEMFROM_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType> (CustomWidgetFrom);
HbDataFormModelItem *customModelItem = new HbDataFormModelItem(itemType,
hbTrId("txt_calendar_setlabel_start_time"));
mCalenEditorModel->appendDataFormItem(customModelItem);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ADDCUSTOMITEMFROM_EXIT );
}
/*!
@@ -671,12 +711,14 @@
*/
void CalenEditorPrivate::addCustomItemTo()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ADDCUSTOMITEMTO_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType> (CustomWidgetTo);
HbDataFormModelItem *customModelItem = new HbDataFormModelItem(itemType,
hbTrId("txt_calendar_setlabel_end_time"));
mCalenEditorModel->appendDataFormItem(customModelItem);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ADDCUSTOMITEMTO_EXIT );
}
/*!
@@ -688,11 +730,13 @@
*/
void CalenEditorPrivate::addCustomItemLocation()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ADDCUSTOMITEMLOCATION_ENTRY );
HbDataFormModelItem::DataItemType
itemType =
static_cast<HbDataFormModelItem::DataItemType> (CustomWidgetLocation);
HbDataFormModelItem *customModelItem = new HbDataFormModelItem(itemType, hbTrId("txt_calendar_formlabel_val_location"));
mCalenEditorModel->appendDataFormItem(customModelItem);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ADDCUSTOMITEMLOCATION_EXIT );
}
/*!
@@ -700,20 +744,24 @@
*/
void CalenEditorPrivate::addRepeatItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ADDREPEATITEM_ENTRY );
// Create the editor reminder field class to handle reminder related
// features
mRepeatField = new CalenEditorRepeatField(this, mCalenEditorForm,
mCalenEditorModel, this);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ADDREPEATITEM_EXIT );
}
/*!
Appends the reminder item to the Data form Model.
*/
void CalenEditorPrivate::addReminderItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ADDREMINDERITEM_ENTRY );
// Create the editor reminder field class to handle reminder related
// features
mReminderField = new CalenEditorReminderField(this, mCalenEditorForm,
mCalenEditorModel, this);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ADDREMINDERITEM_EXIT );
}
/*!
@@ -721,8 +769,11 @@
*/
void CalenEditorPrivate::handleDescriptionAction()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_ENTRY );
if (!mDescriptionItemAdded) {
populateDescriptionItem();
+ //Scroll to the description item added
+ mCalenEditorForm->scrollTo(mCalenEditorModel->indexFromItem(mDescriptionItem), HbAbstractItemView::EnsureVisible);
mDescriptionAction->setText(
hbTrId("txt_calendar_opt_remove_description"));
} else {
@@ -730,6 +781,7 @@
mDescriptionAction->setText(
hbTrId("txt_calendar_opt_add_description"));
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_EXIT );
}
/*!
@@ -737,6 +789,7 @@
*/
void CalenEditorPrivate::populateModel()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATEMODEL_ENTRY );
populateSubjectItem();
if (mIsAllDayItemAdded) {
@@ -755,6 +808,7 @@
if (mDescriptionItemAdded) {
populateDescriptionItem();
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATEMODEL_EXIT );
}
/*!
@@ -762,12 +816,15 @@
*/
void CalenEditorPrivate::populateSubjectItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATESUBJECTITEM_ENTRY );
mSubjectItem->setContentWidgetData("text", mEditedEntry->summary());
- mSubjectItem->setContentWidgetData("minRows", 2);
- mSubjectItem->setContentWidgetData("maxRows", 4);
+ mSubjectItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
+ mSubjectItem->setContentWidgetData("maxLength", MaxCharacterLimit);
+ mSubjectItem->setContentWidgetData("objectName", "subjectItem");
mCalenEditorForm->addConnection(mSubjectItem,
SIGNAL(textChanged(const QString)), this,
SLOT(handleSubjectChange(const QString)));
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATESUBJECTITEM_EXIT );
}
/*!
@@ -775,23 +832,94 @@
*/
void CalenEditorPrivate::populateAllDayItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATEALLDAYITEM_ENTRY );
mAllDayCheckBoxItem->setContentWidgetData("text",
hbTrId("txt_calendar_list_all_day_event"));
- if (AgendaEntry::TypeEvent == mEditedEntry->type()) {
+ if (CalenAgendaUtils::isAlldayEvent(*mEditedEntry)) {
//If All day is enabled.
mAllDayCheckBoxItem->setContentWidgetData("checkState", Qt::Checked);
}
+ mAllDayCheckBoxItem->setContentWidgetData("objectName", "allDayItem");
mCalenEditorForm->addConnection(mAllDayCheckBoxItem,
SIGNAL(stateChanged(int )), this,
SLOT(handleAllDayChange(int)));
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATEALLDAYITEM_EXIT );
}
/*!
+ Calculates default time when Event is on same day.
+ */
+QDateTime CalenEditorPrivate::defaultTimeSameDay( )
+{
+ QDateTime currentDateTime = QDateTime::currentDateTime();
+
+ //Start time should be one hour more than current time.
+ currentDateTime = currentDateTime.addSecs(SecsInOneHour);
+
+ int hour = currentDateTime.time().hour();
+ int minutes = currentDateTime.time().minute();
+ bool addHour = 0;
+
+ //If the current time is within 15 mins after adding one hour, minutes will be rounded off to 0.
+ // Like if current time is 7:14 am, plus one hour is 8:14 am and it will be rounded off to 8:00am
+ //For time between 15 and 45 mins, its rounded off to 30 mins
+ //and anything more than that we round it to the next hour.
+ if (minutes >= 0 && minutes <= 15) {
+ minutes = 0;
+ } else if (minutes > 15 && minutes <= 45) {
+ minutes = 30;
+ }else {
+ minutes = 0;
+ addHour = 1;
+ }
+ QTime tempTime;
+ tempTime.setHMS(hour, minutes, 0, 0);
+ currentDateTime.setTime(tempTime);
+
+ if (addHour) {
+ currentDateTime = currentDateTime.addSecs(SecsInOneHour);
+ }
+
+ // 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))
+ return currentDateTime;
+ else
+ return CalenDateUtils::defaultTime(currentDateTime);
+}
+
+/*!
+ Sets to default time, when AllDay is unchecked
+ */
+void CalenEditorPrivate::refreshTimeForUncheckAllDay()
+{
+ //Get the default time as 8:00 am from CalenDateUtils.
+ QDateTime fromDateTime = CalenDateUtils::defaultTime(mEditedEntry->startTime());
+ QDateTime toDateTime;
+
+ // The default time will be 8.00 am only if its not on current day
+ // else the time is calculated accordingly
+ bool isSameDay = CalenDateUtils::isOnToday(fromDateTime);
+ if (isSameDay) {
+ fromDateTime = defaultTimeSameDay();
+ }
+ mViewFromItem->populateDateTime(fromDateTime, true);
+ mNewEntryDateTime = fromDateTime;
+
+ toDateTime = fromDateTime.addSecs(SecsInOneHour);
+ mViewToItem->populateDateTime(toDateTime, false);
+
+ // Set the default start time to the event.
+ mEditedEntry->setStartAndEndTime(fromDateTime, toDateTime);
+}
+
+/*!
Populates the start and end time of the event item.
*/
void CalenEditorPrivate::populateCustomItemDateTime()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATECUSTOMITEMDATETIME_ENTRY );
// Get the index of the start time of the event item.
// Check if all day has been added or not
// and calculate the index accordingly
@@ -809,7 +937,6 @@
SLOT(saveFromDateTime(QDateTime &)));
// Pass the start time of the event according to new or existing event.
QDateTime fromDateTime = mNewEntryDateTime;
- QTime currentTime = QTime::currentTime();
if (!mNewEntry) {
// Check if we are going to create an exception here
if (mEditRange == ThisOnly) {
@@ -830,21 +957,8 @@
} else {
// Check if it is on same day and set the default time and date accordingly.
bool isSameDay = CalenDateUtils::isOnToday(fromDateTime);
- int minutes = 0;
- int hour = currentTime.hour();
if (isSameDay) {
- minutes = currentTime.minute();
- if (minutes > 0 && minutes < 31) {
- minutes = 30;
- } else {
- minutes = 0;
- }
- currentTime.setHMS(hour, minutes, 0, 0);
- if (minutes == 0) {
- currentTime = currentTime.addSecs(60 * 60);
- }
- fromDateTime.setDate(fromDateTime.date());
- fromDateTime.setTime(currentTime);
+ fromDateTime = defaultTimeSameDay();
}
}
mViewFromItem->populateDateTime(fromDateTime, true);
@@ -885,20 +999,24 @@
// If no instances earlier then set it to 01/01/1900.
if (prevInstanceStartTime.isNull()) {
- prevInstanceStartTime.setDate(QDate(1900, 01, 01));
- prevInstanceStartTime.setTime(QTime(0, 0, 0));
+ prevInstanceEndTime.setDate(QDate(1900, 01, 01));
+ prevInstanceEndTime.setTime(QTime(0, 0, 0));
+ } else {
+ prevInstanceEndTime = prevInstanceEndTime.addDays(1);
}
// If no instances later then set it to 30/01/2100.
if (nextInstanceEndTime.isNull()) {
- nextInstanceEndTime.setDate(QDate(2100, 12, 30));
- nextInstanceEndTime.setTime(QTime(0, 0, 0));
+ nextInstanceStartTime.setDate(QDate(2100, 12, 30));
+ nextInstanceStartTime.setTime(QTime(0, 0, 0));
+ } else {
+ nextInstanceStartTime = nextInstanceStartTime.addDays(-1);
}
mViewFromItem->setDateRange(
- prevInstanceStartTime.addDays(1).date(),
- nextInstanceStartTime.addDays(-1).date());
- mViewToItem->setDateRange(prevInstanceEndTime.date().addDays(1),
- nextInstanceEndTime.date().addDays(-1));
+ prevInstanceEndTime.date(),
+ nextInstanceStartTime.date());
+ mViewToItem->setDateRange(prevInstanceEndTime.date(),
+ nextInstanceStartTime.date());
// If repeating daily then disable the date fields as
// date cannot be changed
@@ -910,7 +1028,7 @@
}
}
} else {
- toDateTime = fromDateTime.addSecs(60 * 60);
+ toDateTime = fromDateTime.addSecs(SecsInOneHour);
}
mViewToItem->populateDateTime(toDateTime, false);
@@ -920,13 +1038,12 @@
if (mNewEntry) {
mOriginalEntry->setStartAndEndTime(fromDateTime, toDateTime);
}
- if ((mAllDayCheckBoxItem &&
- (mAllDayCheckBoxItem->contentWidgetData("checkState") == Qt::Checked))
- || (!mNewEntry && mEditedEntry->type() == AgendaEntry::TypeEvent)) {
-
+ if (isAllDayEvent()) {
// For all-day, we need to substratc 1 minute to get the actual end time
// as we store all-day as 12.00AM to 12.00 AM next day
QDateTime actualEndTime = mEditedEntry->endTime().addSecs(-60);
+ // Set it back to mEditedEntry
+ mEditedEntry->setStartAndEndTime(mEditedEntry->startTime(), actualEndTime);
mViewToItem->populateDateTime(actualEndTime, false);
// If the all day option is checked, we need to
@@ -934,6 +1051,7 @@
enableFromTotimeFileds(false, mEditedEntry->startTime(),
actualEndTime);
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATECUSTOMITEMDATETIME_EXIT );
}
/*!
Populate location item from the editor model and set it in the widget and listen
@@ -941,6 +1059,7 @@
*/
void CalenEditorPrivate::populateCustomItemLocation()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATECUSTOMITEMLOCATION_ENTRY );
//Get the index of the custom location widget item of the event item.
// Check if all day has been added or not
// and calculate the index accordingly
@@ -953,30 +1072,34 @@
}
QModelIndex index = mCalenEditorModel->index(itemIndex, 0);
mViewLocationItem = qobject_cast<CalenEditorCustomItem *>
- (mCalenEditorForm->itemByIndex(index));
-
+ (mCalenEditorForm->itemByIndex(index));
+ mViewLocationItem->populateLocation(mEditedEntry->location());
+
+ // Connect the slots only after setting the location text
connect(mViewLocationItem, SIGNAL(locationTextChanged(const QString)),
this, SLOT(handleLocationChange(const QString)));
- connect(mViewLocationItem, SIGNAL(locationTextChanged(const QString, const double, const double)),
- this, SLOT(handleLocationChange(const QString, const double, const double)));
+ connect(mViewLocationItem,
+ SIGNAL(locationTextChanged(const QString, const double, const double)),
+ this,
+ SLOT(handleLocationChange(const QString, const double, const double)));
- mViewLocationItem->populateLocation(mEditedEntry->location());
+ connect(mViewLocationItem, SIGNAL(locationEditingFinished()),
+ this, SLOT(handleLocationEditingFinished()));
- connect(mViewLocationItem, SIGNAL(locationEditingFinished()),
- this, SLOT(handleLocationEditingFinished()));
-
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATECUSTOMITEMLOCATION_EXIT );
}
/*!
Save the changed start time of the event.
*/
void CalenEditorPrivate::saveFromDateTime(QDateTime& fromDateTime)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVEFROMDATETIME_ENTRY );
QDateTime endTime = mEditedEntry->endTime();
// Update the end time accordingly on UI - duration will be 60 mins
// bydefault only while creating new entry and if it crossed the endtime
if (mNewEntry && fromDateTime > endTime) {
- endTime = fromDateTime.addSecs(3600);
+ endTime = fromDateTime.addSecs(SecsInOneHour);
} else { // for existing entry
// we need to see if user has moved start time beyond the end time
// then add the duration of the meeting that was saved earlier to the
@@ -999,15 +1122,19 @@
}
updateReminderChoices();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SAVEFROMDATETIME_EXIT );
}
void CalenEditorPrivate::updateReminderChoices()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_UPDATEREMINDERCHOICES_ENTRY );
QDate referenceDate;
// Start date or repeat until date will be the reference to decide
// whether the event is in past or future.
if (mRepeatField && mRepeatField->isRepeatUntilItemAdded()) {
+ // For repeating entries reminder options will be provided only
+ // when the repeatuntil date is in future
referenceDate = mRepeatField->repeatUntilDate();
} else {
referenceDate = mEditedEntry->startTime().date();
@@ -1015,18 +1142,8 @@
// Check if all day event or not.
if (isAllDayEvent()) {
- int currentIndex = mReminderField->currentReminderIndex();
mReminderField->updateReminderChoicesForAllDay(referenceDate);
- int numberOfReminderChoices = mReminderField->reminderItemsCount();
- if (currentIndex >= numberOfReminderChoices) {
- currentIndex = 0;
- mReminderField->disableReminderTimeField();
- }
- mReminderField->setCurrentIndex(currentIndex);
- if(currentIndex == 0 && mReminderField->isReminderTimeForAllDayAdded()) {
- mReminderField->removeReminderTimeField();
- }
- } else {
+ } else {
if ((referenceDate < QDate::currentDate())
|| (referenceDate == QDate::currentDate()
&& (mEditedEntry->startTime().time() < QTime::currentTime())))
@@ -1037,9 +1154,12 @@
// do anything.
if (!mReminderField->isReminderFieldEnabled()) {
mReminderField->setReminderChoices();
+ // Set the default alarm time 15 minutes before
+ mReminderField->setCurrentIndex(2);
}
}
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_UPDATEREMINDERCHOICES_EXIT );
}
/*!
@@ -1047,12 +1167,13 @@
*/
void CalenEditorPrivate::saveToDateTime(QDateTime& toDateTime)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVETODATETIME_ENTRY );
QDateTime startTime = mEditedEntry->startTime();
bool fromDateChanged = false;
// Update the start time accordingly on UI - duration will be 60 mins
// bydefault for new entry and if it crosses the starttime
if (mNewEntry && toDateTime < startTime) {
- startTime = toDateTime.addSecs(-3600);
+ startTime = toDateTime.addSecs(-SecsInOneHour);
fromDateChanged = true;
} else {
// for exisitng entry
@@ -1082,6 +1203,7 @@
if (fromDateChanged) {
updateReminderChoices();
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SAVETODATETIME_EXIT );
}
/*!
@@ -1089,6 +1211,7 @@
*/
void CalenEditorPrivate::populateRepeatItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATEREPEATITEM_ENTRY );
// Check if all day has been added or not
// and calculate the index accordingly
// all day added implies reminder time field is also added
@@ -1102,6 +1225,7 @@
}
mRepeatField->populateRepeatItem(index);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATEREPEATITEM_EXIT );
}
/*!
@@ -1109,6 +1233,7 @@
*/
void CalenEditorPrivate::populateDescriptionItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATEDESCRIPTIONITEM_ENTRY );
QModelIndex repeatIndex;
if (mEditRange == ThisOnly) {
repeatIndex = mReminderField->modelIndex();
@@ -1129,16 +1254,14 @@
"txt_calendar_formlabel_val_description")),
mCalenEditorModel->invisibleRootItem());
mDescriptionItem->setContentWidgetData("text", mEditedEntry->description());
- mDescriptionItem->setContentWidgetData("minRows", 2);
- mDescriptionItem->setContentWidgetData("maxRows", 4);
+ mDescriptionItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
+ mDescriptionItem->setContentWidgetData("objectName", "descriptionItem");
mCalenEditorForm->addConnection(
mDescriptionItem,
SIGNAL(textChanged(const QString)), this,
SLOT(handleDescriptionChange(const QString)));
mDescriptionItemAdded = true;
- // TODO: Scroll the previous form item to the top so that the description
- // field automatically scrolls to the top as well
- // mCalenEditorForm->scrollTo(repeatIndex, HbAbstractItemView::EnsureVisible);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATEDESCRIPTIONITEM_EXIT );
}
/*!
@@ -1146,6 +1269,7 @@
*/
void CalenEditorPrivate::removeDescriptionItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_ENTRY );
// Disconnect the slot connected to description item
mCalenEditorForm->removeConnection(
mDescriptionItem,
@@ -1167,8 +1291,9 @@
// Remove the description from the entry
mEditedEntry->setDescription("");
- mDescriptionItem = NULL;
+ mDescriptionItem = 0;
mDescriptionItemAdded = false;
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_EXIT );
}
@@ -1177,9 +1302,11 @@
*/
void CalenEditorPrivate::closeEditor()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_CLOSEEDITOR_ENTRY );
HbMainWindow* window = hbInstance->allMainWindows().first();
window->removeView(mEditorView);
emit q_ptr->dialogClosed();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_CLOSEEDITOR_EXIT );
}
/*!
@@ -1200,6 +1327,7 @@
*/
void CalenEditorPrivate::handleAllDayChange(int state)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_ENTRY );
Q_UNUSED(state)
if (mAllDayCheckBoxItem->contentWidgetData("checkState") == Qt::Checked) {
// AllDayCheckBox is checked
@@ -1215,12 +1343,19 @@
tempEndTime.setTime(tempEndQTime);
enableFromTotimeFileds(false, tempSartTime, tempEndTime);
+ mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
+
QDate referenceDate;
if (mRepeatField->isRepeatUntilItemAdded()) {
referenceDate = mRepeatField->repeatUntilDate();
} else {
referenceDate = mEditedEntry->startTime().date();
}
+ // For the transition from normal entry to all day - set reminder off
+ // This is to avoid conflict in the reminder time as
+ // the index set for the normal meeting may not be valid for an allday
+ // Set it off before doing the reminder updation for all day
+ mReminderField->setCurrentIndex(0);
mReminderField->updateReminderChoicesForAllDay(referenceDate);
// If the reminder field is enabled and it is not off
// it implies default alarm day and time is being displayed.
@@ -1234,30 +1369,23 @@
}
} else {
// AllDayCheckBox in un-checked
+ // then we need to refresh the Time to show default time
+ refreshTimeForUncheckAllDay();
// Set From/To times buttons editable
// Update Start/End Times with Edited entry values
enableFromTotimeFileds(true, mEditedEntry->startTime(),
mEditedEntry->endTime());
- // If original entry was an All-day, then we need to save the date that
- // is shown on the "To" date push button
- if (mOriginalEntry->type() == AgendaEntry::TypeEvent) {
- mEditedEntry->setStartAndEndTime(mViewFromItem->getDateTime(),
- mViewToItem->getDateTime());
- }
- int index;
- if (mIsAllDayItemAdded) {
- index = ReminderTimeForAllDayItem;
- } else {
- index = ReminderTimeForAllDayItem - 1;
- }
mReminderField->removeReminderTimeField();
mReminderField->setReminderChoices();
+ // Set the default alarm time 15 minutes before
+ mReminderField->setCurrentIndex(2);
updateReminderChoices();
}
if(!mNewEntry){
addDiscardAction();
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_EXIT );
}
/*!
@@ -1266,10 +1394,12 @@
*/
void CalenEditorPrivate::handleLocationChange(const QString location)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_ENTRY );
mEditedEntry->setLocation(location);
if(!mNewEntry){
addDiscardAction();
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_EXIT );
}
@@ -1280,9 +1410,11 @@
void CalenEditorPrivate::handleLocationChange(const QString location,
const double /*geoLatitude*/, const double /*geoLongitude*/)
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_ENTRY );
mEditedEntry->setLocation(location);
mEditedEntry->clearGeoValue();
addDiscardAction();
+ OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_EXIT );
}
/*!
@@ -1290,6 +1422,7 @@
*/
void CalenEditorPrivate::handleLocationEditingFinished()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_ENTRY );
if ( !mOriginalEntry->location().isEmpty() )
{
AgendaGeoValue entryGeoValue =mAgendaUtil->fetchById(mEditedEntry->id()).geoValue();
@@ -1304,7 +1437,7 @@
confirmationQuery->setIconVisible(true);
QString displayText;
- displayText = displayText.append("Location changed. Keep existing location on Map?");
+ displayText = displayText.append(hbTrId("txt_calendar_info_location_updated_keep_existing"));
confirmationQuery->setText(displayText);
@@ -1316,12 +1449,12 @@
}
defaultActions.clear();
-
- confirmationQuery->addAction(new HbAction("Yes"));
- confirmationQuery->addAction(new HbAction("No"));
+ confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_yes")));
+ confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_no")));
confirmationQuery->open(this, SLOT(selectEditingFinishedAction(HbAction*)));
}
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_EXIT );
}
/*!
@@ -1329,12 +1462,14 @@
*/
void CalenEditorPrivate::selectEditingFinishedAction(HbAction* action)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SELECTEDITINGFINISHEDACTION_ENTRY );
HbMessageBox* dlg = static_cast<HbMessageBox*>(sender());
if (action == dlg->actions().at(1))
{
mEditedEntry->clearGeoValue();
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SELECTEDITINGFINISHEDACTION_EXIT );
}
/*!
@@ -1343,10 +1478,12 @@
*/
void CalenEditorPrivate::handleDescriptionChange(const QString description)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEDESCRIPTIONCHANGE_ENTRY );
mEditedEntry->setDescription(description);
if(!mNewEntry){
addDiscardAction();
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDESCRIPTIONCHANGE_EXIT );
}
/*!
@@ -1355,6 +1492,7 @@
*/
void CalenEditorPrivate::saveAndCloseEditor()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_ENTRY );
Action action = handleDone();
if (CalenEditorPrivate::ActionDelete != action) {
closeEditor();
@@ -1372,6 +1510,7 @@
SLOT(handleCalendarLaunchError(int)));
}
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_EXIT );
}
/*!
@@ -1379,8 +1518,10 @@
*/
void CalenEditorPrivate::handleCalendarLaunchError(int error)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLECALENDARLAUNCHERROR_ENTRY );
// emit signal to the editor launcher
emit q_ptr->calendarLaunchFailed(error);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLECALENDARLAUNCHERROR_EXIT );
}
/*!
@@ -1388,14 +1529,17 @@
*/
void CalenEditorPrivate::handleDeleteAction()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEDELETEACTION_ENTRY );
// If its a new entry just close the editor
if (mNewEntry) {
closeEditor();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT );
return;
}else {
// Delete entry and close editor
deleteEntry(true);
}
+ OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT );
}
/*!
@@ -1403,7 +1547,9 @@
*/
void CalenEditorPrivate::launchSettingsView()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_ENTRY );
// TODO :: Not yet implemented.
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_EXIT );
}
/*!
@@ -1411,8 +1557,10 @@
*/
void CalenEditorPrivate::discardChanges()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_DISCARDCHANGES_ENTRY );
// Close the editor without saving the changes.
closeEditor();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_DISCARDCHANGES_EXIT );
}
/*!
@@ -1420,6 +1568,7 @@
*/
void CalenEditorPrivate::showDeleteConfirmationQuery(bool closeEditor)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_ENTRY );
HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
popup->setDismissPolicy(HbDialog::NoDismiss);
popup->setTimeout(HbDialog::NoTimeout);
@@ -1450,12 +1599,12 @@
{
popup->removeAction(list[i]);
}
- HbAction *deleteAction = new HbAction(hbTrId("txt_calendar_button_delete"),
+ HbAction *deleteAction = new HbAction(hbTrId("txt_common_button_delete"),
popup);
popup->addAction(deleteAction);
connect(deleteAction, SIGNAL(triggered()), this,
SLOT(handleDeleteAction()));
- HbAction *cancelAction = new HbAction(hbTrId("txt_calendar_button_cancel"),
+ 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) {
@@ -1464,6 +1613,7 @@
}
popup->addAction(cancelAction);
popup->open();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT );
}
/*!
@@ -1472,6 +1622,7 @@
*/
bool CalenEditorPrivate::isChild() const
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISCHILD_ENTRY );
return mEditedEntry->recurrenceId().toUTC().isNull();
}
@@ -1489,24 +1640,47 @@
*/
CalenEditorPrivate::Action CalenEditorPrivate::handleDone()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEDONE_ENTRY );
if (mEditRange == ThisAndAll) {
mRepeatField->saveRepeatRule();
}
+
+ // Set the all-day endtime back
+ if(isAllDayEvent()) {
+ // Set the all-day end time to 12:00AM to next day here only
+ // In case if user doesnt change/edit anything then,
+ // we shall not show "Entry updated" popup
+ QDateTime actualStartTime =
+ CalenDateUtils::beginningOfDay(mEditedEntry->startTime());
+
+ // Set EndTime of AllDay event to 00:00:00 of next day
+ QDateTime actualEndTime = mEditedEntry->endTime().addDays(1);
+ QTime tempEndQTime = actualEndTime.time();
+ tempEndQTime.setHMS(0, 0, 0);
+ actualEndTime.setTime(tempEndQTime);
+ // Set the start and end time properly
+ mEditedEntry->setStartAndEndTime(actualStartTime, actualEndTime);
+ }
+
// TODO: Need to check entry status here. EntryStillExistsL
switch (mDataHandler->shouldSaveOrDeleteOrDoNothing(mLaunchCalendar)) {
case CalenEditorPrivate::ActionSave:
if (saveEntry()) {
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDONE_EXIT );
return CalenEditorPrivate::ActionSave;
}
+ 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:
break;
}
+ OstTraceFunctionExit0( DUP3_CALENEDITORPRIVATE_HANDLEDONE_EXIT );
return CalenEditorPrivate::ActionNothing;
}
@@ -1516,61 +1690,31 @@
*/
bool CalenEditorPrivate::saveEntry()
{
- // check if we are editing child
- if (mIsChild && (mEditRange == ThisOnly)) {
- // Add the entry
- mAgendaUtil->updateEntry(*mEditedEntry, true);
- // TODO: Add the text id once available
- if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) {
- HbNotificationDialog::launchDialog(hbTrId("Meeting updated"));
- }else if(mEditedEntry->type() == AgendaEntry::TypeEvent) {
- HbNotificationDialog::launchDialog(hbTrId("All day event updated"));
- }
- emit q_ptr->entrySaved();
- return true;
- } else if ((mEditRange == ThisOnly)) {
- // If we are editing only this occurence, then
- // clear the repeating properties of it
- mAgendaUtil->clearRepeatingProperties(*mEditedEntry);
- }
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVEENTRY_ENTRY );
- CalenEditorPrivate::Error error = CalenEditorPrivate::CalenEditorErrorNone;
- error = mDataHandler->checkErrorsForThisAndAll();
- if (CalenEditorPrivate::CalenEditorErrorNone == error) {
- if (!handleAllDayToSave()) {
- if (mNewEntry) {
- mAgendaUtil->addEntry(*mEditedEntry);
- } else if (mEditRange == ThisAndAll && mOriginalEntry->isRepeating()) {
- mAgendaUtil->storeRepeatingEntry(*mEditedEntry, true);
- } else if (!mIsChild && (mEditRange == ThisOnly)) {
- // Create the new exception
- mAgendaUtil->createException(*mEditedEntry,
- mOriginalEntry->startTime());
- } else {
- // Normal entry updation
- mAgendaUtil->updateEntry(*mEditedEntry, false);
- }
+ if (!handleAllDayToSave()) {
+ // creating an exceptional entry
+ if (!mIsChild && (mEditRange == ThisOnly)) {
+ mAgendaUtil->store(*mEditedEntry, AgendaUtil::ThisOnly);
+ } else {
+ mAgendaUtil->store(*mEditedEntry);
}
- if (mNewEntry) {
- // TODO: Add the text id once available
- if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) {
- HbNotificationDialog::launchDialog(hbTrId("New meeting saved"));
- } else if(mEditedEntry->type() == AgendaEntry::TypeEvent) {
- HbNotificationDialog::launchDialog(hbTrId("New all-day saved"));
- }
- } else {
- // TODO: Add the text id once available
- if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) {
- HbNotificationDialog::launchDialog(hbTrId("Meeting updated"));
- } else if(mEditedEntry->type() == AgendaEntry::TypeEvent) {
- HbNotificationDialog::launchDialog(hbTrId("All day event updated"));
- }
+ }
+ if (mNewEntry) {
+ if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) {
+ HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_new_meeting_saved"));
+ } else if(isAllDayEvent()) {
+ HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_new_all_day_event_saved"));
}
- emit q_ptr->entrySaved();
- } else if (error) {
- mDataHandler->displayErrorMsg(error);
- return false;
+ } else {
+ if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) {
+ HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_meeting_updated"));
+ } else if(isAllDayEvent()) {
+ HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_all_day_event_updated"));
+ }
}
+ emit q_ptr->entrySaved();
+ OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_SAVEENTRY_EXIT );
return true;
}
@@ -1581,6 +1725,7 @@
*/
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) {
@@ -1599,6 +1744,7 @@
closeEditor();
}
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_DELETEENTRY_EXIT );
}
/*!
@@ -1606,76 +1752,97 @@
*/
bool CalenEditorPrivate::handleAllDayToSave()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY );
+
+ // Check the state of AllDay checkBox
+ // If the all day item was not added, definitely its an instance of a
+ // repeating entry(TypeAppoinment or TypeEvent)
+ // In this case the parent entry type should not be changed
+ // so return false
if (!mIsAllDayItemAdded) {
- // All day item was not added, return true
+ // All day item was not added, return false
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
return false;
}
- // Check the state of AllDay checkBox
+ // If the entry type is getting changed say TypeEvent to TypeAppoinment
+ // or TypeAppoinment to TypeEvent then,
+ // Clone the entry to the new type and Delete old entry from Database
+ // So checking all the possible type conversions and other cases
+
// If Creating new Entry and AllDay Box is checked.
- // Clone the entry to AllDay
-
- QDateTime tempSartTime =
- CalenDateUtils::beginningOfDay(mEditedEntry->startTime());
-
- // Set EndTime of AllDay event to 00:00:00 of next day
- QDateTime tempEndTime = mEditedEntry->endTime().addDays(1);
- QTime tempEndQTime = tempEndTime.time();
- tempEndQTime.setHMS(0, 0, 0);
- tempEndTime.setTime(tempEndQTime);
-
+ // Just return false to save it.
if (mNewEntry && (mAllDayCheckBoxItem->contentWidgetData("checkState")
- == Qt::Checked)) {
- // changes Start/End times of entry to Beginning ot the day
- mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
+ == Qt::Checked)) {
mEditedEntry->setType(AgendaEntry::TypeEvent);
+ OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
return false;
} else if ((mAllDayCheckBoxItem->contentWidgetData("checkState")
- == Qt::Checked) && (mEditedEntry->type() !=
- AgendaEntry::TypeEvent)) {
- // Editing existing Meetingentry, and Alldat Box is Checked
- // changes Start/End times of entry to Beginning ot the day
- mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
-
- // Clone the entry to AllDayEntry, Delete old entry from Database
- mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
- // For later reference for the notification popup
- mEditedEntry->setType(AgendaEntry::TypeEvent);
- return true;
+ == Qt::Checked)) {
+ bool isAllDayEvent = CalenAgendaUtils::isAlldayEvent(*mOriginalEntry);
+ // Editing existing Meeting entry, and Allday Box is Checked
+ if (!isAllDayEvent) {
+ // Clone the entry to AllDayEntry, Delete old entry from Database
+ mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
+ // For later reference for the notification popup
+ mEditedEntry->setType(AgendaEntry::TypeEvent);
+ OstTraceFunctionExit0( DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ return true;
+ }
+ OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ // Return false since the entry is already an all day entry
+ // so cloning not required. Just save it.
+ return false;
} else if (mAllDayCheckBoxItem->contentWidgetData("checkState")
- != Qt::Checked) {
- if (mEditedEntry->type() != AgendaEntry::TypeAppoinment) {
- // Editing existing AllDayentry, and Alldat Box is Not-Checked
- // Clone the entry to MeetingEntry, Delete old entry from Database
- mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeAppoinment);
- // For later reference for the notification popup
- mEditedEntry->setType(AgendaEntry::TypeAppoinment);
- return true;
- }
- // Check if the duration of the meeting is matching the all-day criteria
- // if yes, then we need to store it as all-day instead of normal meeting
- else if (mEditedEntry->startTime() == CalenDateUtils::beginningOfDay(mEditedEntry->startTime())) {
- // Get the end time and see if it is at the beginning of the end date day
- if (mEditedEntry->endTime() == CalenDateUtils::beginningOfDay(mEditedEntry->endTime())) {
- // Store it as all-day
- mEditedEntry->setType(AgendaEntry::TypeEvent);
- // Check if this was an all-day earlier and now user has changed it like that
- // or it is a new entry
- if (mOriginalEntry->type() == AgendaEntry::TypeEvent ||
- mNewEntry) {
- return false;
- } else {
- // It was a meeting
- // Clone the entry to AllDayEntry, Delete old entry from Database
- mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
- mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
- // For later reference for the notification popup
- mEditedEntry->setType(AgendaEntry::TypeEvent);
- return true;
- }
- }
- }
+ != Qt::Checked) {
+ if (mEditedEntry->type() != AgendaEntry::TypeAppoinment) {
+ // Editing existing AllDayentry, and Allday Box is Not-Checked
+ // Clone the entry to MeetingEntry, Delete old entry from Database
+ mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeAppoinment);
+ // For later reference for the notification popup
+ mEditedEntry->setType(AgendaEntry::TypeAppoinment);
+ OstTraceFunctionExit0( DUP3_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ return true;
+ } else if (CalenAgendaUtils::isAlldayEvent(*mOriginalEntry)) {
+ // This else case will be executed when the original entry is
+ // an all day and the entry type is still TypeAppoinment.
+ // eg: Outlook synced all day entry type will be still TypeAppoinment
+ // In this case cloning is not required but entry has to be saved.
+ // So return false
+ OstTraceFunctionExit0( DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ // save it
+ return false;
+ }
+ // Check if the duration of the meeting is matching the all-day criteria
+ // if yes, then we need to store it as all-day instead of normal meeting
+ else if (mEditedEntry->startTime() ==
+ CalenDateUtils::beginningOfDay(mEditedEntry->startTime())) {
+ // Get the end time and see if it is at the beginning of the end date day
+ if (mEditedEntry->endTime() ==
+ CalenDateUtils::beginningOfDay(mEditedEntry->endTime())) {
+ // Since the start and end time matches the all day criteria
+ // Store it as all-day
+ mEditedEntry->setType(AgendaEntry::TypeEvent);
+ // Check if this was an all-day earlier and now user
+ // has changed it like that or it is a new entry
+ if (mOriginalEntry->type() == AgendaEntry::TypeEvent ||
+ mNewEntry) {
+ OstTraceFunctionExit0( DUP4_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ return false;
+ } else {
+ // It was a meeting
+ // Clone the entry to AllDayEntry,
+ // And Delete old entry from Database
+ mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
+ // For later reference for the notification popup
+ mEditedEntry->setType(AgendaEntry::TypeEvent);
+ OstTraceFunctionExit0( DUP5_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ return true;
+ }
+ }
+ }
}
+ OstTraceFunctionExit0( DUP6_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
return false;
}
@@ -1686,9 +1853,11 @@
QDateTime fromTime,
QDateTime toTime)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ENABLEFROMTOTIMEFILEDS_ENTRY );
mViewFromItem->enableFromTimeFieldAndSetTime(enableFileds, fromTime);
mViewToItem->enableToTimeFieldAndSetTime(enableFileds, toTime);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ENABLEFROMTOTIMEFILEDS_EXIT );
}
/*!
@@ -1696,6 +1865,8 @@
*/
AgendaEntry* CalenEditorPrivate::editedEntry()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_EDITEDENTRY_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_EDITEDENTRY_EXIT );
return mEditedEntry;
}
@@ -1704,6 +1875,8 @@
*/
AgendaEntry* CalenEditorPrivate::originalEntry()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ORIGINALENTRY_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ORIGINALENTRY_EXIT );
return mOriginalEntry;
}
@@ -1712,6 +1885,8 @@
*/
bool CalenEditorPrivate::isNewEntry()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISNEWENTRY_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ISNEWENTRY_EXIT );
return mNewEntry;
}
@@ -1720,6 +1895,8 @@
*/
HbDataFormModelItem* CalenEditorPrivate::allDayCheckBoxItem()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ALLDAYCHECKBOXITEM_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ALLDAYCHECKBOXITEM_EXIT );
return mAllDayCheckBoxItem;
}
@@ -1731,6 +1908,7 @@
*/
bool CalenEditorPrivate::isReminderTimeForAllDayAdded()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISREMINDERTIMEFORALLDAYADDED_ENTRY );
return mReminderField->isReminderTimeForAllDayAdded();
}
@@ -1739,14 +1917,20 @@
*/
bool CalenEditorPrivate::isAllDayEvent()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISALLDAYEVENT_ENTRY );
if (mAllDayCheckBoxItem) {
return (mAllDayCheckBoxItem->contentWidgetData("checkState")
== Qt::Checked)? true:false;
- } else if (!mNewEntry && mEditedEntry->type() == AgendaEntry::TypeEvent) {
- // If editing single occurence then all day item not shown but still it
- // is an all day event..
+ } else if (!mNewEntry && CalenAgendaUtils::isAlldayEvent(*mOriginalEntry)) {
+ // This else is for exceptional entries
+ // While editing a single occurence, the type of the entry
+ // should not be changed so the allday item won't be shown in editor
+ // even if its of TypeEvent or TypeAppoinment
+ // So checking for the original entry type
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT );
return true;;
} else {
+ OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT );
return false;
}
}
@@ -1756,6 +1940,7 @@
*/
int CalenEditorPrivate::currentIndexOfReminderField()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_CURRENTINDEXOFREMINDERFIELD_ENTRY );
return mReminderField->currentReminderIndex();
}
@@ -1765,7 +1950,9 @@
*/
void CalenEditorPrivate::setCurrentIndexOfReminderField(int index)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_ENTRY );
mReminderField->setCurrentIndex(index);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_EXIT );
}
/*!
@@ -1773,7 +1960,9 @@
*/
void CalenEditorPrivate::setReminderChoices()
{
- mReminderField->setReminderChoices();
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SETREMINDERCHOICES_ENTRY );
+ mReminderField->setReminderChoices();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SETREMINDERCHOICES_EXIT );
}
/*!
@@ -1781,6 +1970,8 @@
*/
bool CalenEditorPrivate::isEditRangeThisOnly()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISEDITRANGETHISONLY_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ISEDITRANGETHISONLY_EXIT );
return (mEditRange == ThisOnly);
}
@@ -1789,7 +1980,16 @@
*/
bool CalenEditorPrivate::isAllDayFieldAdded()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISALLDAYFIELDADDED_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ISALLDAYFIELDADDED_EXIT );
return mIsAllDayItemAdded;
}
+/*!
+ save the entry from other views.
+ */
+void CalenEditorPrivate::forcedSaveEntry()
+{
+ saveAndCloseEditor();
+}
// End of file --Don't remove this.
--- a/calendarui/caleneditor/src/caleneditorcustomitem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/src/caleneditorcustomitem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -33,17 +33,22 @@
#include <QGraphicsLinearLayout>
#include <QDate>
#include <QTime>
+#include <xqaiwrequest.h>
+#include <xqappmgr.h>
//LI related headers
#include "qlocationpickeritem.h"
-#include <xqaiwrequest.h>
-#include <xqappmgr.h>
// User includes
#include "caleneditorcustomitem.h"
#include "calendateutils.h"
#include "caleneditorcommon.h"
#include "caleneditordocloader.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneditorcustomitemTraces.h"
+#endif
+
/*!
\class CalenEditorCustomItem
@@ -56,33 +61,44 @@
*/
CalenEditorCustomItem::CalenEditorCustomItem(QGraphicsItem *parent)
:HbDataFormViewItem(parent),
- mPushButtonTime(NULL),
- mPushButtonDate(NULL),
- mRepeatUntilWidget(NULL),
- mReminderTimeWidget(NULL),
- mDatePicker(NULL),
- mTimePicker(NULL)
+ mAppManager(0),
+ mRequest(0),
+ mPushButtonTime(0),
+ mPushButtonDate(0),
+ mRepeatUntilWidget(0),
+ mReminderTimeWidget(0),
+ mDatePicker(0),
+ mTimePicker(0),
+ mRequestPending(false)
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY );
mMinDate = CalenDateUtils::minTime().date();
mMaxDate = CalenDateUtils::maxTime().date();
mMinTime.setHMS(0,0,0,0);
mMaxTime.setHMS(23,59,59,999);
mLocale = HbExtendedLocale::system();
- mLocationLineEdit = NULL;
- mLocationPushButton = NULL;
+ mLocationLineEdit = 0;
+ mLocationPushButton = 0;
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_EXIT );
}
/*!
Destructor.
*/
CalenEditorCustomItem::~CalenEditorCustomItem()
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_EXIT );
+
+ delete mAppManager;
+ delete mRequest;
}
/*!
Creates a new CalenEditorCustomItem.
*/
HbAbstractViewItem* CalenEditorCustomItem::createItem()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_CREATEITEM_ENTRY );
return new CalenEditorCustomItem(*this);
}
/*!
@@ -90,6 +106,7 @@
*/
HbWidget* CalenEditorCustomItem::createCustomWidget()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType> (modelIndex() .data(
HbDataFormModelItem::ItemTypeRole).toInt());
@@ -103,15 +120,18 @@
widgetTop->setLayout(layoutTop);
mPushButtonTime = new HbPushButton();
+ mPushButtonTime->setObjectName("startTime");
connect(mPushButtonTime, SIGNAL(clicked()),
this, SLOT(handleTime()));
layoutTop->addItem(mPushButtonTime);
mPushButtonDate =
new HbPushButton();
+ mPushButtonDate->setObjectName("startDate");
connect(mPushButtonDate, SIGNAL(clicked()),
this, SLOT(handleDate()));
layoutTop->addItem(mPushButtonDate);
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return widgetTop;
}
@@ -124,14 +144,17 @@
widgetBottom->setLayout(layoutBottom);
mPushButtonTime = new HbPushButton(this);
+ mPushButtonTime->setObjectName("endTime");
connect(mPushButtonTime, SIGNAL(clicked()),
this, SLOT(handleTime()));
layoutBottom->addItem(mPushButtonTime);
mPushButtonDate = new HbPushButton(this);
+ mPushButtonDate->setObjectName("endDate");
connect(mPushButtonDate, SIGNAL(clicked()),
this, SLOT(handleDate()));
layoutBottom->addItem(mPushButtonDate);
+ OstTraceFunctionExit0( DUP1_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return widgetBottom;
}
@@ -150,11 +173,13 @@
mLocationLineEdit = qobject_cast<HbLineEdit *>(
editorLocationDocLoader.findWidget(
CALEN_EDITOR_LOCATION_LINEEDIT));
+ mLocationLineEdit->setObjectName("locationLineEdit");
mLocationLineEdit->setMinRows(1);
- mLocationLineEdit->setMaxRows(4);
+ mLocationLineEdit->setMaxRows(MaxRowsInTextItem);
mLocationPushButton = qobject_cast<HbPushButton*>(
editorLocationDocLoader.findWidget(
CALEN_EDITOR_LOCATION_PUSHBUTTON));
+ mLocationPushButton->setObjectName("locationIcon");
mLocationPushButton->setIcon( HbIcon("qtg_mono_location"));
connect(mLocationPushButton, SIGNAL(clicked()), this,
@@ -165,18 +190,23 @@
connect(mLocationLineEdit, SIGNAL(editingFinished()),
this, SLOT(handleEditingFinished()));
+ OstTraceFunctionExit0( DUP2_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return widgetLocation;
}
case RepeatUntilOffset:
{
mRepeatUntilWidget = new HbPushButton(this);
+ mRepeatUntilWidget->setObjectName("repeatUntilItem");
+ OstTraceFunctionExit0( DUP3_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mRepeatUntilWidget;
}
case ReminderTimeOffset:
{
mReminderTimeWidget = new HbPushButton(this);
+ mReminderTimeWidget->setObjectName("remainderTimeItem");
+ OstTraceFunctionExit0( DUP4_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mReminderTimeWidget;
}
@@ -190,24 +220,34 @@
void CalenEditorCustomItem::launchLocationPicker()
{
- XQApplicationManager *appManager = new XQApplicationManager();
-
- XQAiwRequest *request = appManager->create("com.nokia.symbian", "ILocationPick", "pick()", true);
- if( request )
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY );
+ if(!mAppManager)
+ {
+ mAppManager = new XQApplicationManager();
+ }
+ if(!mRequest)
+ {
+ mRequest = mAppManager->create("com.nokia.symbian", "ILocationPick", "pick()", true);
+ mRequest->setSynchronous(false);
+ connect(mRequest, SIGNAL(requestOk(const QVariant&)), this, SLOT(setSelectedLocation(const QVariant&)));
+ }
+ if(!mRequestPending)
{
- QVariant retValue;
- if( request->send( retValue ) )
- {
- setSelectedLocation(retValue);
- }
- }
+ if( mRequest->send() )
+ {
+ mRequestPending = true;
+ }
+ }
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_EXIT );
}
/*!
set the selected location from the picker to the line edit widget
and notify the other observers.
*/
-void CalenEditorCustomItem::setSelectedLocation( QVariant &aValue )
+void CalenEditorCustomItem::setSelectedLocation( const QVariant &aValue )
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_SETSELECTEDLOCATION_ENTRY );
+ mRequestPending = false;
QLocationPickerItem selectedLocation = aValue.value<QLocationPickerItem>();
if( selectedLocation.mIsValid )
{
@@ -226,6 +266,7 @@
emit locationTextChanged(locationString, selectedLocation.mLatitude, selectedLocation.mLongitude);
mLocationLineEdit->setText(locationString );
}
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_SETSELECTEDLOCATION_EXIT );
}
/*!
@@ -233,6 +274,7 @@
*/
void CalenEditorCustomItem::populateDateTime(QDateTime defaultDateTime, bool isFromItem)
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_POPULATEDATETIME_ENTRY );
// Store the date and time to be shown
mDate = defaultDateTime.date();
mTime = defaultDateTime.time();
@@ -243,6 +285,7 @@
r_qtn_date_usual_with_zero));
mPushButtonTime->setText(mLocale.format(defaultDateTime.time(),
r_qtn_time_usual_with_zero));
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_POPULATEDATETIME_EXIT );
}
/*!
@@ -250,7 +293,9 @@
*/
void CalenEditorCustomItem::populateLocation(QString location )
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_POPULATELOCATION_ENTRY );
mLocationLineEdit->setText( location );
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_POPULATELOCATION_EXIT );
}
/*!
@@ -258,6 +303,7 @@
*/
void CalenEditorCustomItem::setDateRange(QDate start, QDate end)
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_SETDATERANGE_ENTRY );
mMaxDate = end;
mMinDate = start;
// Check if both are falling on same day
@@ -266,6 +312,7 @@
(mMaxDate.day() == mMinDate.day())) {
enableDateButton(false);
}
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_SETDATERANGE_EXIT );
}
/*!
@@ -273,8 +320,10 @@
*/
void CalenEditorCustomItem::setTimeRange(QTime start, QTime end)
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_SETTIMERANGE_ENTRY );
mMaxTime = start;
mMinTime = end;
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_SETTIMERANGE_EXIT );
}
/*!
@@ -282,7 +331,9 @@
*/
void CalenEditorCustomItem::enableDateButton(bool value)
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_ENABLEDATEBUTTON_ENTRY );
mPushButtonDate->setEnabled(value);
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_ENABLEDATEBUTTON_EXIT );
}
/*!
@@ -290,7 +341,9 @@
*/
void CalenEditorCustomItem::handleLocationTextChange(QString location)
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_HANDLELOCATIONTEXTCHANGE_ENTRY );
emit locationTextChanged(location);
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_HANDLELOCATIONTEXTCHANGE_EXIT );
}
/*!
@@ -298,7 +351,9 @@
*/
void CalenEditorCustomItem::handleEditingFinished()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_HANDLEEDITINGFINISHED_ENTRY );
emit locationEditingFinished();
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_HANDLEEDITINGFINISHED_EXIT );
}
/*!
@@ -306,6 +361,7 @@
*/
void CalenEditorCustomItem::handleDate()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_HANDLEDATE_ENTRY );
// Create a popup with datepicker for the user to select date.
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
@@ -322,7 +378,7 @@
}
// Create a date picker
if(mDatePicker) {
- mDatePicker = NULL;
+ mDatePicker = 0;
}
mDatePicker = new HbDateTimePicker(mDate, popUp);
mDatePicker->setMinimumDate(mMinDate);
@@ -334,6 +390,7 @@
connect(okAction, SIGNAL(triggered()), this, SLOT(saveDate()));
popUp->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popUp));
popUp->open();
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_HANDLEDATE_EXIT );
}
/*!
@@ -341,6 +398,7 @@
*/
void CalenEditorCustomItem::handleTime()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_HANDLETIME_ENTRY );
// Create a popup with time picker for the user to select time.
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
@@ -357,7 +415,7 @@
}
// Create a time picker.
if(mTimePicker) {
- mTimePicker = NULL;
+ mTimePicker = 0;
}
mTimePicker = new HbDateTimePicker(mTime, popUp);
@@ -374,6 +432,7 @@
connect(okAction, SIGNAL(triggered()), this, SLOT(saveTime()));
popUp->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popUp));
popUp->open();
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_HANDLETIME_EXIT );
}
/*!
@@ -381,6 +440,7 @@
*/
void CalenEditorCustomItem::saveDate()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_SAVEDATE_ENTRY );
mDate = mDatePicker->date();
if (mDate.isValid()) {
mPushButtonDate->setText(mLocale.format(mDate,
@@ -388,6 +448,7 @@
QDateTime dateTime(mDate,mTime);
emit dateTimeUpdated(dateTime);
}
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_SAVEDATE_EXIT );
}
/*!
@@ -395,6 +456,7 @@
*/
void CalenEditorCustomItem::saveTime()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_SAVETIME_ENTRY );
mTime = mTimePicker->time();
if (mTime.isValid()) {
mPushButtonTime->setText(mLocale.format(mTime,
@@ -403,6 +465,7 @@
QDateTime dateTime(mDate,mTime);
emit dateTimeUpdated(dateTime);
}
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_SAVETIME_EXIT );
}
/*!
@@ -410,6 +473,7 @@
*/
void CalenEditorCustomItem::enableFromTimeFieldAndSetTime(bool enableTimeFiles, QDateTime fromDateTime)
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_ENABLEFROMTIMEFIELDANDSETTIME_ENTRY );
// Set FromTime filed Read-Only/Editable
mPushButtonTime->setEnabled(enableTimeFiles);
@@ -418,6 +482,7 @@
// Store the time
mTime = fromDateTime.time();
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_ENABLEFROMTIMEFIELDANDSETTIME_EXIT );
}
/*!
@@ -425,8 +490,10 @@
*/
void CalenEditorCustomItem::disableFromToDateField()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_DISABLEFROMTODATEFIELD_ENTRY );
// disable the date field.
mPushButtonDate->setEnabled(false);
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_DISABLEFROMTODATEFIELD_EXIT );
}
/*!
@@ -434,6 +501,7 @@
*/
void CalenEditorCustomItem::enableToTimeFieldAndSetTime(bool enableTimeFiles, QDateTime toDateTime)
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_ENABLETOTIMEFIELDANDSETTIME_ENTRY );
// Set ToTime filed Read-Only/Editable
mPushButtonTime->setEnabled(enableTimeFiles);
@@ -443,6 +511,7 @@
// Store the time
mTime = toDateTime.time();
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_ENABLETOTIMEFIELDANDSETTIME_EXIT );
}
/*!
@@ -450,20 +519,24 @@
*/
bool CalenEditorCustomItem::canSetModelIndex(const QModelIndex &index) const
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_CANSETMODELINDEX_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
index.data(HbDataFormModelItem::ItemTypeRole).toInt());
if(itemType == CustomWidgetFrom || itemType == CustomWidgetTo || itemType == RepeatUntilOffset
|| itemType == CustomWidgetLocation || itemType == ReminderTimeOffset ) {
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT );
return true;
} else {
+ OstTraceFunctionExit0( DUP1_CALENEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT );
return false;
}
}
void CalenEditorCustomItem::restore()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_RESTORE_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -485,10 +558,12 @@
}
break;
}
+ OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_RESTORE_EXIT );
}
QDateTime CalenEditorCustomItem::getDateTime()
{
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_GETDATETIME_ENTRY );
return QDateTime(mDate, mTime);
}
--- a/calendarui/caleneditor/src/caleneditordatahandler.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/src/caleneditordatahandler.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,13 @@
// User Includes
#include "caleneditordatahandler.h"
#include "calendateutils.h"
-#include "agendaentry.h"
+#include "calenagendautils.h"
+#include <agendaentry.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneditordatahandlerTraces.h"
+#endif
+
/*!
\class CalenEditorDataHandler
@@ -37,7 +43,9 @@
AgendaEntry* originalEntry)
: mCalenEditor(calenEditor),mEditedEntry(editedEntry), mOriginalEntry(originalEntry)
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_EXIT );
}
/*!
@@ -45,7 +53,9 @@
*/
CalenEditorDataHandler::~CalenEditorDataHandler()
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_ENTRY );
// Nothing Yet
+ OstTraceFunctionExit0( DUP1_CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_EXIT );
}
/*!
@@ -54,6 +64,8 @@
*/
AgendaEntry* CalenEditorDataHandler::editedEntry()
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_EDITEDENTRY_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_EDITEDENTRY_EXIT );
return mEditedEntry;
}
@@ -63,6 +75,8 @@
*/
AgendaEntry* CalenEditorDataHandler::originalEntry()
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ORIGINALENTRY_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_ORIGINALENTRY_EXIT );
return mOriginalEntry;
}
@@ -72,6 +86,7 @@
*/
CalenEditorPrivate::Error CalenEditorDataHandler::checkErrorsForThisAndAll()
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_ENTRY );
//TODO : Remove implementation once handle all repeating errors
const QDateTime startTime = mEditedEntry->startTime();
const QDateTime endTime = mEditedEntry->endTime();
@@ -109,11 +124,14 @@
}
if (durationGreaterThanRepeatIntervalError()) {
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT );
return CalenEditorPrivate::
CalenEditorErrorDurationGreaterThanRepeatInterval;
}
+ OstTraceFunctionExit0( DUP1_CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT );
return CalenEditorPrivate::CalenEditorErrorNone;
}
+ OstTraceFunctionExit0( DUP2_CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT );
return CalenEditorPrivate::CalenEditorErrorNone;
}
@@ -123,6 +141,7 @@
*/
bool CalenEditorDataHandler::isEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISEDITED_ENTRY );
return (isSummaryEdited() ||
isAllDayEdited() ||
isLocationEdited() ||
@@ -139,6 +158,7 @@
*/
bool CalenEditorDataHandler::isSummaryEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISSUMMARYEDITED_ENTRY );
return (mOriginalEntry->summary() != mEditedEntry->summary());
}
@@ -148,24 +168,30 @@
*/
bool CalenEditorDataHandler::isAllDayEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISALLDAYEDITED_ENTRY );
HbDataFormModelItem* alldayItem = mCalenEditor->allDayCheckBoxItem();
if (alldayItem) {
- if (mOriginalEntry->type() == AgendaEntry::TypeEvent) {
+ if (CalenAgendaUtils::isAlldayEvent(*mOriginalEntry)) {
if (alldayItem->contentWidgetData("checkState")
== Qt::Checked) {
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT );
return false;
} else {
+ OstTraceFunctionExit0( DUP1_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT );
return true;
}
} else if (mOriginalEntry->type() == AgendaEntry::TypeAppoinment) {
if (alldayItem->contentWidgetData("checkState")
== Qt::Checked) {
+ OstTraceFunctionExit0( DUP2_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT );
return true;
} else {
+ OstTraceFunctionExit0( DUP3_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT );
return false;
}
}
}
+ OstTraceFunctionExit0( DUP4_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT );
return false;
}
@@ -175,6 +201,7 @@
*/
bool CalenEditorDataHandler::isLocationEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISLOCATIONEDITED_ENTRY );
return (mOriginalEntry->location() != mEditedEntry->location());
}
@@ -184,6 +211,7 @@
*/
bool CalenEditorDataHandler::isStartDateTimeEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISSTARTDATETIMEEDITED_ENTRY );
return (mOriginalEntry->startTime() != mEditedEntry->startTime());
}
@@ -193,6 +221,7 @@
*/
bool CalenEditorDataHandler::isEndDateTimeEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISENDDATETIMEEDITED_ENTRY );
return (mOriginalEntry->endTime() != mEditedEntry->endTime());
}
@@ -202,6 +231,7 @@
*/
bool CalenEditorDataHandler::isAlarmEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISALARMEDITED_ENTRY );
return (mOriginalEntry->alarm() != mEditedEntry->alarm());
}
@@ -211,15 +241,14 @@
*/
bool CalenEditorDataHandler::isRepeatRuleEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISREPEATRULEEDITED_ENTRY );
if ((mOriginalEntry->repeatRule().type() == AgendaRepeatRule::InvalidRule)
&& (mEditedEntry->repeatRule().type()
== AgendaRepeatRule::InvalidRule)) {
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_ISREPEATRULEEDITED_EXIT );
return false;
} else {
- return ((mOriginalEntry->repeatRule().type() !=
- mEditedEntry->repeatRule().type())
- || (mOriginalEntry->repeatRule().until().date() !=
- mEditedEntry->repeatRule().until().date()));
+ return (mOriginalEntry->repeatRule() != mEditedEntry->repeatRule());
}
}
@@ -229,6 +258,7 @@
*/
bool CalenEditorDataHandler::isDescriptionEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISDESCRIPTIONEDITED_ENTRY );
return (mOriginalEntry->description() != mEditedEntry->description());
}
@@ -239,6 +269,7 @@
*/
bool CalenEditorDataHandler::nonTextItemsEdited() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_NONTEXTITEMSEDITED_ENTRY );
return (isAllDayEdited() ||
isStartDateTimeEdited() ||
isEndDateTimeEdited() ||
@@ -253,6 +284,7 @@
*/
bool CalenEditorDataHandler::areTextItemsEmpty() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ARETEXTITEMSEMPTY_ENTRY );
return (mEditedEntry->summary().isEmpty()
&& mEditedEntry->location().isEmpty()
&& mEditedEntry->description().isEmpty());
@@ -265,15 +297,18 @@
*/
bool CalenEditorDataHandler::areTextItemsCleared() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_ENTRY );
if (mEditedEntry->summary().isEmpty() &&
mEditedEntry->location().isEmpty() &&
mEditedEntry->description().isEmpty()) {
if (isSummaryEmptied()
|| isLocationEmptied()
|| isDescriptionEmptied()) {
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_EXIT );
return true;
}
}
+ OstTraceFunctionExit0( DUP1_CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_EXIT );
return false;
}
@@ -284,6 +319,7 @@
*/
bool CalenEditorDataHandler::isSummaryEmptied() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISSUMMARYEMPTIED_ENTRY );
return (!mOriginalEntry->summary().isEmpty()
&& mEditedEntry->summary().isEmpty());
}
@@ -295,6 +331,7 @@
*/
bool CalenEditorDataHandler::isLocationEmptied() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISLOCATIONEMPTIED_ENTRY );
return (!mOriginalEntry->location().isEmpty()
&& mEditedEntry->location().isEmpty());
}
@@ -306,6 +343,7 @@
*/
bool CalenEditorDataHandler::isDescriptionEmptied() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISDESCRIPTIONEMPTIED_ENTRY );
return (!mOriginalEntry->description().isEmpty()
&& mEditedEntry->description().isEmpty());
}
@@ -318,6 +356,7 @@
CalenEditorPrivate::Action CalenEditorDataHandler::shouldSaveOrDeleteOrDoNothing(bool launchCalendar)
const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_ENTRY );
// Need to save the entry if third party calls editor to launch the
// calendar after that. So, that entry will be new entry adn we assume
// that client launches editor with some prefilled text items
@@ -326,6 +365,7 @@
// Only added space characters to text fields but not
// edited the non-text items
// no need to save the entry
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT );
return CalenEditorPrivate::ActionNothing;
}
// new entry is edited
@@ -335,8 +375,10 @@
// If text items as a whole is empty, we can still save the note
// since we edited "non-text" fields
if (!nonTextItemsEdited() && areTextItemsEmpty()) {
+ OstTraceFunctionExit0( DUP1_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT );
return CalenEditorPrivate::ActionNothing;
} else {
+ OstTraceFunctionExit0( DUP2_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT );
return CalenEditorPrivate::ActionSave;
}
}
@@ -344,9 +386,11 @@
// ***** 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;
}
@@ -358,6 +402,7 @@
*/
bool CalenEditorDataHandler::durationGreaterThanRepeatIntervalError() const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_DURATIONGREATERTHANREPEATINTERVALERROR_ENTRY );
bool isError = false;
switch (mEditedEntry->repeatRule().type()) {
case AgendaRepeatRule::DailyRule: {
@@ -395,6 +440,7 @@
isError = false;
break;
}
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_DURATIONGREATERTHANREPEATINTERVALERROR_EXIT );
return isError;
}
@@ -405,6 +451,7 @@
CalenEditorPrivate::Error CalenEditorDataHandler::checkAlarmFieldsForErrors(
bool series) const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_CHECKALARMFIELDSFORERRORS_ENTRY );
CalenEditorPrivate::Error error = CalenEditorPrivate::CalenEditorErrorNone;
// If alarm not active, no check
if (!mEditedEntry->alarm().isNull()) {
@@ -424,6 +471,7 @@
}
}
}
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_CHECKALARMFIELDSFORERRORS_EXIT );
return error;
}
@@ -439,6 +487,7 @@
const QDateTime &alarmTime,
const QDateTime &startTime) const
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISALARMINACCEPTABLEPERIOD_ENTRY );
QDateTime upperLimit = startTime;
QDateTime lowerLimit = startTime.addDays(-31);
@@ -452,6 +501,7 @@
error = CalenEditorPrivate::CalenEditorErrorAlarmTimeLaterThanNote;
}
}
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_ISALARMINACCEPTABLEPERIOD_EXIT );
return acceptable;
}
@@ -461,6 +511,7 @@
*/
void CalenEditorDataHandler::displayErrorMsg(int error)
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_DISPLAYERRORMSG_ENTRY );
QString errorMsg = QString::Null();
switch (error) {
@@ -494,6 +545,7 @@
if (!errorMsg.isNull()) {
HbMessageBox::information(errorMsg);
}
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_DISPLAYERRORMSG_EXIT );
}
/*!
@@ -501,6 +553,7 @@
*/
void CalenEditorDataHandler::dispalyErrorMsgByRepeatType()
{
+ OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_DISPALYERRORMSGBYREPEATTYPE_ENTRY );
QString errorMsg = QString::Null();
int durationDays =
@@ -534,6 +587,7 @@
if (!errorMsg.isNull()) {
HbMessageBox::information(errorMsg.arg(numDaysEntrySpan));
}
+ OstTraceFunctionExit0( CALENEDITORDATAHANDLER_DISPALYERRORMSGBYREPEATTYPE_EXIT );
}
// End of file --Don't remove this.
--- a/calendarui/caleneditor/src/caleneditordocloader.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/src/caleneditordocloader.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -17,18 +17,28 @@
// User includes
#include "caleneditordocloader.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneditordocloaderTraces.h"
+#endif
+
CalenEditorDocLoader::CalenEditorDocLoader()
{
+ OstTraceFunctionEntry0( CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_EXIT );
}
CalenEditorDocLoader::~CalenEditorDocLoader()
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_ENTRY );
+ OstTraceFunctionExit0( DUP1_CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_EXIT );
}
QObject* CalenEditorDocLoader::createObject(const QString &type, const QString &name)
{
+ OstTraceFunctionEntry0( CALENEDITORDOCLOADER_CREATEOBJECT_ENTRY );
return HbDocumentLoader::createObject(type, name);
}
--- a/calendarui/caleneditor/src/caleneditorreminderfield.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/src/caleneditorreminderfield.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -31,7 +31,13 @@
#include <hbaction.h>
// User Includes
+#include "calenagendautils.h"
#include "caleneditorreminderfield.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneditorreminderfieldTraces.h"
+#endif
+
#define numberOfMinutesInADay 1440
/*!
@@ -52,9 +58,10 @@
mCalenEditor(calenEditor),
mEditorForm(form),
mCalenEditorModel(model),
- mCustomReminderTimeItem(NULL),
+ mCustomReminderTimeItem(0),
mReminderTimeAdded(false)
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_ENTRY );
mReminderItem = new HbDataFormModelItem();
mReminderItem->setType(HbDataFormModelItem::ComboBoxItem);
mReminderItem->setData(HbDataFormModelItem::LabelRole,
@@ -62,6 +69,7 @@
// Add it to the model
mCalenEditorModel->appendDataFormItem(mReminderItem,
mCalenEditorModel->invisibleRootItem());
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_EXIT );
}
/*!
@@ -69,9 +77,11 @@
*/
CalenEditorReminderField::~CalenEditorReminderField()
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_ENTRY );
if(mReminderHash.count()) {
mReminderHash.clear();
}
+ OstTraceFunctionExit0( DUP1_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_EXIT );
}
/*!
@@ -79,6 +89,7 @@
*/
void CalenEditorReminderField::setReminderChoices()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_SETREMINDERCHOICES_ENTRY );
// Create the reminder choices
QStringList reminderChoices;
reminderChoices << hbTrId("txt_calendar_setlabel_reminder_val_off")
@@ -87,7 +98,8 @@
<< hbTrId("txt_calendar_setlabel_reminder_val_30_minutes_befo")
<< hbTrId("txt_calendar_setlabel_reminder_val_1_hour_before");
- mReminderItem->setContentWidgetData(QString("items"), reminderChoices);
+ mReminderItem->setContentWidgetData("items", reminderChoices);
+ mReminderItem->setContentWidgetData("objectName", "remainderItem");
// Build the hash map for the reminder.
mReminderHash[0] = -1; // OFF.
@@ -96,6 +108,7 @@
mReminderHash[3] = 30;
mReminderHash[4] = 60;
mReminderItem->setEnabled(true);
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_SETREMINDERCHOICES_EXIT );
}
/*!
@@ -103,9 +116,11 @@
*/
void CalenEditorReminderField::addItemToModel()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_ADDITEMTOMODEL_ENTRY );
// Add reminder to the model
mCalenEditorModel->appendDataFormItem( mReminderItem,
mCalenEditorModel->invisibleRootItem());
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_ADDITEMTOMODEL_EXIT );
}
/*!
@@ -113,7 +128,9 @@
*/
void CalenEditorReminderField::removeItemFromModel()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_REMOVEITEMFROMMODEL_ENTRY );
mCalenEditorModel->removeItem(modelIndex());
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_REMOVEITEMFROMMODEL_EXIT );
}
/*!
@@ -122,6 +139,7 @@
*/
void CalenEditorReminderField::populateReminderItem(bool newEntry)
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_POPULATEREMINDERITEM_ENTRY );
AgendaAlarm reminder;
bool pastEvent = false;
@@ -166,12 +184,11 @@
// Check if all day event or not and then set the choices accordingly.
if (mCalenEditor->editedEntry()->alarm().isNull()) {
// Alarm is set off
- mReminderItem->setContentWidgetData("currentIndex", 0);
+ mReminderItem->setContentWidgetData("currentIndex", ReminderOff);
if(mReminderTimeAdded) {
removeReminderTimeField();
}
- } else if (mCalenEditor->editedEntry()->type()
- != AgendaEntry::TypeEvent) {
+ } else if (!mCalenEditor->isAllDayEvent()) {
// Get the reminder offset value.
int reminderOffset =
mCalenEditor->editedEntry()->alarm().timeOffset();
@@ -184,9 +201,9 @@
// If past then disable the field.
if (!mReminderTimeAdded) {
insertReminderTimeField();
- if (pastEvent) {
- mCustomReminderTimeItem->setEnabled(false);
- }
+ }
+ if (pastEvent && mReminderTimeAdded) {
+ mCustomReminderTimeItem->setEnabled(false);
}
QStringList reminderChoicesForAllDay;
reminderChoicesForAllDay << hbTrId("txt_calendar_setlabel_reminder_val_off")
@@ -200,15 +217,15 @@
reminder = mCalenEditor->editedEntry()->alarm();
int offsetInMins = reminder.timeOffset();
if (offsetInMins < 0 || offsetInMins == 0) {
- mReminderItem->setContentWidgetData("currentIndex", 1);
+ mReminderItem->setContentWidgetData("currentIndex", ReminderOnEventDay);
mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
* 60));
} else if (offsetInMins < numberOfMinutesInADay) {
- mReminderItem->setContentWidgetData("currentIndex", 2);
+ mReminderItem->setContentWidgetData("currentIndex", ReminderOneDayBefore);
mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
* 60));
} else {
- mReminderItem->setContentWidgetData("currentIndex", 3);
+ mReminderItem->setContentWidgetData("currentIndex", ReminderTwoDaysBefore);
offsetInMins %= (24 * 60);
mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
* 60));
@@ -222,6 +239,7 @@
mEditorForm->addConnection(mReminderItem,
SIGNAL(currentIndexChanged(int)), this,
SLOT(handleReminderIndexChanged(int)));
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_POPULATEREMINDERITEM_EXIT );
}
/*!
@@ -231,6 +249,7 @@
*/
void CalenEditorReminderField::handleReminderIndexChanged(int index)
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_ENTRY );
AgendaAlarm reminder;
if (!mCalenEditor->editedEntry()->alarm().isNull()) {
reminder = mCalenEditor->editedEntry()->alarm();
@@ -255,14 +274,14 @@
startDateTimeForAllDay(
mCalenEditor->editedEntry()->startTime().date(),
QTime(0, 0, 0));
- if (mReminderItem->contentWidgetData("currentIndex") == 0) {
+ if (mReminderItem->contentWidgetData("currentIndex") == ReminderOff) {
reminder = AgendaAlarm();
- mCustomReminderTimeItem->setEnabled(false);
+ removeReminderTimeField();
} else {
int offset = 0;
- if (mReminderItem->contentWidgetData("currentIndex") == 2) {
+ if (mReminderItem->contentWidgetData("currentIndex") == ReminderOneDayBefore) {
offset = 1;
- } else if (mReminderItem->contentWidgetData("currentIndex") == 3) {
+ } else if (mReminderItem->contentWidgetData("currentIndex") == ReminderTwoDaysBefore) {
offset = 2;
}
if(!mReminderTimeAdded) {
@@ -282,17 +301,18 @@
reminderDateTimeForAllDay.setTime(mReminderTimeForAllDay);
int seconds =
reminderDateTimeForAllDay.secsTo(startDateTimeForAllDay);
- int timeOffest = seconds / 60;
+ int timeOffset = seconds / 60;
mCustomReminderTimeItem->setEnabled(true);
- reminder.setTimeOffset(timeOffest);
+ reminder.setTimeOffset(timeOffset);
reminder.setAlarmSoundName(QString(" "));
}
}
// Set the reminder to the entry.
mCalenEditor->editedEntry()->setAlarm(reminder);
if(!mCalenEditor->isNewEntry()) {
- mCalenEditor->addDiscardAction();
+ mCalenEditor->addDiscardAction();
}
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_EXIT );
}
/*!
@@ -301,6 +321,7 @@
*/
QModelIndex CalenEditorReminderField::modelIndex()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_MODELINDEX_ENTRY );
return mCalenEditorModel->indexFromItem(mReminderItem);
}
@@ -309,11 +330,13 @@
*/
void CalenEditorReminderField::setReminderOff()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_SETREMINDEROFF_ENTRY );
// Create the remindar choices
QStringList reminderChoices;
reminderChoices << hbTrId("txt_calendar_setlabel_reminder_val_off");
mReminderItem->setContentWidgetData(QString("items"), reminderChoices);
mReminderItem->setEnabled(false);
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_SETREMINDEROFF_EXIT );
}
/*!
@@ -321,12 +344,13 @@
*/
void CalenEditorReminderField::setDefaultAlarmForAllDay()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_SETDEFAULTALARMFORALLDAY_ENTRY );
// Set default alarm if its a new entry.
if (mCalenEditor->isNewEntry()) {
AgendaAlarm reminder;
QDate defaultDate
(mCalenEditor->editedEntry()->startTime().date().addDays(-1));
- // Set default time.
+ // Set default time as 6pm of the previous day.
mReminderTimeForAllDay.setHMS(18, 0, 0, 0);
setDisplayTime();
QDateTime startDateTimeForAllDay(
@@ -342,6 +366,7 @@
mCalenEditor->editedEntry()->setAlarm(reminder);
mCalenEditor->originalEntry()->setAlarm(reminder);
}
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_SETDEFAULTALARMFORALLDAY_EXIT );
}
/*!
@@ -350,6 +375,7 @@
*/
void CalenEditorReminderField::updateReminderChoicesForAllDay(QDate referenceDate)
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_ENTRY );
if (!mReminderTimeAdded){
insertReminderTimeField();
}
@@ -357,16 +383,48 @@
QDate tomorrow = QDate::currentDate().addDays(1);
QDate theDayAfterTomorrow = QDate::currentDate().addDays(2);
+ // Get the previous index to retain if the alarm is valid
+ QVariant countVariant = mReminderItem->contentWidgetData("currentIndex");
+ int previousIndex = countVariant.toInt();
+ AgendaAlarm previousAlarm = mCalenEditor->editedEntry()->alarm();
+
+ // Update the reminder choices only if the alarm set is not valid
+ // Get the alarm offset to check for the validity
+ int offset = mCalenEditor->editedEntry()->alarm().timeOffset();
+ bool update = true;
+
+ // Calculate the alarm time
+ QDateTime refDateTime;
+ refDateTime.setDate(referenceDate);
+ refDateTime.setTime(mCalenEditor->editedEntry()->startTime().time());
+ QTime checkTime = refDateTime.time().addSecs(-(offset * 60));
+ refDateTime.setTime(checkTime);
+ // Check for valid alarm offset
+ if(offset >= 0) {
+ // If the alarm which was already set is valid,
+ // then dont update the reminder choices
+ if ((refDateTime > QDateTime::currentDateTime()) ||
+ (refDateTime.date() == QDate::currentDate() && (
+ refDateTime.time() > QTime::currentTime()))) {
+ update = false;
+ }
+ }
+ // If the event is on a past date the default alarm will be off.
if (referenceDate < QDate::currentDate() ||
referenceDate == QDate::currentDate()) {
// Set reminder off for past event.
reminderChoicesForAllDay << hbTrId("txt_calendar_setlabel_reminder_val_off");
mReminderItem->setContentWidgetData(QString("items"),
reminderChoicesForAllDay);
- mReminderItem->setEnabled(false);
- removeReminderTimeField();
+ mReminderItem->setEnabled(false);
+ // Remove the reminder field if it was added
+ if(mReminderTimeAdded) {
+ removeReminderTimeField();
+ }
} else if (theDayAfterTomorrow < referenceDate ||
theDayAfterTomorrow == referenceDate) {
+ // If the event is on a future date which is two days after the current date
+ // The options are off, on event day, 1 day before and 2 days before
reminderChoicesForAllDay
<< hbTrId("txt_calendar_setlabel_reminder_val_off")
<< hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
@@ -374,18 +432,68 @@
<< hbTrId("txt_calendar_setlabel_reminder_val_2_days_before");
mReminderItem->setEnabled(true);
mCustomReminderTimeItem->setEnabled(true);
- } else {
+ mReminderItem->setContentWidgetData(QString("items"),
+ reminderChoicesForAllDay);
+ } else if (QTime::currentTime() < QTime(18, 0, 0, 0)) {
+ // If the event is on a future date which is one day after the current date
+ // and current time is before 6.00 pm.
+ // The options are off, on event day and 1 day before
reminderChoicesForAllDay
- << hbTrId("txt_calendar_setlabel_reminder_val_off")
- << hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
- << hbTrId("txt_calendar_setlabel_reminder_val_1_day_before");
+ << hbTrId("txt_calendar_setlabel_reminder_val_off")
+ << hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
+ << hbTrId("txt_calendar_setlabel_reminder_val_1_day_before");
+ mReminderItem->setEnabled(true);
+ mCustomReminderTimeItem->setEnabled(true);
+ mReminderItem->setContentWidgetData(QString("items"),
+ reminderChoicesForAllDay);
+ }else {
+ // If the event is on a future date which is one day after the current date
+ // and current time is after 6.00 pm.
+ // The options are off and on event day
+ reminderChoicesForAllDay
+ << hbTrId("txt_calendar_setlabel_reminder_val_off")
+ << hbTrId("txt_calendar_setlabel_reminder_val_on_event_day");
mReminderItem->setEnabled(true);
mCustomReminderTimeItem->setEnabled(true);
+ mReminderItem->setContentWidgetData(QString("items"),
+ reminderChoicesForAllDay);
}
- if (mReminderItem->isEnabled()) {
- mReminderItem->setContentWidgetData(QString("items"),
- reminderChoicesForAllDay);
+ // Set the proper index based on the validity of the previous index
+ int count = reminderItemsCount();
+ // By default, in case of reminder updation, its been agreed to set
+ // ReminderOneDayBefore even though ReminderTwoDaysBefore holds good
+ // If the ReminderOneDayBefore option is available set it or
+ // else set it to ReminderOff
+ if(count > ReminderOneDayBefore) {
+ // Don't make the reminder off since
+ // the valid reminder options are there in the combobox
+ // So check for ReminderOff is needed
+ if (update &&
+ (previousIndex == ReminderOff || previousIndex >= ReminderOneDayBefore)) {
+ // If the index has to be updated check the previous index value
+ // And set the default reminder as 1 day before.
+ mReminderItem->setContentWidgetData("currentIndex",
+ ReminderOneDayBefore);
+ }else {
+ // Set the previous index since the alarm is valid
+ mReminderItem->setContentWidgetData("currentIndex", previousIndex);
+ // Set the previous alarm also as the value will be changed to default value
+ // when the current index is been changed
+ mCalenEditor->editedEntry()->setAlarm(previousAlarm);
+ // Get the alarm time from the offset
+ QTime alarmTime = refDateTime.time();
+ // Set the alarm time and display it on the button
+ mReminderTimeForAllDay.setHMS(
+ alarmTime.hour(),alarmTime.minute(),alarmTime.second());
+ setDisplayTime();
+ }
+ }else {
+ // Enters this condition if the previous index set is not valid or
+ // the index is ReminderOff
+ mReminderItem->setContentWidgetData("currentIndex", ReminderOff);
}
+
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_EXIT );
}
/*!
@@ -393,6 +501,7 @@
*/
void CalenEditorReminderField::insertReminderTimeField()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_INSERTREMINDERTIMEFIELD_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType> (ReminderTimeOffset);
@@ -416,6 +525,7 @@
this, SLOT(launchReminderTimePicker()));
setDisplayTime();
mReminderTimeAdded = true;
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_INSERTREMINDERTIMEFIELD_EXIT );
}
/*!
@@ -423,11 +533,13 @@
*/
void CalenEditorReminderField::setDisplayTime()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_SETDISPLAYTIME_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
QString timeString = locale.format(
mReminderTimeForAllDay,
r_qtn_time_usual_with_zero);
mCustomReminderTimeItem->setContentWidgetData("text", timeString);
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_SETDISPLAYTIME_EXIT );
}
/*!
@@ -435,6 +547,7 @@
*/
void CalenEditorReminderField::removeReminderTimeField()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_REMOVEREMINDERTIMEFIELD_ENTRY );
mReminderTimeAdded = false;
if (mCustomReminderTimeItem) {
QModelIndex reminderIndex =
@@ -442,8 +555,9 @@
mCalenEditorModel->removeItem(
mCalenEditorModel->index(
reminderIndex.row(), 0));
- mCustomReminderTimeItem = NULL;
+ mCustomReminderTimeItem = 0;
}
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_REMOVEREMINDERTIMEFIELD_EXIT );
}
/*!
@@ -451,21 +565,32 @@
*/
void CalenEditorReminderField::launchReminderTimePicker()
{
- mTimePicker = new HbDateTimePicker(mReminderTimeForAllDay);
- mTimePicker->setTime(mReminderTimeForAllDay);
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_ENTRY );
+
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
- popUp->setContentWidget(mTimePicker);
+ popUp->setAttribute( Qt::WA_DeleteOnClose, true );
popUp->setHeadingWidget( new HbLabel(
- hbTrId("Reminder Time")));
- HbAction *okAction = new HbAction(hbTrId("txt_common_button_ok"));
+ hbTrId("Reminder Time")));
+
+ HbExtendedLocale locale = HbExtendedLocale::system();
+ mTimePicker = new HbDateTimePicker(mReminderTimeForAllDay);
+ if(locale.timeStyle() == HbExtendedLocale::Time12) {
+ mTimePicker->setDisplayFormat("hh:mm ap");
+ }else {
+ mTimePicker->setDisplayFormat("hh:mm");
+ }
+ mTimePicker->setTime(mReminderTimeForAllDay);
+ popUp->setContentWidget(mTimePicker);
+
+ HbAction *okAction = new HbAction(hbTrId("txt_common_button_ok"), popUp);
popUp->addAction(okAction);
connect(okAction, SIGNAL(triggered()), this, SLOT(setReminderTimeForAllDay()));
- connect(okAction, SIGNAL(triggered()), popUp, SLOT(close()));
popUp->addAction(new HbAction(hbTrId("txt_common_button_cancel"),
popUp));
popUp->open();
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_EXIT );
}
/*!
@@ -473,12 +598,14 @@
*/
void CalenEditorReminderField::setReminderTimeForAllDay()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_SETREMINDERTIMEFORALLDAY_ENTRY );
mReminderTimeForAllDay = mTimePicker->time();
if (mReminderTimeForAllDay.isValid()) {
// Change the time displayed to that selected by the user.
setDisplayTime();
handleReminderIndexChanged(currentReminderIndex());
}
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_SETREMINDERTIMEFORALLDAY_EXIT );
}
/*!
@@ -486,6 +613,7 @@
*/
bool CalenEditorReminderField::isReminderFieldEnabled()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_ISREMINDERFIELDENABLED_ENTRY );
return mReminderItem->isEnabled();
}
@@ -494,9 +622,11 @@
*/
int CalenEditorReminderField::reminderItemsCount()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_REMINDERITEMSCOUNT_ENTRY );
QVariant strings = mReminderItem->contentWidgetData("items");
QStringList stringList(strings.toStringList());
int count = stringList.count();
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_REMINDERITEMSCOUNT_EXIT );
return count;
}
@@ -505,8 +635,10 @@
*/
int CalenEditorReminderField::currentReminderIndex()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_CURRENTREMINDERINDEX_ENTRY );
QVariant countVariant = mReminderItem->contentWidgetData("currentIndex");
int index = countVariant.toInt();
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_CURRENTREMINDERINDEX_EXIT );
return index;
}
@@ -516,7 +648,9 @@
*/
void CalenEditorReminderField::setCurrentIndex(int index)
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_SETCURRENTINDEX_ENTRY );
mReminderItem->setContentWidgetData("currentIndex", index);
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_SETCURRENTINDEX_EXIT );
}
/*!
@@ -524,9 +658,11 @@
*/
void CalenEditorReminderField::disableReminderTimeField()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_ENTRY );
if (mReminderTimeAdded) {
mCustomReminderTimeItem->setEnabled(false);
}
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_EXIT );
}
/*!
@@ -534,6 +670,8 @@
*/
bool CalenEditorReminderField::isReminderTimeForAllDayAdded()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_EXIT );
return mReminderTimeAdded;
}
--- a/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,6 +32,12 @@
// User Included
#include "caleneditorrepeatfield.h"
#include "caleneditorcustomitem.h"
+#include "calendateutils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneditorrepeatfieldTraces.h"
+#endif
+
// Constants
const int userRole = Qt::UserRole + 100;
@@ -40,6 +46,39 @@
\class CalenEditorRepeatField
*/
/*!
+ \enum CalenEditorRepeatField::RepeatTypes
+ This enum defines the different repeat types of an entry
+ */
+/*!
+ \var CalenEditorRepeatField::RepeatTypes CalenEditorRepeatField::RepeatOnce
+ No repeating type.
+ */
+/*!
+ \var CalenEditorRepeatField::RepeatTypes CalenEditorRepeatField::RepeatDaily
+ Daily repeating type.
+ */
+/*!
+ \var CalenEditorRepeatField::RepeatTypes CalenEditorRepeatField::RepeatWorkdays
+ Workdays repeating type.
+ */
+/*!
+ \var CalenEditorRepeatField::RepeatTypes CalenEditorRepeatField::RepeatWeekly
+ Weekly repeating type.
+ */
+/*!
+ \var CalenEditorRepeatField::RepeatTypes CalenEditorRepeatField::RepeatBiWeekly
+ Fortnightly repeating type.
+ */
+/*!
+ \var CalenEditorRepeatField::RepeatTypes CalenEditorRepeatField::RepeatMonthly
+ Monthly repeating type.
+ */
+/*!
+ \var CalenEditorRepeatField::RepeatTypes CalenEditorRepeatField::RepeatYearly
+ Yearly repeating type.
+ */
+
+/*!
Constructor.
\param parent QObject pointer
@@ -53,36 +92,40 @@
mCalenEditor(calenEditor),
mEditorForm(form),
mCalenEditorModel(model),
- mRepeatItem(NULL),
- mRepeatComboBox(NULL),
- mCustomRepeatUntilItem(NULL),
+ mRepeatItem(0),
+ mRepeatComboBox(0),
+ mCustomRepeatUntilItem(0),
+ mRepeatRoleValue(0),
mIsBiWeekly(false),
mIsWorkdays(false),
mRepeatUntilItemAdded(false)
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY );
if (!mCalenEditor->editedEntry()->repeatRule().isNull()) {
mRepeatRuleType = mCalenEditor->editedEntry()->repeatRule().type();
mRepeatUntilDate = mCalenEditor->editedEntry()->repeatRule().until().date();
- }
-
- mRepeatItem = new HbDataFormModelItem();
- mRepeatItem->setType(HbDataFormModelItem::ComboBoxItem);
- mRepeatItem->setData(HbDataFormModelItem::LabelRole,
- hbTrId("txt_calendar_setlabel_repeat"));
+ }
+
+ mRepeatItem = new HbDataFormModelItem();
+ mRepeatItem->setType(HbDataFormModelItem::ComboBoxItem);
+ mRepeatItem->setData(HbDataFormModelItem::LabelRole,
+ hbTrId("txt_calendar_setlabel_repeat"));
- // Create the repeat choices
- QStringList repeatChoices;
- repeatChoices << hbTrId("txt_calendar_setlabel_repeat_val_only_once")
- << hbTrId("txt_calendar_setlabel_repeat_val_daily")
- << hbTrId("txt_calendar_setlabel_repeat_val_workdays")
- << hbTrId("txt_calendar_setlabel_repeat_val_weekly")
- << hbTrId("txt_calendar_setlabel_repeat_val_fortnightly")
- << hbTrId("txt_calendar_setlabel_repeat_val_monthly")
- << hbTrId("txt_calendar_setlabel_repeat_val_yearly");
+ // Create the repeat choices
+ QStringList repeatChoices;
+ repeatChoices << hbTrId("txt_calendar_setlabel_repeat_val_only_once")
+ << hbTrId("txt_calendar_setlabel_repeat_val_daily")
+ << hbTrId("txt_calendar_setlabel_repeat_val_workdays")
+ << hbTrId("txt_calendar_setlabel_repeat_val_weekly")
+ << hbTrId("txt_calendar_setlabel_repeat_val_fortnightly")
+ << hbTrId("txt_calendar_setlabel_repeat_val_monthly")
+ << hbTrId("txt_calendar_setlabel_repeat_val_yearly");
- mRepeatItem->setContentWidgetData(QString("items"), repeatChoices);
+ mRepeatItem->setContentWidgetData("items", repeatChoices);
+ mRepeatItem->setContentWidgetData("objectName", "repeatItem");
mCalenEditorModel->appendDataFormItem( mRepeatItem,
mCalenEditorModel->invisibleRootItem());
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_EXIT );
}
/*!
@@ -90,7 +133,9 @@
*/
CalenEditorRepeatField::~CalenEditorRepeatField()
{
+ OstTraceFunctionEntry0( DUP1_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY );
// Nothing Yet
+ OstTraceFunctionExit0( DUP1_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_EXIT );
}
/*!
@@ -98,9 +143,11 @@
*/
void CalenEditorRepeatField::addItemToModel()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_ADDITEMTOMODEL_ENTRY );
// Add reminder to the model
mCalenEditorModel->appendDataFormItem( mRepeatItem,
mCalenEditorModel->invisibleRootItem());
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_ADDITEMTOMODEL_EXIT );
}
/*!
@@ -108,7 +155,9 @@
*/
void CalenEditorRepeatField::removeItemFromModel()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_REMOVEITEMFROMMODEL_ENTRY );
mCalenEditorModel->removeItem(modelIndex());
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_REMOVEITEMFROMMODEL_EXIT );
}
/*!
@@ -117,6 +166,7 @@
*/
void CalenEditorRepeatField::populateRepeatItem(int index)
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_POPULATEREPEATITEM_ENTRY );
HbDataFormViewItem
*item =
qobject_cast<HbDataFormViewItem *> (
@@ -142,31 +192,31 @@
if (mCalenEditor->editedEntry()->isRepeating()) {
switch (mCalenEditor->editedEntry()->repeatRule().type()) {
case AgendaRepeatRule::DailyRule: {
- mRepeatComboBox->setCurrentIndex(1);
+ mRepeatComboBox->setCurrentIndex(DailyRole);
}
break;
case AgendaRepeatRule::WeeklyRule: {
bool isWorkdays = AgendaUtil::isWorkdaysRepeatingEntry(
mCalenEditor->editedEntry()->repeatRule());
if (isWorkdays) {
- mRepeatComboBox->setCurrentIndex(2);
+ mRepeatComboBox->setCurrentIndex(WorkdaysRole);
mIsWorkdays = true;
} else {
if (mCalenEditor->editedEntry()->repeatRule().interval() == 1) {
- mRepeatComboBox->setCurrentIndex(3);
+ mRepeatComboBox->setCurrentIndex(WeeklyRole);
} else {
- mRepeatComboBox->setCurrentIndex(4);
+ mRepeatComboBox->setCurrentIndex(BiWeeklyRole);
mIsBiWeekly = true;
}
}
}
break;
case AgendaRepeatRule::MonthlyRule: {
- mRepeatComboBox->setCurrentIndex(5);
+ mRepeatComboBox->setCurrentIndex(MonthlyRole);
}
break;
case AgendaRepeatRule::YearlyRule: {
- mRepeatComboBox->setCurrentIndex(6);
+ mRepeatComboBox->setCurrentIndex(YearlyRole);
}
break;
default:
@@ -181,11 +231,32 @@
AgendaRepeatRule(
AgendaRepeatRule::InvalidRule));
}
-
+ // Connect the slot once the updation of mRepeatComboBox is done
+ connect(mRepeatComboBox, SIGNAL(currentIndexChanged(int)), this,
+ SLOT(handleRepeatIndexChanged(int)));
// Update the repeat choices depending upon the duration
updateRepeatChoices();
- connect(mRepeatComboBox, SIGNAL(currentIndexChanged(int)), this,
- SLOT(handleRepeatIndexChanged(int)));
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_POPULATEREPEATITEM_EXIT );
+}
+
+/*!
+ Removes the repeat until item from the model
+ and removed the connection for date picker launch too.
+ */
+void CalenEditorRepeatField::removeRepeatUntilItem()
+{
+ mRepeatRuleType = AgendaRepeatRule::InvalidRule;
+ if (mRepeatUntilItemAdded) {
+ mEditorForm->removeConnection(mCustomRepeatUntilItem, SIGNAL(clicked()),
+ this, SLOT(launchRepeatUntilDatePicker()));
+ QModelIndex repeatIndex =
+ mCalenEditorModel->indexFromItem(mRepeatItem);
+ mCalenEditorModel->removeItem(
+ mCalenEditorModel->index(
+ repeatIndex.row()+ 1, 0));
+ mRepeatUntilItemAdded = false;
+ mCustomRepeatUntilItem = 0;
+ }
}
/*!
@@ -195,6 +266,7 @@
*/
void CalenEditorRepeatField::handleRepeatIndexChanged(int index)
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_ENTRY );
mIsBiWeekly = false;
mIsWorkdays = false;
@@ -202,12 +274,33 @@
// Get the user role we have set for this index
QVariant role = mRepeatComboBox->itemData(index, userRole);
int value = role.toInt();
- switch (value) {
- case 1: {
+
+ // Boolean to check if the repeating property of the entry is changed.
+ // based on the value and mRepeatUntilItemAdded
+ // ie. From repeating to non repeating OR vice versa OR No change
+ bool repeatPropertyChange = false;
+ if (value > 0 && value <= 6 && !mRepeatUntilItemAdded) {
+ // Non repeating to repeating
+ repeatPropertyChange = true;
+ }else if(mRepeatUntilItemAdded && value == 0) {
+ // Repeating to non repeating
+ repeatPropertyChange = true;
+ }else {
+ // No change in repeat value
+ repeatPropertyChange = false;
+ }
+ QDate repeatUntilDate = mRepeatUntilDate;
+
+ if (value != mRepeatRoleValue)
+ {
+ mRepeatRoleValue = value;
+ switch (value) {
+ case DailyRole: {
if (!mRepeatUntilItemAdded) {
insertRepeatUntilItem();
}
if (mCustomRepeatUntilItem) {
+ // Show default repeat until date till one year for daily rule
mRepeatUntilDate = mCalenEditor->editedEntry()->startTime().date().addYears(1);
mCustomRepeatUntilItem->setContentWidgetData( "text",
locale.format( mRepeatUntilDate,
@@ -216,11 +309,12 @@
mRepeatRuleType = AgendaRepeatRule::DailyRule;
}
break;
- case 2: {
+ case WorkdaysRole: {
if (!mRepeatUntilItemAdded) {
insertRepeatUntilItem();
}
if (mCustomRepeatUntilItem) {
+ // Show default repeat until date till one year for workdays rule
mRepeatUntilDate = mCalenEditor->editedEntry()->startTime().date().addYears(1);
mCustomRepeatUntilItem->setContentWidgetData( "text",
locale.format( mRepeatUntilDate,
@@ -230,25 +324,26 @@
mIsWorkdays = true;
}
break;
- case 3: {
+ case WeeklyRole: {
if (!mRepeatUntilItemAdded) {
insertRepeatUntilItem();
}
if (mCustomRepeatUntilItem) {
+ // Show default repeat until date till one year for weekly rule
mRepeatUntilDate = mCalenEditor->editedEntry()->startTime().date().addYears(1);
mCustomRepeatUntilItem->setContentWidgetData( "text",
locale.format( mRepeatUntilDate,
r_qtn_date_usual_with_zero));
-
}
mRepeatRuleType = AgendaRepeatRule::WeeklyRule;
}
break;
- case 4: {
+ case BiWeeklyRole: {
if (!mRepeatUntilItemAdded) {
insertRepeatUntilItem();
}
if (mCustomRepeatUntilItem) {
+ // Show default repeat until date till one year for bi-weekly rule
mRepeatUntilDate = mCalenEditor->editedEntry()->startTime().date().addYears(1);
mCustomRepeatUntilItem->setContentWidgetData( "text",
locale.format( mRepeatUntilDate,
@@ -258,12 +353,13 @@
mIsBiWeekly = true;
}
break;
- case 5: {
+ case MonthlyRole: {
if (!mRepeatUntilItemAdded) {
insertRepeatUntilItem();
}
if (mCustomRepeatUntilItem) {
- mRepeatUntilDate = mCalenEditor->editedEntry()->startTime().date().addYears(5);
+ // Show default repeat until date till one year for monthly rule
+ mRepeatUntilDate = mCalenEditor->editedEntry()->startTime().date().addYears(1);
mCustomRepeatUntilItem->setContentWidgetData( "text",
locale.format( mRepeatUntilDate,
r_qtn_date_usual_with_zero));
@@ -271,11 +367,12 @@
mRepeatRuleType = AgendaRepeatRule::MonthlyRule;
}
break;
- case 6: {
+ case YearlyRole: {
if (!mRepeatUntilItemAdded) {
insertRepeatUntilItem();
}
if (mCustomRepeatUntilItem) {
+ // Show default repeat until date till ten years for yearly rule
mRepeatUntilDate = mCalenEditor->editedEntry()->startTime().date().addYears(10);
mCustomRepeatUntilItem->setContentWidgetData( "text",
locale.format( mRepeatUntilDate,
@@ -285,23 +382,20 @@
}
break;
default: {
- mRepeatRuleType = AgendaRepeatRule::InvalidRule;
- if (mRepeatUntilItemAdded) {
- QModelIndex repeatIndex =
- mCalenEditorModel->indexFromItem(mRepeatItem);
- mCalenEditorModel->removeItem(
- mCalenEditorModel->index(
- repeatIndex.row()+ 1, 0));
- mRepeatUntilItemAdded = false;
- mCustomRepeatUntilItem = NULL;
- }
+ removeRepeatUntilItem();
}
break;
}
+ }
if(!mCalenEditor->isNewEntry()) {
mCalenEditor->addDiscardAction();
}
- mCalenEditor->updateReminderChoices();
+ // Depending on repeatPropertyChange value and the repeatuntil date change
+ // the reminder choices are updated
+ if(repeatPropertyChange || repeatUntilDate != mRepeatUntilDate) {
+ mCalenEditor->updateReminderChoices();
+ }
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_EXIT );
}
/*!
@@ -310,6 +404,7 @@
*/
QModelIndex CalenEditorRepeatField::modelIndex()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_MODELINDEX_ENTRY );
return mCalenEditorModel->indexFromItem(mRepeatItem);
}
@@ -318,6 +413,7 @@
*/
void CalenEditorRepeatField::insertRepeatUntilItem()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_INSERTREPEATUNTILITEM_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType> (RepeatUntilOffset);
@@ -343,7 +439,9 @@
r_qtn_date_usual_with_zero);
mCustomRepeatUntilItem->setContentWidgetData("text", dateString);
}
- //TODO: Scroll to functionality has to be implemented
+ //Scroll to repeat until item added
+ mEditorForm->scrollTo(mCalenEditorModel->index(index, 0), HbAbstractItemView::EnsureVisible);
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_INSERTREPEATUNTILITEM_EXIT );
}
/*!
@@ -352,6 +450,8 @@
*/
bool CalenEditorRepeatField::isRepeatUntilItemAdded()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_ISREPEATUNTILITEMADDED_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_ISREPEATUNTILITEMADDED_EXIT );
return mRepeatUntilItemAdded;
}
@@ -360,6 +460,7 @@
*/
void CalenEditorRepeatField::launchRepeatUntilDatePicker()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_LAUNCHREPEATUNTILDATEPICKER_ENTRY );
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
@@ -368,13 +469,13 @@
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
if (mDatePicker) {
- mDatePicker = NULL;
+ mDatePicker = 0;
}
if (mRepeatRuleType == AgendaRepeatRule::DailyRule) {
QDate minDate = mCalenEditor->editedEntry()->endTime().date().addDays(1);
mDatePicker = new HbDateTimePicker(mRepeatUntilDate, popUp);
mDatePicker->setMinimumDate(minDate);
- mDatePicker->setMaximumDate(QDate(31, 12, 2100));
+ mDatePicker->setMaximumDate(CalenDateUtils::maxTime().date());
mDatePicker->setDate(mRepeatUntilDate);
} else if (mRepeatRuleType == AgendaRepeatRule::WeeklyRule) {
QDate minDate;
@@ -385,19 +486,19 @@
}
mDatePicker = new HbDateTimePicker(mRepeatUntilDate, popUp);
mDatePicker->setMinimumDate(minDate);
- mDatePicker->setMaximumDate(QDate(31, 12, 2100));
+ mDatePicker->setMaximumDate(CalenDateUtils::maxTime().date());
mDatePicker->setDate(mRepeatUntilDate);
} else if (mRepeatRuleType == AgendaRepeatRule::MonthlyRule) {
QDate minDate = mCalenEditor->editedEntry()->endTime().date().addMonths(1);
mDatePicker = new HbDateTimePicker(mRepeatUntilDate, popUp);
mDatePicker->setMinimumDate(minDate);
- mDatePicker->setMaximumDate(QDate(31, 12, 2100));
+ mDatePicker->setMaximumDate(CalenDateUtils::maxTime().date());
mDatePicker->setDate(mRepeatUntilDate);
} else if (mRepeatRuleType == AgendaRepeatRule::YearlyRule) {
QDate minDate = mCalenEditor->editedEntry()->endTime().date().addYears(1);
mDatePicker = new HbDateTimePicker(mRepeatUntilDate, popUp);
mDatePicker->setMinimumDate(minDate);
- mDatePicker->setMaximumDate(QDate(31, 12, 2100));
+ mDatePicker->setMaximumDate(CalenDateUtils::maxTime().date());
mDatePicker->setDate(mRepeatUntilDate);
}
popUp->setContentWidget(mDatePicker);
@@ -407,6 +508,7 @@
connect(okAction, SIGNAL(triggered()), this, SLOT(setRepeatUntilDate()));
popUp->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popUp));
popUp->open();
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_LAUNCHREPEATUNTILDATEPICKER_EXIT );
}
/*!
@@ -414,6 +516,7 @@
*/
void CalenEditorRepeatField::setRepeatUntilDate()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_SETREPEATUNTILDATE_ENTRY );
mRepeatUntilDate = mDatePicker->date();
if (mRepeatUntilDate.isValid()) {
HbExtendedLocale locale = HbExtendedLocale::system();
@@ -422,6 +525,7 @@
mCustomRepeatUntilItem->setContentWidgetData("text", dateString);
}
mCalenEditor->updateReminderChoices();
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_SETREPEATUNTILDATE_EXIT );
}
/*!
@@ -429,6 +533,8 @@
*/
QDate CalenEditorRepeatField::repeatUntilDate()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_REPEATUNTILDATE_ENTRY );
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_REPEATUNTILDATE_EXIT );
return mRepeatUntilDate;
}
@@ -437,14 +543,25 @@
*/
void CalenEditorRepeatField::updateRepeatChoices()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_ENTRY );
if (!mRepeatComboBox) {
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT );
return;
}
+ // Disconnect the slot and connect it back again at end to avoid unnecessary
+ // calls to handleRepeatIndexChanged slot. Or else the slot gets called
+ // when we add all of items to the repeat combobox.
+ disconnect(mRepeatComboBox, SIGNAL(currentIndexChanged(int)), this,
+ SLOT(handleRepeatIndexChanged(int)));
// Clear all the choices and add it again. If we dont do it
// as user would have changed the end times many times and we would have
// deleted repeat options depending upon that
// Get the current choice
int choice = mRepeatComboBox->currentIndex();
+
+ QVariant role = mRepeatComboBox->itemData(choice, userRole);
+ mRepeatRoleValue = role.toInt();
+
int previousCount = mRepeatComboBox->count();
mRepeatComboBox->clear();
QStringList repeatChoices;
@@ -499,6 +616,8 @@
mRepeatComboBox->removeItem(RepeatWeekly);
mRepeatComboBox->removeItem(RepeatWorkdays);
mRepeatComboBox->removeItem(RepeatDaily);
+ //Remove the repeat until item too.
+ removeRepeatUntilItem();
} else if (mCalenEditor->editedEntry()->endTime()
>= (mCalenEditor->editedEntry()->startTime().addMonths(1))) {
isRemovedItem = true;
@@ -545,8 +664,13 @@
if (choice >= count) {
choice = count - 1;
}
+
+ //Connecting back the slot for repeat index change before setting index.
+ connect(mRepeatComboBox, SIGNAL(currentIndexChanged(int)), this,
+ SLOT(handleRepeatIndexChanged(int)));
// Set the previous user's choice
mRepeatComboBox->setCurrentIndex(choice);
+ OstTraceFunctionExit0( DUP1_CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT );
}
/*!
@@ -554,6 +678,7 @@
*/
void CalenEditorRepeatField::saveRepeatRule()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_SAVEREPEATRULE_ENTRY );
// saves repeat type of entry.
if (mRepeatRuleType != AgendaRepeatRule::InvalidRule) {
AgendaRepeatRule repeatRule(mRepeatRuleType);
@@ -614,19 +739,18 @@
}
} else if (mRepeatRuleType == AgendaRepeatRule::MonthlyRule) {
QList<int> monthDays;
- //TODO :
int dayNoInMonth = mCalenEditor->editedEntry()->startTime().date().day();
monthDays.append(dayNoInMonth);
repeatRule.setByMonthDay(monthDays);
} else if (mRepeatRuleType == AgendaRepeatRule::YearlyRule) {
- //TODO : Add yearly rule.Check if required.
}
mCalenEditor->editedEntry()->setRepeatRule(repeatRule);
} else {
mCalenEditor->editedEntry()->setRepeatRule( AgendaRepeatRule(
AgendaRepeatRule::InvalidRule));
}
- // TODO: Need to update rDates here
+ // TODO: Need to update rDates here for 10.2 if required
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_SAVEREPEATRULE_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/caleneditorTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,32 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITORTRACES_H__
+#define __CALENEDITORTRACES_H__
+
+#define KOstTraceComponentID 0x10207198
+
+#define CALENEDITOR_CALENEDITOR_ENTRY 0x8a0001
+#define CALENEDITOR_CALENEDITOR_EXIT 0x8a0002
+#define DUP1_CALENEDITOR_CALENEDITOR_ENTRY 0x8a0003
+#define DUP1_CALENEDITOR_CALENEDITOR_EXIT 0x8a0004
+#define DUP2_CALENEDITOR_CALENEDITOR_ENTRY 0x8a0005
+#define DUP2_CALENEDITOR_CALENEDITOR_EXIT 0x8a0006
+#define CALENEDITOR_EDIT_ENTRY 0x8a0007
+#define CALENEDITOR_EDIT_EXIT 0x8a0008
+#define DUP1_CALENEDITOR_EDIT_ENTRY 0x8a0009
+#define DUP1_CALENEDITOR_EDIT_EXIT 0x8a000a
+#define DUP2_CALENEDITOR_EDIT_EXIT 0x8a000b
+#define DUP2_CALENEDITOR_EDIT_ENTRY 0x8a000c
+#define DUP3_CALENEDITOR_EDIT_EXIT 0x8a000d
+#define CALENEDITOR_CREATE_ENTRY 0x8a000e
+#define CALENEDITOR_CREATE_EXIT 0x8a000f
+#define DUP1_CALENEDITOR_CREATE_ENTRY 0x8a0010
+#define DUP1_CALENEDITOR_CREATE_EXIT 0x8a0011
+#define DUP2_CALENEDITOR_CREATE_EXIT 0x8a0012
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/caleneditor_pTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,156 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITOR_PTRACES_H__
+#define __CALENEDITOR_PTRACES_H__
+
+#define KOstTraceComponentID 0x10207198
+
+#define CALENEDITORPRIVATE_CALENEDITORPRIVATE_ENTRY 0x8a0013
+#define CALENEDITORPRIVATE_CALENEDITORPRIVATE_EXIT 0x8a0014
+#define DUP1_CALENEDITORPRIVATE_CALENEDITORPRIVATE_ENTRY 0x8a0015
+#define DUP1_CALENEDITORPRIVATE_CALENEDITORPRIVATE_EXIT 0x8a0016
+#define CALENEDITORPRIVATE_EDIT_ENTRY 0x8a0017
+#define CALENEDITORPRIVATE_EDIT_EXIT 0x8a0018
+#define DUP1_CALENEDITORPRIVATE_EDIT_ENTRY 0x8a0019
+#define DUP1_CALENEDITORPRIVATE_EDIT_EXIT 0x8a001a
+#define DUP2_CALENEDITORPRIVATE_EDIT_ENTRY 0x8a001b
+#define DUP2_CALENEDITORPRIVATE_EDIT_EXIT 0x8a001c
+#define DUP3_CALENEDITORPRIVATE_EDIT_EXIT 0x8a001d
+#define CALENEDITORPRIVATE_CREATE_ENTRY 0x8a001e
+#define CALENEDITORPRIVATE_CREATE_EXIT 0x8a001f
+#define DUP1_CALENEDITORPRIVATE_CREATE_ENTRY 0x8a0020
+#define DUP1_CALENEDITORPRIVATE_CREATE_EXIT 0x8a0021
+#define CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_ENTRY 0x8a0022
+#define CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_EXIT 0x8a0023
+#define CALENEDITORPRIVATE_HANDLEEDITOCCURENCE_ENTRY 0x8a0024
+#define CALENEDITORPRIVATE_HANDLEEDITOCCURENCE_EXIT 0x8a0025
+#define CALENEDITORPRIVATE_HANDLECANCEL_ENTRY 0x8a0026
+#define CALENEDITORPRIVATE_HANDLECANCEL_EXIT 0x8a0027
+#define CALENEDITORPRIVATE_OPENEDITOR_ENTRY 0x8a0028
+#define CALENEDITORPRIVATE_OPENEDITOR_EXIT 0x8a0029
+#define DUP1_CALENEDITORPRIVATE_OPENEDITOR_EXIT 0x8a002a
+#define CALENEDITORPRIVATE_SHOWEDITOR_ENTRY 0x8a002b
+#define CALENEDITORPRIVATE_SHOWEDITOR_EXIT 0x8a002c
+#define CALENEDITORPRIVATE_SETUPVIEW_ENTRY 0x8a002d
+#define CALENEDITORPRIVATE_SETUPVIEW_EXIT 0x8a002e
+#define CALENEDITORPRIVATE_ADDDISCARDACTION_ENTRY 0x8a002f
+#define CALENEDITORPRIVATE_ADDDISCARDACTION_EXIT 0x8a0030
+#define CALENEDITORPRIVATE_INITMODEL_ENTRY 0x8a0031
+#define CALENEDITORPRIVATE_INITMODEL_EXIT 0x8a0032
+#define CALENEDITORPRIVATE_ADDSUBJECTITEM_ENTRY 0x8a0033
+#define CALENEDITORPRIVATE_ADDSUBJECTITEM_EXIT 0x8a0034
+#define CALENEDITORPRIVATE_ADDALLDAYCHECKBOXITEM_ENTRY 0x8a0035
+#define CALENEDITORPRIVATE_ADDALLDAYCHECKBOXITEM_EXIT 0x8a0036
+#define CALENEDITORPRIVATE_ADDCUSTOMITEMFROM_ENTRY 0x8a0037
+#define CALENEDITORPRIVATE_ADDCUSTOMITEMFROM_EXIT 0x8a0038
+#define CALENEDITORPRIVATE_ADDCUSTOMITEMTO_ENTRY 0x8a0039
+#define CALENEDITORPRIVATE_ADDCUSTOMITEMTO_EXIT 0x8a003a
+#define CALENEDITORPRIVATE_ADDCUSTOMITEMLOCATION_ENTRY 0x8a003b
+#define CALENEDITORPRIVATE_ADDCUSTOMITEMLOCATION_EXIT 0x8a003c
+#define CALENEDITORPRIVATE_ADDREPEATITEM_ENTRY 0x8a003d
+#define CALENEDITORPRIVATE_ADDREPEATITEM_EXIT 0x8a003e
+#define CALENEDITORPRIVATE_ADDREMINDERITEM_ENTRY 0x8a003f
+#define CALENEDITORPRIVATE_ADDREMINDERITEM_EXIT 0x8a0040
+#define CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_ENTRY 0x8a0041
+#define CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_EXIT 0x8a0042
+#define CALENEDITORPRIVATE_POPULATEMODEL_ENTRY 0x8a0043
+#define CALENEDITORPRIVATE_POPULATEMODEL_EXIT 0x8a0044
+#define CALENEDITORPRIVATE_POPULATESUBJECTITEM_ENTRY 0x8a0045
+#define CALENEDITORPRIVATE_POPULATESUBJECTITEM_EXIT 0x8a0046
+#define CALENEDITORPRIVATE_POPULATEALLDAYITEM_ENTRY 0x8a0047
+#define CALENEDITORPRIVATE_POPULATEALLDAYITEM_EXIT 0x8a0048
+#define CALENEDITORPRIVATE_POPULATECUSTOMITEMDATETIME_ENTRY 0x8a0049
+#define CALENEDITORPRIVATE_POPULATECUSTOMITEMDATETIME_EXIT 0x8a004a
+#define CALENEDITORPRIVATE_POPULATECUSTOMITEMLOCATION_ENTRY 0x8a004b
+#define CALENEDITORPRIVATE_POPULATECUSTOMITEMLOCATION_EXIT 0x8a004c
+#define CALENEDITORPRIVATE_SAVEFROMDATETIME_ENTRY 0x8a004d
+#define CALENEDITORPRIVATE_SAVEFROMDATETIME_EXIT 0x8a004e
+#define CALENEDITORPRIVATE_UPDATEREMINDERCHOICES_ENTRY 0x8a004f
+#define CALENEDITORPRIVATE_UPDATEREMINDERCHOICES_EXIT 0x8a0050
+#define CALENEDITORPRIVATE_SAVETODATETIME_ENTRY 0x8a0051
+#define CALENEDITORPRIVATE_SAVETODATETIME_EXIT 0x8a0052
+#define CALENEDITORPRIVATE_POPULATEREPEATITEM_ENTRY 0x8a0053
+#define CALENEDITORPRIVATE_POPULATEREPEATITEM_EXIT 0x8a0054
+#define CALENEDITORPRIVATE_POPULATEDESCRIPTIONITEM_ENTRY 0x8a0055
+#define CALENEDITORPRIVATE_POPULATEDESCRIPTIONITEM_EXIT 0x8a0056
+#define CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_ENTRY 0x8a0057
+#define CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_EXIT 0x8a0058
+#define CALENEDITORPRIVATE_CLOSEEDITOR_ENTRY 0x8a0059
+#define CALENEDITORPRIVATE_CLOSEEDITOR_EXIT 0x8a005a
+#define CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_ENTRY 0x8a005b
+#define CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_EXIT 0x8a005c
+#define CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_ENTRY 0x8a005d
+#define CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_EXIT 0x8a005e
+#define DUP1_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_ENTRY 0x8a005f
+#define DUP1_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_EXIT 0x8a0060
+#define CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_ENTRY 0x8a0061
+#define CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_EXIT 0x8a0062
+#define CALENEDITORPRIVATE_SELECTEDITINGFINISHEDACTION_ENTRY 0x8a0063
+#define CALENEDITORPRIVATE_SELECTEDITINGFINISHEDACTION_EXIT 0x8a0064
+#define CALENEDITORPRIVATE_HANDLEDESCRIPTIONCHANGE_ENTRY 0x8a0065
+#define CALENEDITORPRIVATE_HANDLEDESCRIPTIONCHANGE_EXIT 0x8a0066
+#define CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_ENTRY 0x8a0067
+#define CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_EXIT 0x8a0068
+#define CALENEDITORPRIVATE_HANDLECALENDARLAUNCHERROR_ENTRY 0x8a0069
+#define CALENEDITORPRIVATE_HANDLECALENDARLAUNCHERROR_EXIT 0x8a006a
+#define CALENEDITORPRIVATE_HANDLEDELETEACTION_ENTRY 0x8a006b
+#define CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT 0x8a006c
+#define DUP1_CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT 0x8a006d
+#define CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_ENTRY 0x8a006e
+#define CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_EXIT 0x8a006f
+#define CALENEDITORPRIVATE_DISCARDCHANGES_ENTRY 0x8a0070
+#define CALENEDITORPRIVATE_DISCARDCHANGES_EXIT 0x8a0071
+#define CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_ENTRY 0x8a0072
+#define CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT 0x8a0073
+#define CALENEDITORPRIVATE_ISCHILD_ENTRY 0x8a0074
+#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
+#define DUP2_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0083
+#define DUP3_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0084
+#define DUP4_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0085
+#define DUP5_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0086
+#define DUP6_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0087
+#define CALENEDITORPRIVATE_ENABLEFROMTOTIMEFILEDS_ENTRY 0x8a0088
+#define CALENEDITORPRIVATE_ENABLEFROMTOTIMEFILEDS_EXIT 0x8a0089
+#define CALENEDITORPRIVATE_EDITEDENTRY_ENTRY 0x8a008a
+#define CALENEDITORPRIVATE_EDITEDENTRY_EXIT 0x8a008b
+#define CALENEDITORPRIVATE_ORIGINALENTRY_ENTRY 0x8a008c
+#define CALENEDITORPRIVATE_ORIGINALENTRY_EXIT 0x8a008d
+#define CALENEDITORPRIVATE_ISNEWENTRY_ENTRY 0x8a008e
+#define CALENEDITORPRIVATE_ISNEWENTRY_EXIT 0x8a008f
+#define CALENEDITORPRIVATE_ALLDAYCHECKBOXITEM_ENTRY 0x8a0090
+#define CALENEDITORPRIVATE_ALLDAYCHECKBOXITEM_EXIT 0x8a0091
+#define CALENEDITORPRIVATE_ISREMINDERTIMEFORALLDAYADDED_ENTRY 0x8a0092
+#define CALENEDITORPRIVATE_ISALLDAYEVENT_ENTRY 0x8a0093
+#define CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT 0x8a0094
+#define DUP1_CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT 0x8a0095
+#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
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/caleneditorcustomitemTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,63 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITORCUSTOMITEMTRACES_H__
+#define __CALENEDITORCUSTOMITEMTRACES_H__
+
+#define KOstTraceComponentID 0x10207198
+
+#define CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY 0x8a009f
+#define CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_EXIT 0x8a00a0
+#define DUP1_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY 0x8a00a1
+#define DUP1_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_EXIT 0x8a00a2
+#define CALENEDITORCUSTOMITEM_CREATEITEM_ENTRY 0x8a00a3
+#define CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY 0x8a00a4
+#define CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a00a5
+#define DUP1_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a00a6
+#define DUP2_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a00a7
+#define DUP3_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a00a8
+#define DUP4_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a00a9
+#define CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY 0x8a00aa
+#define CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_EXIT 0x8a00ab
+#define CALENEDITORCUSTOMITEM_SETSELECTEDLOCATION_ENTRY 0x8a00ac
+#define CALENEDITORCUSTOMITEM_SETSELECTEDLOCATION_EXIT 0x8a00ad
+#define CALENEDITORCUSTOMITEM_POPULATEDATETIME_ENTRY 0x8a00ae
+#define CALENEDITORCUSTOMITEM_POPULATEDATETIME_EXIT 0x8a00af
+#define CALENEDITORCUSTOMITEM_POPULATELOCATION_ENTRY 0x8a00b0
+#define CALENEDITORCUSTOMITEM_POPULATELOCATION_EXIT 0x8a00b1
+#define CALENEDITORCUSTOMITEM_SETDATERANGE_ENTRY 0x8a00b2
+#define CALENEDITORCUSTOMITEM_SETDATERANGE_EXIT 0x8a00b3
+#define CALENEDITORCUSTOMITEM_SETTIMERANGE_ENTRY 0x8a00b4
+#define CALENEDITORCUSTOMITEM_SETTIMERANGE_EXIT 0x8a00b5
+#define CALENEDITORCUSTOMITEM_ENABLEDATEBUTTON_ENTRY 0x8a00b6
+#define CALENEDITORCUSTOMITEM_ENABLEDATEBUTTON_EXIT 0x8a00b7
+#define CALENEDITORCUSTOMITEM_HANDLELOCATIONTEXTCHANGE_ENTRY 0x8a00b8
+#define CALENEDITORCUSTOMITEM_HANDLELOCATIONTEXTCHANGE_EXIT 0x8a00b9
+#define CALENEDITORCUSTOMITEM_HANDLEEDITINGFINISHED_ENTRY 0x8a00ba
+#define CALENEDITORCUSTOMITEM_HANDLEEDITINGFINISHED_EXIT 0x8a00bb
+#define CALENEDITORCUSTOMITEM_HANDLEDATE_ENTRY 0x8a00bc
+#define CALENEDITORCUSTOMITEM_HANDLEDATE_EXIT 0x8a00bd
+#define CALENEDITORCUSTOMITEM_HANDLETIME_ENTRY 0x8a00be
+#define CALENEDITORCUSTOMITEM_HANDLETIME_EXIT 0x8a00bf
+#define CALENEDITORCUSTOMITEM_SAVEDATE_ENTRY 0x8a00c0
+#define CALENEDITORCUSTOMITEM_SAVEDATE_EXIT 0x8a00c1
+#define CALENEDITORCUSTOMITEM_SAVETIME_ENTRY 0x8a00c2
+#define CALENEDITORCUSTOMITEM_SAVETIME_EXIT 0x8a00c3
+#define CALENEDITORCUSTOMITEM_ENABLEFROMTIMEFIELDANDSETTIME_ENTRY 0x8a00c4
+#define CALENEDITORCUSTOMITEM_ENABLEFROMTIMEFIELDANDSETTIME_EXIT 0x8a00c5
+#define CALENEDITORCUSTOMITEM_DISABLEFROMTODATEFIELD_ENTRY 0x8a00c6
+#define CALENEDITORCUSTOMITEM_DISABLEFROMTODATEFIELD_EXIT 0x8a00c7
+#define CALENEDITORCUSTOMITEM_ENABLETOTIMEFIELDANDSETTIME_ENTRY 0x8a00c8
+#define CALENEDITORCUSTOMITEM_ENABLETOTIMEFIELDANDSETTIME_EXIT 0x8a00c9
+#define CALENEDITORCUSTOMITEM_CANSETMODELINDEX_ENTRY 0x8a00ca
+#define CALENEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a00cb
+#define DUP1_CALENEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a00cc
+#define CALENEDITORCUSTOMITEM_RESTORE_ENTRY 0x8a00cd
+#define CALENEDITORCUSTOMITEM_RESTORE_EXIT 0x8a00ce
+#define CALENEDITORCUSTOMITEM_GETDATETIME_ENTRY 0x8a00cf
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/caleneditordatahandlerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,65 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITORDATAHANDLERTRACES_H__
+#define __CALENEDITORDATAHANDLERTRACES_H__
+
+#define KOstTraceComponentID 0x10207198
+
+#define CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_ENTRY 0x8a00d0
+#define CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_EXIT 0x8a00d1
+#define DUP1_CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_ENTRY 0x8a00d2
+#define DUP1_CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_EXIT 0x8a00d3
+#define CALENEDITORDATAHANDLER_EDITEDENTRY_ENTRY 0x8a00d4
+#define CALENEDITORDATAHANDLER_EDITEDENTRY_EXIT 0x8a00d5
+#define CALENEDITORDATAHANDLER_ORIGINALENTRY_ENTRY 0x8a00d6
+#define CALENEDITORDATAHANDLER_ORIGINALENTRY_EXIT 0x8a00d7
+#define CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_ENTRY 0x8a00d8
+#define CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT 0x8a00d9
+#define DUP1_CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT 0x8a00da
+#define DUP2_CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT 0x8a00db
+#define CALENEDITORDATAHANDLER_ISEDITED_ENTRY 0x8a00dc
+#define CALENEDITORDATAHANDLER_ISSUMMARYEDITED_ENTRY 0x8a00dd
+#define CALENEDITORDATAHANDLER_ISALLDAYEDITED_ENTRY 0x8a00de
+#define CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT 0x8a00df
+#define DUP1_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT 0x8a00e0
+#define DUP2_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT 0x8a00e1
+#define DUP3_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT 0x8a00e2
+#define DUP4_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT 0x8a00e3
+#define CALENEDITORDATAHANDLER_ISLOCATIONEDITED_ENTRY 0x8a00e4
+#define CALENEDITORDATAHANDLER_ISSTARTDATETIMEEDITED_ENTRY 0x8a00e5
+#define CALENEDITORDATAHANDLER_ISENDDATETIMEEDITED_ENTRY 0x8a00e6
+#define CALENEDITORDATAHANDLER_ISALARMEDITED_ENTRY 0x8a00e7
+#define CALENEDITORDATAHANDLER_ISREPEATRULEEDITED_ENTRY 0x8a00e8
+#define CALENEDITORDATAHANDLER_ISREPEATRULEEDITED_EXIT 0x8a00e9
+#define CALENEDITORDATAHANDLER_ISDESCRIPTIONEDITED_ENTRY 0x8a00ea
+#define CALENEDITORDATAHANDLER_NONTEXTITEMSEDITED_ENTRY 0x8a00eb
+#define CALENEDITORDATAHANDLER_ARETEXTITEMSEMPTY_ENTRY 0x8a00ec
+#define CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_ENTRY 0x8a00ed
+#define CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_EXIT 0x8a00ee
+#define DUP1_CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_EXIT 0x8a00ef
+#define CALENEDITORDATAHANDLER_ISSUMMARYEMPTIED_ENTRY 0x8a00f0
+#define CALENEDITORDATAHANDLER_ISLOCATIONEMPTIED_ENTRY 0x8a00f1
+#define CALENEDITORDATAHANDLER_ISDESCRIPTIONEMPTIED_ENTRY 0x8a00f2
+#define CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_ENTRY 0x8a00f3
+#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
+#define CALENEDITORDATAHANDLER_CHECKALARMFIELDSFORERRORS_ENTRY 0x8a00fb
+#define CALENEDITORDATAHANDLER_CHECKALARMFIELDSFORERRORS_EXIT 0x8a00fc
+#define CALENEDITORDATAHANDLER_ISALARMINACCEPTABLEPERIOD_ENTRY 0x8a00fd
+#define CALENEDITORDATAHANDLER_ISALARMINACCEPTABLEPERIOD_EXIT 0x8a00fe
+#define CALENEDITORDATAHANDLER_DISPLAYERRORMSG_ENTRY 0x8a00ff
+#define CALENEDITORDATAHANDLER_DISPLAYERRORMSG_EXIT 0x8a0100
+#define CALENEDITORDATAHANDLER_DISPALYERRORMSGBYREPEATTYPE_ENTRY 0x8a0101
+#define CALENEDITORDATAHANDLER_DISPALYERRORMSGBYREPEATTYPE_EXIT 0x8a0102
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/caleneditordocloaderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,19 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITORDOCLOADERTRACES_H__
+#define __CALENEDITORDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x10207198
+
+#define CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_ENTRY 0x8a0103
+#define CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_EXIT 0x8a0104
+#define DUP1_CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_ENTRY 0x8a0105
+#define DUP1_CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_EXIT 0x8a0106
+#define CALENEDITORDOCLOADER_CREATEOBJECT_ENTRY 0x8a0107
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/caleneditorreminderfieldTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,56 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITORREMINDERFIELDTRACES_H__
+#define __CALENEDITORREMINDERFIELDTRACES_H__
+
+#define KOstTraceComponentID 0x10207198
+
+#define CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_ENTRY 0x8a0108
+#define CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_EXIT 0x8a0109
+#define DUP1_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_ENTRY 0x8a010a
+#define DUP1_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_EXIT 0x8a010b
+#define CALENEDITORREMINDERFIELD_SETREMINDERCHOICES_ENTRY 0x8a010c
+#define CALENEDITORREMINDERFIELD_SETREMINDERCHOICES_EXIT 0x8a010d
+#define CALENEDITORREMINDERFIELD_ADDITEMTOMODEL_ENTRY 0x8a010e
+#define CALENEDITORREMINDERFIELD_ADDITEMTOMODEL_EXIT 0x8a010f
+#define CALENEDITORREMINDERFIELD_REMOVEITEMFROMMODEL_ENTRY 0x8a0110
+#define CALENEDITORREMINDERFIELD_REMOVEITEMFROMMODEL_EXIT 0x8a0111
+#define CALENEDITORREMINDERFIELD_POPULATEREMINDERITEM_ENTRY 0x8a0112
+#define CALENEDITORREMINDERFIELD_POPULATEREMINDERITEM_EXIT 0x8a0113
+#define CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_ENTRY 0x8a0114
+#define CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_EXIT 0x8a0115
+#define CALENEDITORREMINDERFIELD_MODELINDEX_ENTRY 0x8a0116
+#define CALENEDITORREMINDERFIELD_SETREMINDEROFF_ENTRY 0x8a0117
+#define CALENEDITORREMINDERFIELD_SETREMINDEROFF_EXIT 0x8a0118
+#define CALENEDITORREMINDERFIELD_SETDEFAULTALARMFORALLDAY_ENTRY 0x8a0119
+#define CALENEDITORREMINDERFIELD_SETDEFAULTALARMFORALLDAY_EXIT 0x8a011a
+#define CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_ENTRY 0x8a011b
+#define CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_EXIT 0x8a011c
+#define CALENEDITORREMINDERFIELD_INSERTREMINDERTIMEFIELD_ENTRY 0x8a011d
+#define CALENEDITORREMINDERFIELD_INSERTREMINDERTIMEFIELD_EXIT 0x8a011e
+#define CALENEDITORREMINDERFIELD_SETDISPLAYTIME_ENTRY 0x8a011f
+#define CALENEDITORREMINDERFIELD_SETDISPLAYTIME_EXIT 0x8a0120
+#define CALENEDITORREMINDERFIELD_REMOVEREMINDERTIMEFIELD_ENTRY 0x8a0121
+#define CALENEDITORREMINDERFIELD_REMOVEREMINDERTIMEFIELD_EXIT 0x8a0122
+#define CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_ENTRY 0x8a0123
+#define CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_EXIT 0x8a0124
+#define CALENEDITORREMINDERFIELD_SETREMINDERTIMEFORALLDAY_ENTRY 0x8a0125
+#define CALENEDITORREMINDERFIELD_SETREMINDERTIMEFORALLDAY_EXIT 0x8a0126
+#define CALENEDITORREMINDERFIELD_ISREMINDERFIELDENABLED_ENTRY 0x8a0127
+#define CALENEDITORREMINDERFIELD_REMINDERITEMSCOUNT_ENTRY 0x8a0128
+#define CALENEDITORREMINDERFIELD_REMINDERITEMSCOUNT_EXIT 0x8a0129
+#define CALENEDITORREMINDERFIELD_CURRENTREMINDERINDEX_ENTRY 0x8a012a
+#define CALENEDITORREMINDERFIELD_CURRENTREMINDERINDEX_EXIT 0x8a012b
+#define CALENEDITORREMINDERFIELD_SETCURRENTINDEX_ENTRY 0x8a012c
+#define CALENEDITORREMINDERFIELD_SETCURRENTINDEX_EXIT 0x8a012d
+#define CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_ENTRY 0x8a012e
+#define CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_EXIT 0x8a012f
+#define CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_ENTRY 0x8a0130
+#define CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_EXIT 0x8a0131
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/caleneditorrepeatfieldTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,42 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITORREPEATFIELDTRACES_H__
+#define __CALENEDITORREPEATFIELDTRACES_H__
+
+#define KOstTraceComponentID 0x10207198
+
+#define CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY 0x8a0132
+#define CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_EXIT 0x8a0133
+#define DUP1_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY 0x8a0134
+#define DUP1_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_EXIT 0x8a0135
+#define CALENEDITORREPEATFIELD_ADDITEMTOMODEL_ENTRY 0x8a0136
+#define CALENEDITORREPEATFIELD_ADDITEMTOMODEL_EXIT 0x8a0137
+#define CALENEDITORREPEATFIELD_REMOVEITEMFROMMODEL_ENTRY 0x8a0138
+#define CALENEDITORREPEATFIELD_REMOVEITEMFROMMODEL_EXIT 0x8a0139
+#define CALENEDITORREPEATFIELD_POPULATEREPEATITEM_ENTRY 0x8a013a
+#define CALENEDITORREPEATFIELD_POPULATEREPEATITEM_EXIT 0x8a013b
+#define CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_ENTRY 0x8a013c
+#define CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_EXIT 0x8a013d
+#define CALENEDITORREPEATFIELD_MODELINDEX_ENTRY 0x8a013e
+#define CALENEDITORREPEATFIELD_INSERTREPEATUNTILITEM_ENTRY 0x8a013f
+#define CALENEDITORREPEATFIELD_INSERTREPEATUNTILITEM_EXIT 0x8a0140
+#define CALENEDITORREPEATFIELD_ISREPEATUNTILITEMADDED_ENTRY 0x8a0141
+#define CALENEDITORREPEATFIELD_ISREPEATUNTILITEMADDED_EXIT 0x8a0142
+#define CALENEDITORREPEATFIELD_LAUNCHREPEATUNTILDATEPICKER_ENTRY 0x8a0143
+#define CALENEDITORREPEATFIELD_LAUNCHREPEATUNTILDATEPICKER_EXIT 0x8a0144
+#define CALENEDITORREPEATFIELD_SETREPEATUNTILDATE_ENTRY 0x8a0145
+#define CALENEDITORREPEATFIELD_SETREPEATUNTILDATE_EXIT 0x8a0146
+#define CALENEDITORREPEATFIELD_REPEATUNTILDATE_ENTRY 0x8a0147
+#define CALENEDITORREPEATFIELD_REPEATUNTILDATE_EXIT 0x8a0148
+#define CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_ENTRY 0x8a0149
+#define CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT 0x8a014a
+#define DUP1_CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT 0x8a014b
+#define CALENEDITORREPEATFIELD_SAVEREPEATRULE_ENTRY 0x8a014c
+#define CALENEDITORREPEATFIELD_SAVEREPEATRULE_EXIT 0x8a014d
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/caleneditor/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,337 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY=0x9f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_EXIT=0xa0
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_CANSETMODELINDEX_ENTRY=0xca
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT=0xcb
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY=0xa4
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xa5
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_CREATEITEM_ENTRY=0xa3
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_DISABLEFROMTODATEFIELD_ENTRY=0xc6
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_DISABLEFROMTODATEFIELD_EXIT=0xc7
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_ENABLEDATEBUTTON_ENTRY=0xb6
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_ENABLEDATEBUTTON_EXIT=0xb7
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_ENABLEFROMTIMEFIELDANDSETTIME_ENTRY=0xc4
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_ENABLEFROMTIMEFIELDANDSETTIME_EXIT=0xc5
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_ENABLETOTIMEFIELDANDSETTIME_ENTRY=0xc8
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_ENABLETOTIMEFIELDANDSETTIME_EXIT=0xc9
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_GETDATETIME_ENTRY=0xcf
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_HANDLEDATE_ENTRY=0xbc
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_HANDLEDATE_EXIT=0xbd
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_HANDLEEDITINGFINISHED_ENTRY=0xba
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_HANDLEEDITINGFINISHED_EXIT=0xbb
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_HANDLELOCATIONTEXTCHANGE_ENTRY=0xb8
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_HANDLELOCATIONTEXTCHANGE_EXIT=0xb9
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_HANDLETIME_ENTRY=0xbe
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_HANDLETIME_EXIT=0xbf
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY=0xaa
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_EXIT=0xab
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_POPULATEDATETIME_ENTRY=0xae
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_POPULATEDATETIME_EXIT=0xaf
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_POPULATELOCATION_ENTRY=0xb0
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_POPULATELOCATION_EXIT=0xb1
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_RESTORE_ENTRY=0xcd
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_RESTORE_EXIT=0xce
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SAVEDATE_ENTRY=0xc0
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SAVEDATE_EXIT=0xc1
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SAVETIME_ENTRY=0xc2
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SAVETIME_EXIT=0xc3
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SETDATERANGE_ENTRY=0xb2
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SETDATERANGE_EXIT=0xb3
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SETSELECTEDLOCATION_ENTRY=0xac
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SETSELECTEDLOCATION_EXIT=0xad
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SETTIMERANGE_ENTRY=0xb4
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORCUSTOMITEM_SETTIMERANGE_EXIT=0xb5
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_ENTRY=0xed
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_EXIT=0xee
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ARETEXTITEMSEMPTY_ENTRY=0xec
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_ENTRY=0xd0
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_EXIT=0xd1
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_CHECKALARMFIELDSFORERRORS_ENTRY=0xfb
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_CHECKALARMFIELDSFORERRORS_EXIT=0xfc
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_ENTRY=0xd8
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT=0xd9
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_DISPALYERRORMSGBYREPEATTYPE_ENTRY=0x101
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_DISPALYERRORMSGBYREPEATTYPE_EXIT=0x102
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_DISPLAYERRORMSG_ENTRY=0xff
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_DISPLAYERRORMSG_EXIT=0x100
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_DURATIONGREATERTHANREPEATINTERVALERROR_ENTRY=0xf9
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_DURATIONGREATERTHANREPEATINTERVALERROR_EXIT=0xfa
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_EDITEDENTRY_ENTRY=0xd4
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_EDITEDENTRY_EXIT=0xd5
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISALARMEDITED_ENTRY=0xe7
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISALARMINACCEPTABLEPERIOD_ENTRY=0xfd
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISALARMINACCEPTABLEPERIOD_EXIT=0xfe
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISALLDAYEDITED_ENTRY=0xde
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT=0xdf
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISDESCRIPTIONEDITED_ENTRY=0xea
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISDESCRIPTIONEMPTIED_ENTRY=0xf2
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISEDITED_ENTRY=0xdc
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISENDDATETIMEEDITED_ENTRY=0xe6
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISLOCATIONEDITED_ENTRY=0xe4
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISLOCATIONEMPTIED_ENTRY=0xf1
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISREPEATRULEEDITED_ENTRY=0xe8
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISREPEATRULEEDITED_EXIT=0xe9
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISSTARTDATETIMEEDITED_ENTRY=0xe5
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISSUMMARYEDITED_ENTRY=0xdd
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ISSUMMARYEMPTIED_ENTRY=0xf0
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_NONTEXTITEMSEDITED_ENTRY=0xeb
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ORIGINALENTRY_ENTRY=0xd6
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_ORIGINALENTRY_EXIT=0xd7
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_ENTRY=0xf3
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT=0xf4
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_ENTRY=0x103
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_EXIT=0x104
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORDOCLOADER_CREATEOBJECT_ENTRY=0x107
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDALLDAYCHECKBOXITEM_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDALLDAYCHECKBOXITEM_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDCUSTOMITEMFROM_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDCUSTOMITEMFROM_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDCUSTOMITEMLOCATION_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDCUSTOMITEMLOCATION_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDCUSTOMITEMTO_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDCUSTOMITEMTO_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDDISCARDACTION_ENTRY=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDDISCARDACTION_EXIT=0x30
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDREMINDERITEM_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDREMINDERITEM_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDREPEATITEM_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDREPEATITEM_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDSUBJECTITEM_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ADDSUBJECTITEM_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ALLDAYCHECKBOXITEM_ENTRY=0x90
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ALLDAYCHECKBOXITEM_EXIT=0x91
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CALENEDITORPRIVATE_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CALENEDITORPRIVATE_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CLOSEEDITOR_ENTRY=0x59
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CLOSEEDITOR_EXIT=0x5a
+[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_DISCARDCHANGES_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DISCARDCHANGES_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_EDITEDENTRY_ENTRY=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_EDITEDENTRY_EXIT=0x8b
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_EDIT_ENTRY=0x17
+[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_HANDLEALLDAYCHANGE_ENTRY=0x5b
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_EXIT=0x5c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY=0x80
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x81
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLECALENDARLAUNCHERROR_ENTRY=0x69
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLECALENDARLAUNCHERROR_EXIT=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLECANCEL_ENTRY=0x26
+[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_HANDLEDESCRIPTIONACTION_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONCHANGE_ENTRY=0x65
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONCHANGE_EXIT=0x66
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDONE_ENTRY=0x75
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDONE_EXIT=0x76
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEEDITOCCURENCE_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEEDITOCCURENCE_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_ENTRY=0x5d
+[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_INITMODEL_ENTRY=0x31
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_INITMODEL_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISALLDAYEVENT_ENTRY=0x93
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT=0x94
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISALLDAYFIELDADDED_ENTRY=0x9d
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISALLDAYFIELDADDED_EXIT=0x9e
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISCHILD_ENTRY=0x74
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISEDITRANGETHISONLY_ENTRY=0x9b
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISEDITRANGETHISONLY_EXIT=0x9c
+[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_LAUNCHSETTINGSVIEW_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_OPENEDITOR_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_OPENEDITOR_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ORIGINALENTRY_ENTRY=0x8c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ORIGINALENTRY_EXIT=0x8d
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEALLDAYITEM_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEALLDAYITEM_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATECUSTOMITEMDATETIME_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATECUSTOMITEMDATETIME_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATECUSTOMITEMLOCATION_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATECUSTOMITEMLOCATION_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEDESCRIPTIONITEM_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEDESCRIPTIONITEM_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEMODEL_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEMODEL_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEREPEATITEM_ENTRY=0x53
+[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_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
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVETODATETIME_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SELECTEDITINGFINISHEDACTION_ENTRY=0x63
+[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_SHOWEDITOCCURENCEPOPUP_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOR_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOR_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_UPDATEREMINDERCHOICES_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_UPDATEREMINDERCHOICES_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_ADDITEMTOMODEL_ENTRY=0x10e
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_ADDITEMTOMODEL_EXIT=0x10f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_ENTRY=0x108
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_EXIT=0x109
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_CURRENTREMINDERINDEX_ENTRY=0x12a
+[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_HANDLEREMINDERINDEXCHANGED_ENTRY=0x114
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_EXIT=0x115
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_INSERTREMINDERTIMEFIELD_ENTRY=0x11d
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_INSERTREMINDERTIMEFIELD_EXIT=0x11e
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_ISREMINDERFIELDENABLED_ENTRY=0x127
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_ENTRY=0x130
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_EXIT=0x131
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_ENTRY=0x123
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_EXIT=0x124
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_MODELINDEX_ENTRY=0x116
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_POPULATEREMINDERITEM_ENTRY=0x112
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_POPULATEREMINDERITEM_EXIT=0x113
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_REMINDERITEMSCOUNT_ENTRY=0x128
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_REMINDERITEMSCOUNT_EXIT=0x129
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_REMOVEITEMFROMMODEL_ENTRY=0x110
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_REMOVEITEMFROMMODEL_EXIT=0x111
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_REMOVEREMINDERTIMEFIELD_ENTRY=0x121
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_REMOVEREMINDERTIMEFIELD_EXIT=0x122
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETCURRENTINDEX_ENTRY=0x12c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETCURRENTINDEX_EXIT=0x12d
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETDEFAULTALARMFORALLDAY_ENTRY=0x119
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETDEFAULTALARMFORALLDAY_EXIT=0x11a
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETDISPLAYTIME_ENTRY=0x11f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETDISPLAYTIME_EXIT=0x120
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDERCHOICES_ENTRY=0x10c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDERCHOICES_EXIT=0x10d
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDEROFF_ENTRY=0x117
+[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_UPDATEREMINDERCHOICESFORALLDAY_ENTRY=0x11b
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_EXIT=0x11c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_ADDITEMTOMODEL_ENTRY=0x136
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_ADDITEMTOMODEL_EXIT=0x137
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY=0x132
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_EXIT=0x133
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_ENTRY=0x13c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_EXIT=0x13d
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_INSERTREPEATUNTILITEM_ENTRY=0x13f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_INSERTREPEATUNTILITEM_EXIT=0x140
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_ISREPEATUNTILITEMADDED_ENTRY=0x141
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_ISREPEATUNTILITEMADDED_EXIT=0x142
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_LAUNCHREPEATUNTILDATEPICKER_ENTRY=0x143
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_LAUNCHREPEATUNTILDATEPICKER_EXIT=0x144
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_MODELINDEX_ENTRY=0x13e
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_POPULATEREPEATITEM_ENTRY=0x13a
+[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_REPEATUNTILDATE_ENTRY=0x147
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REPEATUNTILDATE_EXIT=0x148
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_SAVEREPEATRULE_ENTRY=0x14c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_SAVEREPEATRULE_EXIT=0x14d
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_SETREPEATUNTILDATE_ENTRY=0x145
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_SETREPEATUNTILDATE_EXIT=0x146
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_ENTRY=0x149
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT=0x14a
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITOR_CALENEDITOR_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITOR_CALENEDITOR_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITOR_CREATE_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITOR_CREATE_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITOR_EDIT_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITOR_EDIT_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY=0xa1
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_EXIT=0xa2
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT=0xcc
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xa6
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORDATAHANDLER_ARETEXTITEMSCLEARED_EXIT=0xef
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_ENTRY=0xd2
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORDATAHANDLER_CALENEDITORDATAHANDLER_EXIT=0xd3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT=0xda
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT=0xe0
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT=0xf5
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_ENTRY=0x105
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORDOCLOADER_CALENEDITORDOCLOADER_EXIT=0x106
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_CALENEDITORPRIVATE_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_CALENEDITORPRIVATE_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_CREATE_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_CREATE_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_EDIT_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_EDIT_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x82
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT=0x6d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_HANDLEDONE_EXIT=0x77
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_ENTRY=0x5f
+[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
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_EXIT=0x135
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT=0x14b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITOR_CALENEDITOR_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITOR_CALENEDITOR_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITOR_CREATE_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITOR_CREATE_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITOR_EDIT_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITOR_EDIT_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xa7
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORDATAHANDLER_CHECKERRORSFORTHISANDALL_EXIT=0xdb
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT=0xe1
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT=0xf6
+[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
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITOR_CREATE_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITOR_EDIT_ENTRY=0xc
+[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
+[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITOR_EDIT_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_DUP4_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xa9
+[TRACE]TRACE_FLOW[0x8A]_DUP4_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT=0xe3
+[TRACE]TRACE_FLOW[0x8A]_DUP4_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT=0xf8
+[TRACE]TRACE_FLOW[0x8A]_DUP4_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x85
+[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
--- a/calendarui/calenlauncher/calenlauncher.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/calenlauncher/calenlauncher.pro Mon Aug 23 16:00:50 2010 +0100
@@ -25,20 +25,19 @@
./inc
-symbian: {
- BLD_INF_RULES.prj_exports += \
- "./inc/calenlauncher.h |../inc/calenlauncher.h"
-
+symbian: {
TARGET.UID3 = 0x10282DCD
TARGET.CAPABILITY += ALL -TCB
TARGET.EPOCALLOWDLLDATA = 1
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
LIBS += -lxqservice \
-lxqserviceutil
}
SOURCES += calenlauncher.cpp
-HEADERS += calenlauncher.h
+HEADERS += ../../organizer_plat/calendar_launcher_api/inc/calenlauncher.h
# End of file --Don't remove this.
--- a/calendarui/calenlauncher/inc/calenlauncher.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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: Calendar Launcher
-*
-*/
-#include <QObject>
-#include <qdatetime.h>
-
-#ifdef CALENLAUNCHER_LIB
-# define CALENLAUNCHER_EXPORT Q_DECL_EXPORT
-#else
-# define CALENLAUNCHER_EXPORT Q_DECL_IMPORT
-#endif
-class CALENLAUNCHER_EXPORT CalenLauncher : public QObject
-{
-Q_OBJECT
-
-public:
- enum CalenView{
- MonthView = 0,
- AgendaView
- };
- CalenLauncher(QObject* parent = 0);
- ~CalenLauncher();
-
- void launchCalendarApp(CalenView view, QDateTime& dateTime,
- bool synchronousLaunch = true);
-
-signals:
- void calendarLaunchFailed(int error);
-
-public slots:
- void handleError(int error);
-};
-
-// End of file --Don't remove this.
--- a/calendarui/calenlauncher/src/calenlauncher.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/calenlauncher/src/calenlauncher.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -18,7 +18,7 @@
#include <xqservicerequest.h>
// User includes
-#include "calenlauncher.h"
+#include <calenlauncher.h>
/*!
\class CalenLauncher
--- a/calendarui/calenplugins/agendaeventviewerplugin/agendaeventviewerplugin.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/calenplugins/agendaeventviewerplugin/agendaeventviewerplugin.pro Mon Aug 23 16:00:50 2010 +0100
@@ -61,6 +61,6 @@
SOURCES += agendaeventviewerplugin.cpp
HEADERS += agendaeventviewerplugin.h \
- eventviewerplugininterface.h
+ ../../../organizer_plat/eventviewer_plugin_api/inc/eventviewerplugininterface.h
# End of file --Don't remove this.
--- a/calendarui/calenplugins/agendaeventviewerplugin/inc/eventviewerplugininterface.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* 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: Header file for EventViewer Plugin Interface
-*
-*/
-
-#ifndef EVENTVIEWERPLUGININTERFACE_H
-#define EVENTVIEWERPLUGININTERFACE_H
-
-// System includes
-#include <QObject>
-#include <QtPlugin>
-#include <QDate>
-#include <qglobal.h>
-
-// Forward declarations
-class QFile;
-class QString;
-class AgendaUtil;
-class AgendaEntry;
-
-#define CALENDAR_EVENTVIEWER_PLUGIN_PATH QString("z:/resource/qt/plugins/calendar")
-#define CALENDAR_EVENTVIEWER_PLUGIN_NAME QString("agendaeventviewerplugin.qtplugin")
-
-class EventViewerPluginInterface : public QObject
-{
- Q_OBJECT
-
-public:
- enum Actions {
- ActionNothing,
- ActionEdit = 0x01,
- ActionDelete = 0x02,
- ActionEditDelete = ActionEdit | ActionDelete,
- ActionSave = 0x04
- };
- virtual ~EventViewerPluginInterface() {}
-
-
-
-public:
- virtual void viewEvent(const ulong id,
- Actions action = ActionNothing,
- AgendaUtil *agendaUtil = 0) = 0;
- virtual void viewEvent(const QFile &fileHandle,
- Actions action = ActionNothing,
- AgendaUtil *agendaUtil = 0) = 0;
- virtual void viewEvent(AgendaEntry entry,
- Actions action = ActionNothing,
- AgendaUtil *agendaUtil = 0) = 0;
-
-signals:
- void viewingCompleted(const QDate date = QDate());
- void editingStarted();
- void editingCompleted();
- void deletingStarted();
- void deletingCompleted();
-
-};
-
-Q_DECLARE_INTERFACE(EventViewerPluginInterface,
- "org.nokia.calendar.EventViewerPluginInterface/1.0")
-
-#endif // EVENTVIEWERPLUGININTERFACE_H
-
-// End of file
--- a/calendarui/calenplugins/agendaeventviewerplugin/src/agendaeventviewerplugin.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/calenplugins/agendaeventviewerplugin/src/agendaeventviewerplugin.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -17,7 +17,7 @@
// User Includes.
#include "agendaeventviewerplugin.h"
-#include "agendaentry.h"
+#include <agendaentry.h>
/*!
\class AgendaEventViewerPlugin
--- a/calendarui/commonutils/bwins/calencommonutilsu.def Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/commonutils/bwins/calencommonutilsu.def Mon Aug 23 16:00:50 2010 +0100
@@ -17,4 +17,5 @@
?defaultTime@CalenDateUtils@@SA?AVQDateTime@@ABV2@@Z @ 16 NONAME ; class QDateTime CalenDateUtils::defaultTime(class QDateTime const &)
?futureOf@CalenDateUtils@@SA?AVQDateTime@@ABV2@H@Z @ 17 NONAME ; class QDateTime CalenDateUtils::futureOf(class QDateTime const &, int)
?now@CalenDateUtils@@SA?AVQDateTime@@XZ @ 18 NONAME ; class QDateTime CalenDateUtils::now(void)
+ ?isAlldayEvent@CalenAgendaUtils@@SA_NABVAgendaEntry@@@Z @ 19 NONAME ; bool CalenAgendaUtils::isAlldayEvent(class AgendaEntry const &)
--- a/calendarui/commonutils/commonutils.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/commonutils/commonutils.pro Mon Aug 23 16:00:50 2010 +0100
@@ -30,8 +30,8 @@
"./inc/calenagendautils.h |../inc/calenagendautils.h" \
"./inc/calendateutils.h |../inc/calendateutils.h"
- TARGET.UID3 = 0x10207199
- TARGET.CAPABILITY = CAP_GENERAL_DLL
+ TARGET.UID3 = 0x10207199
+ TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.EPOCALLOWDLLDATA=1
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
--- a/calendarui/commonutils/eabi/calencommonutilsu.def Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/commonutils/eabi/calencommonutilsu.def Mon Aug 23 16:00:50 2010 +0100
@@ -17,4 +17,5 @@
_ZN14CalenDateUtils9onSameDayERK9QDateTimeS2_ @ 16 NONAME
_ZN14CalenDateUtils9timeOfDayERK9QDateTime @ 17 NONAME
_ZN16CalenAgendaUtils16endsAtStartOfDayER11AgendaEntryRK9QDateTime @ 18 NONAME
+ _ZN16CalenAgendaUtils13isAlldayEventERK11AgendaEntry @ 19 NONAME
--- a/calendarui/commonutils/inc/calenagendautils.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/commonutils/inc/calenagendautils.h Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,7 @@
// INCLUDES
-#include "agendaentry.h"
+#include <agendaentry.h>
#include <qglobal.h> // Q_DECL_EXPORT macro
#ifdef CALENDATEUTILS_DLL
@@ -52,6 +52,14 @@
**/
static bool endsAtStartOfDay( AgendaEntry& entry,
const QDateTime& day );
+
+ /**
+ * Checks if the given entry is an all-day
+ * Need to call this API only for entry types other than EEvent
+ * @param entry Entry for which all-day attribute is being queried
+ * @returns True, If entry is an all-day else False
+ */
+ static bool CalenAgendaUtils::isAlldayEvent( const AgendaEntry& entry );
};
--- a/calendarui/commonutils/src/calenagendautils.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/commonutils/src/calenagendautils.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -50,4 +50,38 @@
return result;
}
+ // ---------------------------------------------------------------------------
+ // CalenAgendaUtils::IsAllDayEvent
+ // Allday event is an event with a duration of n*24h.
+ // ---------------------------------------------------------------------------
+ //
+ bool CalenAgendaUtils::isAlldayEvent( const AgendaEntry& entry )
+ {
+
+ TRACE_ENTRY_POINT;
+
+ bool allDayEvent( false );
+ if (AgendaEntry::TypeAppoinment == entry.type() ||
+ AgendaEntry::TypeEvent == entry.type()) {
+ QDateTime startTime = entry.startTime();
+ QDateTime stopTime = entry.endTime();
+
+ int differenceInDays = startTime.daysTo(stopTime);
+ if( startTime != stopTime &&
+ startTime == CalenDateUtils::beginningOfDay( startTime ) &&
+ stopTime == CalenDateUtils::beginningOfDay( stopTime ) &&
+ differenceInDays >= 1 )
+ {
+ allDayEvent = true;
+ }
+ else
+ {
+ allDayEvent = false;
+ }
+ }
+
+ TRACE_EXIT_POINT;
+ return allDayEvent;
+ }
+
// End of File
--- a/calendarui/commonutils/src/calendateutils.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/commonutils/src/calendateutils.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -21,7 +21,7 @@
#include "calendarui_debug.h"
#include "calendateutils.h"
-#include "agendautil.h"
+#include <agendautil.h>
// LOCAL CONSTANTS AND MACROS
const int KDefaultStartTime(8); // 8 am ( 0 to 23 hour scale)
--- a/calendarui/controller/bwins/calencontrolleru.def Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/bwins/calencontrolleru.def Mon Aug 23 16:00:50 2010 +0100
@@ -37,4 +37,7 @@
?GetCommandHandlerL@CCalenController@@QAEPAVMCalenCommandHandler@@H@Z @ 36 NONAME ; class MCalenCommandHandler * CCalenController::GetCommandHandlerL(int)
?RegisterForNotificationsL@CCalenController@@QAEXPAVMCalenNotificationHandler@@AAV?$RArray@W4TCalenNotification@@@@@Z @ 37 NONAME ; void CCalenController::RegisterForNotificationsL(class MCalenNotificationHandler *, class RArray<enum TCalenNotification> &)
?NewServicesL@CCalenController@@UAEPAVMCalenServices@@XZ @ 38 NONAME ; class MCalenServices * CCalenController::NewServicesL(void)
+ ?emitAppReady@CCalenController@@QAEXXZ @ 39 NONAME ; void CCalenController::emitAppReady(void)
+ ?appReady@CCalenController@@IAEXXZ @ 40 NONAME ; void CCalenController::appReady(void)
+ ?raiseWindow@CCalenController@@AAEXXZ @ 41 NONAME ; void CCalenController::raiseWindow(void)
--- a/calendarui/controller/controller.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/controller.pro Mon Aug 23 16:00:50 2010 +0100
@@ -21,10 +21,12 @@
./src
DEFINES += CALENCONTROLLER_DLL
INCLUDEPATH += ./inc \
- ../inc \
+ ../inc \
+ ../application/inc \
../views/inc \
../views/dayview/inc \
- ../globaldata/inc
+ ../globaldata/inc \
+ ./traces
CONFIG += hb
@@ -105,7 +107,7 @@
calenviewingstate.cpp \
caleneditui.cpp \
calendocloader.cpp
-
+
RESOURCES += ./data/calendar.qrc
# End of file --Don't remove this.
\ No newline at end of file
--- a/calendarui/controller/data/calendar.qrc Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/data/calendar.qrc Mon Aug 23 16:00:50 2010 +0100
@@ -2,5 +2,6 @@
<qresource prefix="/xml">
<file alias="calenagendaview.docml">xml/calenagendaview.docml</file>
<file alias="calenmonthview.docml">xml/calenmonthview.docml</file>
+ <file alias="calendayview.docml">xml/calendayview.docml</file>
</qresource>
</RCC>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/data/xml/calendayview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+ <widget name="dayView" type="HbView">
+ <widget name="dayViewDayInfo" type="HbGroupBox">
+ <bool name="collapsable" value="FALSE"/>
+ </widget>
+ <widget name="dayViewRegionalInfo" type="HbGroupBox">
+ <bool name="collapsable" value="FALSE"/>
+ </widget>
+ <widget name="dayViewContentWidget" type="HbWidget">
+ <widget name="dayViewHourScrollArea" type="HbScrollArea">
+ <enums name="verticalScrollBarPolicy" value="ScrollBarAlwaysOff"/>
+ </widget>
+ <widget name="dayViewContentScrollArea" type="HbScrollArea">
+ <enums name="scrollDirections" value="Horizontal"/>
+ <enums name="horizontalScrollBarPolicy" value="ScrollBarAlwaysOff"/>
+ <enums name="clampingStyle" value="StrictClamping"/>
+ </widget>
+ <real name="z" value="0"/>
+ <layout orientation="Horizontal" spacing="0un" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <linearitem itemname="dayViewHourScrollArea"/>
+ <linearitem itemname="dayViewContentScrollArea"/>
+ </layout>
+ </widget>
+ <real name="z" value="0"/>
+ <layout orientation="Vertical" spacing="0un" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <linearitem itemname="dayViewDayInfo"/>
+ <linearitem itemname="dayViewRegionalInfo"/>
+ <linearitem itemname="dayViewContentWidget"/>
+ </layout>
+ <string name="title" value="Day view"/>
+ </widget>
+ <metadata activeUIState="Common ui state" display="QHD portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- a/calendarui/controller/data/xml/calenmonthview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/data/xml/calenmonthview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,7 @@
<widget name="monthViewExceptPreviewPane" type="HbWidget">
<widget name="monthTitle" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="textColor" value="qtc_cal_monthgrid_title"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
<real name="z" value="6"/>
<sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="PREFERRED" width="52un"/>
@@ -33,64 +34,50 @@
<widget name="dayNamesWidget" type="HbWidget">
<widget name="firstDayLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="textColor" value="qtc_cal_week_day"/>
<real name="z" value="6"/>
- <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
- <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
- <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
<widget name="secondDayLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="textColor" value="qtc_cal_week_day"/>
<real name="z" value="6"/>
- <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
- <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
- <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
<widget name="thirdDayLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="textColor" value="qtc_cal_week_day"/>
<real name="z" value="6"/>
- <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
- <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
- <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
<widget name="fourthDayLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="textColor" value="qtc_cal_week_day"/>
<real name="z" value="6"/>
- <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
- <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
- <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
<widget name="fifthDayLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="textColor" value="qtc_cal_week_day"/>
<real name="z" value="6"/>
- <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
- <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
- <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
<widget name="sixthDayLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="textColor" value="qtc_cal_week_day"/>
<real name="z" value="6"/>
- <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
- <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
- <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
<widget name="seventhDayLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="textColor" value="qtc_cal_week_day"/>
<real name="z" value="6"/>
- <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
- <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
- <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
<real name="z" value="6"/>
- <sizehint height="3un" type="PREFERRED" width="52un"/>
- <sizehint height="3un" type="MINIMUM" width="52un"/>
- <sizehint height="3un" type="MAXIMUM" width="52un"/>
+ <sizehint height="expr(var(hb-param-text-height-tiny))" type="PREFERRED" width="52un"/>
+ <sizehint height="expr(var(hb-param-text-height-tiny))" type="MINIMUM" width="52un"/>
+ <sizehint height="expr(var(hb-param-text-height-tiny))" type="MAXIMUM" width="52un"/>
<layout orientation="Horizontal" spacing="0un" type="linear">
<contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
<linearitem itemname="firstDayLabel"/>
@@ -149,7 +136,7 @@
<sizehint height="43.77612un" type="PREFERRED" width="6.41604un"/>
<sizehint height="43.77612un" type="MINIMUM" width="6.41604un"/>
<sizehint height="62.77612un" type="MAXIMUM" width="6.41604un"/>
- <layout orientation="Vertical" type="linear">
+ <layout orientation="Vertical" spacing="0un" type="linear">
<contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
<linearitem itemname="firstWeekLabel"/>
<linearitem itemname="secondWeekLabel"/>
@@ -202,7 +189,10 @@
<bool name="frictionEnabled" value="TRUE"/>
</widget>
<widget name="NoEntriesLabelPrev" type="HbLabel">
- <string locid="txt_calendar_empty_list_no_entries" name="plainText"/>
+ <string locid="txt_calendar_preview_no_entries" name="plainText"/>
+ <bool name="visible" value="FALSE"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<enums name="elideMode" value="ElideNone"/>
</widget>
@@ -257,7 +247,10 @@
<bool name="frictionEnabled" value="TRUE"/>
</widget>
<widget name="NoEntriesLabelCurr" type="HbLabel">
- <string locid="txt_calendar_empty_list_no_entries" name="plainText"/>
+ <string locid="txt_calendar_preview_no_entries" name="plainText"/>
+ <bool name="visible" value="FALSE"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<enums name="elideMode" value="ElideNone"/>
</widget>
@@ -312,7 +305,10 @@
<bool name="frictionEnabled" value="TRUE"/>
</widget>
<widget name="NoEntriesLabelNext" type="HbLabel">
- <string locid="txt_calendar_empty_list_no_entries" name="plainText"/>
+ <string locid="txt_calendar_preview_no_entries" name="plainText"/>
+ <bool name="visible" value="FALSE"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<enums name="elideMode" value="ElideNone"/>
</widget>
--- a/calendarui/controller/eabi/calencontrolleru.def Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/eabi/calencontrolleru.def Mon Aug 23 16:00:50 2010 +0100
@@ -38,4 +38,7 @@
_ZTI16CCalenController @ 37 NONAME
_ZTV16CCalenController @ 38 NONAME
_ZThn8_N16CCalenController12NewServicesLEv @ 39 NONAME
+ _ZN16CCalenController12emitAppReadyEv @ 40 NONAME
+ _ZN16CCalenController8appReadyEv @ 41 NONAME
+ _ZN16CCalenController11raiseWindowEv @ 42 NONAME
--- a/calendarui/controller/inc/calenactionui.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/inc/calenactionui.h Mon Aug 23 16:00:50 2010 +0100
@@ -60,6 +60,11 @@
* Gets a command handler or NULL.
*/
MCalenCommandHandler* GetCommandHandlerL( TInt aCommand );
+ /**
+ * This Function saves the entries
+ * should only calls after edit or create function has called
+ */
+ void saveAndCloseEditor();
private: // Construction and destruction
/**
--- a/calendarui/controller/inc/calencontroller.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/inc/calencontroller.h Mon Aug 23 16:00:50 2010 +0100
@@ -19,15 +19,17 @@
#ifndef CALENCONTROLLER_H
#define CALENCONTROLLER_H
-// INCLUDES
-#include <e32base.h> // CAsyncCallBack
-#include <vwsdef.h> // TVwsViewId
-#include <apadef.h> // TApaCommand
-#include <qglobal.h> // Q_DECL_EXPORT macro
+// System includes
+#include <e32base.h>// CAsyncCallBack
+#include <vwsdef.h>// TVwsViewId
+#include <apadef.h>// TApaCommand
+#include <qglobal.h>// Q_DECL_EXPORT macro
#include <agendautil.h>
#include <qobject>
-#include "hb_calencommands.hrh" // Calendar commands
-#include "calennotificationhandler.h" // TCalenNotification
+
+// User includes
+#include "hb_calencommands.hrh"// Calendar commands
+#include "calennotificationhandler.h"// TCalenNotification
#include "calenservices.h"
#include "calenservicesfactory.h" // MCalenServicesFactory
@@ -100,7 +102,10 @@
* destructor
*/
~CCalenController();
-
+
+ signals:
+ void appReady();
+
public: // New functions
/**
* Adds the passed command to the command queue. Command are handled
@@ -225,6 +230,11 @@
*/
bool eventFilter(QObject *object, QEvent *event);
+ /**
+ * Emits appReady signal.
+ */
+ void emitAppReady();
+
private: // Construction and destruction
/**
@@ -236,6 +246,8 @@
*/
void checkMultipleCreation();
+private slots:
+ void raiseWindow();
private: // Data
CalenViewManager* iViewManager;// Activate / deactivate views
--- a/calendarui/controller/inc/calendeleteui.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/inc/calendeleteui.h Mon Aug 23 16:00:50 2010 +0100
@@ -40,7 +40,8 @@
EDeleteEntry = 1,
EDeleteToDo,
EDeleteToDos,
- EDeleteAll
+ EDeleteAll,
+ EDeleteEvent
};
// CLASS DECLARATION
--- a/calendarui/controller/inc/caleneditui.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/inc/caleneditui.h Mon Aug 23 16:00:50 2010 +0100
@@ -68,6 +68,12 @@
* @param aNotification Nofication to be handled
*/
void HandleNotification(const TCalenNotification aNotification );
+
+ /**
+ * This Function saves the entries
+ * should only calls after edit or create function has called
+ */
+ void saveAndCloseEditor();
private: // own methods
/**
--- a/calendarui/controller/inc/calenviewmanager.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/inc/calenviewmanager.h Mon Aug 23 16:00:50 2010 +0100
@@ -36,6 +36,7 @@
class CalenLandscapeDayView;
class CalenSettingsView;
class CalenDocLoader;
+class CalenDayView;
/**
* The action ui handles events passed from the controller and delegates
@@ -117,9 +118,15 @@
*/
void loadMonthView();
/**
- * Loads day view frm the docml
+ * Loads agenda view from the docml
*/
void loadAgendaView();
+
+ /**
+ * Loads day view from the docml
+ */
+ void loadDayView();
+
/**
* Activates the default view, as retrieved from settings.
*/
@@ -151,7 +158,8 @@
void handleDeletingCompleted();
void handleInstanceViewCreation(int status);
void handleEntryViewCreation(int status);
- void handleDayViewReady();
+ void handleEntriesChanged(QList<ulong>);
+ void handleEntryUpdation(ulong id);
private: // Data
@@ -165,11 +173,12 @@
CalenDocLoader *mMonthViewDocLoader;
CalenAgendaView *mCalenAgendaViewAlt;
CalenDocLoader *mAgendaViewAltDocLoader;
- CalenNativeView *mCalenDayView;
+ CalenDayView *mCalenDayView;
int mCurrentViewId;
int mPreviousViewsId;
int mFirstView;
+ bool mInstanceViewCreated;
};
#endif // CALENVIEWMANAGER_H
--- a/calendarui/controller/src/calenactionui.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenactionui.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -27,6 +27,10 @@
#include "calensettingsview.h"
#include "calenviewmanager.h"
#include <hbmainwindow.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenactionuiTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenActionUi::NewL
@@ -36,14 +40,14 @@
//
CCalenActionUi* CCalenActionUi::NewL( CCalenController& aController )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENACTIONUI_NEWL_ENTRY );
+
CCalenActionUi* self = new( ELeave ) CCalenActionUi( aController );
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENACTIONUI_NEWL_EXIT );
return self;
}
@@ -56,8 +60,9 @@
CCalenActionUi::CCalenActionUi( CCalenController& aController )
: iController( aController )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENACTIONUI_CCALENACTIONUI_ENTRY );
+
+ OstTraceFunctionExit0( CCALENACTIONUI_CCALENACTIONUI_EXIT );
}
// ----------------------------------------------------------------------------
@@ -68,8 +73,9 @@
//
void CCalenActionUi::ConstructL()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENACTIONUI_CONSTRUCTL_ENTRY );
+
+ OstTraceFunctionExit0( CCALENACTIONUI_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -80,12 +86,12 @@
//
CCalenActionUi::~CCalenActionUi()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( DUP1_CCALENACTIONUI_CCALENACTIONUI_ENTRY );
+
delete iDeleteUi;
delete iEditUi;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENACTIONUI_CCALENACTIONUI_EXIT );
}
// ----------------------------------------------------------------------------
@@ -95,6 +101,8 @@
//
MCalenCommandHandler* CCalenActionUi::GetCommandHandlerL( TInt aCommand )
{
+ OstTraceFunctionEntry0( CCALENACTIONUI_GETCOMMANDHANDLERL_ENTRY );
+
MCalenCommandHandler* handler = NULL;
if ( aCommand >= ECalenEditCommandBase
@@ -125,7 +133,7 @@
{
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENACTIONUI_GETCOMMANDHANDLERL_EXIT );
return handler;
}
@@ -137,7 +145,8 @@
//
TBool CCalenActionUi::HandleCommandL( const TCalenCommand& aCommand )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENACTIONUI_HANDLECOMMANDL_ENTRY );
+
TBool continueCommand(EFalse);
if(aCommand.Command()==ECalenShowSettings)
@@ -145,8 +154,17 @@
iController.ViewManager().launchSettingsView();
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENACTIONUI_HANDLECOMMANDL_EXIT );
return continueCommand;
}
+// ----------------------------------------------------------------------------
+// CCalenActionUi::saveEntry
+// save the entry from editor
+// ----------------------------------------------------------------------------
+//
+void CCalenActionUi::saveAndCloseEditor()
+ {
+ iEditUi->saveAndCloseEditor();
+ }
// End of file
--- a/calendarui/controller/src/calenactionuiutils.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenactionuiutils.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,6 +32,10 @@
#include "caleninstanceid.h"
#include "CleanupResetAndDestroy.h"
#include "calendateutils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenactionuiutilsTraces.h"
+#endif
// -----------------------------------------------------------------------------
// CCalenCommonUI::FindPossibleInstanceL
@@ -42,10 +46,16 @@
AgendaEntry CalenActionUiUtils::findPossibleInstanceL(const TCalenInstanceId& id,
AgendaUtil* agendaUtil )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_ENTRY );
- QList<AgendaEntry> instances = agendaUtil->createEntryIdListForDay(id.mInstanceTime,
- AgendaUtil::FilterFlags(AgendaUtil::IncludeAll));
+ AgendaUtil::FilterFlags filter =
+ AgendaUtil::FilterFlags(AgendaUtil::IncludeAnniversaries |
+ AgendaUtil::IncludeAppointments |
+ AgendaUtil::IncludeEvents |
+ AgendaUtil::IncludeReminders |
+ AgendaUtil::IncludeIncompletedTodos);
+ QList<AgendaEntry> instances =
+ agendaUtil->createEntryIdListForDay(id.mInstanceTime, filter);
AgendaEntry result;
// For instances finishing the next day (now possible with unified DateTime editor),
@@ -78,7 +88,7 @@
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_EXIT );
return result;
}
@@ -94,15 +104,15 @@
AgendaEntry& entry,
const bool status )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENACTIONUIUTILS_SETTODOCOMPLETESTATUS_ENTRY );
+
ASSERT( !entry.isNull() );
QDateTime now = QDateTime::currentDateTime();
// set as completed or restore and update the entry in the database
- agendaUtil->setCompleted(entry, status, now)
+ agendaUtil->setCompleted(entry, status, now);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENACTIONUIUTILS_SETTODOCOMPLETESTATUS_EXIT );
}
// End of file
--- a/calendarui/controller/src/calenasynccallback.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenasynccallback.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,7 +19,12 @@
// INCLUDE FILES
#include "calenasynccallback.h"
-#include "calendarui_debug.h"
+#include "calendarui_debug.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenasynccallbackTraces.h"
+#endif
+
// ---------------------------------------------------------------------------
@@ -33,8 +38,9 @@
:CAsyncCallBack(aCallBack, aPriority),
iController(aController)
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENASYNCCALLBACK_CALENASYNCCALLBACK_ENTRY );
+
+ OstTraceFunctionExit0( CALENASYNCCALLBACK_CALENASYNCCALLBACK_EXIT );
}
// ---------------------------------------------------------------------------
@@ -46,11 +52,11 @@
CalenAsyncCallBack* CalenAsyncCallBack::NewL(TCallBack& aCallBack, CActive::TPriority aPriority,
CCalenController& aController)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENASYNCCALLBACK_NEWL_ENTRY );
+
CalenAsyncCallBack* self = new( ELeave ) CalenAsyncCallBack( aCallBack, aPriority , aController );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENASYNCCALLBACK_NEWL_EXIT );
return self;
}
// ---------------------------------------------------------------------------
@@ -61,8 +67,9 @@
//
CalenAsyncCallBack::~CalenAsyncCallBack()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CALENASYNCCALLBACK_CALENASYNCCALLBACK_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENASYNCCALLBACK_CALENASYNCCALLBACK_EXIT );
}
// ---------------------------------------------------------------------------
@@ -72,9 +79,9 @@
//
void CalenAsyncCallBack::BaseConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENASYNCCALLBACK_BASECONSTRUCTL_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENASYNCCALLBACK_BASECONSTRUCTL_EXIT );
}
// ---------------------------------------------------------------------------
@@ -85,7 +92,7 @@
//
void CalenAsyncCallBack::RunL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENASYNCCALLBACK_RUNL_ENTRY );
if(iCallBack.CallBack())
{
@@ -93,8 +100,8 @@
// request for continuing the executing command
CallBack();
}
-
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENASYNCCALLBACK_RUNL_EXIT );
}
--- a/calendarui/controller/src/calenbackgroundstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenbackgroundstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenbackgroundstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenBackgroundState::NewLC
@@ -30,13 +34,13 @@
CCalenBackgroundState* CCalenBackgroundState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENBACKGROUNDSTATE_NEWLC_ENTRY );
+
CCalenBackgroundState* self = new ( ELeave ) CCalenBackgroundState( aController,aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENBACKGROUNDSTATE_NEWLC_EXIT );
return self;
}
@@ -46,10 +50,11 @@
// ----------------------------------------------------------------------------
void CCalenBackgroundState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENBACKGROUNDSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENBACKGROUNDSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
// ----------------------------------------------------------------------------
CCalenBackgroundState::~CCalenBackgroundState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,7 +88,8 @@
TBool CCalenBackgroundState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENBACKGROUNDSTATE_HANDLECOMMANDL_ENTRY );
+
//When application is pushed background
//1,when launched from active idle ,( AI screen or missed alarm softnotification/small indicator),
@@ -135,7 +141,7 @@
RequestCallbackL( handler, aCommand );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENBACKGROUNDSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -146,7 +152,7 @@
void CCalenBackgroundState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENBACKGROUNDSTATE_HANDLENOTIFICATIONL_ENTRY );
switch( aNotification )
{
@@ -171,7 +177,7 @@
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENBACKGROUNDSTATE_HANDLENOTIFICATIONL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -180,13 +186,14 @@
// ----------------------------------------------------------------------------
void CCalenBackgroundState::HandleStateActivationL(CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENBACKGROUNDSTATE_HANDLESTATEACTIVATIONL_ENTRY );
+
if(iOutstandingNotifications.Find(ECalenNotifyAppBackgrounded))
{
CCalenState::HandleStateActivationL(aStateMachine);
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENBACKGROUNDSTATE_HANDLESTATEACTIVATIONL_EXIT );
}
// end of file
--- a/calendarui/controller/src/calencontroller.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calencontroller.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -37,6 +37,11 @@
#include "calenservicesimpl.h" // Calendar service implementation
#include "CalenUid.h"
#include "calencontextimpl.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calencontrollerTraces.h"
+#endif
+
// Constants
const TInt KCustomCommandRangeStart = ECalenLastCommand;
@@ -50,7 +55,8 @@
//
CCalenController::CCalenController()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_CCALENCONTROLLER_ENTRY );
+
// Check the Application Startup reason, set iIsFromServiceFrmWrk if application
// is started by service framework, false otherwise
/*Hb::ActivationReasonService == qobject_cast<HbApplication*>(qApp)->activateReason() ?
@@ -67,7 +73,7 @@
iRefCount = 0;
mAgendaUtil = 0;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCONTROLLER_CCALENCONTROLLER_EXIT );
}
// ----------------------------------------------------------------------------
@@ -78,6 +84,7 @@
//
void CCalenController::constructController()
{
+ OstTraceFunctionEntry0( CCALENCONTROLLER_CONSTRUCTCONTROLLER_ENTRY );
// Store the pointer in tls, also avoid multiple creations
checkMultipleCreation();
@@ -142,10 +149,13 @@
RegisterForNotificationsL( iViewManager, notificationArray );
notificationArray.Reset();
notificationArray.Close();
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_CONSTRUCTCONTROLLER_EXIT );
}
void CCalenController::checkMultipleCreation()
{
+ OstTraceFunctionEntry0( CCALENCONTROLLER_CHECKMULTIPLECREATION_ENTRY );
TAny* tlsPtr = Dll::Tls();
// Check Thread local storage
@@ -164,6 +174,7 @@
// This function should only have been called once, by CCalenAppUi
User::Leave( KErrAlreadyExists );
}
+ OstTraceFunctionExit0( CCALENCONTROLLER_CHECKMULTIPLECREATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -177,8 +188,8 @@
//
CCalenController* CCalenController::InstanceL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCONTROLLER_INSTANCEL_ENTRY );
+
CCalenController* self = NULL;
TAny* tlsPtr = Dll::Tls();
@@ -197,7 +208,8 @@
++self->iRefCount;
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_INSTANCEL_EXIT );
return self;
}
@@ -210,12 +222,12 @@
//
void CCalenController::ReleaseCustomisations()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_RELEASECUSTOMISATIONS_ENTRY );
delete iCustomisationManager;
iCustomisationManager = NULL;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCONTROLLER_RELEASECUSTOMISATIONS_EXIT );
}
// ----------------------------------------------------------------------------
@@ -228,7 +240,8 @@
//
void CCalenController::Release()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_RELEASE_ENTRY );
+
--iRefCount;
// The controller owns its own instance of the services, therefore the
@@ -237,7 +250,8 @@
{
delete this;
}
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_RELEASE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -249,7 +263,7 @@
//
CCalenController::~CCalenController()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENCONTROLLER_CCALENCONTROLLER_ENTRY );
if(iStateMachine) {
delete iStateMachine;
@@ -299,7 +313,7 @@
Dll::SetTls( NULL );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENCONTROLLER_CCALENCONTROLLER_EXIT );
}
@@ -313,12 +327,14 @@
//
TBool CCalenController::IssueCommandL( TInt aCommand )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_ISSUECOMMANDL_ENTRY );
+
TCalenCommand cmd;
cmd.SetCommandAndContextL( aCommand ,context());
TBool ret = iStateMachine->HandleCommandL( cmd );
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_ISSUECOMMANDL_EXIT );
return ret;
}
@@ -330,8 +346,9 @@
//
MCalenServices& CCalenController::Services()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_SERVICES_ENTRY );
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_SERVICES_EXIT );
return *iServices;
}
@@ -342,8 +359,9 @@
// ----------------------------------------------------------------------------
CalenViewManager& CCalenController::ViewManager()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_VIEWMANAGER_ENTRY );
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_VIEWMANAGER_EXIT );
return *iViewManager;
}
@@ -354,11 +372,14 @@
// ----------------------------------------------------------------------------
HbMainWindow& CCalenController::MainWindow()
{
- TRACE_ENTRY_POINT;
+
+ OstTraceFunctionEntry0( DUP1_CCALENCONTROLLER_MAINWINDOW_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CCALENCONTROLLER_MAINWINDOW_EXIT );
return *(hbInstance->allMainWindows().first());
- TRACE_EXIT_POINT;
+
}
// ----------------------------------------------------------------------------
@@ -370,11 +391,11 @@
//
void CCalenController::BroadcastNotification( TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_BROADCASTNOTIFICATION_ENTRY );
iNotifier->BroadcastNotification( aNotification );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCONTROLLER_BROADCASTNOTIFICATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -386,11 +407,11 @@
void CCalenController::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_ENTRY );
iNotifier->RegisterForNotificationsL( aHandler, aNotification );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -402,11 +423,11 @@
void CCalenController::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
RArray<TCalenNotification>& aNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_ENTRY );
iNotifier->RegisterForNotificationsL( aHandler, aNotifications );
-
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( DUP1_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -417,11 +438,11 @@
//
void CCalenController::CancelNotifications( MCalenNotificationHandler* aHandler )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_CANCELNOTIFICATIONS_ENTRY );
iNotifier->CancelNotifications( aHandler );
-
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_CANCELNOTIFICATIONS_EXIT );
}
// ----------------------------------------------------------------------------
@@ -432,7 +453,7 @@
// ----------------------------------------------------------------------------
MCalenCommandHandler* CCalenController::GetCommandHandlerL( TInt aCommand )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_GETCOMMANDHANDLERL_ENTRY );
MCalenCommandHandler* handler( NULL );
@@ -465,8 +486,9 @@
// No command handler is an error
+ OstTraceFunctionExit0( CCALENCONTROLLER_GETCOMMANDHANDLERL_EXIT );
+
// return the handler
- TRACE_EXIT_POINT;
return handler;
}
@@ -478,14 +500,15 @@
//
MCalenServices* CCalenController::NewServicesL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_NEWSERVICESL_ENTRY );
TInt commandRangeStart = iNextServicesCommandBase;
TInt commandRangeEnd = commandRangeStart + KNumberOfCommandsPerServices;
iNextServicesCommandBase = commandRangeEnd + 1;
CalenServicesImpl* svc = CalenServicesImpl::NewL( commandRangeStart,commandRangeEnd );
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_NEWSERVICESL_EXIT );
return svc;
}
@@ -497,8 +520,9 @@
//
CalenNotifier& CCalenController::Notifier()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_NOTIFIER_ENTRY );
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_NOTIFIER_EXIT );
return *iNotifier;
}
@@ -511,8 +535,9 @@
//
HbWidget* CCalenController::Infobar()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENCONTROLLER_INFOBAR_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CCALENCONTROLLER_INFOBAR_EXIT );
return iCustomisationManager->Infobar();
}
// ----------------------------------------------------------------------------
@@ -523,8 +548,9 @@
//
QString* CCalenController::InfobarTextL()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_INFOBARTEXTL_ENTRY );
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_INFOBARTEXTL_EXIT );
return iCustomisationManager->InfobarTextL();
}
// ----------------------------------------------------------------------------
@@ -535,8 +561,9 @@
//
CCalenCustomisationManager& CCalenController::CustomisationManager()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_CUSTOMISATIONMANAGER_ENTRY );
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_CUSTOMISATIONMANAGER_EXIT );
return *iCustomisationManager;
}
@@ -548,10 +575,12 @@
//
void CCalenController::SetDefaultContext()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_SETDEFAULTCONTEXT_ENTRY );
+
QDateTime focusTime = mContext->defaultCalTimeForViewsL();
mContext->setFocusDateAndTime(focusTime);
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_SETDEFAULTCONTEXT_EXIT );
}
// ----------------------------------------------------------------------------
@@ -563,9 +592,11 @@
void CCalenController::OfferMenu(HbMenu* aHbMenu)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_OFFERMENU_ENTRY );
+
iCustomisationManager->OfferMenu(aHbMenu);
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_OFFERMENU_EXIT );
}
// ----------------------------------------------------------------------------
@@ -576,8 +607,10 @@
//
AgendaUtil* CCalenController::agendaInterface()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_AGENDAINTERFACE_ENTRY );
+
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_AGENDAINTERFACE_EXIT );
return mAgendaUtil;
}
@@ -589,8 +622,9 @@
//
MCalenContext& CCalenController::context()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_CONTEXT_ENTRY );
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_CONTEXT_EXIT );
return *mContext;
}
@@ -602,6 +636,7 @@
//
void CCalenController::handleServiceManagerSlot(int view, const QDateTime& dateTime)
{
+ OstTraceFunctionEntry0( CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_ENTRY );
if (iIsFromServiceFrmWrk) {
// Set the context properly
@@ -614,19 +649,32 @@
// or deleting state or sending state, then dont do anything as
// user might loose the data
CCalenStateMachine::TCalenStateIndex currentState = iStateMachine->CurrentState();
- if ((currentState == CCalenStateMachine::ECalenEditingState) ||
- (currentState == CCalenStateMachine::ECalenDeletingState) ||
+ if ((currentState == CCalenStateMachine::ECalenDeletingState) ||
(currentState == CCalenStateMachine::ECalenPrintingState) ||
(currentState == CCalenStateMachine::ECalenSendingState)) {
// simply return - we dont have anything to do
- } else {
- // Set the context properly
- mContext->setFocusDateAndTime(dateTime);
- IssueCommandL(view);
- }
+ }
+ else if (currentState == CCalenStateMachine::ECalenEditingState) {
+ // close the editor and save the entry
+ //and launch the desired view
+ iActionUi->saveAndCloseEditor();
+ }
+ // 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()));
}
+
}
-
+void CCalenController::raiseWindow()
+ {
+ MainWindow().raise();
+ disconnect(&MainWindow(), SIGNAL(viewReady()),
+ this, SLOT(raiseWindow()));
+ }
// ----------------------------------------------------------------------------
// CCalenController::getFirstView
// returns the first view with which calendar has been launched
@@ -635,8 +683,9 @@
//
int CCalenController::getFirstView()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCONTROLLER_GETFIRSTVIEW_ENTRY );
+
+ OstTraceFunctionExit0( CCALENCONTROLLER_GETFIRSTVIEW_EXIT );
return iViewManager->getFirstView();
@@ -650,6 +699,8 @@
//
bool CCalenController::eventFilter(QObject *object, QEvent *event)
{
+ OstTraceFunctionEntry0( CCALENCONTROLLER_EVENTFILTER_ENTRY );
+
switch (event->type())
{
case QEvent::LanguageChange:
@@ -662,6 +713,17 @@
default:
break;
}
+ OstTraceFunctionExit0( CCALENCONTROLLER_EVENTFILTER_EXIT );
+
return QObject::eventFilter(object, event);
}
-// End of file
+
+/*
+ * Emits the appReady signal.
+ */
+void CCalenController::emitAppReady()
+{
+ emit appReady();
+}
+
+// End of file --Don't remove this.
--- a/calendarui/controller/src/calendeleteui.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calendeleteui.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -37,6 +37,10 @@
#include "calenactionuiutils.h"
#include "calendateutils.h"
#include "calenagendautils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calendeleteuiTraces.h"
+#endif
// Local constants
@@ -50,14 +54,14 @@
//
CalenDeleteUi* CalenDeleteUi::NewL( CCalenController& aController )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENDELETEUI_NEWL_ENTRY );
+
CalenDeleteUi* self = new( ELeave ) CalenDeleteUi( aController, NULL );
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_NEWL_EXIT );
return self;
}
@@ -70,9 +74,11 @@
CalenDeleteUi::CalenDeleteUi( CCalenController& aController, QObject *parent )
:QObject(parent), iController( aController )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_CALENDELETEUI_ENTRY );
+
iIsDeleting = false;
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENDELETEUI_CALENDELETEUI_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,9 +89,9 @@
//
CalenDeleteUi::~CalenDeleteUi()
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CALENDELETEUI_CALENDELETEUI_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENDELETEUI_CALENDELETEUI_EXIT );
}
// ----------------------------------------------------------------------------
@@ -96,12 +102,14 @@
//
void CalenDeleteUi::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_CONSTRUCTL_ENTRY );
+
iController.RegisterForNotificationsL( this, ECalenNotifyCancelDelete );
iMoreEntriesToDelete = EFalse;
iDisplayQuery = EFalse;
iEntriesToDelete = KEntriesToDelete;
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENDELETEUI_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -112,7 +120,7 @@
//
void CalenDeleteUi::HandleNotification(const TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_HANDLENOTIFICATION_ENTRY );
if( aNotification == ECalenNotifyCancelDelete)
{
@@ -125,7 +133,8 @@
}
}
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENDELETEUI_HANDLENOTIFICATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -136,7 +145,8 @@
//
TBool CalenDeleteUi::HandleCommandL( const TCalenCommand& aCommand )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_HANDLECOMMANDL_ENTRY );
+
TBool continueCommand(EFalse);
switch( aCommand.Command() )
@@ -180,7 +190,7 @@
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_HANDLECOMMANDL_EXIT );
return continueCommand;
}
@@ -193,7 +203,7 @@
//
void CalenDeleteUi::DeleteThisOrAllL( AgendaUtil::RecurrenceRange aRepeatType )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETETHISORALLL_ENTRY );
if( iController.context().instanceId().mEntryLocalUid )
{
@@ -205,7 +215,8 @@
DeleteSingleInstanceL( instance, aRepeatType );
}
}
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENDELETEUI_DELETETHISORALLL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -216,7 +227,8 @@
//
TBool CalenDeleteUi::DeleteEntryWithoutQueryL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETEENTRYWITHOUTQUERYL_ENTRY );
+
bool continueCommand(EFalse);
// get the context
@@ -279,7 +291,7 @@
iController.BroadcastNotification(ECalenNotifyDeleteFailed);
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_DELETEENTRYWITHOUTQUERYL_EXIT );
return continueCommand;
}
@@ -291,8 +303,8 @@
//
void CalenDeleteUi::DeleteCurrentEntryL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETECURRENTENTRYL_ENTRY );
+
// Make sure we're focused on an entry.
if (iController.context().instanceId().mEntryLocalUid) {
// Fetch the entry
@@ -310,6 +322,8 @@
// Show a confirmation note whether the user
// wants to delete the single instance or all of them
showRepeatingEntryDeleteQuery();
+ } else if (CalenAgendaUtils::isAlldayEvent(entry)) {
+ showDeleteQuery(EDeleteEvent);
} else {
// If the entry is not a repeating entry,
// delete it directly
@@ -318,7 +332,7 @@
}
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_DELETECURRENTENTRYL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -329,11 +343,15 @@
//
void CalenDeleteUi::DeleteAllEntriesL()
{
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETEALLENTRIESL_ENTRY );
+
if(iIsDeleting) {
+ OstTraceFunctionExit0( CALENDELETEUI_DELETEALLENTRIESL_EXIT );
return;
}
showDeleteQuery(EDeleteAll );
+ OstTraceFunctionExit0( DUP1_CALENDELETEUI_DELETEALLENTRIESL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -344,13 +362,15 @@
//
void CalenDeleteUi::DeleteEntriesBeforeDateL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETEENTRIESBEFOREDATEL_ENTRY );
+
if(iIsDeleting) {
+ OstTraceFunctionExit0( CALENDELETEUI_DELETEENTRIESBEFOREDATEL_EXIT );
return;
}
// launch the datepicker
dateQuery();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CALENDELETEUI_DELETEENTRIESBEFOREDATEL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -361,6 +381,8 @@
//
void CalenDeleteUi::dateQuery()
{
+ OstTraceFunctionEntry0( CALENDELETEUI_DATEQUERY_ENTRY );
+
// Create a popup with datepicker to select the date.
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
@@ -380,12 +402,14 @@
popUp->setContentWidget(mDatePicker);
mDeleteAction = new HbAction(
- hbTrId("txt_calendar_button_dialog_delete"), popUp);
+ hbTrId("txt_common_button_delete"), popUp);
popUp->addAction(mDeleteAction);
mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"),popUp);
popUp->addAction(mCancelAction);
// Show the popup
popUp->open(this, SLOT(handleDateQuery(HbAction*)));
+
+ OstTraceFunctionExit0( CALENDELETEUI_DATEQUERY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -396,6 +420,8 @@
//
void CalenDeleteUi::handleDateQuery(HbAction* action)
{
+ OstTraceFunctionEntry0( CALENDELETEUI_HANDLEDATEQUERY_ENTRY );
+
if(action == mDeleteAction) {
// User selected the date before which all the entries has to be deleted
QDate selectedDate(mDatePicker->date());
@@ -428,6 +454,8 @@
// Reset the member variables
mDeleteAction = NULL;
mCancelAction = NULL;
+
+ OstTraceFunctionExit0( CALENDELETEUI_HANDLEDATEQUERY_EXIT );
}
// ----------------------------------------------------------------------------
// CalenDeleteUi::showRepeatingEntryDeleteQuery
@@ -437,6 +465,8 @@
//
void CalenDeleteUi::showRepeatingEntryDeleteQuery()
{
+ OstTraceFunctionEntry0( CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_ENTRY );
+
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
@@ -462,7 +492,7 @@
// Add cancel action
HbAction *cancelAction = new HbAction(
- hbTrId("txt_calendar_button_softkey1_cancel"));
+ hbTrId("txt_common_button_cancel_singledialog"));
popUp->addAction(cancelAction);
connect(editButtonList, SIGNAL(itemSelected(int)), this,
SLOT(handleRepeatedEntryDelete(int)));
@@ -472,6 +502,8 @@
// Show the popup
popUp->open();
+
+ OstTraceFunctionExit0( CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -482,11 +514,17 @@
//
void CalenDeleteUi::handleDeleteCancel()
{
+ OstTraceFunctionEntry0( CALENDELETEUI_HANDLEDELETECANCEL_ENTRY );
+
iController.BroadcastNotification(ECalenNotifyDeleteFailed);
+
+ OstTraceFunctionExit0( CALENDELETEUI_HANDLEDELETECANCEL_EXIT );
}
void CalenDeleteUi::handleRepeatedEntryDelete(int index)
{
+ OstTraceFunctionEntry0( CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_ENTRY );
+
// Fetch the entry
// Find all possible instances
AgendaEntry instance = CalenActionUiUtils::findPossibleInstanceL(
@@ -509,7 +547,10 @@
instance, AgendaUtil::ThisAndAll);
break;
}
+ }else {
+ iController.BroadcastNotification(ECalenNotifyDeleteFailed);
}
+ OstTraceFunctionExit0( CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -521,6 +562,8 @@
void CalenDeleteUi::showDeleteQuery(const TDeleteConfirmationType type,
const int count)
{
+ OstTraceFunctionEntry0( CALENDELETEUI_SHOWDELETEQUERY_ENTRY );
+
HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
popup->setDismissPolicy(HbDialog::NoDismiss);
popup->setTimeout(HbDialog::NoTimeout);
@@ -551,6 +594,11 @@
text.append(hbTrId("txt_calendar_info_delete_all_calendar_entries"));
break;
}
+ case EDeleteEvent:
+ {
+ text.append(hbTrId("txt_calendar_info_delete_allday_event"));
+ break;
+ }
default:
break;
}
@@ -563,11 +611,13 @@
popup->removeAction(list[i]);
}
mDeleteAction = new HbAction(
- hbTrId("txt_calendar_button_dialog_delete"), popup);
+ hbTrId("txt_common_button_delete"), popup);
popup->addAction(mDeleteAction);
- mCancelAction = new HbAction(hbTrId("txt_calendar_button_cancel"), popup);
+ mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"), popup);
popup->addAction(mCancelAction);
popup->open(this, SLOT(handleDeletion(HbAction*)));
+
+ OstTraceFunctionExit0( CALENDELETEUI_SHOWDELETEQUERY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -578,6 +628,8 @@
//
void CalenDeleteUi::handleDeletion(HbAction* action)
{
+ OstTraceFunctionEntry0( CALENDELETEUI_HANDLEDELETION_ENTRY );
+
TCalenNotification notification = ECalenNotifyDeleteFailed;
if(action == mDeleteAction) {
@@ -614,6 +666,8 @@
iController.Services().agendaInterface()->deleteRepeatedEntry(
instance, mRecurrenceRange );
}
+ }else {
+ iController.BroadcastNotification(ECalenNotifyDeleteFailed);
}
}
break;
@@ -629,24 +683,31 @@
break;
}
+ } else {
+ // If the user presses cancel button the notification will be
+ // ECalenNotifyDeleteFailed as default.
+ // Notify the status
+ iController.BroadcastNotification(notification);
}
- // If the user presses cancel button the notification will be
- // ECalenNotifyDeleteFailed as default.
- // Notify the status
- iController.BroadcastNotification(notification);
// Reset the member variables
mDeleteAction = NULL;
mCancelAction = NULL;
+
+ OstTraceFunctionExit0( CALENDELETEUI_HANDLEDELETION_EXIT );
}
void CalenDeleteUi::entryDeleted(ulong id)
{
+ OstTraceFunctionEntry0( CALENDELETEUI_ENTRYDELETED_ENTRY );
+
if (iController.context().instanceId().mEntryLocalUid == id) {
iController.BroadcastNotification(ECalenNotifyEntryDeleted);
}
disconnect(iController.Services().agendaInterface(), SIGNAL(entryDeleted(ulong)),
this, SLOT(entryDeleted(ulong)));
+
+ OstTraceFunctionExit0( CALENDELETEUI_ENTRYDELETED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -659,16 +720,17 @@
const QDateTime& aLastDay,
int aConfNoteId )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_ENTRY );
if(iIsDeleting) {
+ OstTraceFunctionExit0( CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_EXIT );
return;
}
iConfirmationNoteId = aConfNoteId;
DeleteDayRangeL( aFirstDay, aLastDay );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -680,8 +742,8 @@
void CalenDeleteUi::DeleteDayRangeL( const QDateTime& aStart,
const QDateTime& aEnd )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETEDAYRANGEL_ENTRY );
+
iStartTime = aStart;
iEndTime = aEnd;
@@ -696,11 +758,13 @@
| AgendaUtil::IncludeAppointments
| AgendaUtil::IncludeEvents
| AgendaUtil::IncludeReminders
- | AgendaUtil::IncludeIncompletedTodos);
+ | AgendaUtil::IncludeIncompletedTodos
+ | AgendaUtil::IncludeCompletedTodos
+ | AgendaUtil::IncludeAnniversaries);
// 1: First pass, delete all entries.
iController.agendaInterface()->deleteEntries(iStartTime, iEndTime, filter);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_DELETEDAYRANGEL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -711,7 +775,7 @@
//
void CalenDeleteUi::doCompleted( int aFirstPassError )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DOCOMPLETED_ENTRY );
if( aFirstPassError == KErrNone )
{
@@ -727,7 +791,7 @@
iController.BroadcastNotification( ECalenNotifyMultipleEntriesDeleted );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_DOCOMPLETED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -738,7 +802,7 @@
//
void CalenDeleteUi::deleteEntriesEndingAtMidnight( QDateTime aMidnight )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETEENTRIESENDINGATMIDNIGHT_ENTRY );
QDateTime start, end;
QTime startTime(aMidnight.time());
@@ -773,7 +837,7 @@
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_DELETEENTRIESENDINGATMIDNIGHT_EXIT );
}
// -----------------------------------------------------------------------------
@@ -784,9 +848,11 @@
//
void CalenDeleteUi::DeleteSingleInstanceL( AgendaEntry& aInstance )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETESINGLEINSTANCEL_ENTRY );
+
DoDeleteSingleInstanceL( aInstance, EFalse, AgendaUtil::ThisAndAll );
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENDELETEUI_DELETESINGLEINSTANCEL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -798,10 +864,11 @@
void CalenDeleteUi::DeleteSingleInstanceL( AgendaEntry& aInstance,
AgendaUtil::RecurrenceRange aRepeatType )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CALENDELETEUI_DELETESINGLEINSTANCEL_ENTRY );
+
DoDeleteSingleInstanceL( aInstance, ETrue, aRepeatType );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CALENDELETEUI_DELETESINGLEINSTANCEL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -818,7 +885,8 @@
bool aHasRepeatType,
AgendaUtil::RecurrenceRange aRepeatType )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DODELETESINGLEINSTANCEL_ENTRY );
+
bool repeating = aInstance.isRepeating();
if( !repeating ) {
@@ -846,7 +914,7 @@
EDeleteToDo :
EDeleteEntry );
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_DODELETESINGLEINSTANCEL_EXIT );
}
@@ -859,7 +927,7 @@
//
void CalenDeleteUi::DialogDismissedL( const TInt /*aButtonId*/ )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DIALOGDISMISSEDL_ENTRY );
// no more entries to delete
iMoreEntriesToDelete = EFalse;
@@ -867,7 +935,8 @@
// issue notification cancel delete
iController.BroadcastNotification(ECalenNotifyCancelDelete);
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENDELETEUI_DIALOGDISMISSEDL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -877,11 +946,11 @@
//
void CalenDeleteUi::DeleteEntryL(ulong& aEntryLocalUid)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DELETEENTRYL_ENTRY );
iController.Services().agendaInterface()->deleteEntry(aEntryLocalUid);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_DELETEENTRYL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -891,8 +960,9 @@
//
void CalenDeleteUi::DisplayWaitDialogL()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_DISPLAYWAITDIALOGL_ENTRY );
+
+ OstTraceFunctionExit0( CALENDELETEUI_DISPLAYWAITDIALOGL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -902,11 +972,12 @@
//
void CalenDeleteUi::MarkedEntriesDeletedL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENDELETEUI_MARKEDENTRIESDELETEDL_ENTRY );
+
// notify marked entries deleted
iController.BroadcastNotification( ECalenNotifyMarkedEntryDeleted );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENDELETEUI_MARKEDENTRIESDELETEDL_EXIT );
}
// End of File
--- a/calendarui/controller/src/calendeletingstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calendeletingstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calendeletingstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenDeletingState::NewLC
@@ -30,14 +34,14 @@
CCalenDeletingState* CCalenDeletingState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENDELETINGSTATE_NEWLC_ENTRY );
+
CCalenDeletingState* self = new( ELeave ) CCalenDeletingState( aController,aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENDELETINGSTATE_NEWLC_EXIT );
return self;
}
@@ -47,10 +51,11 @@
// ----------------------------------------------------------------------------
void CCalenDeletingState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENDELETINGSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENDELETINGSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -61,9 +66,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENDELETINGSTATE_CCALENDELETINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENDELETINGSTATE_CCALENDELETINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -72,9 +77,9 @@
// ----------------------------------------------------------------------------
CCalenDeletingState::~CCalenDeletingState()
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENDELETINGSTATE_CCALENDELETINGSTATE_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CCALENDELETINGSTATE_CCALENDELETINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -84,7 +89,7 @@
TBool CCalenDeletingState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENDELETINGSTATE_HANDLECOMMANDL_ENTRY );
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -106,7 +111,7 @@
cmdUsed = ETrue;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENDELETINGSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -117,7 +122,7 @@
void CCalenDeletingState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENDELETINGSTATE_HANDLENOTIFICATIONL_ENTRY );
switch( aNotification )
{
@@ -150,7 +155,7 @@
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENDELETINGSTATE_HANDLENOTIFICATIONL_EXIT );
}
// end of file
--- a/calendarui/controller/src/calendocloader.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calendocloader.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -15,6 +15,8 @@
*
*/
+// System includes
+#include <HbGroupBox>
// User includes
#include "calendocloader.h"
@@ -27,6 +29,13 @@
#include "calenthicklinesdrawer.h"
#include "calencommon.h"
#include "calenpluginlabel.h"
+#include "calendayview.h"
+#include "calendayhourscrollarea.h"
+#include "calendaycontentscrollarea.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calendocloaderTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CalenDocLoader::CalenDocLoader
@@ -37,7 +46,10 @@
CalenDocLoader::CalenDocLoader(CCalenController &controller) :
mController(controller)
{
+ OstTraceFunctionEntry0( CALENDOCLOADER_CALENDOCLOADER_ENTRY );
+
+ OstTraceFunctionExit0( CALENDOCLOADER_CALENDOCLOADER_EXIT );
}
// ----------------------------------------------------------------------------
@@ -47,7 +59,10 @@
//
CalenDocLoader::~CalenDocLoader()
{
+ OstTraceFunctionEntry0( DUP1_CALENDOCLOADER_CALENDOCLOADER_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENDOCLOADER_CALENDOCLOADER_EXIT );
}
// ----------------------------------------------------------------------------
// CalenDocLoader::createObject
@@ -62,61 +77,100 @@
QObject *CalenDocLoader::createObject(const QString &type,
const QString &name)
{
+ OstTraceFunctionEntry0( CALENDOCLOADER_CREATEOBJECT_ENTRY );
+
MCalenServices &services = mController.Services();
if (name == QString(CALEN_AGENDAVIEW)) {
QObject *calenAgendaView = new CalenAgendaView(services);
calenAgendaView->setObjectName(name);
+ OstTraceFunctionExit0( CALENDOCLOADER_CREATEOBJECT_EXIT );
return calenAgendaView;
} else if (name == QString(CALEN_AGENDAVIEW_WIDGET)) {
QObject *calenAgendaViewWidget = new CalenAgendaViewWidget(services, this);
calenAgendaViewWidget->setObjectName(name);
+ OstTraceFunctionExit0( DUP1_CALENDOCLOADER_CREATEOBJECT_EXIT );
return calenAgendaViewWidget;
} else if (name == QString(CALEN_MONTHVIEW)) { // For Month View
QObject *calenMonthView = new CalenMonthView(services);
calenMonthView->setObjectName(name);
+ OstTraceFunctionExit0( DUP2_CALENDOCLOADER_CREATEOBJECT_EXIT );
return calenMonthView;
} else if (name == QString(CALEN_MONTHGRID)) {
QObject *calenMonthGrid = new CalenMonthGrid();
calenMonthGrid->setObjectName(name);
+ OstTraceFunctionExit0( DUP3_CALENDOCLOADER_CREATEOBJECT_EXIT );
return calenMonthGrid;
} else if(name == QString(CALEN_PREVPREVIEWPANE)) {
QObject *prevPreviewPane =
new CalenPreviewPane(services);
prevPreviewPane->setObjectName(name);
+ OstTraceFunctionExit0( DUP4_CALENDOCLOADER_CREATEOBJECT_EXIT );
return prevPreviewPane;
} else if(name == QString(CALEN_CURRPREVIEWPANE)) {
QObject *currPreviewPane =
new CalenPreviewPane(services);
currPreviewPane->setObjectName(name);
+ OstTraceFunctionExit0( DUP5_CALENDOCLOADER_CREATEOBJECT_EXIT );
return currPreviewPane;
} else if(name == QString(CALEN_NEXTPREVIEWPANE)) {
QObject *nextPreviewPane =
new CalenPreviewPane(services);
nextPreviewPane->setObjectName(name);
+ OstTraceFunctionExit0( DUP6_CALENDOCLOADER_CREATEOBJECT_EXIT );
return nextPreviewPane;
} else if (name == QString(CALEN_DAYNAMES_WIDGET)) {
QObject *calenDayNamesWidget =
new CalenThickLinesDrawer(CalendarNamespace::CalenDayNameWidget);
calenDayNamesWidget->setObjectName(name);
+ OstTraceFunctionExit0( DUP7_CALENDOCLOADER_CREATEOBJECT_EXIT );
return calenDayNamesWidget;
} else if (name == QString(CALEN_WEEKNUMBERS_WIDGET)) {
QObject *calenSWeekNumWidget =
new CalenThickLinesDrawer(CalendarNamespace::CalenWeekNumWidget);
calenSWeekNumWidget->setObjectName(name);
+ OstTraceFunctionExit0( DUP8_CALENDOCLOADER_CREATEOBJECT_EXIT );
return calenSWeekNumWidget;
} else if (name == QString(CALEN_PREVREGIONALINFO)) {
QObject *calenPrevRegionalLabel = new CalenPluginLabel(services);
calenPrevRegionalLabel->setObjectName(name);
+ OstTraceFunctionExit0( DUP9_CALENDOCLOADER_CREATEOBJECT_EXIT );
return calenPrevRegionalLabel;
} else if (name == QString(CALEN_CURRREGIONALINFO)) {
QObject *calencurrRegionalLabel = new CalenPluginLabel(services);
calencurrRegionalLabel->setObjectName(name);
+ OstTraceFunctionExit0( DUP10_CALENDOCLOADER_CREATEOBJECT_EXIT );
return calencurrRegionalLabel;
} else if (name == QString(CALEN_NEXTREGIONALINFO)) {
QObject *calenNextRegionalLabel = new CalenPluginLabel(services);
calenNextRegionalLabel->setObjectName(name);
+ OstTraceFunctionExit0( DUP11_CALENDOCLOADER_CREATEOBJECT_EXIT );
return calenNextRegionalLabel;
+ } else if (name == QString(CALEN_DAYVIEW)) {
+ QObject *calenDayView = new CalenDayView(services);
+ calenDayView->setObjectName(name);
+ return calenDayView;
+ } else if (name == QString(CALEN_DAYVIEW_DAYINFO)) {
+ QObject *calenDayInfo = new HbGroupBox();
+ calenDayInfo->setObjectName(name);
+ return calenDayInfo;
+ } else if (name == QString(CALEN_DAYVIEW_REGIONALINFO)) {
+ QObject *calenRegionalInfo = new HbGroupBox();
+ calenRegionalInfo->setObjectName(name);
+ return calenRegionalInfo;
+ } else if (name == QString(CALEN_DAYVIEW_CONTENTWIDGET)) {
+ QObject *calenContentWidget = new HbWidget();
+ calenContentWidget->setObjectName(name);
+ return calenContentWidget;
+ } else if (name == QString(CALEN_DAYVIEW_HOURSCROLLAREA)) {
+ QObject *hourScrollArea = new CalenDayHourScrollArea();
+ hourScrollArea->setObjectName(name);
+ return hourScrollArea;
+ } else if (name == QString(CALEN_DAYVIEW_CONTENTSCROLLAREA)) {
+ QObject *contentScrollArea = new CalenDayContentScrollArea();
+ contentScrollArea->setObjectName(name);
+ return contentScrollArea;
} else {
+ OstTraceFunctionExit0( DUP12_CALENDOCLOADER_CREATEOBJECT_EXIT );
return HbDocumentLoader::createObject(type, name);
}
}
--- a/calendarui/controller/src/caleneditingstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/caleneditingstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneditingstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenEditingState::NewLC
@@ -30,13 +34,13 @@
CCalenEditingState* CCalenEditingState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENEDITINGSTATE_NEWLC_ENTRY );
+
CCalenEditingState* self = new( ELeave ) CCalenEditingState( aController, aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEDITINGSTATE_NEWLC_EXIT );
return self;
}
@@ -46,10 +50,11 @@
// ----------------------------------------------------------------------------
void CCalenEditingState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEDITINGSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEDITINGSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENEDITINGSTATE_CCALENEDITINGSTATE_ENTRY );
+
+ OstTraceFunctionExit0( CCALENEDITINGSTATE_CCALENEDITINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
// ----------------------------------------------------------------------------
CCalenEditingState::~CCalenEditingState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENEDITINGSTATE_CCALENEDITINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENEDITINGSTATE_CCALENEDITINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,7 +88,7 @@
TBool CCalenEditingState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT
+ OstTraceFunctionEntry0( CCALENEDITINGSTATE_HANDLECOMMANDL_ENTRY );
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -138,8 +143,8 @@
if(cmdUsed)
RequestCallbackL( handler, aCommand );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEDITINGSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -150,7 +155,7 @@
void CCalenEditingState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEDITINGSTATE_HANDLENOTIFICATIONL_ENTRY );
switch( aNotification )
{
@@ -168,11 +173,11 @@
}
break;
default:
- CCalenState::HandleNotificationL( aNotification, aStateMachine );
- break;
+ iOutstandingNotifications.InsertL(aNotification);
+ break;
}
-
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENEDITINGSTATE_HANDLENOTIFICATIONL_EXIT );
}
// end of file
--- a/calendarui/controller/src/caleneditui.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/caleneditui.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -24,9 +24,13 @@
#include "calencontroller.h"
#include "hb_calencommands.hrh"
#include "calenservicesimpl.h"
-#include "agendaentry.h"
-#include "caleneditor.h"
+#include <agendaentry.h>
+#include <caleneditor.h>
#include "calendateutils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenedituiTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenEditUi::NewL
@@ -36,14 +40,14 @@
//
CCalenEditUi* CCalenEditUi::NewL( CCalenController& aController )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENEDITUI_NEWL_ENTRY );
+
CCalenEditUi* self = new(ELeave) CCalenEditUi( aController );
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEDITUI_NEWL_EXIT );
return self;
}
@@ -55,9 +59,11 @@
//
CCalenEditUi::~CCalenEditUi()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEDITUI_CCALENEDITUI_ENTRY );
+
iController.CancelNotifications(this);
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENEDITUI_CCALENEDITUI_EXIT );
}
// ----------------------------------------------------------------------------
@@ -69,8 +75,9 @@
CCalenEditUi::CCalenEditUi( CCalenController& aController )
: iController( aController )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENEDITUI_CCALENEDITUI_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CCALENEDITUI_CCALENEDITUI_EXIT );
}
// ----------------------------------------------------------------------------
@@ -81,11 +88,11 @@
//
void CCalenEditUi::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEDITUI_CONSTRUCTL_ENTRY );
iController.RegisterForNotificationsL( this, ECalenNotifyDialogClosed );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEDITUI_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -96,7 +103,7 @@
//
TBool CCalenEditUi::HandleCommandL( const TCalenCommand& aCommand )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEDITUI_HANDLECOMMANDL_ENTRY );
TBool continueCommand(EFalse);
TInt command = aCommand.Command();
@@ -140,7 +147,7 @@
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEDITUI_HANDLECOMMANDL_EXIT );
return continueCommand;
}
@@ -151,7 +158,11 @@
//
void CCalenEditUi::handleEntrySaved()
{
+ OstTraceFunctionEntry0( CCALENEDITUI_HANDLEENTRYSAVED_ENTRY );
+
iController.Services().IssueNotificationL(ECalenNotifyEntrySaved);
+
+ OstTraceFunctionExit0( CCALENEDITUI_HANDLEENTRYSAVED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -161,7 +172,11 @@
//
void CCalenEditUi::handleDialogClosed()
{
+ OstTraceFunctionEntry0( CCALENEDITUI_HANDLEDIALOGCLOSED_ENTRY );
+
iController.Services().IssueNotificationL(ECalenNotifyDialogClosed);
+
+ OstTraceFunctionExit0( CCALENEDITUI_HANDLEDIALOGCLOSED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -172,13 +187,22 @@
//
void CCalenEditUi::HandleNotification(const TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEDITUI_HANDLENOTIFICATION_ENTRY );
if( aNotification == ECalenNotifyDialogClosed )
{
iEditor->deleteLater();
}
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENEDITUI_HANDLENOTIFICATION_EXIT );
}
-
+// ----------------------------------------------------------------------------
+// CCalenEditUi::saveEntry
+// save the entry from editor
+// ----------------------------------------------------------------------------
+//
+void CCalenEditUi::saveAndCloseEditor()
+ {
+ iEditor->saveAndCloseEditor();
+ }
// End of file
--- a/calendarui/controller/src/calenexitingstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenexitingstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenexitingstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenExitingState::NewLC
@@ -30,13 +34,13 @@
CCalenExitingState* CCalenExitingState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEXITINGSTATE_NEWLC_ENTRY );
CCalenExitingState* self = new ( ELeave ) CCalenExitingState( aController,aOutstandingNotifications);
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEXITINGSTATE_NEWLC_EXIT );
return self;
}
@@ -46,10 +50,11 @@
// ----------------------------------------------------------------------------
void CCalenExitingState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEXITINGSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEXITINGSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
// ----------------------------------------------------------------------------
CCalenExitingState::~CCalenExitingState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,8 +88,9 @@
TBool CCalenExitingState::HandleCommandL( const TCalenCommand& /*aCommand*/,
CCalenStateMachine& /*aStateMachine*/ )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENEXITINGSTATE_HANDLECOMMANDL_ENTRY );
+
+ OstTraceFunctionExit0( CCALENEXITINGSTATE_HANDLECOMMANDL_EXIT );
return EFalse;
}
@@ -95,8 +101,9 @@
void CCalenExitingState::HandleNotificationL(const TCalenNotification& /*aNotification*/,
CCalenStateMachine& /*aStateMachine*/ )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENEXITINGSTATE_HANDLENOTIFICATIONL_ENTRY );
+
+ OstTraceFunctionExit0( CCALENEXITINGSTATE_HANDLENOTIFICATIONL_EXIT );
}
--- a/calendarui/controller/src/calenhelpstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenhelpstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenhelpstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenHelpState::NewLC
@@ -30,13 +34,13 @@
CCalenHelpState* CCalenHelpState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENHELPSTATE_NEWLC_ENTRY );
+
CCalenHelpState* self = new ( ELeave ) CCalenHelpState( aController, aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENHELPSTATE_NEWLC_EXIT );
return self;
}
@@ -46,10 +50,11 @@
// ----------------------------------------------------------------------------
void CCalenHelpState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENHELPSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENHELPSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENHELPSTATE_CCALENHELPSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENHELPSTATE_CCALENHELPSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
// ----------------------------------------------------------------------------
CCalenHelpState::~CCalenHelpState()
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENHELPSTATE_CCALENHELPSTATE_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CCALENHELPSTATE_CCALENHELPSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,7 +88,8 @@
TBool CCalenHelpState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENHELPSTATE_HANDLECOMMANDL_ENTRY );
+
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -100,7 +106,7 @@
cmdUsed = ETrue;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENHELPSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -112,8 +118,9 @@
void CCalenHelpState::HandleNotificationL(const TCalenNotification& /*aNotification*/,
CCalenStateMachine& /*aStateMachine*/ )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENHELPSTATE_HANDLENOTIFICATIONL_ENTRY );
+
+ OstTraceFunctionExit0( CCALENHELPSTATE_HANDLENOTIFICATIONL_EXIT );
}
--- a/calendarui/controller/src/calenidlestate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenidlestate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenidlestateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CalenIdleState::NewLC
@@ -30,14 +34,14 @@
CCalenIdleState* CCalenIdleState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENIDLESTATE_NEWLC_ENTRY );
+
CCalenIdleState* self = new ( ELeave ) CCalenIdleState( aController,
aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENIDLESTATE_NEWLC_EXIT );
return self;
}
@@ -47,10 +51,11 @@
// ----------------------------------------------------------------------------
void CCalenIdleState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENIDLESTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENIDLESTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -61,9 +66,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENIDLESTATE_CCALENIDLESTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENIDLESTATE_CCALENIDLESTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -72,9 +77,9 @@
// ----------------------------------------------------------------------------
CCalenIdleState::~CCalenIdleState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENIDLESTATE_CCALENIDLESTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENIDLESTATE_CCALENIDLESTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -84,7 +89,7 @@
TBool CCalenIdleState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENIDLESTATE_HANDLECOMMANDL_ENTRY );
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -220,7 +225,7 @@
RequestCallbackL( handler, aCommand );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENIDLESTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -231,11 +236,11 @@
void CCalenIdleState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENIDLESTATE_HANDLENOTIFICATIONL_ENTRY );
CCalenState::HandleNotificationL( aNotification, aStateMachine );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENIDLESTATE_HANDLENOTIFICATIONL_EXIT );
}
// end of file
--- a/calendarui/controller/src/calennotifier.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calennotifier.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -25,6 +25,10 @@
#include "calendarui_debug.h"
#include "calennotifier.h" // CalenNotifier
#include "calenstatemachine.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calennotifierTraces.h"
+#endif
const TInt KHashLength = 64;
@@ -37,8 +41,9 @@
CalenNotifier::CalenNotifier( CCalenStateMachine& aStateMachine )
: iStateMachine( aStateMachine )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENNOTIFIER_CALENNOTIFIER_ENTRY );
+
+ OstTraceFunctionExit0( CALENNOTIFIER_CALENNOTIFIER_EXIT );
}
// ----------------------------------------------------------------------------
@@ -49,8 +54,8 @@
//
CalenNotifier::~CalenNotifier()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( DUP1_CALENNOTIFIER_CALENNOTIFIER_ENTRY );
+
// Reset the handler array.
// Before we reset , close hashset for each handler
for(TInt i = 0 ; i < iHandlers.Count() ; i++)
@@ -68,7 +73,7 @@
delete iEnvChangeNotifier;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CALENNOTIFIER_CALENNOTIFIER_EXIT );
}
// ----------------------------------------------------------------------------
@@ -79,7 +84,7 @@
//
void CalenNotifier::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENNOTIFIER_CONSTRUCTL_ENTRY );
// Register for system environment changes
TCallBack envCallback( EnvChangeCallbackL, this );
@@ -89,7 +94,7 @@
iIgnoreFirstLocaleChange = ETrue;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -101,8 +106,8 @@
void CalenNotifier::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
TCalenNotification aNotification)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_ENTRY );
+
TNotificationHandler handler;
handler.iHandler = aHandler;
@@ -129,7 +134,7 @@
iHandlers.Append( handler );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -141,7 +146,7 @@
void CalenNotifier::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
RArray<TCalenNotification>& aNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_ENTRY );
TNotificationHandler handler;
handler.iHandler = aHandler;
@@ -172,7 +177,7 @@
iHandlers.Append( handler );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -183,8 +188,8 @@
//
void CalenNotifier::CancelNotifications( MCalenNotificationHandler* aHandler )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENNOTIFIER_CANCELNOTIFICATIONS_ENTRY );
+
for( TInt x = 0; x < iHandlers.Count(); ++x )
{
if( iHandlers[x].iHandler == aHandler )
@@ -195,11 +200,12 @@
iHandlers[x].iHashSet.Close();
iHandlers[x].iHandler = NULL;
TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_CANCELNOTIFICATIONS_EXIT );
return;
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CALENNOTIFIER_CANCELNOTIFICATIONS_EXIT );
}
// ----------------------------------------------------------------------------
@@ -210,11 +216,11 @@
//
void CalenNotifier::ContextChanged()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENNOTIFIER_CONTEXTCHANGED_ENTRY );
+
BroadcastNotification( ECalenNotifyContextChanged );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_CONTEXTCHANGED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -228,9 +234,10 @@
//
TInt CalenNotifier::EnvChangeCallbackL( TAny* aThisPtr )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENNOTIFIER_ENVCHANGECALLBACKL_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_ENVCHANGECALLBACKL_EXIT );
+
// Return value for functions used as TCallBack objects should be EFalse
// unless the function is intended to be called again from a timer.
// return EFalse;
@@ -244,7 +251,7 @@
//
TInt CalenNotifier::DoEnvChange()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENNOTIFIER_DOENVCHANGE_ENTRY );
if( ((iEnvChangeNotifier->Change() & EChangesMidnightCrossover)
|| (iEnvChangeNotifier->Change() & EChangesSystemTime))
@@ -262,7 +269,7 @@
iIgnoreFirstLocaleChange = EFalse;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_DOENVCHANGE_EXIT );
return EFalse ;
}
@@ -274,14 +281,14 @@
//
void CalenNotifier::BroadcastNotification( TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENNOTIFIER_BROADCASTNOTIFICATION_ENTRY );
+
// Someone has told us to broadcast, or one of our notifiers completed.
// We run it past the state machine and that may or may not call the
// function to really do the broadcast.
iStateMachine.HandleNotification( aNotification );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_BROADCASTNOTIFICATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -292,7 +299,7 @@
//
void CalenNotifier::BroadcastApprovedNotification( TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENNOTIFIER_BROADCASTAPPROVEDNOTIFICATION_ENTRY );
iBroadcastQueue.Append( aNotification );
@@ -308,7 +315,7 @@
iBroadcastActive = EFalse;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_BROADCASTAPPROVEDNOTIFICATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -319,8 +326,8 @@
//
void CalenNotifier::DoBroadcast( TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENNOTIFIER_DOBROADCAST_ENTRY );
+
for( TInt x = 0; x < iHandlers.Count(); ++x )
{
TNotificationHandler handler = iHandlers[x];
@@ -339,7 +346,7 @@
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENNOTIFIER_DOBROADCAST_EXIT );
}
// ----------------------------------------------------------------------------
@@ -349,8 +356,9 @@
CalenNotifier::TNotificationHandler::TNotificationHandler() :
iHashSet(&::HashCalenNotificationFunction,&::HashCalenNotificationIdentityRelation)
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_ENTRY );
+
+ OstTraceFunctionExit0( TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_EXIT );
}
// End of file
--- a/calendarui/controller/src/calenpopulationstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenpopulationstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenpopulationstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CalenPopulationState::NewLC
@@ -30,13 +34,13 @@
CCalenPopulationState* CCalenPopulationState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_NEWLC_ENTRY );
+
CCalenPopulationState* self = new( ELeave ) CCalenPopulationState( aController, aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPOPULATIONSTATE_NEWLC_EXIT );
return self;
}
@@ -46,10 +50,11 @@
// ----------------------------------------------------------------------------
void CCalenPopulationState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPOPULATIONSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
// ----------------------------------------------------------------------------
CCalenPopulationState::~CCalenPopulationState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,7 +88,8 @@
TBool CCalenPopulationState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_HANDLECOMMANDL_ENTRY );
+
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -99,7 +105,7 @@
cmdUsed = ETrue;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPOPULATIONSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -110,7 +116,7 @@
void CCalenPopulationState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_HANDLENOTIFICATIONL_ENTRY );
switch ( aNotification )
{
@@ -127,7 +133,7 @@
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPOPULATIONSTATE_HANDLENOTIFICATIONL_EXIT );
}
--- a/calendarui/controller/src/calenprintingstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenprintingstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenprintingstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenPrintingState::NewLC
@@ -30,13 +34,13 @@
CCalenPrintingState* CCalenPrintingState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENPRINTINGSTATE_NEWLC_ENTRY );
+
CCalenPrintingState* self = new ( ELeave ) CCalenPrintingState( aController,aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPRINTINGSTATE_NEWLC_EXIT );
return self;
}
@@ -46,10 +50,11 @@
// ----------------------------------------------------------------------------
void CCalenPrintingState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENPRINTINGSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPRINTINGSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
// ----------------------------------------------------------------------------
CCalenPrintingState::~CCalenPrintingState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,7 +88,8 @@
TBool CCalenPrintingState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENPRINTINGSTATE_HANDLECOMMANDL_ENTRY );
+
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -99,7 +105,7 @@
cmdUsed = ETrue;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENPRINTINGSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -110,8 +116,9 @@
void CCalenPrintingState::HandleNotificationL(const TCalenNotification& /*aNotification*/,
CCalenStateMachine& /*aStateMachine*/ )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENPRINTINGSTATE_HANDLENOTIFICATIONL_ENTRY );
+
+ OstTraceFunctionExit0( CCALENPRINTINGSTATE_HANDLENOTIFICATIONL_EXIT );
}
// end of file
--- a/calendarui/controller/src/calensendingstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calensendingstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calensendingstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenSendingState::NewLC
@@ -30,13 +34,13 @@
CCalenSendingState* CCalenSendingState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSENDINGSTATE_NEWLC_ENTRY );
+
CCalenSendingState* self = new ( ELeave ) CCalenSendingState( aController,aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSENDINGSTATE_NEWLC_EXIT );
return self;
}
@@ -46,10 +50,11 @@
// ----------------------------------------------------------------------------
void CCalenSendingState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSENDINGSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSENDINGSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSENDINGSTATE_CCALENSENDINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSENDINGSTATE_CCALENSENDINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
// ----------------------------------------------------------------------------
CCalenSendingState::~CCalenSendingState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENSENDINGSTATE_CCALENSENDINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENSENDINGSTATE_CCALENSENDINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,7 +88,8 @@
TBool CCalenSendingState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSENDINGSTATE_HANDLECOMMANDL_ENTRY );
+
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -99,7 +105,7 @@
cmdUsed = ETrue;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSENDINGSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -110,8 +116,8 @@
void CCalenSendingState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSENDINGSTATE_HANDLENOTIFICATIONL_ENTRY );
+
switch( aNotification )
{
case ECalenNotifyDialogClosed: // issued when send method query dialog is cancelled
@@ -133,7 +139,7 @@
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSENDINGSTATE_HANDLENOTIFICATIONL_EXIT );
}
--- a/calendarui/controller/src/calenservicesimpl.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenservicesimpl.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,10 @@
#include "calenservicesimpl.h"
#include "calencontroller.h"
#include "calenviewmanager.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenservicesimplTraces.h"
+#endif
@@ -36,7 +40,7 @@
CalenServicesImpl* CalenServicesImpl::NewL( TInt aCommandRangeStart,
TInt aCommandRangeEnd )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_NEWL_ENTRY );
CalenServicesImpl* self = new( ELeave ) CalenServicesImpl(
aCommandRangeStart, aCommandRangeEnd );
@@ -44,7 +48,7 @@
self->ConstructL();
CleanupStack::Pop( self );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENSERVICESIMPL_NEWL_EXIT );
return self;
}
@@ -56,14 +60,15 @@
//
CalenServicesImpl* CalenServicesImpl::NewL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CALENSERVICESIMPL_NEWL_ENTRY );
+
CalenServicesImpl* self = new( ELeave ) CalenServicesImpl( 0, 0 );
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CALENSERVICESIMPL_NEWL_EXIT );
return self;
}
@@ -78,8 +83,9 @@
: iCommandRangeStart( aCommandRangeStart ),
iCommandRangeEnd( aCommandRangeEnd )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_CALENSERVICESIMPL_ENTRY );
+
+ OstTraceFunctionExit0( CALENSERVICESIMPL_CALENSERVICESIMPL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -90,11 +96,11 @@
//
void CalenServicesImpl::ConstructL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_CONSTRUCTL_ENTRY );
+
iController = CCalenController::InstanceL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENSERVICESIMPL_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -105,7 +111,7 @@
//
void CalenServicesImpl::Release()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_RELEASE_ENTRY );
if( iController )
{
@@ -114,7 +120,7 @@
delete this;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENSERVICESIMPL_RELEASE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -125,9 +131,11 @@
//
HbMainWindow& CalenServicesImpl::MainWindow()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_MAINWINDOW_ENTRY );
+
ASSERT( iController ); // Make sure ConstructL has been called.
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENSERVICESIMPL_MAINWINDOW_EXIT );
return iController->MainWindow();
}
@@ -140,12 +148,12 @@
void CalenServicesImpl::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_ENTRY );
+
ASSERT( iController ); // Make sure ConstructL has been called.
iController->RegisterForNotificationsL( aHandler, aNotification );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -157,12 +165,12 @@
void CalenServicesImpl::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
RArray<TCalenNotification>& aNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( DUP1_CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_ENTRY );
+
ASSERT( iController ); // Make sure ConstructL has been called.
iController->RegisterForNotificationsL( aHandler, aNotifications );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -173,12 +181,12 @@
//
void CalenServicesImpl::CancelNotifications( MCalenNotificationHandler* aHandler )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_CANCELNOTIFICATIONS_ENTRY );
+
ASSERT( iController ); // Make sure ConstructL has been called.
iController->CancelNotifications( aHandler );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENSERVICESIMPL_CANCELNOTIFICATIONS_EXIT );
}
// ----------------------------------------------------------------------------
@@ -189,10 +197,11 @@
//
TBool CalenServicesImpl::IssueCommandL( TInt aCommand )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_ISSUECOMMANDL_ENTRY );
+
ASSERT( iController ); // Make sure ConstructL has been called.
-
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENSERVICESIMPL_ISSUECOMMANDL_EXIT );
return iController->IssueCommandL( aCommand );
}
@@ -205,12 +214,12 @@
//
void CalenServicesImpl::IssueNotificationL( TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_ISSUENOTIFICATIONL_ENTRY );
+
ASSERT( iController ); // Make sure ConstructL has been called.
iController->BroadcastNotification( aNotification );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENSERVICESIMPL_ISSUENOTIFICATIONL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -221,8 +230,11 @@
//
void CalenServicesImpl::RequestActivationL( const TVwsViewId& /*aViewId*/ )
{
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_REQUESTACTIVATIONL_ENTRY );
//ASSERT( iGlobalData && iController ); // Make sure ConstructL has been called.
// iController->RequestActivationL( aViewId );
+
+ OstTraceFunctionExit0( CALENSERVICESIMPL_REQUESTACTIVATIONL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -233,7 +245,10 @@
//
void CalenServicesImpl::ActivationNotificationL( const TVwsViewId& /*aViewId*/ )
{
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_ACTIVATIONNOTIFICATIONL_ENTRY );
+
//ASSERT( iGlobalData && iController ); // Make sure ConstructL has been called.
+ OstTraceFunctionExit0( CALENSERVICESIMPL_ACTIVATIONNOTIFICATIONL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -244,9 +259,11 @@
//
MCalenContext& CalenServicesImpl::Context()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_CONTEXT_ENTRY );
+
ASSERT( iController ); // Make sure ConstructL has been called.
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENSERVICESIMPL_CONTEXT_EXIT );
return iController->context();
}
@@ -258,9 +275,9 @@
//
HbWidget* CalenServicesImpl::Infobar( )
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_INFOBAR_ENTRY );
+
+ OstTraceFunctionExit0( CALENSERVICESIMPL_INFOBAR_EXIT );
return iController->Infobar();
}
// ----------------------------------------------------------------------------
@@ -271,9 +288,9 @@
//
QString* CalenServicesImpl::InfobarTextL()
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_INFOBARTEXTL_ENTRY );
+
+ OstTraceFunctionExit0( CALENSERVICESIMPL_INFOBARTEXTL_EXIT );
return iController->InfobarTextL();
}
// ----------------------------------------------------------------------------
@@ -285,12 +302,12 @@
void CalenServicesImpl::GetCommandRange( TInt& aCommandRangeStart,
TInt& aCommandRangeEnd ) const
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_GETCOMMANDRANGE_ENTRY );
+
aCommandRangeStart = iCommandRangeStart;
aCommandRangeEnd = iCommandRangeEnd;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENSERVICESIMPL_GETCOMMANDRANGE_EXIT );
}
// ----------------------------------------------------------------------------
// CalenServicesImpl::OfferMenu
@@ -300,11 +317,11 @@
//
void CalenServicesImpl::OfferMenu(HbMenu* aHbMenu )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_OFFERMENU_ENTRY );
+
iController->OfferMenu(aHbMenu);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENSERVICESIMPL_OFFERMENU_EXIT );
}
// ----------------------------------------------------------------------------
@@ -315,9 +332,9 @@
//
AgendaUtil* CalenServicesImpl::agendaInterface()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_AGENDAINTERFACE_ENTRY );
+ OstTraceFunctionExit0( CALENSERVICESIMPL_AGENDAINTERFACE_EXIT );
return iController->agendaInterface();
}
@@ -330,9 +347,9 @@
//
int CalenServicesImpl::getFirstView()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
-
+ OstTraceFunctionEntry0( CALENSERVICESIMPL_GETFIRSTVIEW_ENTRY );
+
+ OstTraceFunctionExit0( CALENSERVICESIMPL_GETFIRSTVIEW_EXIT );
return iController->getFirstView();
}
--- a/calendarui/controller/src/calensettingsstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calensettingsstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,10 @@
#include "calenstatemachine.h"
#include "calennotifier.h"
#include "calenviewmanager.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calensettingsstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenSettingsState::NewLC
@@ -31,14 +35,14 @@
CCalenSettingsState* CCalenSettingsState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSETTINGSSTATE_NEWLC_ENTRY );
+
CCalenSettingsState* self = new ( ELeave ) CCalenSettingsState( aController,
aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSETTINGSSTATE_NEWLC_EXIT );
return self;
}
@@ -48,10 +52,11 @@
// ----------------------------------------------------------------------------
void CCalenSettingsState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSETTINGSSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSETTINGSSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -62,9 +67,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -73,9 +78,9 @@
// ----------------------------------------------------------------------------
CCalenSettingsState::~CCalenSettingsState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -85,8 +90,8 @@
TBool CCalenSettingsState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSETTINGSSTATE_HANDLECOMMANDL_ENTRY );
+
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -123,7 +128,7 @@
RequestCallbackL( handler, aCommand );
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSETTINGSSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -134,7 +139,7 @@
void CCalenSettingsState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSETTINGSSTATE_HANDLENOTIFICATIONL_ENTRY );
switch( aNotification )
{
@@ -162,7 +167,7 @@
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSETTINGSSTATE_HANDLENOTIFICATIONL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -171,14 +176,14 @@
// ----------------------------------------------------------------------------
void CCalenSettingsState::HandleStateActivationL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSETTINGSSTATE_HANDLESTATEACTIVATIONL_ENTRY );
if( iOutstandingNotifications.FindL(ECalenNotifySettingsCRepKeyChanged) )
{
iController.Notifier().BroadcastApprovedNotification( ECalenNotifySettingsCRepKeyChanged );
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSETTINGSSTATE_HANDLESTATEACTIVATIONL_EXIT );
}
// end of file
--- a/calendarui/controller/src/calenstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,10 @@
#include "calenstatemachine.h"
#include "calennotifier.h"
#include "calenasynccallback.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenState::CCalenState
@@ -33,9 +37,9 @@
iOutstandingNotifications( aOutstandingNotifications ),
iPreviousState( CCalenStateMachine::ECalenIdleState )
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_CCALENSTATE_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATE_CCALENSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -44,13 +48,13 @@
// ----------------------------------------------------------------------------
void CCalenState::BaseConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_BASECONSTRUCTL_ENTRY );
TCalenCommand command;
MCalenCommandHandler* handler( NULL );
iCallBackPackage = new( ELeave ) CalenCallbackPackage( this, command, handler );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_BASECONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -59,13 +63,13 @@
// ----------------------------------------------------------------------------
CCalenState::~CCalenState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENSTATE_CCALENSTATE_ENTRY );
delete iCallBackPackage;
iCallBackPackage = NULL;
delete iCmdCallback;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENSTATE_CCALENSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -74,8 +78,8 @@
// ----------------------------------------------------------------------------
void CCalenState::RequestCallbackL( MCalenCommandHandler* aCommandHandler, const TCalenCommand& aCommand )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_REQUESTCALLBACKL_ENTRY );
+
iCallBackPackage->SetCommandHandler(this, aCommand, aCommandHandler);
if( !iCmdCallback )
@@ -90,7 +94,7 @@
iCmdCallback->Set( callback );
iCmdCallback->CallBack();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_REQUESTCALLBACKL_EXIT );
}
@@ -101,13 +105,14 @@
// ----------------------------------------------------------------------------
TInt CCalenState::CommandCallback( TAny* aCommandStruct )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_COMMANDCALLBACK_ENTRY );
+
TBool continueCommand(EFalse);
CalenCallbackPackage* package = static_cast<CalenCallbackPackage*>( aCommandStruct );
continueCommand = package->HandleCallBack();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_COMMANDCALLBACK_EXIT );
return continueCommand;
}
@@ -120,7 +125,7 @@
void CCalenState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_HANDLENOTIFICATIONL_ENTRY );
switch( aNotification )
{
@@ -139,9 +144,7 @@
break;
}
-
- TRACE_EXIT_POINT;
-
+ OstTraceFunctionExit0( CCALENSTATE_HANDLENOTIFICATIONL_EXIT );
}
@@ -151,9 +154,9 @@
// ----------------------------------------------------------------------------
CCalenStateMachine::TCalenStateIndex CCalenState::PreviousState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_PREVIOUSSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_PREVIOUSSTATE_EXIT );
return iPreviousState;
}
@@ -163,11 +166,11 @@
// ----------------------------------------------------------------------------
void CCalenState::SetPreviousState(const CCalenStateMachine::TCalenStateIndex& aPreviousState )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_SETPREVIOUSSTATE_ENTRY );
iPreviousState = aPreviousState;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_SETPREVIOUSSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -176,8 +179,9 @@
// ----------------------------------------------------------------------------
void CCalenState::CommandExecuting()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_COMMANDEXECUTING_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATE_COMMANDEXECUTING_EXIT );
}
// ----------------------------------------------------------------------------
@@ -188,8 +192,9 @@
TCalenCommand aCommand, MCalenCommandHandler* aCommandHandler)
: iSelf( aSelf ), iCommand( aCommand ), iCommandHandler( aCommandHandler )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENCALLBACKPACKAGE_CALENCALLBACKPACKAGE_ENTRY );
+
+ OstTraceFunctionExit0( CALENCALLBACKPACKAGE_CALENCALLBACKPACKAGE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -198,13 +203,14 @@
// ----------------------------------------------------------------------------
TBool CCalenState::CalenCallbackPackage::HandleCallBack()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENCALLBACKPACKAGE_HANDLECALLBACK_ENTRY );
+
TBool continueCommand(EFalse);
iSelf->CommandExecuting();
PIM_TRAPD_HANDLE ( continueCommand = iCommandHandler->HandleCommandL( iCommand ) );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENCALLBACKPACKAGE_HANDLECALLBACK_EXIT );
return continueCommand;
}
@@ -215,13 +221,13 @@
void CCalenState::CalenCallbackPackage::SetCommandHandler(CCalenState* aSelf,
TCalenCommand aCommand, MCalenCommandHandler* aCommandHandler)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENCALLBACKPACKAGE_SETCOMMANDHANDLER_ENTRY );
+
iSelf = aSelf;
iCommand = aCommand;
iCommandHandler = aCommandHandler;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENCALLBACKPACKAGE_SETCOMMANDHANDLER_EXIT );
}
// ----------------------------------------------------------------------------
@@ -231,7 +237,7 @@
// ----------------------------------------------------------------------------
void CCalenState::HandleStateActivationL(CCalenStateMachine& /*aStateMachine*/)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_HANDLESTATEACTIVATIONL_ENTRY );
// Can only issue one of the following Notifications
// ECalenNotifySettingsChanged or
@@ -258,7 +264,7 @@
iOutstandingNotifications.Close();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_HANDLESTATEACTIVATIONL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -268,11 +274,11 @@
void CCalenState::SetCurrentState(CCalenStateMachine& aStateMachine,
const CCalenStateMachine::TCalenStateIndex& aState )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_SETCURRENTSTATE_ENTRY );
aStateMachine.SetCurrentState(aState);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_SETCURRENTSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -282,9 +288,9 @@
CCalenStateMachine::TCalenStateIndex CCalenState::GetCurrentState(
CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_GETCURRENTSTATE_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATE_GETCURRENTSTATE_EXIT );
return aStateMachine.GetCurrentState();
}
@@ -295,11 +301,11 @@
void CCalenState::SetCurrentPreviousState(CCalenStateMachine& aStateMachine,
const CCalenStateMachine::TCalenStateIndex& aState)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_SETCURRENTPREVIOUSSTATE_ENTRY );
+
aStateMachine.SetCurrentPreviousState(aState);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_SETCURRENTPREVIOUSSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -308,11 +314,11 @@
// ----------------------------------------------------------------------------
void CCalenState::ActivateCurrentStateL(CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_ACTIVATECURRENTSTATEL_ENTRY );
+
aStateMachine.ActivateCurrentStateL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_ACTIVATECURRENTSTATEL_EXIT );
}
// ----------------------------------------------------------------------------
// CCalenState::CancelPreviousCmd
@@ -320,11 +326,11 @@
// ----------------------------------------------------------------------------
void CCalenState::CancelPreviousCmd(CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_CANCELPREVIOUSCMD_ENTRY );
+
aStateMachine.CancelPreviousCmd();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_CANCELPREVIOUSCMD_EXIT );
}
// ----------------------------------------------------------------------------
@@ -333,13 +339,13 @@
// ----------------------------------------------------------------------------
void CCalenState::CancelExecutingCmd()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_CANCELEXECUTINGCMD_ENTRY );
+
if(iCmdCallback)
{
iCmdCallback->Cancel();
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_CANCELEXECUTINGCMD_EXIT );
}
// End of file
--- a/calendarui/controller/src/calenstatemachine.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenstatemachine.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,6 +32,10 @@
#include "calensendingstate.h"
#include "calensettingsstate.h"
#include "calenviewingstate.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenstatemachineTraces.h"
+#endif
const TInt KHashLength = 64;
@@ -43,14 +47,14 @@
//
CCalenStateMachine* CCalenStateMachine::NewL( CCalenController& aController )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_NEWL_ENTRY );
+
CCalenStateMachine* self = new ( ELeave ) CCalenStateMachine( aController );
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_NEWL_EXIT );
return self;
}
@@ -64,8 +68,9 @@
: iController( aController ) ,
iOutstandingNotifications(&::HashCalenNotificationFunction,&::HashCalenNotificationIdentityRelation)
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_CCALENSTATEMACHINE_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_CCALENSTATEMACHINE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -76,8 +81,8 @@
//
void CCalenStateMachine::ConstructL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_CONSTRUCTL_ENTRY );
+
CCalenState* state = NULL;
iOutstandingNotifications.ReserveL(KHashLength);
@@ -127,7 +132,7 @@
ASSERT( iStates.Count() == KCalenLastState );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -138,12 +143,12 @@
//
CCalenStateMachine::~CCalenStateMachine()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENSTATEMACHINE_CCALENSTATEMACHINE_ENTRY );
iOutstandingNotifications.Close();
iStates.ResetAndDestroy();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENSTATEMACHINE_CCALENSTATEMACHINE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -154,11 +159,11 @@
//
void CCalenStateMachine::HandleNotification(const TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_HANDLENOTIFICATION_ENTRY );
+
TRAP_IGNORE(iStates[iCurrentState]->HandleNotificationL( aNotification, *this));
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_HANDLENOTIFICATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -169,6 +174,9 @@
//
CCalenStateMachine::TCalenStateIndex CCalenStateMachine::CurrentState()
{
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_CURRENTSTATE_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_CURRENTSTATE_EXIT );
return iCurrentState;
}
@@ -180,11 +188,11 @@
//
TBool CCalenStateMachine::HandleCommandL( const TCalenCommand& aCommand )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_HANDLECOMMANDL_ENTRY );
TBool cmdUsed = iStates[iCurrentState]->HandleCommandL( aCommand, *this);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -196,8 +204,8 @@
//
void CCalenStateMachine::CancelPreviousCmd()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_CANCELPREVIOUSCMD_ENTRY );
+
TCalenStateIndex previousState = iStates[iCurrentState]->PreviousState();
iStates[iCurrentState]->CancelExecutingCmd();
@@ -206,7 +214,7 @@
iCurrentState = previousState;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_CANCELPREVIOUSCMD_EXIT );
}
// ----------------------------------------------------------------------------
@@ -217,10 +225,10 @@
//
CCalenStateMachine::TCalenStateIndex CCalenStateMachine::GetCurrentState()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
-
- return iCurrentState;
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_GETCURRENTSTATE_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_GETCURRENTSTATE_EXIT );
+ return iCurrentState;
}
// ----------------------------------------------------------------------------
@@ -231,11 +239,11 @@
//
void CCalenStateMachine::SetCurrentState(const TCalenStateIndex& aState)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_SETCURRENTSTATE_ENTRY );
+
iCurrentState = aState;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_SETCURRENTSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -246,11 +254,11 @@
//
void CCalenStateMachine::SetCurrentPreviousState(const TCalenStateIndex& aState)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_SETCURRENTPREVIOUSSTATE_ENTRY );
+
iStates[iCurrentState]->SetPreviousState(aState);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_SETCURRENTPREVIOUSSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -261,10 +269,10 @@
//
void CCalenStateMachine::ActivateCurrentStateL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATEMACHINE_ACTIVATECURRENTSTATEL_ENTRY );
+
iStates[iCurrentState]->HandleStateActivationL(*this);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATEMACHINE_ACTIVATECURRENTSTATEL_EXIT );
}
// End of file
--- a/calendarui/controller/src/calenviewingstate.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenviewingstate.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,10 @@
#include "calencontroller.h"
#include "calenstatemachine.h"
#include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenviewingstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenViewingState::NewLC
@@ -30,13 +34,13 @@
CCalenViewingState* CCalenViewingState::NewLC( CCalenController& aController,
RHashSet<TCalenNotification>& aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENVIEWINGSTATE_NEWLC_ENTRY );
+
CCalenViewingState* self = new ( ELeave ) CCalenViewingState( aController,aOutstandingNotifications );
CleanupStack::PushL( self );
self->ConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENVIEWINGSTATE_NEWLC_EXIT );
return self;
}
@@ -46,10 +50,11 @@
// ----------------------------------------------------------------------------
void CCalenViewingState::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENVIEWINGSTATE_CONSTRUCTL_ENTRY );
+
BaseConstructL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENVIEWINGSTATE_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
RHashSet<TCalenNotification>& aOutstandingNotifications )
: CCalenState( aController, aOutstandingNotifications )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
// ----------------------------------------------------------------------------
CCalenViewingState::~CCalenViewingState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -83,7 +88,7 @@
TBool CCalenViewingState::HandleCommandL( const TCalenCommand& aCommand,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENVIEWINGSTATE_HANDLECOMMANDL_ENTRY );
TInt cmd = aCommand.Command();
MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -147,7 +152,7 @@
}
RequestCallbackL( handler, aCommand );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENVIEWINGSTATE_HANDLECOMMANDL_EXIT );
return cmdUsed;
}
@@ -158,8 +163,8 @@
void CCalenViewingState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENVIEWINGSTATE_HANDLENOTIFICATIONL_ENTRY );
+
switch( aNotification )
{
case ECalenNotifyEntryClosed:
@@ -182,7 +187,7 @@
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENVIEWINGSTATE_HANDLENOTIFICATIONL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -191,7 +196,7 @@
// ----------------------------------------------------------------------------
void CCalenViewingState::HandleStateActivationL(CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENVIEWINGSTATE_HANDLESTATEACTIVATIONL_ENTRY );
if( iOutstandingNotifications.Find(ECalenNotifyEntryDeleted) )
{
@@ -202,7 +207,8 @@
{
CCalenState::HandleStateActivationL(aStateMachine);
}
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENVIEWINGSTATE_HANDLESTATEACTIVATIONL_EXIT );
}
// end of file
--- a/calendarui/controller/src/calenviewmanager.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/controller/src/calenviewmanager.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -39,6 +39,11 @@
#include "calendarui_debug.h"
#include "calencommon.h"
#include "calendayview.h"
+#include <agendautil.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenviewmanagerTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CalenViewManager::CalenViewManager
@@ -49,7 +54,7 @@
CalenViewManager::CalenViewManager( CCalenController& aController)
: mController(aController)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_CALENVIEWMANAGER_ENTRY );
// Following block intializes member variables
mCalenEventViewer = NULL;
@@ -61,6 +66,7 @@
mCalenAgendaViewAlt = NULL;
mSettingsView = NULL;
mCalenDayView = NULL;
+ mInstanceViewCreated = false;
// Connect to instance view and entry view creation signals from agenda
// interface
@@ -68,14 +74,18 @@
this, SLOT(handleInstanceViewCreation(int)));
connect(mController.agendaInterface(), SIGNAL(entryViewCreationCompleted(int)),
this, SLOT(handleEntryViewCreation(int)));
-
- TRACE_EXIT_POINT;
+ connect(mController.agendaInterface(), SIGNAL(entriesChanged(QList<ulong>)),
+ this, SLOT(handleEntriesChanged(QList<ulong>)));
+ connect(mController.agendaInterface(), SIGNAL(entryUpdated(ulong)),
+ this, SLOT(handleEntryUpdation(ulong)));
+ connect(mController.agendaInterface(), SIGNAL(entryAdded(ulong)),
+ this, SLOT(handleEntryUpdation(ulong)));
+ OstTraceFunctionExit0( CALENVIEWMANAGER_CALENVIEWMANAGER_EXIT );
}
void CalenViewManager::SecondPhaseConstruction()
{
-
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_SECONDPHASECONSTRUCTION_ENTRY );
// Check the Application Startup reason from Activity Manager
int activityReason = qobject_cast<HbApplication*>(qApp)->activateReason();
@@ -144,8 +154,8 @@
mController.MainWindow().setCurrentView(mCalenMonthView);
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENVIEWMANAGER_SECONDPHASECONSTRUCTION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -156,8 +166,8 @@
//
CalenViewManager::~CalenViewManager()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( DUP1_CALENVIEWMANAGER_CALENVIEWMANAGER_ENTRY );
+
if (mSettingsView) {
delete mSettingsView;
mSettingsView = 0;
@@ -174,7 +184,8 @@
delete mMonthViewDocLoader;
mMonthViewDocLoader = 0;
}
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( DUP1_CALENVIEWMANAGER_CALENVIEWMANAGER_EXIT );
}
// ----------------------------------------------------------------------------
@@ -185,8 +196,9 @@
//
void CalenViewManager::constructAndActivateView(int view)
{
- TRACE_ENTRY_POINT;
- // We are here because, some other application is launching calendar with
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_CONSTRUCTANDACTIVATEVIEW_ENTRY );
+
+ // We are here because, some other application is launching calendar with
// the view, hence connect to viewReady() signal to do any lazy loading
// in the slot
@@ -208,8 +220,9 @@
// Add agenda view to mainwindow.
mController.MainWindow().addView(mCalenAgendaView);
mController.MainWindow().setCurrentView(mCalenAgendaView);
+ mController.MainWindow().addView(mCalenAgendaViewAlt);
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENVIEWMANAGER_CONSTRUCTANDACTIVATEVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -220,6 +233,8 @@
//
void CalenViewManager::loadMonthView()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_LOADMONTHVIEW_ENTRY );
+
bool loadSuccess = false;
Qt::Orientation currentOrienation = mController.MainWindow().orientation();
// Create the month view docloader object.
@@ -245,6 +260,8 @@
// Setup the month view.
mCalenMonthView->setupView(mMonthViewDocLoader);
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_LOADMONTHVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -255,6 +272,8 @@
//
void CalenViewManager::loadAgendaView()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_LOADAGENDAVIEW_ENTRY );
+
bool loadSuccess = false;
// Create the agenda view docloader object.
mAgendaViewDocLoader = new CalenDocLoader(mController);
@@ -280,6 +299,36 @@
// to provide an illusion of flow to the user
loadAlternateAgendaView();
+ OstTraceFunctionExit0( CALENVIEWMANAGER_LOADAGENDAVIEW_EXIT );
+}
+
+// ----------------------------------------------------------------------------
+// CalenViewManager::loadDayView
+// Loads day view from the docml
+// ----------------------------------------------------------------------------
+void CalenViewManager::loadDayView()
+{
+ bool loadSuccess = false;
+
+ // Create the docloader object
+ CalenDocLoader *docLoader = new CalenDocLoader(mController);
+
+ if (docLoader) {
+ docLoader->load(CALEN_DAYVIEW_DOCML, &loadSuccess);
+ if (!loadSuccess) {
+ qFatal("calenviewmanager.cpp : Unable to load day view XML");
+ }
+
+ // Get the CalenDayView object from the loader
+ mCalenDayView = static_cast<CalenDayView *>
+ (docLoader->findWidget(CALEN_DAYVIEW));
+ if (!mCalenDayView) {
+ qFatal("calenviewmanager.cpp : Unable to find day view");
+ }
+
+ // Set up the day view - day view takes the ownership
+ mCalenDayView->setupView(docLoader);
+ }
}
// ----------------------------------------------------------------------------
@@ -290,9 +339,20 @@
//
void CalenViewManager::handleMainViewReady()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEMAINVIEWREADY_ENTRY );
+
// Construct the month view part that is kept for lazy loading
- if (mCalenMonthView) {
+ if (mCalenMonthView) {
mCalenMonthView->doLazyLoading();
+
+ if (mInstanceViewCreated) {
+ // populate entries for the month view if the month view is launched
+ // from the service APIs. Otherwise the month view is not populated with
+ // the entries as CalenViewManager::handleInstanceViewCreation is called
+ // before the month view creation so the model array is not populated.
+ mCalenMonthView->fetchEntriesAndUpdateModel();
+ }
+
}
// Construct other views
@@ -305,6 +365,8 @@
// disconnect the view ready signal as we dont need it anymore
disconnect(&mController.MainWindow(), SIGNAL(viewReady()),
this, SLOT(handleMainViewReady()));
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEMAINVIEWREADY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -315,6 +377,8 @@
//
void CalenViewManager::constructOtherViews()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_CONSTRUCTOTHERVIEWS_ENTRY );
+
// Load all other views except mFirstView
// NOTE: Right now, since Calendar has only two views, month view
@@ -329,7 +393,7 @@
loadAgendaView();
if (!mCalenDayView) {
- mCalenDayView = new CalenDayView(mController.Services());
+ loadDayView();
}
}
else //agenda view was launched as first view
@@ -344,6 +408,8 @@
// Setup the settings view
mSettingsView = new CalenSettingsView(mController.Services());
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_CONSTRUCTOTHERVIEWS_EXIT );
}
// ----------------------------------------------------------------------------
@@ -354,6 +420,9 @@
//
int CalenViewManager::getFirstView()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_GETFIRSTVIEW_ENTRY );
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_GETFIRSTVIEW_EXIT );
return mFirstView;
}
@@ -364,6 +433,8 @@
//
void CalenViewManager::showNextDay()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_SHOWNEXTDAY_ENTRY );
+
// Set the context for the next day
QDateTime currentDay = mController.Services().Context().focusDateAndTime();
currentDay = currentDay.addDays(1);
@@ -395,6 +466,7 @@
mCalenAgendaView->doPopulation();
mController.MainWindow().setCurrentView(mCalenAgendaView, true, Hb::ViewSwitchUseNormalAnim);
}
+ OstTraceFunctionExit0( CALENVIEWMANAGER_SHOWNEXTDAY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -404,6 +476,8 @@
//
void CalenViewManager::showPrevDay()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_SHOWPREVDAY_ENTRY );
+
QDateTime currentDay = mController.Services().Context().focusDateAndTime();
currentDay = currentDay.addDays(-1);
mController.Services().Context().setFocusDate(currentDay);
@@ -431,6 +505,8 @@
mCalenAgendaView->doPopulation();
mController.MainWindow().setCurrentView(mCalenAgendaView, true, Hb::ViewSwitchUseNormalAnim);
}
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_SHOWPREVDAY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -440,6 +516,8 @@
//
void CalenViewManager::removePreviousView()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_REMOVEPREVIOUSVIEW_ENTRY );
+
if (ECalenAgendaView == mCurrentViewId) {
mCalenAgendaView->clearListModel();
mCalenAgendaViewAlt->clearListModel();
@@ -453,6 +531,7 @@
}
}
+ OstTraceFunctionExit0( CALENVIEWMANAGER_REMOVEPREVIOUSVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -463,14 +542,15 @@
//
void CalenViewManager::ActivateDefaultViewL(int defaultView)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_ACTIVATEDEFAULTVIEWL_ENTRY );
+
mCurrentViewId = defaultView;
if (ECalenMonthView == defaultView) {
mCalenMonthView->doPopulation();
} else if (ECalenAgendaView == defaultView) {
mCalenAgendaView->doPopulation();
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENVIEWMANAGER_ACTIVATEDEFAULTVIEWL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -479,9 +559,11 @@
// ----------------------------------------------------------------------------
void CalenViewManager::refreshCurrentViewL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_REFRESHCURRENTVIEWL_ENTRY );
+
activateCurrentView();
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_REFRESHCURRENTVIEWL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -490,7 +572,8 @@
// ----------------------------------------------------------------------------
void CalenViewManager::activateCurrentView()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_ACTIVATECURRENTVIEW_ENTRY );
+
switch (mCurrentViewId) {
case ECalenMonthView:
mCalenMonthView->doPopulation();
@@ -532,7 +615,8 @@
mController.MainWindow().setCurrentView(mCalenDayView);
break;
}
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_ACTIVATECURRENTVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -543,6 +627,8 @@
//
void CalenViewManager::launchEventView()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_LAUNCHEVENTVIEW_ENTRY );
+
// capture cureent view in case app closed/quits from AgendaEventViewer
if (mCalenMonthView) {
mCalenMonthView->captureScreenshot(true);
@@ -575,6 +661,7 @@
// Launch agenda event viewer
mCalenEventViewer->view(viewEntry, AgendaEventViewer::ActionEditDelete);
+ OstTraceFunctionExit0( CALENVIEWMANAGER_LAUNCHEVENTVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -584,6 +671,8 @@
//
void CalenViewManager::loadAlternateAgendaView()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_LOADALTERNATEAGENDAVIEW_ENTRY );
+
bool loadSuccess = false;
// Create the agenda view docloader object.
mAgendaViewAltDocLoader = new CalenDocLoader(mController);
@@ -602,6 +691,7 @@
// Setup the agenda view
mCalenAgendaViewAlt->setupView(mAgendaViewAltDocLoader);
+ OstTraceFunctionExit0( CALENVIEWMANAGER_LOADALTERNATEAGENDAVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -612,7 +702,8 @@
//
TBool CalenViewManager::HandleCommandL(const TCalenCommand& command)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLECOMMANDL_ENTRY );
+
TBool commandUsed(EFalse);
switch (command.Command()) {
@@ -634,11 +725,17 @@
break;
case ECalenDayView:
{
- // First add new view and use QueuedConnection to assure that
- // view is ready before setting it as the current view
+ // First add new view
mController.MainWindow().addView(mCalenDayView);
- QMetaObject::invokeMethod(this, "handleDayViewReady",
- Qt::QueuedConnection);
+
+ // Removes current view
+ // Notice: removing view should be done after new view is set as current to
+ // avoid situation that there is no current view in application
+ removePreviousView();
+
+ // Sets and activates day view
+ mCurrentViewId = ECalenDayView;
+ activateCurrentView();
}
break;
case ECalenEventView:
@@ -654,7 +751,7 @@
showPrevDay();
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLECOMMANDL_EXIT );
return commandUsed;
}
@@ -667,7 +764,8 @@
void CalenViewManager::HandleNotification(
const TCalenNotification notification)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLENOTIFICATION_ENTRY );
+
switch (notification) {
case ECalenNotifyExternalDatabaseChanged:
case ECalenNotifyDialogClosed:
@@ -677,13 +775,23 @@
case ECalenNotifyInstanceDeleted:
case ECalenNotifyEntryClosed:
case ECalenNotifySystemLocaleChanged:
- case ECalenNotifySystemLanguageChanged:
- {
- activateCurrentView();
- }
+ case ECalenNotifySystemTimeChanged:
+ case ECalenNotifySystemLanguageChanged: {
+
+ if (notification == ECalenNotifySystemTimeChanged) {
+ MCalenContext &context = mController.context();
+ QDateTime defaultTime = context.defaultCalTimeForViewsL();
+ context.setFocusDateAndTime(defaultTime);
+ }
+ activateCurrentView();
+ if (mCalenMonthView) {
+ mCalenMonthView->captureScreenshot();
+ } else if (mCalenAgendaView) {
+ mCalenAgendaView->captureScreenshot();
+ }
+ }
break;
- case ECalenNotifySettingsClosed:
- {
+ case ECalenNotifySettingsClosed: {
//when setting view closed , switch to the previous view
mCurrentViewId = mPreviousViewsId ;
mController.Services().IssueCommandL(ECalenStartActiveStep);
@@ -700,7 +808,7 @@
default:
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLENOTIFICATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -711,6 +819,9 @@
//
CalenSettingsView* CalenViewManager::settingsView()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_SETTINGSVIEW_ENTRY );
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_SETTINGSVIEW_EXIT );
return mSettingsView;
}
@@ -722,11 +833,13 @@
//
void CalenViewManager::handleViewingCompleted(const QDate date)
{
+ Q_UNUSED(date);
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEVIEWINGCOMPLETED_ENTRY );
// Cleanup.
mCalenEventViewer->deleteLater();
if (!date.isNull() && date.isValid()) {
- mController.Services().Context().setFocusDate(QDateTime(date));
+ mController.Services().Context().setFocusDate(QDateTime(date));
}
mController.Services().IssueNotificationL(ECalenNotifyEntryClosed);
@@ -736,6 +849,7 @@
} else if (mCalenAgendaView) {
mCalenAgendaView->captureScreenshot();
}
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEVIEWINGCOMPLETED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -746,9 +860,11 @@
//
void CalenViewManager::handleEditingStarted()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEEDITINGSTARTED_ENTRY );
mController.IssueCommandL(ECalenEditEntryFromViewer);
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEEDITINGSTARTED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -759,9 +875,11 @@
//
void CalenViewManager::handleEditingCompleted()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEEDITINGCOMPLETED_ENTRY );
mController.Services().IssueNotificationL(ECalenNotifyEditorClosedFromViewer);
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEEDITINGCOMPLETED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -772,9 +890,11 @@
//
void CalenViewManager::handleDeletingStarted()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEDELETINGSTARTED_ENTRY );
mController.IssueCommandL(ECalenDeleteEntryFromViewer);
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEDELETINGSTARTED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -785,6 +905,7 @@
//
void CalenViewManager::handleDeletingCompleted()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEDELETINGCOMPLETED_ENTRY );
mController.Services().IssueNotificationL(ECalenNotifyEntryDeleted);
@@ -794,8 +915,8 @@
} else if (mCalenAgendaView) {
mCalenAgendaView->captureScreenshot();
}
-
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEDELETINGCOMPLETED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -806,7 +927,16 @@
//
void CalenViewManager::handleInstanceViewCreation(int status)
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEINSTANCEVIEWCREATION_ENTRY );
+
Q_UNUSED(status);
+
+ // This flag is needed if mCalenMonthView and mCalenAgendaview is not created
+ // and before that this slot is getting called.
+ // if we launch views through services then this slot is getting called
+ // before the view construction.
+ mInstanceViewCreated = true;
+
// handleInstanceViewCreation function is called only once. Now that the instance
// view creation is successfull. Events need to be populated on screen
// Ideal colution should be to call a uniform function, e.g. PopulateEvents
@@ -820,6 +950,14 @@
else if (mCalenAgendaView) {
mCalenAgendaView->doPopulation();
}
+ // Calls the emitAppReady function of CalenController. 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
+ // NotesApplication object needs to emit applicationReady Signal.
+ mController.emitAppReady();
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEINSTANCEVIEWCREATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -830,25 +968,50 @@
//
void CalenViewManager::handleEntryViewCreation(int status)
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEENTRYVIEWCREATION_ENTRY );
+
// Nothing Yet
Q_UNUSED(status);
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEENTRYVIEWCREATION_EXIT );
}
// ----------------------------------------------------------------------------
-// CalenViewManager::handleDayViewReady
-// Launches day view when it is added to MainWindow and ready to be displayed
+// CalenViewManager::handleEntriesChanged
+// this function will be called when someone else has changed the database
// ----------------------------------------------------------------------------
//
-void CalenViewManager::handleDayViewReady()
+void CalenViewManager::handleEntriesChanged(QList<ulong> ids)
{
- // Removes current view
- // Notice: removing view should be done after new view is set as current to
- // avoid situation that there is no current view in application
- removePreviousView();
-
- // Sets and activates day view
- mCurrentViewId = ECalenDayView;
- activateCurrentView();
+ Q_UNUSED(ids);
+ HbView *currentview = mController.MainWindow().currentView();
+ if((mCalenMonthView == currentview)||(mCalenDayView == currentview)||
+ (mCalenAgendaView == currentview ))
+ {
+ activateCurrentView();
+ }
+}
+
+// ----------------------------------------------------------------------------
+// CalenViewManager::handleEntryUpdation
+// this function will be called when any entry is updated or added into database
+// Here we need to set the context to the entry updated or added.
+// ----------------------------------------------------------------------------
+//
+void CalenViewManager::handleEntryUpdation(ulong id)
+{
+ AgendaEntry updatedEntry = mController.agendaInterface()->fetchById(id);
+
+ // Agenda entry is not null then refresh the view else close event viewer
+ if (!updatedEntry.isNull()) {
+ if (AgendaEntry::TypeTodo != updatedEntry.type()) {
+ QDate date = updatedEntry.startTime().date();
+ if (!date.isNull() && date.isValid()) {
+ mController.Services().Context().setFocusDate(QDateTime(date));
+ }
+ }
+ }
+
}
// ----------------------------------------------------------------------------
@@ -859,6 +1022,8 @@
//
void CalenViewManager::launchSettingsView()
{
+ OstTraceFunctionEntry0( CALENVIEWMANAGER_LAUNCHSETTINGSVIEW_ENTRY );
+
mPreviousViewsId = mCurrentViewId ;
mCurrentViewId = ECalenShowSettings;
mSettingsView->initializeForm();
@@ -870,6 +1035,8 @@
} else if(mCalenAgendaView){
mCalenAgendaView->captureScreenshot(true);
}
+
+ OstTraceFunctionExit0( CALENVIEWMANAGER_LAUNCHSETTINGSVIEW_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenactionuiTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENACTIONUITRACES_H__
+#define __CALENACTIONUITRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENACTIONUI_NEWL_ENTRY 0x8a0001
+#define CCALENACTIONUI_NEWL_EXIT 0x8a0002
+#define CCALENACTIONUI_CCALENACTIONUI_ENTRY 0x8a0003
+#define CCALENACTIONUI_CCALENACTIONUI_EXIT 0x8a0004
+#define CCALENACTIONUI_CONSTRUCTL_ENTRY 0x8a0005
+#define CCALENACTIONUI_CONSTRUCTL_EXIT 0x8a0006
+#define DUP1_CCALENACTIONUI_CCALENACTIONUI_ENTRY 0x8a0007
+#define DUP1_CCALENACTIONUI_CCALENACTIONUI_EXIT 0x8a0008
+#define CCALENACTIONUI_GETCOMMANDHANDLERL_ENTRY 0x8a0009
+#define CCALENACTIONUI_GETCOMMANDHANDLERL_EXIT 0x8a000a
+#define CCALENACTIONUI_HANDLECOMMANDL_ENTRY 0x8a000b
+#define CCALENACTIONUI_HANDLECOMMANDL_EXIT 0x8a000c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenactionuiutilsTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,18 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENACTIONUIUTILSTRACES_H__
+#define __CALENACTIONUIUTILSTRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_ENTRY 0x8a000d
+#define CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_EXIT 0x8a000e
+#define CALENACTIONUIUTILS_SETTODOCOMPLETESTATUS_ENTRY 0x8a000f
+#define CALENACTIONUIUTILS_SETTODOCOMPLETESTATUS_EXIT 0x8a0010
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenasynccallbackTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENASYNCCALLBACKTRACES_H__
+#define __CALENASYNCCALLBACKTRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CALENASYNCCALLBACK_CALENASYNCCALLBACK_ENTRY 0x8a0011
+#define CALENASYNCCALLBACK_CALENASYNCCALLBACK_EXIT 0x8a0012
+#define CALENASYNCCALLBACK_NEWL_ENTRY 0x8a0013
+#define CALENASYNCCALLBACK_NEWL_EXIT 0x8a0014
+#define DUP1_CALENASYNCCALLBACK_CALENASYNCCALLBACK_ENTRY 0x8a0015
+#define DUP1_CALENASYNCCALLBACK_CALENASYNCCALLBACK_EXIT 0x8a0016
+#define CALENASYNCCALLBACK_BASECONSTRUCTL_ENTRY 0x8a0017
+#define CALENASYNCCALLBACK_BASECONSTRUCTL_EXIT 0x8a0018
+#define CALENASYNCCALLBACK_RUNL_ENTRY 0x8a0019
+#define CALENASYNCCALLBACK_RUNL_EXIT 0x8a001a
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenbackgroundstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,28 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENBACKGROUNDSTATETRACES_H__
+#define __CALENBACKGROUNDSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENBACKGROUNDSTATE_NEWLC_ENTRY 0x8a001b
+#define CCALENBACKGROUNDSTATE_NEWLC_EXIT 0x8a001c
+#define CCALENBACKGROUNDSTATE_CONSTRUCTL_ENTRY 0x8a001d
+#define CCALENBACKGROUNDSTATE_CONSTRUCTL_EXIT 0x8a001e
+#define CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_ENTRY 0x8a001f
+#define CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_EXIT 0x8a0020
+#define DUP1_CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_ENTRY 0x8a0021
+#define DUP1_CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_EXIT 0x8a0022
+#define CCALENBACKGROUNDSTATE_HANDLECOMMANDL_ENTRY 0x8a0023
+#define CCALENBACKGROUNDSTATE_HANDLECOMMANDL_EXIT 0x8a0024
+#define CCALENBACKGROUNDSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a0025
+#define CCALENBACKGROUNDSTATE_HANDLENOTIFICATIONL_EXIT 0x8a0026
+#define CCALENBACKGROUNDSTATE_HANDLESTATEACTIVATIONL_ENTRY 0x8a0027
+#define CCALENBACKGROUNDSTATE_HANDLESTATEACTIVATIONL_EXIT 0x8a0028
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calencontrollerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,70 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENCONTROLLERTRACES_H__
+#define __CALENCONTROLLERTRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENCONTROLLER_CCALENCONTROLLER_ENTRY 0x8a0029
+#define CCALENCONTROLLER_CCALENCONTROLLER_EXIT 0x8a002a
+#define CCALENCONTROLLER_CONSTRUCTCONTROLLER_ENTRY 0x8a002b
+#define CCALENCONTROLLER_CONSTRUCTCONTROLLER_EXIT 0x8a002c
+#define CCALENCONTROLLER_CHECKMULTIPLECREATION_ENTRY 0x8a002d
+#define CCALENCONTROLLER_CHECKMULTIPLECREATION_EXIT 0x8a002e
+#define CCALENCONTROLLER_INSTANCEL_ENTRY 0x8a002f
+#define CCALENCONTROLLER_INSTANCEL_EXIT 0x8a0030
+#define CCALENCONTROLLER_RELEASECUSTOMISATIONS_ENTRY 0x8a0031
+#define CCALENCONTROLLER_RELEASECUSTOMISATIONS_EXIT 0x8a0032
+#define CCALENCONTROLLER_RELEASE_ENTRY 0x8a0033
+#define CCALENCONTROLLER_RELEASE_EXIT 0x8a0034
+#define DUP1_CCALENCONTROLLER_CCALENCONTROLLER_ENTRY 0x8a0035
+#define DUP1_CCALENCONTROLLER_CCALENCONTROLLER_EXIT 0x8a0036
+#define CCALENCONTROLLER_ISSUECOMMANDL_ENTRY 0x8a0037
+#define CCALENCONTROLLER_ISSUECOMMANDL_EXIT 0x8a0038
+#define CCALENCONTROLLER_SERVICES_ENTRY 0x8a0039
+#define CCALENCONTROLLER_SERVICES_EXIT 0x8a003a
+#define CCALENCONTROLLER_VIEWMANAGER_ENTRY 0x8a003b
+#define CCALENCONTROLLER_VIEWMANAGER_EXIT 0x8a003c
+#define DUP1_CCALENCONTROLLER_MAINWINDOW_ENTRY 0x8a003d
+#define DUP1_CCALENCONTROLLER_MAINWINDOW_EXIT 0x8a003e
+#define CCALENCONTROLLER_BROADCASTNOTIFICATION_ENTRY 0x8a003f
+#define CCALENCONTROLLER_BROADCASTNOTIFICATION_EXIT 0x8a0040
+#define CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_ENTRY 0x8a0041
+#define CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_EXIT 0x8a0042
+#define DUP1_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_ENTRY 0x8a0043
+#define DUP1_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_EXIT 0x8a0044
+#define CCALENCONTROLLER_CANCELNOTIFICATIONS_ENTRY 0x8a0045
+#define CCALENCONTROLLER_CANCELNOTIFICATIONS_EXIT 0x8a0046
+#define CCALENCONTROLLER_GETCOMMANDHANDLERL_ENTRY 0x8a0047
+#define CCALENCONTROLLER_GETCOMMANDHANDLERL_EXIT 0x8a0048
+#define CCALENCONTROLLER_NEWSERVICESL_ENTRY 0x8a0049
+#define CCALENCONTROLLER_NEWSERVICESL_EXIT 0x8a004a
+#define CCALENCONTROLLER_NOTIFIER_ENTRY 0x8a004b
+#define CCALENCONTROLLER_NOTIFIER_EXIT 0x8a004c
+#define DUP1_CCALENCONTROLLER_INFOBAR_ENTRY 0x8a004d
+#define DUP1_CCALENCONTROLLER_INFOBAR_EXIT 0x8a004e
+#define CCALENCONTROLLER_INFOBARTEXTL_ENTRY 0x8a004f
+#define CCALENCONTROLLER_INFOBARTEXTL_EXIT 0x8a0050
+#define CCALENCONTROLLER_CUSTOMISATIONMANAGER_ENTRY 0x8a0051
+#define CCALENCONTROLLER_CUSTOMISATIONMANAGER_EXIT 0x8a0052
+#define CCALENCONTROLLER_SETDEFAULTCONTEXT_ENTRY 0x8a0053
+#define CCALENCONTROLLER_SETDEFAULTCONTEXT_EXIT 0x8a0054
+#define CCALENCONTROLLER_OFFERMENU_ENTRY 0x8a0055
+#define CCALENCONTROLLER_OFFERMENU_EXIT 0x8a0056
+#define CCALENCONTROLLER_AGENDAINTERFACE_ENTRY 0x8a0057
+#define CCALENCONTROLLER_AGENDAINTERFACE_EXIT 0x8a0058
+#define CCALENCONTROLLER_CONTEXT_ENTRY 0x8a0059
+#define CCALENCONTROLLER_CONTEXT_EXIT 0x8a005a
+#define CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_ENTRY 0x8a005b
+#define CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_EXIT 0x8a005c
+#define CCALENCONTROLLER_GETFIRSTVIEW_ENTRY 0x8a005d
+#define CCALENCONTROLLER_GETFIRSTVIEW_EXIT 0x8a005e
+#define CCALENCONTROLLER_EVENTFILTER_ENTRY 0x8a005f
+#define CCALENCONTROLLER_EVENTFILTER_EXIT 0x8a0060
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calendeleteuiTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,77 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENDELETEUITRACES_H__
+#define __CALENDELETEUITRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CALENDELETEUI_NEWL_ENTRY 0x8a0061
+#define CALENDELETEUI_NEWL_EXIT 0x8a0062
+#define CALENDELETEUI_CALENDELETEUI_ENTRY 0x8a0063
+#define CALENDELETEUI_CALENDELETEUI_EXIT 0x8a0064
+#define DUP1_CALENDELETEUI_CALENDELETEUI_ENTRY 0x8a0065
+#define DUP1_CALENDELETEUI_CALENDELETEUI_EXIT 0x8a0066
+#define CALENDELETEUI_CONSTRUCTL_ENTRY 0x8a0067
+#define CALENDELETEUI_CONSTRUCTL_EXIT 0x8a0068
+#define CALENDELETEUI_HANDLENOTIFICATION_ENTRY 0x8a0069
+#define CALENDELETEUI_HANDLENOTIFICATION_EXIT 0x8a006a
+#define CALENDELETEUI_HANDLECOMMANDL_ENTRY 0x8a006b
+#define CALENDELETEUI_HANDLECOMMANDL_EXIT 0x8a006c
+#define CALENDELETEUI_DELETETHISORALLL_ENTRY 0x8a006d
+#define CALENDELETEUI_DELETETHISORALLL_EXIT 0x8a006e
+#define CALENDELETEUI_DELETEENTRYWITHOUTQUERYL_ENTRY 0x8a006f
+#define CALENDELETEUI_DELETEENTRYWITHOUTQUERYL_EXIT 0x8a0070
+#define CALENDELETEUI_DELETECURRENTENTRYL_ENTRY 0x8a0071
+#define CALENDELETEUI_DELETECURRENTENTRYL_EXIT 0x8a0072
+#define CALENDELETEUI_DELETEALLENTRIESL_ENTRY 0x8a0073
+#define CALENDELETEUI_DELETEALLENTRIESL_EXIT 0x8a0074
+#define DUP1_CALENDELETEUI_DELETEALLENTRIESL_EXIT 0x8a0075
+#define CALENDELETEUI_DELETEENTRIESBEFOREDATEL_ENTRY 0x8a0076
+#define CALENDELETEUI_DELETEENTRIESBEFOREDATEL_EXIT 0x8a0077
+#define DUP1_CALENDELETEUI_DELETEENTRIESBEFOREDATEL_EXIT 0x8a0078
+#define CALENDELETEUI_DATEQUERY_ENTRY 0x8a0079
+#define CALENDELETEUI_DATEQUERY_EXIT 0x8a007a
+#define CALENDELETEUI_HANDLEDATEQUERY_ENTRY 0x8a007b
+#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
+#define CALENDELETEUI_SHOWDELETEQUERY_EXIT 0x8a0084
+#define CALENDELETEUI_HANDLEDELETION_ENTRY 0x8a0085
+#define CALENDELETEUI_HANDLEDELETION_EXIT 0x8a0086
+#define CALENDELETEUI_ENTRYDELETED_ENTRY 0x8a0087
+#define CALENDELETEUI_ENTRYDELETED_EXIT 0x8a0088
+#define CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_ENTRY 0x8a0089
+#define CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_EXIT 0x8a008a
+#define DUP1_CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_EXIT 0x8a008b
+#define CALENDELETEUI_DELETEDAYRANGEL_ENTRY 0x8a008c
+#define CALENDELETEUI_DELETEDAYRANGEL_EXIT 0x8a008d
+#define CALENDELETEUI_DOCOMPLETED_ENTRY 0x8a008e
+#define CALENDELETEUI_DOCOMPLETED_EXIT 0x8a008f
+#define CALENDELETEUI_DELETEENTRIESENDINGATMIDNIGHT_ENTRY 0x8a0090
+#define CALENDELETEUI_DELETEENTRIESENDINGATMIDNIGHT_EXIT 0x8a0091
+#define CALENDELETEUI_DELETESINGLEINSTANCEL_ENTRY 0x8a0092
+#define CALENDELETEUI_DELETESINGLEINSTANCEL_EXIT 0x8a0093
+#define DUP1_CALENDELETEUI_DELETESINGLEINSTANCEL_ENTRY 0x8a0094
+#define DUP1_CALENDELETEUI_DELETESINGLEINSTANCEL_EXIT 0x8a0095
+#define CALENDELETEUI_DODELETESINGLEINSTANCEL_ENTRY 0x8a0096
+#define CALENDELETEUI_DODELETESINGLEINSTANCEL_EXIT 0x8a0097
+#define CALENDELETEUI_DIALOGDISMISSEDL_ENTRY 0x8a0098
+#define CALENDELETEUI_DIALOGDISMISSEDL_EXIT 0x8a0099
+#define CALENDELETEUI_DELETEENTRYL_ENTRY 0x8a009a
+#define CALENDELETEUI_DELETEENTRYL_EXIT 0x8a009b
+#define CALENDELETEUI_DISPLAYWAITDIALOGL_ENTRY 0x8a009c
+#define CALENDELETEUI_DISPLAYWAITDIALOGL_EXIT 0x8a009d
+#define CALENDELETEUI_MARKEDENTRIESDELETEDL_ENTRY 0x8a009e
+#define CALENDELETEUI_MARKEDENTRIESDELETEDL_EXIT 0x8a009f
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calendeletingstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENDELETINGSTATETRACES_H__
+#define __CALENDELETINGSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENDELETINGSTATE_NEWLC_ENTRY 0x8a00a0
+#define CCALENDELETINGSTATE_NEWLC_EXIT 0x8a00a1
+#define CCALENDELETINGSTATE_CONSTRUCTL_ENTRY 0x8a00a2
+#define CCALENDELETINGSTATE_CONSTRUCTL_EXIT 0x8a00a3
+#define CCALENDELETINGSTATE_CCALENDELETINGSTATE_ENTRY 0x8a00a4
+#define CCALENDELETINGSTATE_CCALENDELETINGSTATE_EXIT 0x8a00a5
+#define DUP1_CCALENDELETINGSTATE_CCALENDELETINGSTATE_ENTRY 0x8a00a6
+#define DUP1_CCALENDELETINGSTATE_CCALENDELETINGSTATE_EXIT 0x8a00a7
+#define CCALENDELETINGSTATE_HANDLECOMMANDL_ENTRY 0x8a00a8
+#define CCALENDELETINGSTATE_HANDLECOMMANDL_EXIT 0x8a00a9
+#define CCALENDELETINGSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a00aa
+#define CCALENDELETINGSTATE_HANDLENOTIFICATIONL_EXIT 0x8a00ab
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calendocloaderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,32 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENDOCLOADERTRACES_H__
+#define __CALENDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CALENDOCLOADER_CALENDOCLOADER_ENTRY 0x8a00ac
+#define CALENDOCLOADER_CALENDOCLOADER_EXIT 0x8a00ad
+#define DUP1_CALENDOCLOADER_CALENDOCLOADER_ENTRY 0x8a00ae
+#define DUP1_CALENDOCLOADER_CALENDOCLOADER_EXIT 0x8a00af
+#define CALENDOCLOADER_CREATEOBJECT_ENTRY 0x8a00b0
+#define CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b1
+#define DUP1_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b2
+#define DUP2_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b3
+#define DUP3_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b4
+#define DUP4_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b5
+#define DUP5_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b6
+#define DUP6_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b7
+#define DUP7_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b8
+#define DUP8_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00b9
+#define DUP9_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00ba
+#define DUP10_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00bb
+#define DUP11_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00bc
+#define DUP12_CALENDOCLOADER_CREATEOBJECT_EXIT 0x8a00bd
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/caleneditingstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITINGSTATETRACES_H__
+#define __CALENEDITINGSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENEDITINGSTATE_NEWLC_ENTRY 0x8a00be
+#define CCALENEDITINGSTATE_NEWLC_EXIT 0x8a00bf
+#define CCALENEDITINGSTATE_CONSTRUCTL_ENTRY 0x8a00c0
+#define CCALENEDITINGSTATE_CONSTRUCTL_EXIT 0x8a00c1
+#define CCALENEDITINGSTATE_CCALENEDITINGSTATE_ENTRY 0x8a00c2
+#define CCALENEDITINGSTATE_CCALENEDITINGSTATE_EXIT 0x8a00c3
+#define DUP1_CCALENEDITINGSTATE_CCALENEDITINGSTATE_ENTRY 0x8a00c4
+#define DUP1_CCALENEDITINGSTATE_CCALENEDITINGSTATE_EXIT 0x8a00c5
+#define CCALENEDITINGSTATE_HANDLECOMMANDL_ENTRY 0x8a00c6
+#define CCALENEDITINGSTATE_HANDLECOMMANDL_EXIT 0x8a00c7
+#define CCALENEDITINGSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a00c8
+#define CCALENEDITINGSTATE_HANDLENOTIFICATIONL_EXIT 0x8a00c9
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenedituiTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,30 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEDITUITRACES_H__
+#define __CALENEDITUITRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENEDITUI_NEWL_ENTRY 0x8a00ca
+#define CCALENEDITUI_NEWL_EXIT 0x8a00cb
+#define CCALENEDITUI_CCALENEDITUI_ENTRY 0x8a00cc
+#define CCALENEDITUI_CCALENEDITUI_EXIT 0x8a00cd
+#define DUP1_CCALENEDITUI_CCALENEDITUI_ENTRY 0x8a00ce
+#define DUP1_CCALENEDITUI_CCALENEDITUI_EXIT 0x8a00cf
+#define CCALENEDITUI_CONSTRUCTL_ENTRY 0x8a00d0
+#define CCALENEDITUI_CONSTRUCTL_EXIT 0x8a00d1
+#define CCALENEDITUI_HANDLECOMMANDL_ENTRY 0x8a00d2
+#define CCALENEDITUI_HANDLECOMMANDL_EXIT 0x8a00d3
+#define CCALENEDITUI_HANDLEENTRYSAVED_ENTRY 0x8a00d4
+#define CCALENEDITUI_HANDLEENTRYSAVED_EXIT 0x8a00d5
+#define CCALENEDITUI_HANDLEDIALOGCLOSED_ENTRY 0x8a00d6
+#define CCALENEDITUI_HANDLEDIALOGCLOSED_EXIT 0x8a00d7
+#define CCALENEDITUI_HANDLENOTIFICATION_ENTRY 0x8a00d8
+#define CCALENEDITUI_HANDLENOTIFICATION_EXIT 0x8a00d9
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenexitingstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEXITINGSTATETRACES_H__
+#define __CALENEXITINGSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENEXITINGSTATE_NEWLC_ENTRY 0x8a00da
+#define CCALENEXITINGSTATE_NEWLC_EXIT 0x8a00db
+#define CCALENEXITINGSTATE_CONSTRUCTL_ENTRY 0x8a00dc
+#define CCALENEXITINGSTATE_CONSTRUCTL_EXIT 0x8a00dd
+#define CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY 0x8a00de
+#define CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT 0x8a00df
+#define DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY 0x8a00e0
+#define DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT 0x8a00e1
+#define CCALENEXITINGSTATE_HANDLECOMMANDL_ENTRY 0x8a00e2
+#define CCALENEXITINGSTATE_HANDLECOMMANDL_EXIT 0x8a00e3
+#define CCALENEXITINGSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a00e4
+#define CCALENEXITINGSTATE_HANDLENOTIFICATIONL_EXIT 0x8a00e5
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenhelpstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENHELPSTATETRACES_H__
+#define __CALENHELPSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENHELPSTATE_NEWLC_ENTRY 0x8a00e6
+#define CCALENHELPSTATE_NEWLC_EXIT 0x8a00e7
+#define CCALENHELPSTATE_CONSTRUCTL_ENTRY 0x8a00e8
+#define CCALENHELPSTATE_CONSTRUCTL_EXIT 0x8a00e9
+#define CCALENHELPSTATE_CCALENHELPSTATE_ENTRY 0x8a00ea
+#define CCALENHELPSTATE_CCALENHELPSTATE_EXIT 0x8a00eb
+#define DUP1_CCALENHELPSTATE_CCALENHELPSTATE_ENTRY 0x8a00ec
+#define DUP1_CCALENHELPSTATE_CCALENHELPSTATE_EXIT 0x8a00ed
+#define CCALENHELPSTATE_HANDLECOMMANDL_ENTRY 0x8a00ee
+#define CCALENHELPSTATE_HANDLECOMMANDL_EXIT 0x8a00ef
+#define CCALENHELPSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a00f0
+#define CCALENHELPSTATE_HANDLENOTIFICATIONL_EXIT 0x8a00f1
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenidlestateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENIDLESTATETRACES_H__
+#define __CALENIDLESTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENIDLESTATE_NEWLC_ENTRY 0x8a00f2
+#define CCALENIDLESTATE_NEWLC_EXIT 0x8a00f3
+#define CCALENIDLESTATE_CONSTRUCTL_ENTRY 0x8a00f4
+#define CCALENIDLESTATE_CONSTRUCTL_EXIT 0x8a00f5
+#define CCALENIDLESTATE_CCALENIDLESTATE_ENTRY 0x8a00f6
+#define CCALENIDLESTATE_CCALENIDLESTATE_EXIT 0x8a00f7
+#define DUP1_CCALENIDLESTATE_CCALENIDLESTATE_ENTRY 0x8a00f8
+#define DUP1_CCALENIDLESTATE_CCALENIDLESTATE_EXIT 0x8a00f9
+#define CCALENIDLESTATE_HANDLECOMMANDL_ENTRY 0x8a00fa
+#define CCALENIDLESTATE_HANDLECOMMANDL_EXIT 0x8a00fb
+#define CCALENIDLESTATE_HANDLENOTIFICATIONL_ENTRY 0x8a00fc
+#define CCALENIDLESTATE_HANDLENOTIFICATIONL_EXIT 0x8a00fd
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calennotifierTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,41 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENNOTIFIERTRACES_H__
+#define __CALENNOTIFIERTRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CALENNOTIFIER_CALENNOTIFIER_ENTRY 0x8a00fe
+#define CALENNOTIFIER_CALENNOTIFIER_EXIT 0x8a00ff
+#define DUP1_CALENNOTIFIER_CALENNOTIFIER_ENTRY 0x8a0100
+#define DUP1_CALENNOTIFIER_CALENNOTIFIER_EXIT 0x8a0101
+#define CALENNOTIFIER_CONSTRUCTL_ENTRY 0x8a0102
+#define CALENNOTIFIER_CONSTRUCTL_EXIT 0x8a0103
+#define CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_ENTRY 0x8a0104
+#define CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_EXIT 0x8a0105
+#define DUP1_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_ENTRY 0x8a0106
+#define DUP1_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_EXIT 0x8a0107
+#define CALENNOTIFIER_CANCELNOTIFICATIONS_ENTRY 0x8a0108
+#define CALENNOTIFIER_CANCELNOTIFICATIONS_EXIT 0x8a0109
+#define DUP1_CALENNOTIFIER_CANCELNOTIFICATIONS_EXIT 0x8a010a
+#define CALENNOTIFIER_CONTEXTCHANGED_ENTRY 0x8a010b
+#define CALENNOTIFIER_CONTEXTCHANGED_EXIT 0x8a010c
+#define CALENNOTIFIER_ENVCHANGECALLBACKL_ENTRY 0x8a010d
+#define CALENNOTIFIER_ENVCHANGECALLBACKL_EXIT 0x8a010e
+#define CALENNOTIFIER_DOENVCHANGE_ENTRY 0x8a010f
+#define CALENNOTIFIER_DOENVCHANGE_EXIT 0x8a0110
+#define CALENNOTIFIER_BROADCASTNOTIFICATION_ENTRY 0x8a0111
+#define CALENNOTIFIER_BROADCASTNOTIFICATION_EXIT 0x8a0112
+#define CALENNOTIFIER_BROADCASTAPPROVEDNOTIFICATION_ENTRY 0x8a0113
+#define CALENNOTIFIER_BROADCASTAPPROVEDNOTIFICATION_EXIT 0x8a0114
+#define CALENNOTIFIER_DOBROADCAST_ENTRY 0x8a0115
+#define CALENNOTIFIER_DOBROADCAST_EXIT 0x8a0116
+#define TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_ENTRY 0x8a0117
+#define TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_EXIT 0x8a0118
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenpopulationstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENPOPULATIONSTATETRACES_H__
+#define __CALENPOPULATIONSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENPOPULATIONSTATE_NEWLC_ENTRY 0x8a0119
+#define CCALENPOPULATIONSTATE_NEWLC_EXIT 0x8a011a
+#define CCALENPOPULATIONSTATE_CONSTRUCTL_ENTRY 0x8a011b
+#define CCALENPOPULATIONSTATE_CONSTRUCTL_EXIT 0x8a011c
+#define CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_ENTRY 0x8a011d
+#define CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_EXIT 0x8a011e
+#define DUP1_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_ENTRY 0x8a011f
+#define DUP1_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_EXIT 0x8a0120
+#define CCALENPOPULATIONSTATE_HANDLECOMMANDL_ENTRY 0x8a0121
+#define CCALENPOPULATIONSTATE_HANDLECOMMANDL_EXIT 0x8a0122
+#define CCALENPOPULATIONSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a0123
+#define CCALENPOPULATIONSTATE_HANDLENOTIFICATIONL_EXIT 0x8a0124
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenprintingstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENPRINTINGSTATETRACES_H__
+#define __CALENPRINTINGSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENPRINTINGSTATE_NEWLC_ENTRY 0x8a0125
+#define CCALENPRINTINGSTATE_NEWLC_EXIT 0x8a0126
+#define CCALENPRINTINGSTATE_CONSTRUCTL_ENTRY 0x8a0127
+#define CCALENPRINTINGSTATE_CONSTRUCTL_EXIT 0x8a0128
+#define CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_ENTRY 0x8a0129
+#define CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_EXIT 0x8a012a
+#define DUP1_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_ENTRY 0x8a012b
+#define DUP1_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_EXIT 0x8a012c
+#define CCALENPRINTINGSTATE_HANDLECOMMANDL_ENTRY 0x8a012d
+#define CCALENPRINTINGSTATE_HANDLECOMMANDL_EXIT 0x8a012e
+#define CCALENPRINTINGSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a012f
+#define CCALENPRINTINGSTATE_HANDLENOTIFICATIONL_EXIT 0x8a0130
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calensendingstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENSENDINGSTATETRACES_H__
+#define __CALENSENDINGSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENSENDINGSTATE_NEWLC_ENTRY 0x8a0131
+#define CCALENSENDINGSTATE_NEWLC_EXIT 0x8a0132
+#define CCALENSENDINGSTATE_CONSTRUCTL_ENTRY 0x8a0133
+#define CCALENSENDINGSTATE_CONSTRUCTL_EXIT 0x8a0134
+#define CCALENSENDINGSTATE_CCALENSENDINGSTATE_ENTRY 0x8a0135
+#define CCALENSENDINGSTATE_CCALENSENDINGSTATE_EXIT 0x8a0136
+#define DUP1_CCALENSENDINGSTATE_CCALENSENDINGSTATE_ENTRY 0x8a0137
+#define DUP1_CCALENSENDINGSTATE_CCALENSENDINGSTATE_EXIT 0x8a0138
+#define CCALENSENDINGSTATE_HANDLECOMMANDL_ENTRY 0x8a0139
+#define CCALENSENDINGSTATE_HANDLECOMMANDL_EXIT 0x8a013a
+#define CCALENSENDINGSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a013b
+#define CCALENSENDINGSTATE_HANDLENOTIFICATIONL_EXIT 0x8a013c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenservicesimplTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,54 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENSERVICESIMPLTRACES_H__
+#define __CALENSERVICESIMPLTRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CALENSERVICESIMPL_NEWL_ENTRY 0x8a013d
+#define CALENSERVICESIMPL_NEWL_EXIT 0x8a013e
+#define DUP1_CALENSERVICESIMPL_NEWL_ENTRY 0x8a013f
+#define DUP1_CALENSERVICESIMPL_NEWL_EXIT 0x8a0140
+#define CALENSERVICESIMPL_CALENSERVICESIMPL_ENTRY 0x8a0141
+#define CALENSERVICESIMPL_CALENSERVICESIMPL_EXIT 0x8a0142
+#define CALENSERVICESIMPL_CONSTRUCTL_ENTRY 0x8a0143
+#define CALENSERVICESIMPL_CONSTRUCTL_EXIT 0x8a0144
+#define CALENSERVICESIMPL_RELEASE_ENTRY 0x8a0145
+#define CALENSERVICESIMPL_RELEASE_EXIT 0x8a0146
+#define CALENSERVICESIMPL_MAINWINDOW_ENTRY 0x8a0147
+#define CALENSERVICESIMPL_MAINWINDOW_EXIT 0x8a0148
+#define CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_ENTRY 0x8a0149
+#define CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_EXIT 0x8a014a
+#define DUP1_CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_ENTRY 0x8a014b
+#define DUP1_CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_EXIT 0x8a014c
+#define CALENSERVICESIMPL_CANCELNOTIFICATIONS_ENTRY 0x8a014d
+#define CALENSERVICESIMPL_CANCELNOTIFICATIONS_EXIT 0x8a014e
+#define CALENSERVICESIMPL_ISSUECOMMANDL_ENTRY 0x8a014f
+#define CALENSERVICESIMPL_ISSUECOMMANDL_EXIT 0x8a0150
+#define CALENSERVICESIMPL_ISSUENOTIFICATIONL_ENTRY 0x8a0151
+#define CALENSERVICESIMPL_ISSUENOTIFICATIONL_EXIT 0x8a0152
+#define CALENSERVICESIMPL_REQUESTACTIVATIONL_ENTRY 0x8a0153
+#define CALENSERVICESIMPL_REQUESTACTIVATIONL_EXIT 0x8a0154
+#define CALENSERVICESIMPL_ACTIVATIONNOTIFICATIONL_ENTRY 0x8a0155
+#define CALENSERVICESIMPL_ACTIVATIONNOTIFICATIONL_EXIT 0x8a0156
+#define CALENSERVICESIMPL_CONTEXT_ENTRY 0x8a0157
+#define CALENSERVICESIMPL_CONTEXT_EXIT 0x8a0158
+#define CALENSERVICESIMPL_INFOBAR_ENTRY 0x8a0159
+#define CALENSERVICESIMPL_INFOBAR_EXIT 0x8a015a
+#define CALENSERVICESIMPL_INFOBARTEXTL_ENTRY 0x8a015b
+#define CALENSERVICESIMPL_INFOBARTEXTL_EXIT 0x8a015c
+#define CALENSERVICESIMPL_GETCOMMANDRANGE_ENTRY 0x8a015d
+#define CALENSERVICESIMPL_GETCOMMANDRANGE_EXIT 0x8a015e
+#define CALENSERVICESIMPL_OFFERMENU_ENTRY 0x8a015f
+#define CALENSERVICESIMPL_OFFERMENU_EXIT 0x8a0160
+#define CALENSERVICESIMPL_AGENDAINTERFACE_ENTRY 0x8a0161
+#define CALENSERVICESIMPL_AGENDAINTERFACE_EXIT 0x8a0162
+#define CALENSERVICESIMPL_GETFIRSTVIEW_ENTRY 0x8a0163
+#define CALENSERVICESIMPL_GETFIRSTVIEW_EXIT 0x8a0164
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calensettingsstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,28 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENSETTINGSSTATETRACES_H__
+#define __CALENSETTINGSSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENSETTINGSSTATE_NEWLC_ENTRY 0x8a0165
+#define CCALENSETTINGSSTATE_NEWLC_EXIT 0x8a0166
+#define CCALENSETTINGSSTATE_CONSTRUCTL_ENTRY 0x8a0167
+#define CCALENSETTINGSSTATE_CONSTRUCTL_EXIT 0x8a0168
+#define CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_ENTRY 0x8a0169
+#define CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_EXIT 0x8a016a
+#define DUP1_CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_ENTRY 0x8a016b
+#define DUP1_CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_EXIT 0x8a016c
+#define CCALENSETTINGSSTATE_HANDLECOMMANDL_ENTRY 0x8a016d
+#define CCALENSETTINGSSTATE_HANDLECOMMANDL_EXIT 0x8a016e
+#define CCALENSETTINGSSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a016f
+#define CCALENSETTINGSSTATE_HANDLENOTIFICATIONL_EXIT 0x8a0170
+#define CCALENSETTINGSSTATE_HANDLESTATEACTIVATIONL_ENTRY 0x8a0171
+#define CCALENSETTINGSSTATE_HANDLESTATEACTIVATIONL_EXIT 0x8a0172
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,52 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENSTATETRACES_H__
+#define __CALENSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENSTATE_CCALENSTATE_ENTRY 0x8a0173
+#define CCALENSTATE_CCALENSTATE_EXIT 0x8a0174
+#define CCALENSTATE_BASECONSTRUCTL_ENTRY 0x8a0175
+#define CCALENSTATE_BASECONSTRUCTL_EXIT 0x8a0176
+#define DUP1_CCALENSTATE_CCALENSTATE_ENTRY 0x8a0177
+#define DUP1_CCALENSTATE_CCALENSTATE_EXIT 0x8a0178
+#define CCALENSTATE_REQUESTCALLBACKL_ENTRY 0x8a0179
+#define CCALENSTATE_REQUESTCALLBACKL_EXIT 0x8a017a
+#define CCALENSTATE_COMMANDCALLBACK_ENTRY 0x8a017b
+#define CCALENSTATE_COMMANDCALLBACK_EXIT 0x8a017c
+#define CCALENSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a017d
+#define CCALENSTATE_HANDLENOTIFICATIONL_EXIT 0x8a017e
+#define CCALENSTATE_PREVIOUSSTATE_ENTRY 0x8a017f
+#define CCALENSTATE_PREVIOUSSTATE_EXIT 0x8a0180
+#define CCALENSTATE_SETPREVIOUSSTATE_ENTRY 0x8a0181
+#define CCALENSTATE_SETPREVIOUSSTATE_EXIT 0x8a0182
+#define CCALENSTATE_COMMANDEXECUTING_ENTRY 0x8a0183
+#define CCALENSTATE_COMMANDEXECUTING_EXIT 0x8a0184
+#define CALENCALLBACKPACKAGE_CALENCALLBACKPACKAGE_ENTRY 0x8a0185
+#define CALENCALLBACKPACKAGE_CALENCALLBACKPACKAGE_EXIT 0x8a0186
+#define CALENCALLBACKPACKAGE_HANDLECALLBACK_ENTRY 0x8a0187
+#define CALENCALLBACKPACKAGE_HANDLECALLBACK_EXIT 0x8a0188
+#define CALENCALLBACKPACKAGE_SETCOMMANDHANDLER_ENTRY 0x8a0189
+#define CALENCALLBACKPACKAGE_SETCOMMANDHANDLER_EXIT 0x8a018a
+#define CCALENSTATE_HANDLESTATEACTIVATIONL_ENTRY 0x8a018b
+#define CCALENSTATE_HANDLESTATEACTIVATIONL_EXIT 0x8a018c
+#define CCALENSTATE_SETCURRENTSTATE_ENTRY 0x8a018d
+#define CCALENSTATE_SETCURRENTSTATE_EXIT 0x8a018e
+#define CCALENSTATE_GETCURRENTSTATE_ENTRY 0x8a018f
+#define CCALENSTATE_GETCURRENTSTATE_EXIT 0x8a0190
+#define CCALENSTATE_SETCURRENTPREVIOUSSTATE_ENTRY 0x8a0191
+#define CCALENSTATE_SETCURRENTPREVIOUSSTATE_EXIT 0x8a0192
+#define CCALENSTATE_ACTIVATECURRENTSTATEL_ENTRY 0x8a0193
+#define CCALENSTATE_ACTIVATECURRENTSTATEL_EXIT 0x8a0194
+#define CCALENSTATE_CANCELPREVIOUSCMD_ENTRY 0x8a0195
+#define CCALENSTATE_CANCELPREVIOUSCMD_EXIT 0x8a0196
+#define CCALENSTATE_CANCELEXECUTINGCMD_ENTRY 0x8a0197
+#define CCALENSTATE_CANCELEXECUTINGCMD_EXIT 0x8a0198
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenstatemachineTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,38 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENSTATEMACHINETRACES_H__
+#define __CALENSTATEMACHINETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENSTATEMACHINE_NEWL_ENTRY 0x8a0199
+#define CCALENSTATEMACHINE_NEWL_EXIT 0x8a019a
+#define CCALENSTATEMACHINE_CCALENSTATEMACHINE_ENTRY 0x8a019b
+#define CCALENSTATEMACHINE_CCALENSTATEMACHINE_EXIT 0x8a019c
+#define CCALENSTATEMACHINE_CONSTRUCTL_ENTRY 0x8a019d
+#define CCALENSTATEMACHINE_CONSTRUCTL_EXIT 0x8a019e
+#define DUP1_CCALENSTATEMACHINE_CCALENSTATEMACHINE_ENTRY 0x8a019f
+#define DUP1_CCALENSTATEMACHINE_CCALENSTATEMACHINE_EXIT 0x8a01a0
+#define CCALENSTATEMACHINE_HANDLENOTIFICATION_ENTRY 0x8a01a1
+#define CCALENSTATEMACHINE_HANDLENOTIFICATION_EXIT 0x8a01a2
+#define CCALENSTATEMACHINE_CURRENTSTATE_ENTRY 0x8a01a3
+#define CCALENSTATEMACHINE_CURRENTSTATE_EXIT 0x8a01a4
+#define CCALENSTATEMACHINE_HANDLECOMMANDL_ENTRY 0x8a01a5
+#define CCALENSTATEMACHINE_HANDLECOMMANDL_EXIT 0x8a01a6
+#define CCALENSTATEMACHINE_CANCELPREVIOUSCMD_ENTRY 0x8a01a7
+#define CCALENSTATEMACHINE_CANCELPREVIOUSCMD_EXIT 0x8a01a8
+#define CCALENSTATEMACHINE_GETCURRENTSTATE_ENTRY 0x8a01a9
+#define CCALENSTATEMACHINE_GETCURRENTSTATE_EXIT 0x8a01aa
+#define CCALENSTATEMACHINE_SETCURRENTSTATE_ENTRY 0x8a01ab
+#define CCALENSTATEMACHINE_SETCURRENTSTATE_EXIT 0x8a01ac
+#define CCALENSTATEMACHINE_SETCURRENTPREVIOUSSTATE_ENTRY 0x8a01ad
+#define CCALENSTATEMACHINE_SETCURRENTPREVIOUSSTATE_EXIT 0x8a01ae
+#define CCALENSTATEMACHINE_ACTIVATECURRENTSTATEL_ENTRY 0x8a01af
+#define CCALENSTATEMACHINE_ACTIVATECURRENTSTATEL_EXIT 0x8a01b0
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenviewingstateTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,28 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENVIEWINGSTATETRACES_H__
+#define __CALENVIEWINGSTATETRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CCALENVIEWINGSTATE_NEWLC_ENTRY 0x8a01b1
+#define CCALENVIEWINGSTATE_NEWLC_EXIT 0x8a01b2
+#define CCALENVIEWINGSTATE_CONSTRUCTL_ENTRY 0x8a01b3
+#define CCALENVIEWINGSTATE_CONSTRUCTL_EXIT 0x8a01b4
+#define CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_ENTRY 0x8a01b5
+#define CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_EXIT 0x8a01b6
+#define DUP1_CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_ENTRY 0x8a01b7
+#define DUP1_CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_EXIT 0x8a01b8
+#define CCALENVIEWINGSTATE_HANDLECOMMANDL_ENTRY 0x8a01b9
+#define CCALENVIEWINGSTATE_HANDLECOMMANDL_EXIT 0x8a01ba
+#define CCALENVIEWINGSTATE_HANDLENOTIFICATIONL_ENTRY 0x8a01bb
+#define CCALENVIEWINGSTATE_HANDLENOTIFICATIONL_EXIT 0x8a01bc
+#define CCALENVIEWINGSTATE_HANDLESTATEACTIVATIONL_ENTRY 0x8a01bd
+#define CCALENVIEWINGSTATE_HANDLESTATEACTIVATIONL_EXIT 0x8a01be
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/calenviewmanagerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,72 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENVIEWMANAGERTRACES_H__
+#define __CALENVIEWMANAGERTRACES_H__
+
+#define KOstTraceComponentID 0x10282f25
+
+#define CALENVIEWMANAGER_CALENVIEWMANAGER_ENTRY 0x8a01bf
+#define CALENVIEWMANAGER_CALENVIEWMANAGER_EXIT 0x8a01c0
+#define CALENVIEWMANAGER_SECONDPHASECONSTRUCTION_ENTRY 0x8a01c1
+#define CALENVIEWMANAGER_SECONDPHASECONSTRUCTION_EXIT 0x8a01c2
+#define DUP1_CALENVIEWMANAGER_CALENVIEWMANAGER_ENTRY 0x8a01c3
+#define DUP1_CALENVIEWMANAGER_CALENVIEWMANAGER_EXIT 0x8a01c4
+#define CALENVIEWMANAGER_CONSTRUCTANDACTIVATEVIEW_ENTRY 0x8a01c5
+#define CALENVIEWMANAGER_CONSTRUCTANDACTIVATEVIEW_EXIT 0x8a01c6
+#define CALENVIEWMANAGER_LOADMONTHVIEW_ENTRY 0x8a01c7
+#define CALENVIEWMANAGER_LOADMONTHVIEW_EXIT 0x8a01c8
+#define CALENVIEWMANAGER_LOADAGENDAVIEW_ENTRY 0x8a01c9
+#define CALENVIEWMANAGER_LOADAGENDAVIEW_EXIT 0x8a01ca
+#define CALENVIEWMANAGER_HANDLEMAINVIEWREADY_ENTRY 0x8a01cb
+#define CALENVIEWMANAGER_HANDLEMAINVIEWREADY_EXIT 0x8a01cc
+#define CALENVIEWMANAGER_CONSTRUCTOTHERVIEWS_ENTRY 0x8a01cd
+#define CALENVIEWMANAGER_CONSTRUCTOTHERVIEWS_EXIT 0x8a01ce
+#define CALENVIEWMANAGER_GETFIRSTVIEW_ENTRY 0x8a01cf
+#define CALENVIEWMANAGER_GETFIRSTVIEW_EXIT 0x8a01d0
+#define CALENVIEWMANAGER_SHOWNEXTDAY_ENTRY 0x8a01d1
+#define CALENVIEWMANAGER_SHOWNEXTDAY_EXIT 0x8a01d2
+#define CALENVIEWMANAGER_SHOWPREVDAY_ENTRY 0x8a01d3
+#define CALENVIEWMANAGER_SHOWPREVDAY_EXIT 0x8a01d4
+#define CALENVIEWMANAGER_REMOVEPREVIOUSVIEW_ENTRY 0x8a01d5
+#define CALENVIEWMANAGER_REMOVEPREVIOUSVIEW_EXIT 0x8a01d6
+#define CALENVIEWMANAGER_ACTIVATEDEFAULTVIEWL_ENTRY 0x8a01d7
+#define CALENVIEWMANAGER_ACTIVATEDEFAULTVIEWL_EXIT 0x8a01d8
+#define CALENVIEWMANAGER_REFRESHCURRENTVIEWL_ENTRY 0x8a01d9
+#define CALENVIEWMANAGER_REFRESHCURRENTVIEWL_EXIT 0x8a01da
+#define CALENVIEWMANAGER_ACTIVATECURRENTVIEW_ENTRY 0x8a01db
+#define CALENVIEWMANAGER_ACTIVATECURRENTVIEW_EXIT 0x8a01dc
+#define CALENVIEWMANAGER_LAUNCHEVENTVIEW_ENTRY 0x8a01dd
+#define CALENVIEWMANAGER_LAUNCHEVENTVIEW_EXIT 0x8a01de
+#define CALENVIEWMANAGER_LOADALTERNATEAGENDAVIEW_ENTRY 0x8a01df
+#define CALENVIEWMANAGER_LOADALTERNATEAGENDAVIEW_EXIT 0x8a01e0
+#define CALENVIEWMANAGER_HANDLECOMMANDL_ENTRY 0x8a01e1
+#define CALENVIEWMANAGER_HANDLECOMMANDL_EXIT 0x8a01e2
+#define CALENVIEWMANAGER_HANDLENOTIFICATION_ENTRY 0x8a01e3
+#define CALENVIEWMANAGER_HANDLENOTIFICATION_EXIT 0x8a01e4
+#define CALENVIEWMANAGER_SETTINGSVIEW_ENTRY 0x8a01e5
+#define CALENVIEWMANAGER_SETTINGSVIEW_EXIT 0x8a01e6
+#define CALENVIEWMANAGER_HANDLEVIEWINGCOMPLETED_ENTRY 0x8a01e7
+#define CALENVIEWMANAGER_HANDLEVIEWINGCOMPLETED_EXIT 0x8a01e8
+#define CALENVIEWMANAGER_HANDLEEDITINGSTARTED_ENTRY 0x8a01e9
+#define CALENVIEWMANAGER_HANDLEEDITINGSTARTED_EXIT 0x8a01ea
+#define CALENVIEWMANAGER_HANDLEEDITINGCOMPLETED_ENTRY 0x8a01eb
+#define CALENVIEWMANAGER_HANDLEEDITINGCOMPLETED_EXIT 0x8a01ec
+#define CALENVIEWMANAGER_HANDLEDELETINGSTARTED_ENTRY 0x8a01ed
+#define CALENVIEWMANAGER_HANDLEDELETINGSTARTED_EXIT 0x8a01ee
+#define CALENVIEWMANAGER_HANDLEDELETINGCOMPLETED_ENTRY 0x8a01ef
+#define CALENVIEWMANAGER_HANDLEDELETINGCOMPLETED_EXIT 0x8a01f0
+#define CALENVIEWMANAGER_HANDLEINSTANCEVIEWCREATION_ENTRY 0x8a01f1
+#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
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/controller/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,506 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CALENACTIONUIUTILS_SETTODOCOMPLETESTATUS_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CALENACTIONUIUTILS_SETTODOCOMPLETESTATUS_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CALENASYNCCALLBACK_BASECONSTRUCTL_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CALENASYNCCALLBACK_BASECONSTRUCTL_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CALENASYNCCALLBACK_CALENASYNCCALLBACK_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CALENASYNCCALLBACK_CALENASYNCCALLBACK_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CALENASYNCCALLBACK_NEWL_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CALENASYNCCALLBACK_NEWL_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CALENASYNCCALLBACK_RUNL_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CALENASYNCCALLBACK_RUNL_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CALENCALLBACKPACKAGE_CALENCALLBACKPACKAGE_ENTRY=0x185
+[TRACE]TRACE_FLOW[0x8A]_CALENCALLBACKPACKAGE_CALENCALLBACKPACKAGE_EXIT=0x186
+[TRACE]TRACE_FLOW[0x8A]_CALENCALLBACKPACKAGE_HANDLECALLBACK_ENTRY=0x187
+[TRACE]TRACE_FLOW[0x8A]_CALENCALLBACKPACKAGE_HANDLECALLBACK_EXIT=0x188
+[TRACE]TRACE_FLOW[0x8A]_CALENCALLBACKPACKAGE_SETCOMMANDHANDLER_ENTRY=0x189
+[TRACE]TRACE_FLOW[0x8A]_CALENCALLBACKPACKAGE_SETCOMMANDHANDLER_EXIT=0x18a
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_CALENDELETEUI_ENTRY=0x63
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_CALENDELETEUI_EXIT=0x64
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_CONSTRUCTL_ENTRY=0x67
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_CONSTRUCTL_EXIT=0x68
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DATEQUERY_ENTRY=0x79
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DATEQUERY_EXIT=0x7a
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEALLENTRIESL_ENTRY=0x73
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEALLENTRIESL_EXIT=0x74
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETECURRENTENTRYL_ENTRY=0x71
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETECURRENTENTRYL_EXIT=0x72
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEDAYRANGEL_ENTRY=0x8c
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEDAYRANGEL_EXIT=0x8d
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEENTRIESBEFOREDATEL_ENTRY=0x76
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEENTRIESBEFOREDATEL_EXIT=0x77
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEENTRIESENDINGATMIDNIGHT_ENTRY=0x90
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEENTRIESENDINGATMIDNIGHT_EXIT=0x91
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEENTRYL_ENTRY=0x9a
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEENTRYL_EXIT=0x9b
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEENTRYWITHOUTQUERYL_ENTRY=0x6f
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETEENTRYWITHOUTQUERYL_EXIT=0x70
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETESINGLEINSTANCEL_ENTRY=0x92
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETESINGLEINSTANCEL_EXIT=0x93
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETETHISORALLL_ENTRY=0x6d
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DELETETHISORALLL_EXIT=0x6e
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DIALOGDISMISSEDL_ENTRY=0x98
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DIALOGDISMISSEDL_EXIT=0x99
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DISPLAYWAITDIALOGL_ENTRY=0x9c
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DISPLAYWAITDIALOGL_EXIT=0x9d
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DOCOMPLETED_ENTRY=0x8e
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DOCOMPLETED_EXIT=0x8f
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DODELETESINGLEINSTANCEL_ENTRY=0x96
+[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_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
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETION_EXIT=0x86
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLENOTIFICATION_ENTRY=0x69
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLENOTIFICATION_EXIT=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_ENTRY=0x81
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_EXIT=0x82
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_MARKEDENTRIESDELETEDL_ENTRY=0x9e
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_MARKEDENTRIESDELETEDL_EXIT=0x9f
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_NEWL_ENTRY=0x61
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_NEWL_EXIT=0x62
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_SHOWDELETEQUERY_ENTRY=0x83
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_SHOWDELETEQUERY_EXIT=0x84
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_ENTRY=0x7d
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_EXIT=0x7e
+[TRACE]TRACE_FLOW[0x8A]_CALENDOCLOADER_CALENDOCLOADER_ENTRY=0xac
+[TRACE]TRACE_FLOW[0x8A]_CALENDOCLOADER_CALENDOCLOADER_EXIT=0xad
+[TRACE]TRACE_FLOW[0x8A]_CALENDOCLOADER_CREATEOBJECT_ENTRY=0xb0
+[TRACE]TRACE_FLOW[0x8A]_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb1
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_BROADCASTAPPROVEDNOTIFICATION_ENTRY=0x113
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_BROADCASTAPPROVEDNOTIFICATION_EXIT=0x114
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_BROADCASTNOTIFICATION_ENTRY=0x111
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_BROADCASTNOTIFICATION_EXIT=0x112
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_CALENNOTIFIER_ENTRY=0xfe
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_CALENNOTIFIER_EXIT=0xff
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_CANCELNOTIFICATIONS_ENTRY=0x108
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_CANCELNOTIFICATIONS_EXIT=0x109
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_CONSTRUCTL_ENTRY=0x102
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_CONSTRUCTL_EXIT=0x103
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_CONTEXTCHANGED_ENTRY=0x10b
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_CONTEXTCHANGED_EXIT=0x10c
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_DOBROADCAST_ENTRY=0x115
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_DOBROADCAST_EXIT=0x116
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_DOENVCHANGE_ENTRY=0x10f
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_DOENVCHANGE_EXIT=0x110
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_ENVCHANGECALLBACKL_ENTRY=0x10d
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_ENVCHANGECALLBACKL_EXIT=0x10e
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_ENTRY=0x104
+[TRACE]TRACE_FLOW[0x8A]_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_EXIT=0x105
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_ACTIVATIONNOTIFICATIONL_ENTRY=0x155
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_ACTIVATIONNOTIFICATIONL_EXIT=0x156
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_AGENDAINTERFACE_ENTRY=0x161
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_AGENDAINTERFACE_EXIT=0x162
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_CALENSERVICESIMPL_ENTRY=0x141
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_CALENSERVICESIMPL_EXIT=0x142
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_CANCELNOTIFICATIONS_ENTRY=0x14d
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_CANCELNOTIFICATIONS_EXIT=0x14e
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_CONSTRUCTL_ENTRY=0x143
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_CONSTRUCTL_EXIT=0x144
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_CONTEXT_ENTRY=0x157
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_CONTEXT_EXIT=0x158
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_GETCOMMANDRANGE_ENTRY=0x15d
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_GETCOMMANDRANGE_EXIT=0x15e
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_GETFIRSTVIEW_ENTRY=0x163
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_GETFIRSTVIEW_EXIT=0x164
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_INFOBARTEXTL_ENTRY=0x15b
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_INFOBARTEXTL_EXIT=0x15c
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_INFOBAR_ENTRY=0x159
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_INFOBAR_EXIT=0x15a
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_ISSUECOMMANDL_ENTRY=0x14f
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_ISSUECOMMANDL_EXIT=0x150
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_ISSUENOTIFICATIONL_ENTRY=0x151
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_ISSUENOTIFICATIONL_EXIT=0x152
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_MAINWINDOW_ENTRY=0x147
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_MAINWINDOW_EXIT=0x148
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_NEWL_ENTRY=0x13d
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_NEWL_EXIT=0x13e
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_OFFERMENU_ENTRY=0x15f
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_OFFERMENU_EXIT=0x160
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_ENTRY=0x149
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_EXIT=0x14a
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_RELEASE_ENTRY=0x145
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_RELEASE_EXIT=0x146
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_REQUESTACTIVATIONL_ENTRY=0x153
+[TRACE]TRACE_FLOW[0x8A]_CALENSERVICESIMPL_REQUESTACTIVATIONL_EXIT=0x154
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_ACTIVATECURRENTVIEW_ENTRY=0x1db
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_ACTIVATECURRENTVIEW_EXIT=0x1dc
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_ACTIVATEDEFAULTVIEWL_ENTRY=0x1d7
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_ACTIVATEDEFAULTVIEWL_EXIT=0x1d8
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_CALENVIEWMANAGER_ENTRY=0x1bf
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_CALENVIEWMANAGER_EXIT=0x1c0
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_CONSTRUCTANDACTIVATEVIEW_ENTRY=0x1c5
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_CONSTRUCTANDACTIVATEVIEW_EXIT=0x1c6
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_CONSTRUCTOTHERVIEWS_ENTRY=0x1cd
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_CONSTRUCTOTHERVIEWS_EXIT=0x1ce
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_GETFIRSTVIEW_ENTRY=0x1cf
+[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
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDELETINGSTARTED_EXIT=0x1ee
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEEDITINGCOMPLETED_ENTRY=0x1eb
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEEDITINGCOMPLETED_EXIT=0x1ec
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEEDITINGSTARTED_ENTRY=0x1e9
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEEDITINGSTARTED_EXIT=0x1ea
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEENTRYVIEWCREATION_ENTRY=0x1f3
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEENTRYVIEWCREATION_EXIT=0x1f4
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEINSTANCEVIEWCREATION_ENTRY=0x1f1
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEINSTANCEVIEWCREATION_EXIT=0x1f2
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEMAINVIEWREADY_ENTRY=0x1cb
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEMAINVIEWREADY_EXIT=0x1cc
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLENOTIFICATION_ENTRY=0x1e3
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLENOTIFICATION_EXIT=0x1e4
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEVIEWINGCOMPLETED_ENTRY=0x1e7
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEVIEWINGCOMPLETED_EXIT=0x1e8
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LAUNCHEVENTVIEW_ENTRY=0x1dd
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LAUNCHEVENTVIEW_EXIT=0x1de
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LAUNCHSETTINGSVIEW_ENTRY=0x1f7
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LAUNCHSETTINGSVIEW_EXIT=0x1f8
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LOADAGENDAVIEW_ENTRY=0x1c9
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LOADAGENDAVIEW_EXIT=0x1ca
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LOADALTERNATEAGENDAVIEW_ENTRY=0x1df
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LOADALTERNATEAGENDAVIEW_EXIT=0x1e0
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LOADMONTHVIEW_ENTRY=0x1c7
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_LOADMONTHVIEW_EXIT=0x1c8
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_REFRESHCURRENTVIEWL_ENTRY=0x1d9
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_REFRESHCURRENTVIEWL_EXIT=0x1da
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_REMOVEPREVIOUSVIEW_ENTRY=0x1d5
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_REMOVEPREVIOUSVIEW_EXIT=0x1d6
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_SECONDPHASECONSTRUCTION_ENTRY=0x1c1
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_SECONDPHASECONSTRUCTION_EXIT=0x1c2
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_SETTINGSVIEW_ENTRY=0x1e5
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_SETTINGSVIEW_EXIT=0x1e6
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_SHOWNEXTDAY_ENTRY=0x1d1
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_SHOWNEXTDAY_EXIT=0x1d2
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_SHOWPREVDAY_ENTRY=0x1d3
+[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_SHOWPREVDAY_EXIT=0x1d4
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_CCALENACTIONUI_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_CCALENACTIONUI_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_CONSTRUCTL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_CONSTRUCTL_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_GETCOMMANDHANDLERL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_GETCOMMANDHANDLERL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_HANDLECOMMANDL_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_HANDLECOMMANDL_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CCALENACTIONUI_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_CONSTRUCTL_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_CONSTRUCTL_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_HANDLECOMMANDL_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_HANDLECOMMANDL_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_HANDLENOTIFICATIONL_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_HANDLENOTIFICATIONL_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_HANDLESTATEACTIVATIONL_ENTRY=0x27
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_HANDLESTATEACTIVATIONL_EXIT=0x28
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_NEWLC_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CCALENBACKGROUNDSTATE_NEWLC_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_AGENDAINTERFACE_ENTRY=0x57
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_AGENDAINTERFACE_EXIT=0x58
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_BROADCASTNOTIFICATION_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_BROADCASTNOTIFICATION_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CANCELNOTIFICATIONS_ENTRY=0x45
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CANCELNOTIFICATIONS_EXIT=0x46
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CCALENCONTROLLER_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CCALENCONTROLLER_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CHECKMULTIPLECREATION_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CHECKMULTIPLECREATION_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CONSTRUCTCONTROLLER_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CONSTRUCTCONTROLLER_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CONTEXT_ENTRY=0x59
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CONTEXT_EXIT=0x5a
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CUSTOMISATIONMANAGER_ENTRY=0x51
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_CUSTOMISATIONMANAGER_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_EVENTFILTER_ENTRY=0x5f
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_EVENTFILTER_EXIT=0x60
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_GETCOMMANDHANDLERL_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_GETCOMMANDHANDLERL_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_GETFIRSTVIEW_ENTRY=0x5d
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_GETFIRSTVIEW_EXIT=0x5e
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_ENTRY=0x5b
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_EXIT=0x5c
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_INFOBARTEXTL_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_INFOBARTEXTL_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_INSTANCEL_ENTRY=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_INSTANCEL_EXIT=0x30
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_ISSUECOMMANDL_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_ISSUECOMMANDL_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_NEWSERVICESL_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_NEWSERVICESL_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_NOTIFIER_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_NOTIFIER_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_OFFERMENU_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_OFFERMENU_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_RELEASECUSTOMISATIONS_ENTRY=0x31
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_RELEASECUSTOMISATIONS_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_RELEASE_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_RELEASE_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_SERVICES_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_SERVICES_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_SETDEFAULTCONTEXT_ENTRY=0x53
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_SETDEFAULTCONTEXT_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_VIEWMANAGER_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_VIEWMANAGER_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_CCALENDELETINGSTATE_ENTRY=0xa4
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_CCALENDELETINGSTATE_EXIT=0xa5
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_CONSTRUCTL_ENTRY=0xa2
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_CONSTRUCTL_EXIT=0xa3
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_HANDLECOMMANDL_ENTRY=0xa8
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_HANDLECOMMANDL_EXIT=0xa9
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_HANDLENOTIFICATIONL_ENTRY=0xaa
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_HANDLENOTIFICATIONL_EXIT=0xab
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_NEWLC_ENTRY=0xa0
+[TRACE]TRACE_FLOW[0x8A]_CCALENDELETINGSTATE_NEWLC_EXIT=0xa1
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_CCALENEDITINGSTATE_ENTRY=0xc2
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_CCALENEDITINGSTATE_EXIT=0xc3
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_CONSTRUCTL_ENTRY=0xc0
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_CONSTRUCTL_EXIT=0xc1
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_HANDLECOMMANDL_ENTRY=0xc6
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_HANDLECOMMANDL_EXIT=0xc7
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_HANDLENOTIFICATIONL_ENTRY=0xc8
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_HANDLENOTIFICATIONL_EXIT=0xc9
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_NEWLC_ENTRY=0xbe
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITINGSTATE_NEWLC_EXIT=0xbf
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_CCALENEDITUI_ENTRY=0xcc
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_CCALENEDITUI_EXIT=0xcd
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_CONSTRUCTL_ENTRY=0xd0
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_CONSTRUCTL_EXIT=0xd1
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_HANDLECOMMANDL_ENTRY=0xd2
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_HANDLECOMMANDL_EXIT=0xd3
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_HANDLEDIALOGCLOSED_ENTRY=0xd6
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_HANDLEDIALOGCLOSED_EXIT=0xd7
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_HANDLEENTRYSAVED_ENTRY=0xd4
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_HANDLEENTRYSAVED_EXIT=0xd5
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_HANDLENOTIFICATION_ENTRY=0xd8
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_HANDLENOTIFICATION_EXIT=0xd9
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_NEWL_ENTRY=0xca
+[TRACE]TRACE_FLOW[0x8A]_CCALENEDITUI_NEWL_EXIT=0xcb
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY=0xde
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT=0xdf
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_CONSTRUCTL_ENTRY=0xdc
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_CONSTRUCTL_EXIT=0xdd
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_HANDLECOMMANDL_ENTRY=0xe2
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_HANDLECOMMANDL_EXIT=0xe3
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_HANDLENOTIFICATIONL_ENTRY=0xe4
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_HANDLENOTIFICATIONL_EXIT=0xe5
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_NEWLC_ENTRY=0xda
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXITINGSTATE_NEWLC_EXIT=0xdb
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_CCALENHELPSTATE_ENTRY=0xea
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_CCALENHELPSTATE_EXIT=0xeb
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_CONSTRUCTL_ENTRY=0xe8
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_CONSTRUCTL_EXIT=0xe9
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_HANDLECOMMANDL_ENTRY=0xee
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_HANDLECOMMANDL_EXIT=0xef
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_HANDLENOTIFICATIONL_ENTRY=0xf0
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_HANDLENOTIFICATIONL_EXIT=0xf1
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_NEWLC_ENTRY=0xe6
+[TRACE]TRACE_FLOW[0x8A]_CCALENHELPSTATE_NEWLC_EXIT=0xe7
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_CCALENIDLESTATE_ENTRY=0xf6
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_CCALENIDLESTATE_EXIT=0xf7
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_CONSTRUCTL_ENTRY=0xf4
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_CONSTRUCTL_EXIT=0xf5
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_HANDLECOMMANDL_ENTRY=0xfa
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_HANDLECOMMANDL_EXIT=0xfb
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_HANDLENOTIFICATIONL_ENTRY=0xfc
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_HANDLENOTIFICATIONL_EXIT=0xfd
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_NEWLC_ENTRY=0xf2
+[TRACE]TRACE_FLOW[0x8A]_CCALENIDLESTATE_NEWLC_EXIT=0xf3
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_ENTRY=0x11d
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_EXIT=0x11e
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_CONSTRUCTL_ENTRY=0x11b
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_CONSTRUCTL_EXIT=0x11c
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_HANDLECOMMANDL_ENTRY=0x121
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_HANDLECOMMANDL_EXIT=0x122
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_HANDLENOTIFICATIONL_ENTRY=0x123
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_HANDLENOTIFICATIONL_EXIT=0x124
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_NEWLC_ENTRY=0x119
+[TRACE]TRACE_FLOW[0x8A]_CCALENPOPULATIONSTATE_NEWLC_EXIT=0x11a
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_ENTRY=0x129
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_EXIT=0x12a
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_CONSTRUCTL_ENTRY=0x127
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_CONSTRUCTL_EXIT=0x128
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_HANDLECOMMANDL_ENTRY=0x12d
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_HANDLECOMMANDL_EXIT=0x12e
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_HANDLENOTIFICATIONL_ENTRY=0x12f
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_HANDLENOTIFICATIONL_EXIT=0x130
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_NEWLC_ENTRY=0x125
+[TRACE]TRACE_FLOW[0x8A]_CCALENPRINTINGSTATE_NEWLC_EXIT=0x126
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_CCALENSENDINGSTATE_ENTRY=0x135
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_CCALENSENDINGSTATE_EXIT=0x136
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_CONSTRUCTL_ENTRY=0x133
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_CONSTRUCTL_EXIT=0x134
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_HANDLECOMMANDL_ENTRY=0x139
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_HANDLECOMMANDL_EXIT=0x13a
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_HANDLENOTIFICATIONL_ENTRY=0x13b
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_HANDLENOTIFICATIONL_EXIT=0x13c
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_NEWLC_ENTRY=0x131
+[TRACE]TRACE_FLOW[0x8A]_CCALENSENDINGSTATE_NEWLC_EXIT=0x132
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_ENTRY=0x169
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_EXIT=0x16a
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_CONSTRUCTL_ENTRY=0x167
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_CONSTRUCTL_EXIT=0x168
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_HANDLECOMMANDL_ENTRY=0x16d
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_HANDLECOMMANDL_EXIT=0x16e
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_HANDLENOTIFICATIONL_ENTRY=0x16f
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_HANDLENOTIFICATIONL_EXIT=0x170
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_HANDLESTATEACTIVATIONL_ENTRY=0x171
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_HANDLESTATEACTIVATIONL_EXIT=0x172
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_NEWLC_ENTRY=0x165
+[TRACE]TRACE_FLOW[0x8A]_CCALENSETTINGSSTATE_NEWLC_EXIT=0x166
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_ACTIVATECURRENTSTATEL_ENTRY=0x1af
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_ACTIVATECURRENTSTATEL_EXIT=0x1b0
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_CANCELPREVIOUSCMD_ENTRY=0x1a7
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_CANCELPREVIOUSCMD_EXIT=0x1a8
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_CCALENSTATEMACHINE_ENTRY=0x19b
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_CCALENSTATEMACHINE_EXIT=0x19c
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_CONSTRUCTL_ENTRY=0x19d
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_CONSTRUCTL_EXIT=0x19e
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_CURRENTSTATE_ENTRY=0x1a3
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_CURRENTSTATE_EXIT=0x1a4
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_GETCURRENTSTATE_ENTRY=0x1a9
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_GETCURRENTSTATE_EXIT=0x1aa
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_HANDLECOMMANDL_ENTRY=0x1a5
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_HANDLECOMMANDL_EXIT=0x1a6
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_HANDLENOTIFICATION_ENTRY=0x1a1
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_HANDLENOTIFICATION_EXIT=0x1a2
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_NEWL_ENTRY=0x199
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_NEWL_EXIT=0x19a
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_SETCURRENTPREVIOUSSTATE_ENTRY=0x1ad
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_SETCURRENTPREVIOUSSTATE_EXIT=0x1ae
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_SETCURRENTSTATE_ENTRY=0x1ab
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATEMACHINE_SETCURRENTSTATE_EXIT=0x1ac
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_ACTIVATECURRENTSTATEL_ENTRY=0x193
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_ACTIVATECURRENTSTATEL_EXIT=0x194
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_BASECONSTRUCTL_ENTRY=0x175
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_BASECONSTRUCTL_EXIT=0x176
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_CANCELEXECUTINGCMD_ENTRY=0x197
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_CANCELEXECUTINGCMD_EXIT=0x198
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_CANCELPREVIOUSCMD_ENTRY=0x195
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_CANCELPREVIOUSCMD_EXIT=0x196
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_CCALENSTATE_ENTRY=0x173
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_CCALENSTATE_EXIT=0x174
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_COMMANDCALLBACK_ENTRY=0x17b
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_COMMANDCALLBACK_EXIT=0x17c
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_COMMANDEXECUTING_ENTRY=0x183
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_COMMANDEXECUTING_EXIT=0x184
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_GETCURRENTSTATE_ENTRY=0x18f
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_GETCURRENTSTATE_EXIT=0x190
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_HANDLENOTIFICATIONL_ENTRY=0x17d
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_HANDLENOTIFICATIONL_EXIT=0x17e
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_HANDLESTATEACTIVATIONL_ENTRY=0x18b
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_HANDLESTATEACTIVATIONL_EXIT=0x18c
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_PREVIOUSSTATE_ENTRY=0x17f
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_PREVIOUSSTATE_EXIT=0x180
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_REQUESTCALLBACKL_ENTRY=0x179
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_REQUESTCALLBACKL_EXIT=0x17a
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_SETCURRENTPREVIOUSSTATE_ENTRY=0x191
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_SETCURRENTPREVIOUSSTATE_EXIT=0x192
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_SETCURRENTSTATE_ENTRY=0x18d
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_SETCURRENTSTATE_EXIT=0x18e
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_SETPREVIOUSSTATE_ENTRY=0x181
+[TRACE]TRACE_FLOW[0x8A]_CCALENSTATE_SETPREVIOUSSTATE_EXIT=0x182
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_ENTRY=0x1b5
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_EXIT=0x1b6
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_CONSTRUCTL_ENTRY=0x1b3
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_CONSTRUCTL_EXIT=0x1b4
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_HANDLECOMMANDL_ENTRY=0x1b9
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_HANDLECOMMANDL_EXIT=0x1ba
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_HANDLENOTIFICATIONL_ENTRY=0x1bb
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_HANDLENOTIFICATIONL_EXIT=0x1bc
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_HANDLESTATEACTIVATIONL_ENTRY=0x1bd
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_HANDLESTATEACTIVATIONL_EXIT=0x1be
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_NEWLC_ENTRY=0x1b1
+[TRACE]TRACE_FLOW[0x8A]_CCALENVIEWINGSTATE_NEWLC_EXIT=0x1b2
+[TRACE]TRACE_FLOW[0x8A]_DUP10_CALENDOCLOADER_CREATEOBJECT_EXIT=0xbb
+[TRACE]TRACE_FLOW[0x8A]_DUP11_CALENDOCLOADER_CREATEOBJECT_EXIT=0xbc
+[TRACE]TRACE_FLOW[0x8A]_DUP12_CALENDOCLOADER_CREATEOBJECT_EXIT=0xbd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENASYNCCALLBACK_CALENASYNCCALLBACK_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENASYNCCALLBACK_CALENASYNCCALLBACK_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDELETEUI_CALENDELETEUI_ENTRY=0x65
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDELETEUI_CALENDELETEUI_EXIT=0x66
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDELETEUI_DELETEALLENTRIESL_EXIT=0x75
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDELETEUI_DELETEENTRIESBEFOREDATEL_EXIT=0x78
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDELETEUI_DELETESINGLEINSTANCEL_ENTRY=0x94
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDELETEUI_DELETESINGLEINSTANCEL_EXIT=0x95
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_EXIT=0x8b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDOCLOADER_CALENDOCLOADER_ENTRY=0xae
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDOCLOADER_CALENDOCLOADER_EXIT=0xaf
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb2
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENNOTIFIER_CALENNOTIFIER_ENTRY=0x100
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENNOTIFIER_CALENNOTIFIER_EXIT=0x101
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENNOTIFIER_CANCELNOTIFICATIONS_EXIT=0x10a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_ENTRY=0x106
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_EXIT=0x107
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENSERVICESIMPL_NEWL_ENTRY=0x13f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENSERVICESIMPL_NEWL_EXIT=0x140
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_ENTRY=0x14b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENSERVICESIMPL_REGISTERFORNOTIFICATIONSL_EXIT=0x14c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENVIEWMANAGER_CALENVIEWMANAGER_ENTRY=0x1c3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENVIEWMANAGER_CALENVIEWMANAGER_EXIT=0x1c4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENACTIONUI_CCALENACTIONUI_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENACTIONUI_CCALENACTIONUI_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENBACKGROUNDSTATE_CCALENBACKGROUNDSTATE_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCONTROLLER_CCALENCONTROLLER_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCONTROLLER_CCALENCONTROLLER_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCONTROLLER_INFOBAR_ENTRY=0x4d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCONTROLLER_INFOBAR_EXIT=0x4e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCONTROLLER_MAINWINDOW_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCONTROLLER_MAINWINDOW_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENDELETINGSTATE_CCALENDELETINGSTATE_ENTRY=0xa6
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENDELETINGSTATE_CCALENDELETINGSTATE_EXIT=0xa7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEDITINGSTATE_CCALENEDITINGSTATE_ENTRY=0xc4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEDITINGSTATE_CCALENEDITINGSTATE_EXIT=0xc5
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEDITUI_CCALENEDITUI_ENTRY=0xce
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEDITUI_CCALENEDITUI_EXIT=0xcf
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY=0xe0
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT=0xe1
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENHELPSTATE_CCALENHELPSTATE_ENTRY=0xec
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENHELPSTATE_CCALENHELPSTATE_EXIT=0xed
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENIDLESTATE_CCALENIDLESTATE_ENTRY=0xf8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENIDLESTATE_CCALENIDLESTATE_EXIT=0xf9
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_ENTRY=0x11f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_EXIT=0x120
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_ENTRY=0x12b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_EXIT=0x12c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSENDINGSTATE_CCALENSENDINGSTATE_ENTRY=0x137
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSENDINGSTATE_CCALENSENDINGSTATE_EXIT=0x138
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_ENTRY=0x16b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSETTINGSSTATE_CCALENSETTINGSSTATE_EXIT=0x16c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSTATEMACHINE_CCALENSTATEMACHINE_ENTRY=0x19f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSTATEMACHINE_CCALENSTATEMACHINE_EXIT=0x1a0
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSTATE_CCALENSTATE_ENTRY=0x177
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSTATE_CCALENSTATE_EXIT=0x178
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_ENTRY=0x1b7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENVIEWINGSTATE_CCALENVIEWINGSTATE_EXIT=0x1b8
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb3
+[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb4
+[TRACE]TRACE_FLOW[0x8A]_DUP4_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb5
+[TRACE]TRACE_FLOW[0x8A]_DUP5_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb6
+[TRACE]TRACE_FLOW[0x8A]_DUP6_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb7
+[TRACE]TRACE_FLOW[0x8A]_DUP7_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb8
+[TRACE]TRACE_FLOW[0x8A]_DUP8_CALENDOCLOADER_CREATEOBJECT_EXIT=0xb9
+[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
--- a/calendarui/customisationmanager/customisationmanager.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/customisationmanager/customisationmanager.pro Mon Aug 23 16:00:50 2010 +0100
@@ -22,7 +22,8 @@
DEFINES += CALENCUSTOMISATIONMANAGER_DLL
-INCLUDEPATH += ./inc ../inc
+INCLUDEPATH += ./inc ../inc \
+ ./traces
# Platforms
--- a/calendarui/customisationmanager/src/calencustomisationmanager.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/customisationmanager/src/calencustomisationmanager.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -31,6 +31,11 @@
#include "calenservices.h"
#include "calenservicesfactory.h"
#include "CalenUid.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calencustomisationmanagerTraces.h"
+#endif
+
@@ -46,8 +51,7 @@
MCalenServices& aServices
)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_NEWL_ENTRY );
CCalenCustomisationManager* self = new( ELeave ) CCalenCustomisationManager(
aFactory,
aServices );
@@ -55,7 +59,7 @@
self->ConstructL();
CleanupStack::Pop( self );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_NEWL_EXIT );
return self;
}
@@ -70,8 +74,8 @@
: iServicesFactory( aFactory ),
iServices( aServices )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_ENTRY );
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_EXIT );
}
// ----------------------------------------------------------------------------
@@ -82,14 +86,14 @@
//
void CCalenCustomisationManager::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_CONSTRUCTL_ENTRY );
CreateActivePluginListL();
// Load any enabled plugins
DoImmediatePluginLoadingL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_CONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -100,7 +104,7 @@
//
CCalenCustomisationManager::~CCalenCustomisationManager()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_ENTRY );
// Reset and destroy the contents of the owned arrays,
// this will delete the plugins.
@@ -116,7 +120,7 @@
iDefferedUnloadPluginList.Reset();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_EXIT );
}
// ----------------------------------------------------------------------------
// CCalenCustomisationManager::GetCommandHandlerL
@@ -125,7 +129,7 @@
// ----------------------------------------------------------------------------
MCalenCommandHandler* CCalenCustomisationManager::GetCommandHandlerL( TInt aCommand )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_GETCOMMANDHANDLERL_ENTRY );
MCalenCommandHandler* handler( NULL );
@@ -153,7 +157,7 @@
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_GETCOMMANDHANDLERL_EXIT );
return handler;
}
@@ -166,9 +170,8 @@
//
const RArray<TUid>& CCalenCustomisationManager::ActivePlugins() const
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_ACTIVEPLUGINS_ENTRY );
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_ACTIVEPLUGINS_EXIT );
return iActivePlugins;
}
@@ -179,8 +182,7 @@
//
void CCalenCustomisationManager::CreateActivePluginListL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_CREATEACTIVEPLUGINLISTL_ENTRY );
iPluginInfo.ResetAndDestroy();
iActivePlugins.Reset();
iRomBasedPlugins.Reset();
@@ -210,7 +212,7 @@
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_CREATEACTIVEPLUGINLISTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -220,6 +222,7 @@
//
void CCalenCustomisationManager::LoadPluginsBasedOnVariantL()
{
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_LOADPLUGINSBASEDONVARIANTL_ENTRY );
TLanguage languge = User::Language();
RArray<TUid> needsToBeRemoved;
@@ -261,6 +264,7 @@
}
}
needsToBeRemoved.Close();
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_LOADPLUGINSBASEDONVARIANTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -271,6 +275,7 @@
TBool CCalenCustomisationManager::PluginInfoFinder( const TUid* aUid,
const CImplementationInformation& aArrayItem )
{
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_PLUGININFOFINDER_ENTRY );
return (*aUid == aArrayItem.ImplementationUid() );
}
@@ -282,8 +287,7 @@
void CCalenCustomisationManager::SetPluginAvailabilityL( TUid aPluginUid,
TBool aEnabled )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_SETPLUGINAVAILABILITYL_ENTRY );
if ( aEnabled )
{
EnablePluginL( aPluginUid );
@@ -293,7 +297,7 @@
DisablePluginL( aPluginUid );
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_SETPLUGINAVAILABILITYL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -303,8 +307,7 @@
//
void CCalenCustomisationManager::DisablePluginL( TUid aPluginUid )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_DISABLEPLUGINL_ENTRY );
// Find the plugins
TInt index = iPlugins.Find( aPluginUid, CPluginInfo::Identifier );
if ( index != KErrNotFound )
@@ -331,7 +334,7 @@
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_DISABLEPLUGINL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -343,7 +346,7 @@
//
void CCalenCustomisationManager::UnloadPluginsL( const RArray<TUid>& aPlugins )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_UNLOADPLUGINSL_ENTRY );
// Check plugin isn't already enabled
TInt count = aPlugins.Count();
for (TInt index = 0; index < count; ++index )
@@ -364,7 +367,7 @@
}
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_UNLOADPLUGINSL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -375,8 +378,7 @@
//
void CCalenCustomisationManager::EnablePluginL( TUid aPluginUid )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_ENABLEPLUGINL_ENTRY );
// Check plugin isn't already enabled
TInt index = iPlugins.Find( aPluginUid, CPluginInfo::Identifier);
@@ -397,7 +399,7 @@
iServices.IssueNotificationL( ECalenNotifyPluginEnabledDisabled );
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_ENABLEPLUGINL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -408,11 +410,9 @@
//
void CCalenCustomisationManager::HandleNotification(const TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATION_ENTRY );
PIM_TRAPD_HANDLE( HandleNotificationL(aNotification) );
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -427,7 +427,7 @@
//
void CCalenCustomisationManager::HandleNotificationL(TCalenNotification aNotification)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATIONL_ENTRY );
switch( aNotification )
{
case ECalenNotifySystemLanguageChanged:
@@ -437,7 +437,7 @@
}
break;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATIONL_EXIT );
}
@@ -449,8 +449,8 @@
//
const RImplInfoPtrArray& CCalenCustomisationManager::PluginInfoArray() const
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_PLUGININFOARRAY_ENTRY );
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_PLUGININFOARRAY_EXIT );
return iPluginInfo;
}
@@ -465,9 +465,7 @@
//
void CCalenCustomisationManager::DoImmediatePluginLoadingL()
{
- TRACE_ENTRY_POINT;
-
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_DOIMMEDIATEPLUGINLOADINGL_ENTRY );
for(TInt i = 0 ; i < iPlugins.Count() ; i++)
{
RArray<TUid> pluginArray;
@@ -494,7 +492,7 @@
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_DOIMMEDIATEPLUGINLOADINGL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -505,8 +503,7 @@
//
void CCalenCustomisationManager::LoadPluginL( TUid aPluginUid )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_LOADPLUGINL_ENTRY );
// Get a new services object from global data
MCalenServices* services = iServicesFactory.NewServicesL();
CleanupStack::PushL( services );
@@ -524,7 +521,7 @@
CleanupStack::Pop( services );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_LOADPLUGINL_EXIT );
}
@@ -537,8 +534,7 @@
// ----------------------------------------------------------------------------
HbWidget* CCalenCustomisationManager::Infobar( )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_INFOBAR_ENTRY );
iInfoBarProviderUid = TUid::Uid(0);
HbWidget* infoBar =NULL;
@@ -573,7 +569,7 @@
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_INFOBAR_EXIT );
return infoBar;
}
@@ -584,47 +580,46 @@
// ----------------------------------------------------------------------------
//
QString* CCalenCustomisationManager::InfobarTextL()
- {
- TRACE_ENTRY_POINT;
-
- iInfoBarProviderUid = TUid::Uid(0);
-
- QString* infoBarText =NULL;
- // Loop though all the command handlers, within two interlinked
- // for loops. If GetInfoBarL leaves for one plugin, a plugin
- // error message will be displayed and the loop will continue with
- // the next command handler. If none of the plugins leave, there will
- // be only one TRAP used.
- TInt count = iPlugins.Count();
- /*if(count > 0)
- {
- infoBar = iPlugins[0]->Plugin().InfobarL();
- iInfoBarProviderUid = iPlugins[0]->Uid();
- }*/
-
- for ( TInt index = 0; index < count && !infoBarText; ++index )
- {
- TRAPD( error,
- // Loop though until an infobar is found
- for (; index < count && !infoBarText; ++index )
- {
- //if ( !iPlugins[index]->IsDisabled() )
- {
- infoBarText = iPlugins[index]->Plugin().InfobarTextL();
- iInfoBarProviderUid = iPlugins[index]->Uid();
- }
- }
- );
- if(error)
- {
- // Need to handle the error case
- }
-
- }
-
- TRACE_EXIT_POINT;
- return infoBarText;
- }
+ {
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_INFOBARTEXTL_ENTRY );
+ iInfoBarProviderUid = TUid::Uid(0);
+
+ QString* infoBarText =NULL;
+ // Loop though all the command handlers, within two interlinked
+ // for loops. If GetInfoBarL leaves for one plugin, a plugin
+ // error message will be displayed and the loop will continue with
+ // the next command handler. If none of the plugins leave, there will
+ // be only one TRAP used.
+ TInt count = iPlugins.Count();
+ /*if(count > 0)
+ {
+ infoBar = iPlugins[0]->Plugin().InfobarL();
+ iInfoBarProviderUid = iPlugins[0]->Uid();
+ }*/
+
+ for ( TInt index = 0; index < count && !infoBarText; ++index )
+ {
+ TRAPD( error,
+ // Loop though until an infobar is found
+ for (; index < count && !infoBarText; ++index )
+ {
+ //if ( !iPlugins[index]->IsDisabled() )
+ {
+ infoBarText = iPlugins[index]->Plugin().InfobarTextL();
+ iInfoBarProviderUid = iPlugins[index]->Uid();
+ }
+ }
+ );
+ if(error)
+ {
+ // Need to handle the error case
+ }
+
+ }
+
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_INFOBARTEXTL_EXIT );
+ return infoBarText;
+ }
// ----------------------------------------------------------------------------
// CCalenCustomisationManager::FindPluginL
@@ -635,8 +630,7 @@
//
CCalenCustomisation* CCalenCustomisationManager::FindPluginL( TUid aUid )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_FINDPLUGINL_ENTRY );
TInt index = iPlugins.Find( aUid, CPluginInfo::Identifier );
CCalenCustomisation* plugin = NULL;
@@ -645,7 +639,7 @@
plugin = &( iPlugins[index]->Plugin() );
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_FINDPLUGINL_EXIT );
return plugin;
}
@@ -661,8 +655,8 @@
: iPlugin( aPlugin ),
iUid( aUid )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CPLUGININFO_CPLUGININFO_ENTRY );
+ OstTraceFunctionExit0( CPLUGININFO_CPLUGININFO_EXIT );
}
// ----------------------------------------------------------------------------
@@ -673,11 +667,10 @@
//
CCalenCustomisationManager::CPluginInfo::~CPluginInfo()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( DUP1_CPLUGININFO_CPLUGININFO_ENTRY );
delete iPlugin;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CPLUGININFO_CPLUGININFO_EXIT );
}
// ----------------------------------------------------------------------------
@@ -688,9 +681,9 @@
//
CCalenCustomisation& CCalenCustomisationManager::CPluginInfo::Plugin()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+OstTraceFunctionEntry0( CPLUGININFO_PLUGIN_ENTRY );
+ OstTraceFunctionExit0( CPLUGININFO_PLUGIN_EXIT );
return *iPlugin;
}
@@ -702,9 +695,8 @@
//
TUid CCalenCustomisationManager::CPluginInfo::Uid() const
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
-
+ OstTraceFunctionEntry0( CPLUGININFO_UID_ENTRY );
+ OstTraceFunctionExit0( CPLUGININFO_UID_EXIT );
return iUid;
}
@@ -716,11 +708,10 @@
//
void CCalenCustomisationManager::CPluginInfo::Disable( TBool aDisable)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CPLUGININFO_DISABLE_ENTRY );
iDisabled = aDisable;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CPLUGININFO_DISABLE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -731,11 +722,9 @@
//
TBool CCalenCustomisationManager::CPluginInfo::IsDisabled()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CPLUGININFO_ISDISABLED_ENTRY );
+ OstTraceFunctionExit0( CPLUGININFO_ISDISABLED_EXIT );
return iDisabled;
-
- TRACE_EXIT_POINT;
}
@@ -749,14 +738,12 @@
void CCalenCustomisationManager::AddPluginL( CCalenCustomisation* aPlugin,
TUid aUid )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_ADDPLUGINL_ENTRY );
CPluginInfo* newPlugin = new ( ELeave ) CPluginInfo( aPlugin, aUid);
CleanupStack::PushL( newPlugin );
iPlugins.AppendL( newPlugin );
CleanupStack::Pop( newPlugin );
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_ADDPLUGINL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -769,9 +756,7 @@
TBool CCalenCustomisationManager::CPluginInfo::Identifier( const TUid* aUid,
const CPluginInfo& aArray )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
-
+ OstTraceFunctionEntry0( CPLUGININFO_IDENTIFIER_ENTRY );
return ( *aUid == aArray.Uid() );
}
@@ -786,9 +771,9 @@
TBool CCalenCustomisationManager::PluginAvailabilityFinder( const TUid* aUid,
const TCalenPluginAvailability& aArrayItem )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_PLUGINAVAILABILITYFINDER_ENTRY );
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_PLUGINAVAILABILITYFINDER_EXIT );
return ( *aUid == aArrayItem.iUid);
}
@@ -801,8 +786,7 @@
//
void CCalenCustomisationManager::OfferMenu(HbMenu* aHbMenu )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_OFFERMENU_ENTRY );
// Get the number of command handlers
// TInt count = iCommandHandlers.Count();
const TInt count = iPlugins.Count();
@@ -830,7 +814,7 @@
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_OFFERMENU_EXIT );
}
// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/customisationmanager/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/customisationmanager/traces/calencustomisationmanagerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,74 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENCUSTOMISATIONMANAGERTRACES_H__
+#define __CALENCUSTOMISATIONMANAGERTRACES_H__
+
+#define KOstTraceComponentID 0x10282f28
+
+#define CCALENCUSTOMISATIONMANAGER_NEWL_ENTRY 0x8a0001
+#define CCALENCUSTOMISATIONMANAGER_NEWL_EXIT 0x8a0002
+#define CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_ENTRY 0x8a0003
+#define CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_EXIT 0x8a0004
+#define CCALENCUSTOMISATIONMANAGER_CONSTRUCTL_ENTRY 0x8a0005
+#define CCALENCUSTOMISATIONMANAGER_CONSTRUCTL_EXIT 0x8a0006
+#define DUP1_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_ENTRY 0x8a0007
+#define DUP1_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_EXIT 0x8a0008
+#define CCALENCUSTOMISATIONMANAGER_GETCOMMANDHANDLERL_ENTRY 0x8a0009
+#define CCALENCUSTOMISATIONMANAGER_GETCOMMANDHANDLERL_EXIT 0x8a000a
+#define CCALENCUSTOMISATIONMANAGER_ACTIVEPLUGINS_ENTRY 0x8a000b
+#define CCALENCUSTOMISATIONMANAGER_ACTIVEPLUGINS_EXIT 0x8a000c
+#define CCALENCUSTOMISATIONMANAGER_CREATEACTIVEPLUGINLISTL_ENTRY 0x8a000d
+#define CCALENCUSTOMISATIONMANAGER_CREATEACTIVEPLUGINLISTL_EXIT 0x8a000e
+#define CCALENCUSTOMISATIONMANAGER_LOADPLUGINSBASEDONVARIANTL_ENTRY 0x8a000f
+#define CCALENCUSTOMISATIONMANAGER_LOADPLUGINSBASEDONVARIANTL_EXIT 0x8a0010
+#define CCALENCUSTOMISATIONMANAGER_PLUGININFOFINDER_ENTRY 0x8a0011
+#define CCALENCUSTOMISATIONMANAGER_SETPLUGINAVAILABILITYL_ENTRY 0x8a0012
+#define CCALENCUSTOMISATIONMANAGER_SETPLUGINAVAILABILITYL_EXIT 0x8a0013
+#define CCALENCUSTOMISATIONMANAGER_DISABLEPLUGINL_ENTRY 0x8a0014
+#define CCALENCUSTOMISATIONMANAGER_DISABLEPLUGINL_EXIT 0x8a0015
+#define CCALENCUSTOMISATIONMANAGER_UNLOADPLUGINSL_ENTRY 0x8a0016
+#define CCALENCUSTOMISATIONMANAGER_UNLOADPLUGINSL_EXIT 0x8a0017
+#define CCALENCUSTOMISATIONMANAGER_ENABLEPLUGINL_ENTRY 0x8a0018
+#define CCALENCUSTOMISATIONMANAGER_ENABLEPLUGINL_EXIT 0x8a0019
+#define CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATION_ENTRY 0x8a001a
+#define CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATION_EXIT 0x8a001b
+#define CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATIONL_ENTRY 0x8a001c
+#define CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATIONL_EXIT 0x8a001d
+#define CCALENCUSTOMISATIONMANAGER_PLUGININFOARRAY_ENTRY 0x8a001e
+#define CCALENCUSTOMISATIONMANAGER_PLUGININFOARRAY_EXIT 0x8a001f
+#define CCALENCUSTOMISATIONMANAGER_DOIMMEDIATEPLUGINLOADINGL_ENTRY 0x8a0020
+#define CCALENCUSTOMISATIONMANAGER_DOIMMEDIATEPLUGINLOADINGL_EXIT 0x8a0021
+#define CCALENCUSTOMISATIONMANAGER_LOADPLUGINL_ENTRY 0x8a0022
+#define CCALENCUSTOMISATIONMANAGER_LOADPLUGINL_EXIT 0x8a0023
+#define CCALENCUSTOMISATIONMANAGER_INFOBAR_ENTRY 0x8a0024
+#define CCALENCUSTOMISATIONMANAGER_INFOBAR_EXIT 0x8a0025
+#define CCALENCUSTOMISATIONMANAGER_INFOBARTEXTL_ENTRY 0x8a0026
+#define CCALENCUSTOMISATIONMANAGER_INFOBARTEXTL_EXIT 0x8a0027
+#define CCALENCUSTOMISATIONMANAGER_FINDPLUGINL_ENTRY 0x8a0028
+#define CCALENCUSTOMISATIONMANAGER_FINDPLUGINL_EXIT 0x8a0029
+#define CPLUGININFO_CPLUGININFO_ENTRY 0x8a002a
+#define CPLUGININFO_CPLUGININFO_EXIT 0x8a002b
+#define DUP1_CPLUGININFO_CPLUGININFO_ENTRY 0x8a002c
+#define DUP1_CPLUGININFO_CPLUGININFO_EXIT 0x8a002d
+#define CPLUGININFO_PLUGIN_ENTRY 0x8a002e
+#define CPLUGININFO_PLUGIN_EXIT 0x8a002f
+#define CPLUGININFO_UID_ENTRY 0x8a0030
+#define CPLUGININFO_UID_EXIT 0x8a0031
+#define CPLUGININFO_DISABLE_ENTRY 0x8a0032
+#define CPLUGININFO_DISABLE_EXIT 0x8a0033
+#define CPLUGININFO_ISDISABLED_ENTRY 0x8a0034
+#define CPLUGININFO_ISDISABLED_EXIT 0x8a0035
+#define CCALENCUSTOMISATIONMANAGER_ADDPLUGINL_ENTRY 0x8a0036
+#define CCALENCUSTOMISATIONMANAGER_ADDPLUGINL_EXIT 0x8a0037
+#define CPLUGININFO_IDENTIFIER_ENTRY 0x8a0038
+#define CCALENCUSTOMISATIONMANAGER_PLUGINAVAILABILITYFINDER_ENTRY 0x8a0039
+#define CCALENCUSTOMISATIONMANAGER_PLUGINAVAILABILITYFINDER_EXIT 0x8a003a
+#define CCALENCUSTOMISATIONMANAGER_OFFERMENU_ENTRY 0x8a003b
+#define CCALENCUSTOMISATIONMANAGER_OFFERMENU_EXIT 0x8a003c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/customisationmanager/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,62 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_ACTIVEPLUGINS_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_ACTIVEPLUGINS_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_ADDPLUGINL_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_ADDPLUGINL_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_CONSTRUCTL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_CONSTRUCTL_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_CREATEACTIVEPLUGINLISTL_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_CREATEACTIVEPLUGINLISTL_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_DISABLEPLUGINL_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_DISABLEPLUGINL_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_DOIMMEDIATEPLUGINLOADINGL_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_DOIMMEDIATEPLUGINLOADINGL_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_ENABLEPLUGINL_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_ENABLEPLUGINL_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_FINDPLUGINL_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_FINDPLUGINL_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_GETCOMMANDHANDLERL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_GETCOMMANDHANDLERL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATIONL_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATIONL_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATION_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATION_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_INFOBARTEXTL_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_INFOBARTEXTL_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_INFOBAR_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_INFOBAR_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_LOADPLUGINL_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_LOADPLUGINL_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_LOADPLUGINSBASEDONVARIANTL_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_LOADPLUGINSBASEDONVARIANTL_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_NEWL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_NEWL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_OFFERMENU_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_OFFERMENU_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_PLUGINAVAILABILITYFINDER_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_PLUGINAVAILABILITYFINDER_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_PLUGININFOARRAY_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_PLUGININFOARRAY_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_PLUGININFOFINDER_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_SETPLUGINAVAILABILITYL_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_SETPLUGINAVAILABILITYL_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_UNLOADPLUGINSL_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CCALENCUSTOMISATIONMANAGER_UNLOADPLUGINSL_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_CPLUGININFO_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_CPLUGININFO_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_DISABLE_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_DISABLE_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_IDENTIFIER_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_ISDISABLED_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_ISDISABLED_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_PLUGIN_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_PLUGIN_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_UID_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CPLUGININFO_UID_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CPLUGININFO_CPLUGININFO_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CPLUGININFO_CPLUGININFO_EXIT=0x2d
--- a/calendarui/inc/calenagendautils.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/inc/calenagendautils.h Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,7 @@
// INCLUDES
-#include "agendaentry.h"
+#include <agendaentry.h>
#include <qglobal.h> // Q_DECL_EXPORT macro
#ifdef CALENDATEUTILS_DLL
@@ -52,6 +52,14 @@
**/
static bool endsAtStartOfDay( AgendaEntry& entry,
const QDateTime& day );
+
+ /**
+ * Checks if the given entry is an all-day
+ * Need to call this API only for entry types other than EEvent
+ * @param entry Entry for which all-day attribute is being queried
+ * @returns True, If entry is an all-day else False
+ */
+ static bool CalenAgendaUtils::isAlldayEvent( const AgendaEntry& entry );
};
--- a/calendarui/inc/calencommon.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/inc/calencommon.h Mon Aug 23 16:00:50 2010 +0100
@@ -78,6 +78,13 @@
#define CALEN_MONTVIEW_FIFTH_WEEK_LABEL "fifthWeekLabel"
#define CALEN_MONTVIEW_SIXTH_WEEK_LABEL "sixthWeekLabel"
+#define CALEN_DAYVIEW_DOCML ":/xml/calendayview.docml"
+#define CALEN_DAYVIEW "dayView"
+#define CALEN_DAYVIEW_DAYINFO "dayViewDayInfo"
+#define CALEN_DAYVIEW_REGIONALINFO "dayViewRegionalInfo"
+#define CALEN_DAYVIEW_CONTENTWIDGET "dayViewContentWidget"
+#define CALEN_DAYVIEW_HOURSCROLLAREA "dayViewHourScrollArea"
+#define CALEN_DAYVIEW_CONTENTSCROLLAREA "dayViewContentScrollArea"
/*!
\class CalendarNamespace
--- a/calendarui/inc/calendarui_debug.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/inc/calendarui_debug.h Mon Aug 23 16:00:50 2010 +0100
@@ -25,75 +25,17 @@
#ifndef PIM_TRACE_H
#define PIM_TRACE_H
-#if defined (_DEBUG) || defined (_PIM_FILE_LOG) || defined (_DISPLAY_WARNINGS)
+#if defined (_DEBUG) || defined (_PIM_FILE_LOG)
//Includes
#include <e32base.h>
#include <e32std.h>
#include <flogger.h>
#include <e32svr.h>
#include <f32file.h>
- //#include <AknGlobalConfirmationQuery.h>
+
const TInt KMaxLogLineLength = 512;
#endif
-
-/**
-* Define our own trap and assert macros to prevent compiler warnings.
-*/
-#if defined (_DISPLAY_WARNINGS)
- _LIT( KWarningFormat, " error %d trapped %S line %d");
- inline void DisplayWarningNote( TInt aError, const TDesC8& aFile, TInt aWarningNote )
- {
- /*if ( aError )
- {
- TRAP_IGNORE(
- CAknGlobalConfirmationQuery* cq = CAknGlobalConfirmationQuery::NewL();
- CleanupStack::PushL( cq );
-
- TBuf<KMaxLogLineLength> text;
- TBuf<128> fileName;
- fileName.Copy( aFile );
- text.Format( KWarningFormat, aError, &fileName, aWarningNote );
-
- TRequestStatus stat = KRequestPending;
- cq->ShowConfirmationQueryL( stat, text, R_AVKON_SOFTKEYS_YES_NO );
- User::WaitForRequest( stat );
-
- CleanupStack::PopAndDestroy( cq );
- );
- } */
- }
-
- inline void DisplayWarningNote( const TDesC& aNote )
- {
- /*TRAP_IGNORE(
- CAknGlobalConfirmationQuery* cq = CAknGlobalConfirmationQuery::NewL();
- CleanupStack::PushL( cq );
-
-
- TRequestStatus stat = KRequestPending;
- cq->ShowConfirmationQueryL( stat, aNote, R_AVKON_SOFTKEYS_YES_NO );
- User::WaitForRequest( stat );
-
- CleanupStack::PopAndDestroy( cq );
- );*/
- }
-
- #undef TRAP_INSTRUMENTATION_LEAVE
- #define TRAP_INSTRUMENTATION_LEAVE(aResult) DisplayWarningNote( aResult,TPtrC8( ( TText8* )__FILE__), __LINE__);
-
- #define PIM_TRAP_HANDLE( _err, _s ) \
- { \
- TRAP( _err, _s; ); \
- DisplayWarningNote( _err,TPtrC8( ( TText8* )__FILE__),__LINE__ ); \
- }
- #define PIM_TRAPD_HANDLE( _s ) \
- { \
- TRAPD( _err, _s; ); \
- DisplayWarningNote( _err, TPtrC8( ( TText8* )__FILE__), __LINE__ ); \
- }
- #define WARNING_NOTE( _s ) DisplayWarningNote( _s );
-
-#elif defined( _DEBUG )
+#if defined( _DEBUG )
#define PIM_TRAP_HANDLE( _err, _s ) \
{ \
TRAP( _err, _s; ); \
--- a/calendarui/regionalplugins/calenregionalutil/calenregionalutil.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/calenregionalutil/calenregionalutil.pro Mon Aug 23 16:00:50 2010 +0100
@@ -24,7 +24,8 @@
INCLUDEPATH += ./inc
INCLUDEPATH += ../inc \
- ../../inc
+ ../../inc \
+ ./traces
# Input
HEADERS += ./inc/calenextrarowformatter.h \
--- a/calendarui/regionalplugins/calenregionalutil/src/calenextrarowformatter.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/calenregionalutil/src/calenextrarowformatter.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,10 @@
#include "calendarui_debug.h"
#include "CalenExtraRowFormatter.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenextrarowformatterTraces.h"
+#endif
// Constants
const TInt KZero( 0 );
@@ -33,11 +37,11 @@
//
void CollapseDuplicatesL( TDes& aStr, TInt aPos, const TDesC& aSub )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( _COLLAPSEDUPLICATESL_ENTRY );
const TInt sublen = aSub.Length();
if (aStr.Length() == KZero || sublen == KZero || aPos < KZero || (aPos >aStr.Length()))
{
+ OstTraceFunctionExit0( _COLLAPSEDUPLICATESL_EXIT );
return;
}
@@ -70,16 +74,17 @@
// 3) No second substring found -> nothing to collapse
else
{
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1__COLLAPSEDUPLICATESL_EXIT );
return;
}
}
// No substring found
else
{
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP2__COLLAPSEDUPLICATESL_EXIT );
return;
}
+ OstTraceFunctionExit0( DUP3__COLLAPSEDUPLICATESL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -88,8 +93,7 @@
//
void RemoveLeadingAndTrailingL( TDes& aStr, const TDesC& aSub )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( _REMOVELEADINGANDTRAILINGL_ENTRY );
// Trailing
const TInt sublen = aSub.Length();
if ( aStr.Right( sublen ).Find( aSub ) == KZero )
@@ -103,7 +107,7 @@
aStr.Replace( KZero, sublen, KNullDesC );
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( _REMOVELEADINGANDTRAILINGL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -112,14 +116,13 @@
//
EXPORT_C CCalenExtraRowFormatter* CCalenExtraRowFormatter::NewL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENEXTRAROWFORMATTER_NEWL_ENTRY );
CCalenExtraRowFormatter* self = new (ELeave) CCalenExtraRowFormatter;
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEXTRAROWFORMATTER_NEWL_EXIT );
return self;
}
@@ -129,8 +132,8 @@
//
EXPORT_C CCalenExtraRowFormatter::~CCalenExtraRowFormatter()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_ENTRY );
+ OstTraceFunctionExit0( CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_EXIT );
}
// -----------------------------------------------------------------------------
@@ -139,8 +142,8 @@
//
CCalenExtraRowFormatter::CCalenExtraRowFormatter()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_ENTRY );
+ OstTraceFunctionExit0( DUP1_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_EXIT );
}
// -----------------------------------------------------------------------------
@@ -149,8 +152,8 @@
//
void CCalenExtraRowFormatter::ConstructL()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENEXTRAROWFORMATTER_CONSTRUCTL_ENTRY );
+ OstTraceFunctionExit0( CCALENEXTRAROWFORMATTER_CONSTRUCTL_EXIT );
}
@@ -162,14 +165,12 @@
CCalenLunarLocalizedInfo& aLocInfo,
RArray<CCalenLunarLocalizedInfo::TField>& aPrioritizedFields )
{
- TRACE_ENTRY_POINT;
-
-
+ OstTraceFunctionEntry0( CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_ENTRY );
if ( aPrioritizedFields.Count() == KZero)
{
iText = KNullDesC;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_EXIT );
return iText;
}
@@ -247,8 +248,8 @@
// CleanUp
CleanupStack::PopAndDestroy( subs );
CleanupStack::PopAndDestroy( &subLabels );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_EXIT );
return iText;
}
--- a/calendarui/regionalplugins/calenregionalutil/src/calenlunarinfo.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/calenregionalutil/src/calenlunarinfo.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,6 +19,11 @@
#include "calendarui_debug.h"
#include "CalenLunarInfo.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenlunarinfoTraces.h"
+#endif
+
// -----------------------------------------------------------------------------
// TCalenLunarInfo::HasFestival
@@ -26,9 +31,8 @@
//
EXPORT_C TBool TCalenLunarInfo::HasFestival()
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( TCALENLUNARINFO_HASFESTIVAL_ENTRY );
+ OstTraceFunctionExit0( TCALENLUNARINFO_HASFESTIVAL_EXIT );
return iFestival >= 0;
}
@@ -38,9 +42,8 @@
//
EXPORT_C TBool TCalenLunarInfo::HasSolarTerm()
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( TCALENLUNARINFO_HASSOLARTERM_ENTRY );
+ OstTraceFunctionExit0( TCALENLUNARINFO_HASSOLARTERM_EXIT );
return iSolarTerm >= 0;
}
@@ -51,13 +54,11 @@
EXPORT_C TCalenLunarInfo::TAnimalYear TCalenLunarInfo::AnimalYear()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( TCALENLUNARINFO_ANIMALYEAR_ENTRY );
ASSERT( EYearOfRat < EYearOfPig );
ASSERT( EYearOfRat <= iTerrestialBranch );
ASSERT( iTerrestialBranch <= EYearOfPig );
// Ordering is same for animal years and terrestial branches
- TRACE_EXIT_POINT;
return static_cast<TCalenLunarInfo::TAnimalYear>( iTerrestialBranch );
}
--- a/calendarui/regionalplugins/calenregionalutil/src/calenlunarinfoprovider.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/calenregionalutil/src/calenlunarinfoprovider.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,11 @@
#include "CalenSolarTerms.h"
#include <calendarconverter.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenlunarinfoproviderTraces.h"
+#endif
+
// ---------------------------------------------------------
@@ -33,8 +38,7 @@
TInt& aCelestialIndex,
TInt& aTerrestrialIndex)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( _CELESTIALINDEX_ENTRY );
aCelestialIndex = aChineseDate.iYear % 10;
if (aCelestialIndex == 0)
@@ -56,7 +60,7 @@
aTerrestrialIndex--;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( _CELESTIALINDEX_EXIT );
}
// -----------------------------------------------------------------------------
@@ -67,8 +71,7 @@
const TChineseDate& aChineseDate,
const TChineseDate& aNextDate)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( _CHINESEFESTIVAL_ENTRY );
TCalenLunarInfo::TFestival index = TCalenLunarInfo::ENoFestival;
if (!aChineseDate.iLeapMonth)
@@ -116,7 +119,7 @@
index = TCalenLunarInfo::EFestivalNewYearEve;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( _CHINESEFESTIVAL_EXIT );
return index;
}
@@ -126,14 +129,13 @@
//
EXPORT_C CCalenLunarInfoProvider* CCalenLunarInfoProvider::NewL(RFs& aFs)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARINFOPROVIDER_NEWL_ENTRY );
CCalenLunarInfoProvider* self = new (ELeave) CCalenLunarInfoProvider();
CleanupStack::PushL(self);
self->ConstructL(aFs);
CleanupStack::Pop(self);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARINFOPROVIDER_NEWL_EXIT );
return self;
}
@@ -143,12 +145,10 @@
//
EXPORT_C CCalenLunarInfoProvider::~CCalenLunarInfoProvider()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_ENTRY );
delete iSolarTerms;
delete iConverter;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_EXIT );
}
// -----------------------------------------------------------------------------
@@ -157,8 +157,8 @@
//
CCalenLunarInfoProvider::CCalenLunarInfoProvider()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_ENTRY );
+ OstTraceFunctionExit0( DUP1_CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_EXIT );
}
// -----------------------------------------------------------------------------
@@ -167,12 +167,11 @@
//
void CCalenLunarInfoProvider::ConstructL(RFs& aFs)
{
- TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENLUNARINFOPROVIDER_CONSTRUCTL_ENTRY );
iConverter = CChineseCalendarConverter::NewL();
iSolarTerms = CCalenSolarTerms::NewL(aFs);
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARINFOPROVIDER_CONSTRUCTL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -181,8 +180,7 @@
//
EXPORT_C TCalenLunarInfo CCalenLunarInfoProvider::GetLunarInfoL( const TTime& aDay )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARINFOPROVIDER_GETLUNARINFOL_ENTRY );
TDateTime dayDt = aDay.DateTime();
TTime nextDay = aDay + TTimeIntervalDays(1);
@@ -201,6 +199,6 @@
info.iSolarTerm = iSolarTerms->CheckSolarTermDateL( dayDt );
CelestialIndex( chineseDate, info.iHeavenlyStem, info.iTerrestialBranch );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARINFOPROVIDER_GETLUNARINFOL_EXIT );
return info;
}
--- a/calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizedinfo.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizedinfo.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -18,6 +18,11 @@
#include "calendarui_debug.h"
#include "CalenLunarLocalizedInfo.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenlunarlocalizedinfoTraces.h"
+#endif
+
// -----------------------------------------------------------------------------
// CCalenLunarLocalizedInfo::NewL
@@ -25,14 +30,13 @@
//
EXPORT_C CCalenLunarLocalizedInfo* CCalenLunarLocalizedInfo::NewL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZEDINFO_NEWL_ENTRY );
CCalenLunarLocalizedInfo* self = new (ELeave) CCalenLunarLocalizedInfo;
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZEDINFO_NEWL_EXIT );
return self;
}
// -----------------------------------------------------------------------------
@@ -41,8 +45,8 @@
//
EXPORT_C CCalenLunarLocalizedInfo::~CCalenLunarLocalizedInfo()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_ENTRY );
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_EXIT );
}
// -----------------------------------------------------------------------------
@@ -51,8 +55,7 @@
//
CCalenLunarLocalizedInfo::CCalenLunarLocalizedInfo()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( DUP1_CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_ENTRY );
iFestival.Set(KNullDesC);
iSolarTerm.Set(KNullDesC);
iAnimalYear.Set(KNullDesC);
@@ -60,8 +63,7 @@
iLunarMonthAndDay = KNullDesC;
iFullLunarDate = KNullDesC;
iGregorianDate = KNullDesC;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_EXIT );
}
// -----------------------------------------------------------------------------
@@ -70,8 +72,8 @@
//
void CCalenLunarLocalizedInfo::ConstructL()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZEDINFO_CONSTRUCTL_ENTRY );
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZEDINFO_CONSTRUCTL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -80,8 +82,7 @@
//
EXPORT_C const TDesC& CCalenLunarLocalizedInfo::GetField( TField aField )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZEDINFO_GETFIELD_ENTRY );
switch ( aField )
{
case EFestival: return Festival();
@@ -93,9 +94,8 @@
case EGregorianDate: return GregorianDate();
default:
ASSERT( EFalse );
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZEDINFO_GETFIELD_EXIT );
return KNullDesC;
}
-
- TRACE_EXIT_POINT;
}
--- a/calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizer.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizer.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -33,6 +33,11 @@
#include "CalenLunarInfo.h"
#include "CalenLunarLocalizedInfo.h"
#include "CalenExtraRowFormatter.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenlunarlocalizerTraces.h"
+#endif
+
//CONSTANTS
const TInt KCharMonth = 0x6708;
const TInt KCharFirstMonth = 0x6b63;
@@ -50,14 +55,13 @@
//
EXPORT_C CCalenLunarLocalizer* CCalenLunarLocalizer::NewL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_NEWL_ENTRY );
CCalenLunarLocalizer* self = new (ELeave) CCalenLunarLocalizer;
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_NEWL_EXIT );
return self;
}
@@ -67,10 +71,9 @@
//
EXPORT_C CCalenLunarLocalizer::~CCalenLunarLocalizer()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_ENTRY );
delete iRowFormatter;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_EXIT );
}
// -----------------------------------------------------------------------------
@@ -79,8 +82,8 @@
//
EXPORT_C CCalenLunarLocalizer::CCalenLunarLocalizer() : iEikEnv( CEikonEnv::Static() )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_ENTRY );
+ OstTraceFunctionExit0( DUP1_CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_EXIT );
}
// -----------------------------------------------------------------------------
@@ -89,6 +92,7 @@
//
EXPORT_C void CCalenLunarLocalizer::ConstructL()
{
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_CONSTRUCTL_ENTRY );
iRowFormatter = CCalenExtraRowFormatter::NewL();
iFestivalNames.append(hbTrId("txt_calendar_preview_title_spring_fest"));
@@ -163,6 +167,7 @@
iAnimalYearNames.append(hbTrId("txt_calendar_preview_title_year_of_the_dog"));
iAnimalYearNames.append(hbTrId("txt_calendar_preview_title_year_of_the_pig"));
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_CONSTRUCTL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -171,6 +176,7 @@
//
EXPORT_C CCalenLunarLocalizedInfo* CCalenLunarLocalizer::LocalizeL( TCalenLunarInfo& aInfo )
{
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_LOCALIZEL_ENTRY );
CCalenLunarLocalizedInfo* localized = CCalenLunarLocalizedInfo::NewL();
CleanupStack::PushL( localized );
@@ -213,6 +219,7 @@
CleanupStack::Pop( localized );
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_LOCALIZEL_EXIT );
return localized;
}
@@ -224,8 +231,7 @@
EXPORT_C TPtrC CCalenLunarLocalizer::GetExtraRowTextL(
CCalenLunarLocalizedInfo& aLocInfo )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_GETEXTRAROWTEXTL_ENTRY );
RArray<CCalenLunarLocalizedInfo::TField> fields;
CleanupClosePushL( fields );
fields.AppendL( CCalenLunarLocalizedInfo::EFestival );
@@ -236,9 +242,8 @@
TPtrC text = iRowFormatter->FormatExtraRowInformationL( aLocInfo, fields );
CleanupStack::PopAndDestroy( &fields );
-
-
- TRACE_EXIT_POINT;
+
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_GETEXTRAROWTEXTL_EXIT );
return text;
}
@@ -249,6 +254,7 @@
void CCalenLunarLocalizer::LocalizeMonthAndDayL(CCalenLunarLocalizedInfo* aLocInfo,
TCalenLunarInfo& aInfo)
{
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_LOCALIZEMONTHANDDAYL_ENTRY );
TBuf<10> month;
TBuf<10> day;
GetChineseMonth(aInfo.iLunarDate, month);
@@ -268,6 +274,7 @@
}
aLocInfo->iLunarMonthAndDay = static_cast<const TUint16*> (
formattedString.utf16()), formattedString.length();
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_LOCALIZEMONTHANDDAYL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -277,8 +284,7 @@
void CCalenLunarLocalizer::GetChineseMonth(const TChineseDate& aChineseDate,
TDes& aDes)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_GETCHINESEMONTH_ENTRY );
if (aChineseDate.iMonth == 1)
{
aDes.Append(KCharFirstMonth); // Special character for first month
@@ -289,8 +295,7 @@
}
aDes.Append(KCharMonth);
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_GETCHINESEMONTH_EXIT );
}
// -----------------------------------------------------------------------------
@@ -300,16 +305,14 @@
void CCalenLunarLocalizer::GetChineseDay(const TChineseDate& aChineseDate,
TDes& aDes)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_GETCHINESEDAY_ENTRY );
if (aChineseDate.iDay <= 10) // day
{
aDes.Append(KCharChu);
}
GetChineseDigits(aChineseDate.iDay, aDes);
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_GETCHINESEDAY_EXIT );
}
// -----------------------------------------------------------------------------
@@ -318,8 +321,7 @@
//
void CCalenLunarLocalizer::GetChineseDigits(TInt aNum, TDes& aDes)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARLOCALIZER_GETCHINESEDIGITS_ENTRY );
ASSERT( 0 < aNum && aNum <= 30 );
TInt tens = aNum / 10;
TInt ones = aNum % 10;
@@ -355,8 +357,7 @@
{
__ASSERT_DEBUG(EFalse, User::Invariant());
}
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARLOCALIZER_GETCHINESEDIGITS_EXIT );
}
//EOF
--- a/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -27,6 +27,11 @@
#include <f32file.h>
#include <s32file.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calensolartermsTraces.h"
+#endif
+
// CONSTANTS
@@ -49,14 +54,13 @@
//
EXPORT_C CCalenSolarTerms* CCalenSolarTerms::NewL(RFs& aFs)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSOLARTERMS_NEWL_ENTRY );
CCalenSolarTerms* self = new (ELeave) CCalenSolarTerms(aFs);
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSOLARTERMS_NEWL_EXIT );
return self;
}
@@ -67,8 +71,8 @@
//
EXPORT_C CCalenSolarTerms::~CCalenSolarTerms()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY );
+ OstTraceFunctionExit0( CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT );
}
@@ -78,8 +82,7 @@
//
EXPORT_C TInt CCalenSolarTerms::CheckSolarTermDateL( const TDateTime& aDate )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSOLARTERMS_CHECKSOLARTERMDATEL_ENTRY );
ReadSolarTermsL( aDate );
if ( HasSolarTermDataAvailable( aDate ) )
{
@@ -103,17 +106,17 @@
i += KSolarTermCount - 2;
TInt foundIndex = i % KSolarTermCount;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT );
return foundIndex;
}
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT );
return KErrNotFound;
}
else
{
// Solar festival data is NOT available for this date
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP2_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT );
return KErrNotSupported;
}
}
@@ -126,8 +129,8 @@
//
CCalenSolarTerms::CCalenSolarTerms(RFs& aFs) : iFs( aFs )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY );
+ OstTraceFunctionExit0( DUP1_CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT );
}
@@ -137,8 +140,8 @@
//
void CCalenSolarTerms::ConstructL()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENSOLARTERMS_CONSTRUCTL_ENTRY );
+ OstTraceFunctionExit0( CCALENSOLARTERMS_CONSTRUCTL_EXIT );
}
@@ -148,13 +151,11 @@
//
TBool CCalenSolarTerms::HasSolarTermDataAvailable(const TDateTime& aDate) const
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSOLARTERMS_HASSOLARTERMDATAAVAILABLE_ENTRY );
// Note: day parameter for TDateTime starts from 0, not from 1
const TDateTime KMinAvailable( KFirstSolarTermYear, EJanuary, 0, 0, 0, 0, 0 );
const TDateTime KMaxAvailable( KLastSolarTermYear, EDecember, 31 - 1, 23, 59, 59, 0 );
- TRACE_EXIT_POINT;
return TTime(KMinAvailable) <= TTime(aDate) &&
TTime(aDate) <= TTime(KMaxAvailable);
}
@@ -167,11 +168,11 @@
//
void CCalenSolarTerms::ReadSolarTermsL(TDateTime aDate)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSOLARTERMS_READSOLARTERMSL_ENTRY );
// Caches one year of solar items
if ( ! HasSolarTermDataAvailable( aDate ) )
{
+ OstTraceFunctionExit0( CCALENSOLARTERMS_READSOLARTERMSL_EXIT );
return;
}
@@ -205,6 +206,5 @@
CleanupStack::PopAndDestroy(2); // readStream, file
iCachedYear = year;
}
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENSOLARTERMS_READSOLARTERMSL_EXIT );
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/calenregionalutil/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/calenregionalutil/traces/calenextrarowformatterTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,32 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEXTRAROWFORMATTERTRACES_H__
+#define __CALENEXTRAROWFORMATTERTRACES_H__
+
+#define KOstTraceComponentID 0x20022edb
+
+#define _COLLAPSEDUPLICATESL_ENTRY 0x8a0001
+#define _COLLAPSEDUPLICATESL_EXIT 0x8a0002
+#define DUP1__COLLAPSEDUPLICATESL_EXIT 0x8a0003
+#define DUP2__COLLAPSEDUPLICATESL_EXIT 0x8a0004
+#define DUP3__COLLAPSEDUPLICATESL_EXIT 0x8a0005
+#define _REMOVELEADINGANDTRAILINGL_ENTRY 0x8a0006
+#define _REMOVELEADINGANDTRAILINGL_EXIT 0x8a0007
+#define CCALENEXTRAROWFORMATTER_NEWL_ENTRY 0x8a0008
+#define CCALENEXTRAROWFORMATTER_NEWL_EXIT 0x8a0009
+#define CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_ENTRY 0x8a000a
+#define CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_EXIT 0x8a000b
+#define DUP1_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_ENTRY 0x8a000c
+#define DUP1_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_EXIT 0x8a000d
+#define CCALENEXTRAROWFORMATTER_CONSTRUCTL_ENTRY 0x8a000e
+#define CCALENEXTRAROWFORMATTER_CONSTRUCTL_EXIT 0x8a000f
+#define CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_ENTRY 0x8a0010
+#define CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_EXIT 0x8a0011
+#define DUP1_CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_EXIT 0x8a0012
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/calenregionalutil/traces/calenlunarinfoTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,19 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENLUNARINFOTRACES_H__
+#define __CALENLUNARINFOTRACES_H__
+
+#define KOstTraceComponentID 0x20022edb
+
+#define TCALENLUNARINFO_HASFESTIVAL_ENTRY 0x8a0013
+#define TCALENLUNARINFO_HASFESTIVAL_EXIT 0x8a0014
+#define TCALENLUNARINFO_HASSOLARTERM_ENTRY 0x8a0015
+#define TCALENLUNARINFO_HASSOLARTERM_EXIT 0x8a0016
+#define TCALENLUNARINFO_ANIMALYEAR_ENTRY 0x8a0017
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/calenregionalutil/traces/calenlunarinfoproviderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,28 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENLUNARINFOPROVIDERTRACES_H__
+#define __CALENLUNARINFOPROVIDERTRACES_H__
+
+#define KOstTraceComponentID 0x20022edb
+
+#define _CELESTIALINDEX_ENTRY 0x8a0018
+#define _CELESTIALINDEX_EXIT 0x8a0019
+#define _CHINESEFESTIVAL_ENTRY 0x8a001a
+#define _CHINESEFESTIVAL_EXIT 0x8a001b
+#define CCALENLUNARINFOPROVIDER_NEWL_ENTRY 0x8a001c
+#define CCALENLUNARINFOPROVIDER_NEWL_EXIT 0x8a001d
+#define CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_ENTRY 0x8a001e
+#define CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_EXIT 0x8a001f
+#define DUP1_CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_ENTRY 0x8a0020
+#define DUP1_CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_EXIT 0x8a0021
+#define CCALENLUNARINFOPROVIDER_CONSTRUCTL_ENTRY 0x8a0022
+#define CCALENLUNARINFOPROVIDER_CONSTRUCTL_EXIT 0x8a0023
+#define CCALENLUNARINFOPROVIDER_GETLUNARINFOL_ENTRY 0x8a0024
+#define CCALENLUNARINFOPROVIDER_GETLUNARINFOL_EXIT 0x8a0025
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/calenregionalutil/traces/calenlunarlocalizedinfoTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENLUNARLOCALIZEDINFOTRACES_H__
+#define __CALENLUNARLOCALIZEDINFOTRACES_H__
+
+#define KOstTraceComponentID 0x20022edb
+
+#define CCALENLUNARLOCALIZEDINFO_NEWL_ENTRY 0x8a0026
+#define CCALENLUNARLOCALIZEDINFO_NEWL_EXIT 0x8a0027
+#define CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_ENTRY 0x8a0028
+#define CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_EXIT 0x8a0029
+#define DUP1_CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_ENTRY 0x8a002a
+#define DUP1_CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_EXIT 0x8a002b
+#define CCALENLUNARLOCALIZEDINFO_CONSTRUCTL_ENTRY 0x8a002c
+#define CCALENLUNARLOCALIZEDINFO_CONSTRUCTL_EXIT 0x8a002d
+#define CCALENLUNARLOCALIZEDINFO_GETFIELD_ENTRY 0x8a002e
+#define CCALENLUNARLOCALIZEDINFO_GETFIELD_EXIT 0x8a002f
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/calenregionalutil/traces/calenlunarlocalizerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,34 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENLUNARLOCALIZERTRACES_H__
+#define __CALENLUNARLOCALIZERTRACES_H__
+
+#define KOstTraceComponentID 0x20022edb
+
+#define CCALENLUNARLOCALIZER_NEWL_ENTRY 0x8a0030
+#define CCALENLUNARLOCALIZER_NEWL_EXIT 0x8a0031
+#define CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_ENTRY 0x8a0032
+#define CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_EXIT 0x8a0033
+#define DUP1_CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_ENTRY 0x8a0034
+#define DUP1_CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_EXIT 0x8a0035
+#define CCALENLUNARLOCALIZER_CONSTRUCTL_ENTRY 0x8a0036
+#define CCALENLUNARLOCALIZER_CONSTRUCTL_EXIT 0x8a0037
+#define CCALENLUNARLOCALIZER_LOCALIZEL_ENTRY 0x8a0038
+#define CCALENLUNARLOCALIZER_LOCALIZEL_EXIT 0x8a0039
+#define CCALENLUNARLOCALIZER_GETEXTRAROWTEXTL_ENTRY 0x8a003a
+#define CCALENLUNARLOCALIZER_GETEXTRAROWTEXTL_EXIT 0x8a003b
+#define CCALENLUNARLOCALIZER_LOCALIZEMONTHANDDAYL_ENTRY 0x8a003c
+#define CCALENLUNARLOCALIZER_LOCALIZEMONTHANDDAYL_EXIT 0x8a003d
+#define CCALENLUNARLOCALIZER_GETCHINESEMONTH_ENTRY 0x8a003e
+#define CCALENLUNARLOCALIZER_GETCHINESEMONTH_EXIT 0x8a003f
+#define CCALENLUNARLOCALIZER_GETCHINESEDAY_ENTRY 0x8a0040
+#define CCALENLUNARLOCALIZER_GETCHINESEDAY_EXIT 0x8a0041
+#define CCALENLUNARLOCALIZER_GETCHINESEDIGITS_ENTRY 0x8a0042
+#define CCALENLUNARLOCALIZER_GETCHINESEDIGITS_EXIT 0x8a0043
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/calenregionalutil/traces/calensolartermsTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,30 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENSOLARTERMSTRACES_H__
+#define __CALENSOLARTERMSTRACES_H__
+
+#define KOstTraceComponentID 0x20022edb
+
+#define CCALENSOLARTERMS_NEWL_ENTRY 0x8a0044
+#define CCALENSOLARTERMS_NEWL_EXIT 0x8a0045
+#define CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY 0x8a0046
+#define CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT 0x8a0047
+#define CCALENSOLARTERMS_CHECKSOLARTERMDATEL_ENTRY 0x8a0048
+#define CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT 0x8a0049
+#define DUP1_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT 0x8a004a
+#define DUP2_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT 0x8a004b
+#define DUP1_CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY 0x8a004c
+#define DUP1_CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT 0x8a004d
+#define CCALENSOLARTERMS_CONSTRUCTL_ENTRY 0x8a004e
+#define CCALENSOLARTERMS_CONSTRUCTL_EXIT 0x8a004f
+#define CCALENSOLARTERMS_HASSOLARTERMDATAAVAILABLE_ENTRY 0x8a0050
+#define CCALENSOLARTERMS_READSOLARTERMSL_ENTRY 0x8a0051
+#define CCALENSOLARTERMS_READSOLARTERMSL_EXIT 0x8a0052
+#define DUP1_CCALENSOLARTERMS_READSOLARTERMSL_EXIT 0x8a0053
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/calenregionalutil/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,85 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXTRAROWFORMATTER_CONSTRUCTL_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXTRAROWFORMATTER_CONSTRUCTL_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXTRAROWFORMATTER_NEWL_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_CCALENEXTRAROWFORMATTER_NEWL_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARINFOPROVIDER_CONSTRUCTL_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARINFOPROVIDER_CONSTRUCTL_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARINFOPROVIDER_GETLUNARINFOL_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARINFOPROVIDER_GETLUNARINFOL_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARINFOPROVIDER_NEWL_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARINFOPROVIDER_NEWL_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZEDINFO_CONSTRUCTL_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZEDINFO_CONSTRUCTL_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZEDINFO_GETFIELD_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZEDINFO_GETFIELD_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZEDINFO_NEWL_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZEDINFO_NEWL_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_CONSTRUCTL_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_CONSTRUCTL_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_GETCHINESEDAY_ENTRY=0x40
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_GETCHINESEDAY_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_GETCHINESEDIGITS_ENTRY=0x42
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_GETCHINESEDIGITS_EXIT=0x43
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_GETCHINESEMONTH_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_GETCHINESEMONTH_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_GETEXTRAROWTEXTL_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_GETEXTRAROWTEXTL_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_LOCALIZEL_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_LOCALIZEL_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_LOCALIZEMONTHANDDAYL_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_LOCALIZEMONTHANDDAYL_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_NEWL_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARLOCALIZER_NEWL_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT=0x47
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_ENTRY=0x48
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_CONSTRUCTL_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_CONSTRUCTL_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_HASSOLARTERMDATAAVAILABLE_ENTRY=0x50
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_NEWL_ENTRY=0x44
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_NEWL_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_READSOLARTERMSL_ENTRY=0x51
+[TRACE]TRACE_FLOW[0x8A]_CCALENSOLARTERMS_READSOLARTERMSL_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENLUNARINFOPROVIDER_CCALENLUNARINFOPROVIDER_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENLUNARLOCALIZEDINFO_CCALENLUNARLOCALIZEDINFO_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENLUNARLOCALIZER_CCALENLUNARLOCALIZER_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT=0x4d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENSOLARTERMS_READSOLARTERMSL_EXIT=0x53
+[TRACE]TRACE_FLOW[0x8A]_DUP1__COLLAPSEDUPLICATESL_EXIT=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_DUP2__COLLAPSEDUPLICATESL_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP3__COLLAPSEDUPLICATESL_EXIT=0x5
+[TRACE]TRACE_FLOW[0x8A]_TCALENLUNARINFO_ANIMALYEAR_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_TCALENLUNARINFO_HASFESTIVAL_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_TCALENLUNARINFO_HASFESTIVAL_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_TCALENLUNARINFO_HASSOLARTERM_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_TCALENLUNARINFO_HASSOLARTERM_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]__CELESTIALINDEX_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]__CELESTIALINDEX_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]__CHINESEFESTIVAL_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]__CHINESEFESTIVAL_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]__COLLAPSEDUPLICATESL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]__COLLAPSEDUPLICATESL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]__REMOVELEADINGANDTRAILINGL_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]__REMOVELEADINGANDTRAILINGL_EXIT=0x7
--- a/calendarui/regionalplugins/lunarVietnamese/src/calenlunarvietnameseplugin.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/lunarVietnamese/src/calenlunarvietnameseplugin.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -501,11 +501,19 @@
pen.setStyle(Qt::SolidLine);
pen.setWidth(1);
pen.setBrush(Qt::gray);
+
+ // Store the old pen
+ QPen oldPen = painter->pen();
+
painter->setPen(pen);
QRectF rect = this->rect();
painter->eraseRect(rect);
painter->drawRect(rect);
painter->fillRect(rect,Qt::gray);
+
+ // Set the old pen back
+ painter->setPen(oldPen);
+
TRACE_EXIT_POINT;
}
--- a/calendarui/regionalplugins/lunarchinese/inc/CalenLunarChinesePlugin.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/lunarchinese/inc/CalenLunarChinesePlugin.h Mon Aug 23 16:00:50 2010 +0100
@@ -41,6 +41,7 @@
class CCalenLunarInfoProvider;
class CCalenLunarLocalizer;
class CCalenLunarLocalizedInfo;
+class CalenRegionalInfo;
@@ -113,6 +114,8 @@
TInt iStart;
TInt iEnd;
HbTranslator* iTranslator;
+
+ CalenRegionalInfo* iRegionalInfo ;
};
#endif //__CALENLUNARCHINESEPLUGIN_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/lunarchinese/inc/CalenRegionalInfoData.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,46 @@
+/*
+* 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: declaration of Calendar regional info
+ *
+*/
+
+#ifndef CALENREGIONALINFODATA_H_
+#define CALENREGIONALINFODATA_H_
+
+//system includ//
+#include <QObject>
+
+
+class CCalenLunarChinesePlugin;
+/**
+ * CCalenRegionalInfo is used for
+ * slot implementation for showing regional data .
+ */
+class CalenRegionalInfo : public QObject
+ {
+ Q_OBJECT
+
+ public:
+ CalenRegionalInfo(CCalenLunarChinesePlugin &plugin);
+ ~CalenRegionalInfo();
+
+ public slots:
+ //slot to show reginal info
+ void showRegionalDetails();
+
+ private :
+ CCalenLunarChinesePlugin &mPlugin ;
+ };
+
+#endif /* CALENREGIONALINFODATA_H_ */
--- a/calendarui/regionalplugins/lunarchinese/lunarchinese.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/lunarchinese/lunarchinese.pro Mon Aug 23 16:00:50 2010 +0100
@@ -20,14 +20,17 @@
DEPENDPATH += ./inc ./src
INCLUDEPATH += ./inc
-INCLUDEPATH += ../inc ../../inc
+INCLUDEPATH += ../inc ../../inc \
+ ./traces
# Input
-HEADERS += ./inc/CalenLunarChinesePlugin.h
+HEADERS += ./inc/CalenLunarChinesePlugin.h \
+ ./inc/CalenRegionalInfoData.h
SOURCES += ./src/CalenLunarChinesePlugin.cpp \
- ./src/CalenLunarChinesePluginProxy.cpp
+ ./src/CalenLunarChinesePluginProxy.cpp \
+ ./src/CalenRegionalInfoData.cpp
LIBS += -lcalinterimapi \
-lcone \
@@ -88,7 +91,7 @@
MMP_RULES -= "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE"
}
-# TODO: uncomment below line once ts file is released to platform
-#TRANSLATIONS += calenregional.ts
+
+TRANSLATIONS += calenregional.ts
# End of file --Don't remove this.
\ No newline at end of file
--- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -36,7 +36,13 @@
#include "CalenLunarLocalizer.h"
#include "CalenLunarInfoProvider.h"
#include "CalendarPrivateCRKeys.h"
+#include "calenRegionalInfoData.h"
#include "hb_calencommands.hrh"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CalenLunarChinesePluginTraces.h"
+#endif
+
//CONSTANTS
static const QString fieldSeparator("\n");
@@ -57,9 +63,8 @@
iServices(aServices),
iInfoBarText(NULL)
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_ENTRY );
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_EXIT );
}
// -----------------------------------------------------------------------------
@@ -69,13 +74,14 @@
CCalenLunarChinesePlugin* CCalenLunarChinesePlugin::NewL(
MCalenServices* aServices )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_NEWL_ENTRY );
CCalenLunarChinesePlugin* self = new( ELeave )
CCalenLunarChinesePlugin( aServices);
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop(self);
TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_NEWL_EXIT );
return self;
}
@@ -85,9 +91,7 @@
//
CCalenLunarChinesePlugin::~CCalenLunarChinesePlugin()
{
- TRACE_ENTRY_POINT;
-
-
+ OstTraceFunctionEntry0( DUP1_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_ENTRY );
//Deregister services
if ( iServices )
{
@@ -99,7 +103,11 @@
delete iInfoBarText;
iInfoBarText = NULL;
}
-
+ if(iRegionalInfo)
+ {
+ delete iRegionalInfo;
+ iRegionalInfo = NULL;
+ }
delete iInfoProvider;
iInfoProvider = NULL;
delete iLocalizer;
@@ -112,7 +120,7 @@
delete iTranslator;
iTranslator = 0;
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_EXIT );
}
// -----------------------------------------------------------------------------
@@ -121,7 +129,7 @@
//
void CCalenLunarChinesePlugin::ConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_ENTRY );
iServices->RegisterForNotificationsL( this, ECalenNotifyContextChanged );
iServices->GetCommandRange( iStart, iEnd );
@@ -132,9 +140,10 @@
iInfoProvider = CCalenLunarInfoProvider::NewL(
CEikonEnv::Static()->FsSession() );
-
+ //Qt class having a slot ,calls when user clicked show lunar data option
+ iRegionalInfo = new CalenRegionalInfo(*this);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -144,8 +153,7 @@
void CCalenLunarChinesePlugin::FormatExtraRowStringL()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_FORMATEXTRAROWSTRINGL_ENTRY );
if ( iLocInfo )
{
iExtraRowText.Set( iLocalizer->GetExtraRowTextL( *iLocInfo) );
@@ -154,8 +162,7 @@
{
iExtraRowText.Set( KNullDesC );
}
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_FORMATEXTRAROWSTRINGL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -164,8 +171,8 @@
//
HbWidget* CCalenLunarChinesePlugin::InfobarL( )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_INFOBARL_ENTRY );
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_INFOBARL_EXIT );
return NULL;
}
@@ -176,7 +183,7 @@
//
QString* CCalenLunarChinesePlugin::InfobarTextL( )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_INFOBARTEXTL_ENTRY );
if(iInfoBarText)
{
delete iInfoBarText;
@@ -189,7 +196,6 @@
iInfoBarText = iExtraRowText.AllocLC();
CleanupStack::Pop();
- TRACE_EXIT_POINT;
return (new QString((QChar*)iInfoBarText->Des().Ptr(),iInfoBarText->Length()));
}
@@ -201,11 +207,17 @@
void CCalenLunarChinesePlugin::CustomiseMenu(HbMenu* aHbMenu)
{
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CUSTOMISEMENU_ENTRY );
HbAction* lunarAction = new HbAction("Show Lunar Data");
QList<QAction*> actionList = aHbMenu->actions();
- TInt count = actionList.count() - 1;
+ TInt count = actionList.count() - 1; //To show the option "show lunar data"
+ //as a second last action item for all
+ //Menu
if(count >= 0)
aHbMenu->insertAction(actionList[count], lunarAction);
+ //calls a slot whenever user clicked "show lunar data" option
+ QObject::connect(lunarAction,SIGNAL(triggered()), iRegionalInfo,SLOT(showRegionalDetails()));
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_CUSTOMISEMENU_EXIT );
}
// -----------------------------------------------------------------------------
@@ -214,14 +226,13 @@
//
TBool CCalenLunarChinesePlugin::HandleCommandL( const TCalenCommand& aCommand )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_HANDLECOMMANDL_ENTRY );
const TInt commandId = aCommand.Command();
if(ECalenRegionalPluginTapEvent == commandId)
{
ShowDetailsL();
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_HANDLECOMMANDL_EXIT );
return EFalse;
}
@@ -233,8 +244,8 @@
TAny* CCalenLunarChinesePlugin::CalenCommandHandlerExtensionL(
TUid /*aExtensionUid*/ )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CALENCOMMANDHANDLEREXTENSIONL_ENTRY );
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_CALENCOMMANDHANDLEREXTENSIONL_EXIT );
return NULL;
}
@@ -244,8 +255,7 @@
//
MCalenCommandHandler* CCalenLunarChinesePlugin::CommandHandlerL( TInt aCommand )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_COMMANDHANDLERL_ENTRY );
MCalenCommandHandler* commandHandler = NULL;
if(ECalenRegionalPluginTapEvent == aCommand)
@@ -253,8 +263,8 @@
commandHandler = this;
}
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_COMMANDHANDLERL_EXIT );
return commandHandler;
- TRACE_EXIT_POINT;
}
// -----------------------------------------------------------------------------
@@ -263,7 +273,7 @@
//
void CCalenLunarChinesePlugin::UpdateLocalizerInfoL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_UPDATELOCALIZERINFOL_ENTRY );
QDateTime focusDateTime= iServices->Context().focusDateAndTime();
TDateTime tempDateTime(
focusDateTime.date().year(),
@@ -278,7 +288,7 @@
{
iLocInfo = iLocalizer->LocalizeL( lunarInfo );
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_UPDATELOCALIZERINFOL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -288,12 +298,12 @@
void CCalenLunarChinesePlugin::HandleNotification(
const TCalenNotification aNotification )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_ENTRY );
if (aNotification == ECalenNotifyContextChanged)
{
TRAP_IGNORE(UpdateLocalizerInfoL());
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_EXIT );
}
// -----------------------------------------------------------------------------
@@ -303,6 +313,7 @@
//
void CCalenLunarChinesePlugin::ShowDetailsL( )
{
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_SHOWDETAILSL_ENTRY );
QString msgText;
if(iLocInfo) {
QStringList headerIds;
@@ -339,6 +350,7 @@
}
}
ExecuteMessageDialogL(msgText);
+OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_SHOWDETAILSL_EXIT );
}
// -----------------------------------------------------------------------------
@@ -347,7 +359,7 @@
//
void CCalenLunarChinesePlugin::ExecuteMessageDialogL(QString aMsgText)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_ENTRY );
// Instantiate a popup
HbMessageBox *popup = new HbMessageBox();
popup->setDismissPolicy(HbDialog::NoDismiss);
@@ -365,11 +377,11 @@
popup->removeAction(list[i]);
}
// Sets the primary action
- popup->addAction(new HbAction(hbTrId("txt_calendar_button_close"), popup));
+ popup->addAction(new HbAction(hbTrId("txt_common_button_close_singledialog"), popup));
// Launch popup
popup->open();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_EXIT );
}
//EOF
--- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePluginProxy.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePluginProxy.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,11 @@
#include "calencustomisation.h"
#include "CalenLunarChinesePlugin.h"
#include "CalenRegionalPluginUids.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CalenLunarChinesePluginProxyTraces.h"
+#endif
+
// ----------------------------------------------------------------------------
@@ -40,7 +45,9 @@
// ----------------------------------------------------------------------------
EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
{
+ OstTraceFunctionEntry0( _IMPLEMENTATIONGROUPPROXY_ENTRY );
aTableCount = sizeof(ImplementationTable) / sizeof (TImplementationProxy);
+ OstTraceFunctionExit0( _IMPLEMENTATIONGROUPPROXY_EXIT );
return ImplementationTable;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/lunarchinese/src/CalenRegionalInfoData.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,62 @@
+/*
+* 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: CalenAgendaView implementation.
+*
+*/
+
+// User includes
+#include "CalenRegionalInfoData.h"
+#include "CalenLunarChinesePlugin.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CalenRegionalInfoDataTraces.h"
+#endif
+
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CalenRegionalInfo::CCalenRegionalInfo
+// -----------------------------------------------------------------------------
+//
+CalenRegionalInfo::CalenRegionalInfo(CCalenLunarChinesePlugin &plugin): mPlugin(plugin)
+ {
+ OstTraceFunctionEntry0( CALENREGIONALINFO_CALENREGIONALINFO_ENTRY );
+
+ OstTraceFunctionExit0( CALENREGIONALINFO_CALENREGIONALINFO_EXIT );
+ }
+
+// -----------------------------------------------------------------------------
+// CCalenRegionalInfo::~CCalenRegionalInfo
+// -----------------------------------------------------------------------------
+//
+CalenRegionalInfo::~CalenRegionalInfo()
+ {
+ OstTraceFunctionEntry0( DUP1_CALENREGIONALINFO_CALENREGIONALINFO_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENREGIONALINFO_CALENREGIONALINFO_EXIT );
+ }
+
+// -----------------------------------------------------------------------------
+// CCalenRegionalInfo::showRegionalDetailsL
+// its a slot ,calls when user clicked show lunar data option
+// -----------------------------------------------------------------------------
+//
+void CalenRegionalInfo::showRegionalDetails()
+ {
+ OstTraceFunctionEntry0( CALENREGIONALINFO_SHOWREGIONALDETAILS_ENTRY );
+ mPlugin.ShowDetailsL();
+ OstTraceFunctionExit0( CALENREGIONALINFO_SHOWREGIONALDETAILS_EXIT );
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/lunarchinese/traces/CalenLunarChinesePluginProxyTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,16 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENLUNARCHINESEPLUGINPROXYTRACES_H__
+#define __CALENLUNARCHINESEPLUGINPROXYTRACES_H__
+
+#define KOstTraceComponentID 0x2002ea3c
+
+#define _IMPLEMENTATIONGROUPPROXY_ENTRY 0x8a001e
+#define _IMPLEMENTATIONGROUPPROXY_EXIT 0x8a001f
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/lunarchinese/traces/CalenLunarChinesePluginTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,43 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENLUNARCHINESEPLUGINTRACES_H__
+#define __CALENLUNARCHINESEPLUGINTRACES_H__
+
+#define KOstTraceComponentID 0x2002ea3c
+
+#define CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_ENTRY 0x8a0001
+#define CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_EXIT 0x8a0002
+#define CCALENLUNARCHINESEPLUGIN_NEWL_ENTRY 0x8a0003
+#define CCALENLUNARCHINESEPLUGIN_NEWL_EXIT 0x8a0004
+#define DUP1_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_ENTRY 0x8a0005
+#define DUP1_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_EXIT 0x8a0006
+#define CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_ENTRY 0x8a0007
+#define CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_EXIT 0x8a0008
+#define CCALENLUNARCHINESEPLUGIN_FORMATEXTRAROWSTRINGL_ENTRY 0x8a0009
+#define CCALENLUNARCHINESEPLUGIN_FORMATEXTRAROWSTRINGL_EXIT 0x8a000a
+#define CCALENLUNARCHINESEPLUGIN_INFOBARL_ENTRY 0x8a000b
+#define CCALENLUNARCHINESEPLUGIN_INFOBARL_EXIT 0x8a000c
+#define CCALENLUNARCHINESEPLUGIN_INFOBARTEXTL_ENTRY 0x8a000d
+#define CCALENLUNARCHINESEPLUGIN_CUSTOMISEMENU_ENTRY 0x8a000e
+#define CCALENLUNARCHINESEPLUGIN_CUSTOMISEMENU_EXIT 0x8a000f
+#define CCALENLUNARCHINESEPLUGIN_HANDLECOMMANDL_ENTRY 0x8a0010
+#define CCALENLUNARCHINESEPLUGIN_HANDLECOMMANDL_EXIT 0x8a0011
+#define CCALENLUNARCHINESEPLUGIN_CALENCOMMANDHANDLEREXTENSIONL_ENTRY 0x8a0012
+#define CCALENLUNARCHINESEPLUGIN_CALENCOMMANDHANDLEREXTENSIONL_EXIT 0x8a0013
+#define CCALENLUNARCHINESEPLUGIN_COMMANDHANDLERL_ENTRY 0x8a0014
+#define CCALENLUNARCHINESEPLUGIN_COMMANDHANDLERL_EXIT 0x8a0015
+#define CCALENLUNARCHINESEPLUGIN_UPDATELOCALIZERINFOL_ENTRY 0x8a0016
+#define CCALENLUNARCHINESEPLUGIN_UPDATELOCALIZERINFOL_EXIT 0x8a0017
+#define CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_ENTRY 0x8a0018
+#define CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_EXIT 0x8a0019
+#define CCALENLUNARCHINESEPLUGIN_SHOWDETAILSL_ENTRY 0x8a001a
+#define CCALENLUNARCHINESEPLUGIN_SHOWDETAILSL_EXIT 0x8a001b
+#define CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_ENTRY 0x8a001c
+#define CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_EXIT 0x8a001d
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/lunarchinese/traces/CalenRegionalInfoDataTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENREGIONALINFODATATRACES_H__
+#define __CALENREGIONALINFODATATRACES_H__
+
+#define KOstTraceComponentID 0x2002ea3c
+
+#define CALENREGIONALINFO_CALENREGIONALINFO_ENTRY 0x8a0020
+#define CALENREGIONALINFO_CALENREGIONALINFO_EXIT 0x8a0021
+#define DUP1_CALENREGIONALINFO_CALENREGIONALINFO_ENTRY 0x8a0022
+#define DUP1_CALENREGIONALINFO_CALENREGIONALINFO_EXIT 0x8a0023
+#define CALENREGIONALINFO_SHOWREGIONALDETAILS_ENTRY 0x8a0024
+#define CALENREGIONALINFO_SHOWREGIONALDETAILS_EXIT 0x8a0025
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/lunarchinese/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/regionalplugins/lunarchinese/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,39 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CALENREGIONALINFO_CALENREGIONALINFO_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CALENREGIONALINFO_CALENREGIONALINFO_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CALENREGIONALINFO_SHOWREGIONALDETAILS_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CALENREGIONALINFO_SHOWREGIONALDETAILS_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_CALENCOMMANDHANDLEREXTENSIONL_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_CALENCOMMANDHANDLEREXTENSIONL_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_COMMANDHANDLERL_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_COMMANDHANDLERL_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_CUSTOMISEMENU_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_CUSTOMISEMENU_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_FORMATEXTRAROWSTRINGL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_FORMATEXTRAROWSTRINGL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_HANDLECOMMANDL_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_HANDLECOMMANDL_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_INFOBARL_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_INFOBARL_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_INFOBARTEXTL_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_NEWL_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_NEWL_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_SHOWDETAILSL_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_SHOWDETAILSL_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_UPDATELOCALIZERINFOL_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CCALENLUNARCHINESEPLUGIN_UPDATELOCALIZERINFOL_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENREGIONALINFO_CALENREGIONALINFO_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENREGIONALINFO_CALENREGIONALINFO_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]__IMPLEMENTATIONGROUPPROXY_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]__IMPLEMENTATIONGROUPPROXY_EXIT=0x1f
--- a/calendarui/rom/CalendarResources.iby Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/rom/CalendarResources.iby Mon Aug 23 16:00:50 2010 +0100
@@ -25,6 +25,9 @@
// Application resource file.
S60_APP_RESOURCE(calendar)
data=DATAZ_/QT_TRANSLATIONS_DIR/calendar.qm QT_TRANSLATIONS_DIR/calendar.qm
+data=DATAZ_/QT_TRANSLATIONS_DIR/caleneditor.qm QT_TRANSLATIONS_DIR/caleneditor.qm
+data=DATAZ_/QT_TRANSLATIONS_DIR/caleneventviewer.qm QT_TRANSLATIONS_DIR/caleneventviewer.qm
+data=DATAZ_/QT_TRANSLATIONS_DIR/calenregional.qm QT_TRANSLATIONS_DIR/calenregional.qm
#endif // CALENDARRESOURCE_IBY
--- a/calendarui/settings/src/calensettings.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/settings/src/calensettings.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -122,6 +122,7 @@
mSettingsForm->addConnection(mAlarmSnoozeTimeItem,
SIGNAL(currentIndexChanged(int)),
this, SLOT(handleAlarmSnoozeTimeChange(int)));
+ mAlarmSnoozeTimeItem->setContentWidgetData("objectName", "alarmSnoozeTime");
mSettingsModel->appendDataFormItem(mAlarmSnoozeTimeItem);
// Create the weekday list based on start of week.
@@ -143,7 +144,9 @@
HbExtendedLocale locale = HbExtendedLocale::system();
mStartOfWeek = locale.startOfWeek();
mShowWeekStartOnInfoItem->setContentWidgetData("items", weekdaysList);
- mShowWeekStartOnInfoItem->setContentWidgetData("currentIndex", mStartOfWeek);
+ mShowWeekStartOnInfoItem->setContentWidgetData(
+ "currentIndex", mStartOfWeek);
+ mShowWeekStartOnInfoItem->setContentWidgetData("objectName", "startOfWeek");
mSettingsForm->addConnection(mShowWeekStartOnInfoItem,
SIGNAL(currentIndexChanged(int)),
this, SLOT(setStartDayOfWeek(int)));
@@ -171,6 +174,8 @@
QString(hbTrId("txt_calendar_button_no")));
mShowRegionalInfoItem->setContentWidgetData(QString("additionalText"),
QString(hbTrId("txt_calendar_button_yes")));
+ mShowRegionalInfoItem->setContentWidgetData(
+ "objectName", "showRegionalInfo");
mSettingsForm->addConnection(mShowRegionalInfoItem, SIGNAL(clicked()),
this, SLOT(handleRegionalInfoChange()));
mSettingsModel->appendDataFormItem(mShowRegionalInfoItem);
@@ -308,6 +313,7 @@
<< 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()),
--- a/calendarui/views/bwins/calenviewsu.def Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/bwins/calenviewsu.def Mon Aug 23 16:00:50 2010 +0100
@@ -8,128 +8,128 @@
?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 *)
- ?completePopulation@CalenMonthView@@AAEXXZ @ 10 NONAME ; void CalenMonthView::completePopulation(void)
- ??0CalenAgendaViewWidget@@QAE@AAVMCalenServices@@PAVCalenDocLoader@@@Z @ 11 NONAME ; CalenAgendaViewWidget::CalenAgendaViewWidget(class MCalenServices &, class CalenDocLoader *)
- ?handleAppendingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 12 NONAME ; void CalenMonthGrid::handleAppendingRows(class QList<class CalenMonthData> &)
- ?handleChangeOrientation@CalenMonthView@@AAEXXZ @ 13 NONAME ; void CalenMonthView::handleChangeOrientation(void)
- ?staticMetaObject@CalenSettingsView@@2UQMetaObject@@B @ 14 NONAME ; struct QMetaObject const CalenSettingsView::staticMetaObject
- ?docLoader@CalenAgendaView@@QAEPAVCalenDocLoader@@XZ @ 15 NONAME ; class CalenDocLoader * CalenAgendaView::docLoader(void)
- ?getStaticMetaObject@CalenSettingsView@@SAABUQMetaObject@@XZ @ 16 NONAME ; struct QMetaObject const & CalenSettingsView::getStaticMetaObject(void)
- ?updateMonthDataArrayWithActiveDates@CalenMonthView@@AAEXXZ @ 17 NONAME ; void CalenMonthView::updateMonthDataArrayWithActiveDates(void)
- ?scrollingFinished@CalenMonthGrid@@QAEXXZ @ 18 NONAME ; void CalenMonthGrid::scrollingFinished(void)
- ?setCurrentIdex@CalenMonthGrid@@QAEXH@Z @ 19 NONAME ; void CalenMonthGrid::setCurrentIdex(int)
- ?setupView@CalenAgendaView@@QAEXPAVCalenDocLoader@@@Z @ 20 NONAME ; void CalenAgendaView::setupView(class CalenDocLoader *)
- ??_ECalenMonthGrid@@UAE@I@Z @ 21 NONAME ; CalenMonthGrid::~CalenMonthGrid(unsigned int)
- ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 22 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *)
- ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 23 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *)
- ?populatePrevMonth@CalenMonthView@@QAEXXZ @ 24 NONAME ; void CalenMonthView::populatePrevMonth(void)
- ?qt_metacall@CalenSettingsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 25 NONAME ; int CalenSettingsView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??1CalenPluginLabel@@UAE@XZ @ 26 NONAME ; CalenPluginLabel::~CalenPluginLabel(void)
- ?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 27 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &)
- ?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 28 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void)
- ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 29 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int)
- ?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 30 NONAME ; void * CalenMonthView::qt_metacast(char const *)
- ?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 31 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject
- ?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 32 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *)
- ?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 33 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const
- ?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 34 NONAME ; void CalenPreviewPane::startAutoScroll(void)
- ?doLazyLoading@CalenMonthView@@QAEXXZ @ 35 NONAME ; void CalenMonthView::doLazyLoading(void)
- ?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 36 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *)
- ??1CalenSettingsView@@UAE@XZ @ 37 NONAME ; CalenSettingsView::~CalenSettingsView(void)
- ?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 38 NONAME ; class QDateTime CalenPreviewPane::Date(void)
- ?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int)
- ?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 40 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const
- ??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 41 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *)
- ?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 42 NONAME ; int CalenMonthView::rowsInPrevMonth(void)
- ?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 43 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList<class CalenMonthData> &)
- ?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 44 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const
- ?clearListModel@CalenAgendaView@@QAEXXZ @ 45 NONAME ; void CalenAgendaView::clearListModel(void)
- ?gestureEvent@CalenMonthGrid@@MAEXPAVQGestureEvent@@@Z @ 46 NONAME ; void CalenMonthGrid::gestureEvent(class QGestureEvent *)
- ??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 47 NONAME ; CalenDayView::CalenDayView(class MCalenServices &)
- ?populateNextMonth@CalenMonthView@@QAEXXZ @ 48 NONAME ; void CalenMonthView::populateNextMonth(void)
- ?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 49 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &)
- ?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 50 NONAME ; void * CalenMonthGrid::qt_metacast(char const *)
- ?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 51 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void)
- ?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 52 NONAME ; int CalenMonthView::rowsInFutMonth(void)
- ?launchDayView@CalenMonthView@@QAEXXZ @ 53 NONAME ; void CalenMonthView::launchDayView(void)
- ?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 54 NONAME ; int CalenMonthView::getCurrGridIndex(void)
- ?gestureEvent@CalenPreviewPane@@MAEXPAVQGestureEvent@@@Z @ 55 NONAME ; void CalenPreviewPane::gestureEvent(class QGestureEvent *)
- ?prependRows@CalenMonthGrid@@QAEXXZ @ 56 NONAME ; void CalenMonthGrid::prependRows(void)
- ?orientationChanged@CalenMonthGrid@@MAEXW4Orientation@Qt@@@Z @ 57 NONAME ; void CalenMonthGrid::orientationChanged(enum Qt::Orientation)
- ?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 58 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 59 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int)
- ??1CalenThickLinesDrawer@@UAE@XZ @ 60 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void)
- ?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 61 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *)
- ??_ECalenMonthView@@UAE@I@Z @ 62 NONAME ; CalenMonthView::~CalenMonthView(unsigned int)
- ??1CalenAgendaView@@UAE@XZ @ 63 NONAME ; CalenAgendaView::~CalenAgendaView(void)
- ?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 64 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &)
- ??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 65 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *)
- ??0CalenAgendaView@@QAE@AAVMCalenServices@@@Z @ 66 NONAME ; CalenAgendaView::CalenAgendaView(class MCalenServices &)
- ?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 67 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void)
- ?stopScrolling@CalenPreviewPane@@QAEXXZ @ 68 NONAME ; void CalenPreviewPane::stopScrolling(void)
- ?refreshView@CalenSettingsView@@QAEXXZ @ 69 NONAME ; void CalenSettingsView::refreshView(void)
- ?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 70 NONAME ; void CalenMonthView::addBackgroundFrame(void)
- ?createGrid@CalenMonthView@@AAEXXZ @ 71 NONAME ; void CalenMonthView::createGrid(void)
- ?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 72 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *)
- ?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 73 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void)
- ?launchPreviousView@CalenSettingsView@@AAEXXZ @ 74 NONAME ; void CalenSettingsView::launchPreviousView(void)
- ?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 75 NONAME ; void CalenMonthView::setCurrGridIndex(int)
- ?setDateToLabel@CalenMonthView@@AAEXXZ @ 76 NONAME ; void CalenMonthView::setDateToLabel(void)
- ?addWeekNumbers@CalenMonthView@@AAEXXZ @ 77 NONAME ; void CalenMonthView::addWeekNumbers(void)
- ?downGesture@CalenMonthGrid@@AAEXXZ @ 78 NONAME ; void CalenMonthGrid::downGesture(void)
- ?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 79 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 80 NONAME ; void CalenDayView::setupView(class CalenDocLoader *)
- ?upGesture@CalenMonthGrid@@AAEXXZ @ 81 NONAME ; void CalenMonthGrid::upGesture(void)
- ??1CalenMonthView@@UAE@XZ @ 82 NONAME ; CalenMonthView::~CalenMonthView(void)
- ?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 83 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &)
- ?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 84 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject
- ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 85 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int)
- ?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 86 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
- ?initializeForm@CalenSettingsView@@QAEXXZ @ 87 NONAME ; void CalenSettingsView::initializeForm(void)
- ?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 88 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int)
- ?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 89 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void)
- ?goToToday@CalenMonthView@@AAEXXZ @ 90 NONAME ; void CalenMonthView::goToToday(void)
- ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 91 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int)
- ?onContextChanged@CalenMonthView@@EAEXXZ @ 92 NONAME ; void CalenMonthView::onContextChanged(void)
- ?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 93 NONAME ; void * CalenPreviewPane::qt_metacast(char const *)
- ?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 94 NONAME ; int CalenMonthGrid::getCurrentIndex(void)
- ?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int)
- ?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 96 NONAME ; void CalenMonthView::removeWeekNumbers(void)
- ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 97 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int)
- ??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 98 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &)
- ?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 99 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void)
- ?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 100 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *)
- ??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 101 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *)
- ?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 102 NONAME ; void CalenMonthView::onLocaleChanged(int)
- ?doPopulation@CalenMonthView@@UAEXXZ @ 103 NONAME ; void CalenMonthView::doPopulation(void)
- ?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 104 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int)
- ?captureScreenshot@CalenNativeView@@QAEX_N@Z @ 105 NONAME ; void CalenNativeView::captureScreenshot(bool)
- ?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 106 NONAME ; void CalenPreviewPane::GetInstanceListL(void)
- ?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 107 NONAME ; void CalenMonthView::getInstanceList(class QList<class QDate> &, class QDateTime, class QDateTime)
- ?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 108 NONAME ; class QString CalenMonthView::tr(char const *, char const *)
- ??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 109 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *)
- ?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 110 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void)
- ?appendRows@CalenMonthGrid@@QAEXXZ @ 111 NONAME ; void CalenMonthGrid::appendRows(void)
- ?HandleNotification@CalenAgendaView@@UAEXW4TCalenNotification@@@Z @ 112 NONAME ; void CalenAgendaView::HandleNotification(enum TCalenNotification)
- ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 113 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int)
- ??0CalenPluginLabel@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 114 NONAME ; CalenPluginLabel::CalenPluginLabel(class MCalenServices &, class QGraphicsItem *)
- ?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 115 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
- ?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 116 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList<class CalenMonthData> &)
- ?getCurrentDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 117 NONAME ; class QDateTime CalenMonthView::getCurrentDay(void)
- ?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 118 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject
- ?doPopulation@CalenAgendaView@@UAEXXZ @ 119 NONAME ; void CalenAgendaView::doPopulation(void)
- ?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 120 NONAME ; class QString CalenSettingsView::tr(char const *, char const *)
- ?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 121 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void)
- ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 122 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *)
- ?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 123 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject
- ?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 124 NONAME ; void CalenMonthView::populateWithInstanceView(void)
- ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 125 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *)
- ??1CalenAgendaViewWidget@@UAE@XZ @ 126 NONAME ; CalenAgendaViewWidget::~CalenAgendaViewWidget(void)
- ?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 127 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime)
- ?doPopulation@CalenDayView@@UAEXXZ @ 128 NONAME ; void CalenDayView::doPopulation(void)
- ??1CalenDayView@@UAE@XZ @ 129 NONAME ; CalenDayView::~CalenDayView(void)
- ?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 130 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void)
- ?monthDataList@CalenMonthView@@QAE?AV?$QList@VCalenMonthData@@@@XZ @ 131 NONAME ; class QList<class CalenMonthData> CalenMonthView::monthDataList(void)
+ ?monthDataList@CalenMonthView@@QAEAAV?$QList@VCalenMonthData@@@@XZ @ 10 NONAME ; class QList<class CalenMonthData> & 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<class CalenMonthData> &)
+ ?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<class CalenMonthData> &)
+ ?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 QDate> &, 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<class CalenMonthData> &)
+ ?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<class CalenMonthData> &, int, bool)
??1CalenMonthGrid@@UAE@XZ @ 133 NONAME ; CalenMonthGrid::~CalenMonthGrid(void)
?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 134 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const
@@ -159,4 +159,44 @@
??_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)
--- a/calendarui/views/dayview/inc/calendaycommonheaders.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendaycommonheaders.h Mon Aug 23 16:00:50 2010 +0100
@@ -11,47 +11,92 @@
*
* Contributors:
*
-* Description: CalenDay commons.
+* Description: CalenDay commons. All UI specified constants and enums shared
+* beetwen many files should be moved here.
*
*/
#ifndef CALENDAYCOMMONHEADERS_H_
#define CALENDAYCOMMONHEADERS_H_
-// Constants
+// Constants defined by UI spec.
+
+/*!
+ Number of hours in day (UI spec)
+ */
+const int KCalenHoursInDay = 24;
+
+/*!
+ Number of time slots in hour (half of hour is defined as time slot) (UI spec)
+ */
+const int KCalenSlotsInHour = 2;
/*!
- Default timeout for scrolling between days [ms]
+ Content area (1/4 of screen) dedicated for All day events in Day View (UI spec)
+ */
+const qreal KCalenAllDayEventArea = 0.25;
+
+/*!
+ The width [un] of empty right column in Day View (UI spec)
*/
-const int KCalenScrollDaysTimeout = 600;
+const qreal KCalenEmptyRightColumnWidth = 6.0;
+
+/*!
+ The minimum width [un] of touchable event bubble (UI spec)
+ */
+const qreal KCalenMinTouchableEventWidth = 8.2;
+
+/*!
+ The minimum width [un] of event bubble (UI spec)
+ */
+const qreal KCalenMinBubbleWidth = 3.0;
/*!
- Value [%] defines how long (depending on content area width) should horizontal
- pan gesture be to change day to previous/next.
- If the gesture is shorter - current view is not changed.
+ The width [un] of time strip (indicator) in event bubble (UI spec)
+ */
+const qreal KCalenTimeStripWidth = 1.5;
+
+/*!
+ The width [un] of space beetwen event buubles in Day View (UI spec)
*/
-const int KCalenHScrollMoveParam = 30; //!< Percentage
+const qreal KCalenSpaceBeetwenEvents = 1.5;
+
+/*!
+ Number of All day events displayed in single day that remains touchable
+ in portrait orientation (UI spec)
+ */
+const int KCalenTouchableAllDayEventsCountPortrait = 1;
/*!
- Value [degree] defines the max. angle of swipe gesture which should change day.
+ Number of All day events displayed in single day that remains touchable
+ in landscape orientation (UI spec)
+ */
+const int KCalenTouchableAllDayEventsCountLandscape = 2;
+
+/*!
+ Thickness [un] of hour line (UI spec)
*/
-const qreal KCalenSwipeAngle = 30;
+const qreal KCalenHourLineThickness = 0.15;
+
+/*!
+ Thickness [un] of time line (UI spec)
+ */
+const qreal KCalenTimeLineThickness = 0.75;
+
+/*!
+ Color scheme for hour line (UI spec)
+ */
+const QString KCalenHourLineColor = "qtc_cal_day_hour_lines";
+
+/*!
+ Color scheme for current time line (UI spec)
+ */
+const QString KCalenTimeLineColor = "qtc_cal_month_current_day";
// Enumerations
/*!
- \enum CalenPanDirection
- \brief Enumeration identifies pan gesture directions.
- */
-enum CalenPanDirection
-{
- ECalenPanNotSet = 0,
- ECalenPanVertical,
- ECalenPanHorizontal
-};
-
-/*!
\enum CalenScrollDirection
\brief Enumeration identifies horizontal scroll directions of scroll area.
--- a/calendarui/views/dayview/inc/calendaycontainer.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendaycontainer.h Mon Aug 23 16:00:50 2010 +0100
@@ -1,191 +1,134 @@
/*
-* 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 container - parent widget for events (CalenDayItem) and
+ * hours area widgets (CalenDayEventsPane)
+ * Responsible for positioning and resizing events widgets.
+ *
+ */
#ifndef CALENDAYCONTAINER_H
#define CALENDAYCONTAINER_H
-//System includes
+// System includes
#include <QDateTime>
-
#include "../../../../../mw/hb/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h"
-//User includes
-
-//Forward declarations
+// Forward declarations
class CalenDayInfo;
class TouchEventAbsorber;
+// Class declaration
class CalenDayContainer : public HbAbstractItemContainer
{
Q_OBJECT
public:
-
- /**
- * Constructor.
- */
CalenDayContainer(QGraphicsItem *parent = 0);
-
- /**
- * Destructor.
- */
~CalenDayContainer();
- /**
- *
- */
- void itemAdded (int index, HbAbstractViewItem *item, bool animate);
-
- /**
- *
- */
- void itemRemoved (HbAbstractViewItem *item, bool animate);
-
- /**
- *
- */
+ void itemAdded(int index, HbAbstractViewItem *item, bool animate);
+ void itemRemoved(HbAbstractViewItem *item, bool animate);
void reset();
-
- /**
- *
- */
- void viewResized (const QSizeF &size);
-
- /**
- * Sets day's info structer to the container.
- *
- * @param dayInfo Day info.
- */
- void setDayInfo( CalenDayInfo* dayInfo );
-
+ void viewResized(const QSizeF &size);
+
+ void setDayInfo(CalenDayInfo* dayInfo);
+ CalenDayInfo* dayInfo();
+ void setDate(const QDate &date);
+ const QDate &date() const;
+
public slots:
+ void orientationChanged(Qt::Orientation orientation);
- /**
- * Slot handles layout switch.
- * @param orientation Current device orientation
- */
- void orientationChanged(Qt::Orientation orientation);
-
protected:
-
- /**
- *
- */
HbAbstractViewItem * createDefaultPrototype() const;
-
- /**
- *
- */
void setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index);
-
- /**
- * Updates geometry of a timed event.
- */
- void updateTimedEventGeometry(HbAbstractViewItem *item,
- const QModelIndex &index);
-
- /**
- * Updates geometry of a all-day events
+
+ void updateTimedEventGeometry(
+ HbAbstractViewItem *item,
+ const QModelIndex &index);
+ void updateAllDayEventGeometry(
+ HbAbstractViewItem *item,
+ const QModelIndex &index);
+
+ /*!
+ \class LayoutValues
+ \brief Structure with event layout values.
+
+ eventAreaX X value for event area start.
+ eventAreaWidth The width of event area.
+ eventMargin Margins between the multiple events.
+ slotHeight Half hour slot's height.
+ unitInPixels No. of pixels in 1un
+ maxColumns Max. no. of touchable overlapping timed events
*/
- void updateAllDayEventGeometry(HbAbstractViewItem *item,
- const QModelIndex &index);
-
- /**
- * Structure with event layout values.
- *
- * eventAreaX X value for event area start.
- * eventAreaWidth The width of event area.
- * eventMargin Margins between the multiple events.
- * slotHeight Half hour slot's height.
- * unitInPixels no. of pixels in 1un
- */
+ class LayoutValues
+ {
+ public:
+ LayoutValues() :
+ eventAreaX(0), eventAreaWidth(0), eventMargin(0), slotHeight(0),
+ unitInPixels(0), maxColumns(0)
+ {
+ }
- struct LayoutValues {
- LayoutValues()
- :eventAreaX(0),
- eventAreaWidth(0),
- eventMargin(0),
- slotHeight(0),
- unitInPixels(0),
- maxColumns(0)
- {}
-
- qreal eventAreaX;
- qreal eventAreaWidth;
- qreal eventMargin;
- qreal slotHeight;
- qreal unitInPixels;
- int maxColumns;
+ qreal eventAreaX;
+ qreal eventAreaWidth;
+ qreal eventMargin;
+ qreal slotHeight;
+ qreal unitInPixels;
+ int maxColumns;
};
-
- /**
- * Gets event layout values.
- *
- * @param layoutValues structure to be filled with layout data
- */
+
void getTimedEventLayoutValues(LayoutValues& layoutValues);
-
-
- /**
- * creates absorbers which prevent touching to small items
- * (according to UI spec items smaller than ... are untouchable)
- */
void createTouchEventAbsorbers();
-
- /**
- *
- */
- TouchEventAbsorber* crateAbsorberBetweenSlots(int startSlot, int endSlot);
-
-private:
-
- bool mGeometryUpdated;
+ TouchEventAbsorber* crateAbsorberBetweenSlots(
+ int startSlot,
+ int endSlot,
+ bool forAllDayEvents);
- QDateTime mDateTime;
-
- /**
- * Day event info.
- * Not own.
- */
- CalenDayInfo* mInfo;
-
- LayoutValues mLayoutValues;
- QList<TouchEventAbsorber*> mAbsorbers;
+private:
+ bool mGeometryUpdated; //!< Indicates if geometry needs to be updated
+ CalenDayInfo* mInfo; //!< Day event info. Not owned.
+ LayoutValues mLayoutValues; //!< Keeps layout values, see LayoutValues class
+ QList<TouchEventAbsorber*> mAbsorbers; //!< Keeps needed touch absorbers
+ QDate mDate; //!< Keeps date currently associated with this container
};
+/*!
+ \class TouchEventAbsorber
+ \brief TouchEventAbsorber objects are used to catch touch events.
+ \brief Used when event widgets are to small (see UI spec.)
+ */
class TouchEventAbsorber : public HbWidget
- {
- Q_OBJECT
- public:
- TouchEventAbsorber(QGraphicsItem *parent=0);
- ~TouchEventAbsorber();
-
- protected:
- void gestureEvent(QGestureEvent *event);
-
+{
+ Q_OBJECT
+
+public:
+ TouchEventAbsorber(QGraphicsItem *parent = 0);
+ ~TouchEventAbsorber();
+
+protected:
+ void gestureEvent(QGestureEvent *event);
+
#ifdef _DEBUG
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
- QWidget *widget);
-#endif
-
- };
+ void paint(
+ QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget);
+#endif
+};
#endif // CALENDAYCONTAINER_H
-
// End of File
--- a/calendarui/views/dayview/inc/calendaycontentscrollarea.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendaycontentscrollarea.h Mon Aug 23 16:00:50 2010 +0100
@@ -24,14 +24,32 @@
// User includes
#include "calendaycommonheaders.h"
+#ifdef CALENVIEWS_DLL
+#define CALENDAYCONTENTSCROLLAREA_EXPORT Q_DECL_EXPORT
+#else
+#define CALENDAYCONTENTSCROLLAREA_EXPORT Q_DECL_IMPORT
+#endif
+
// Class declaration
-class CalenDayContentScrollArea : public HbScrollArea
+class CALENDAYCONTENTSCROLLAREA_EXPORT CalenDayContentScrollArea : public HbScrollArea
{
Q_OBJECT
public:
CalenDayContentScrollArea(QGraphicsItem *parent = 0);
virtual ~CalenDayContentScrollArea();
+
+public:
+ /*!
+ \enum CalenPanDirection
+ \brief Enumeration identifies pan gesture directions.
+ */
+ enum CalenPanDirection
+ {
+ ECalenPanNotSet = 0,
+ ECalenPanVertical,
+ ECalenPanHorizontal
+ };
signals:
void scrollAreaMoveStarted(CalenScrollDirection scrollTo);
@@ -50,6 +68,7 @@
private: // private functions
void checkPanDirection(QPanGesture *panGesture);
void moveTo(const QPointF &newPosition, int time = 0);
+ bool isHorizontalSwipe(qreal angle) const;
private slots:
void moveFinished();
--- a/calendarui/views/dayview/inc/calendayeventspane.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendayeventspane.h Mon Aug 23 16:00:50 2010 +0100
@@ -24,11 +24,14 @@
class CalenDayEventsPane : public HbWidget
{
+ Q_OBJECT
+
public:
CalenDayEventsPane(HbWidget *parent=0);
virtual ~CalenDayEventsPane();
- void drawTopLine(bool drawTopLine = false);
+ void setDrawTopLine(bool drawTopLine = false);
+ bool isTopLineDrawed() const;
protected:
void paint(QPainter * painter, const QStyleOptionGraphicsItem * option,
--- a/calendarui/views/dayview/inc/calendayhourelement.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendayhourelement.h Mon Aug 23 16:00:50 2010 +0100
@@ -1,32 +1,32 @@
/*
-* 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 CALENDAYHOURELEMENT_H
#define CALENDAYHOURELEMENT_H
-//System includes
+// System includes
#include <QTime>
#include <QPen>
-#include <hbwidget.h>
+#include <HbWidget>
-//User includes
+// User includes
-//Forward declarations
+// Forward declarations
class CalenDayHourScrollArea;
class CalenDayHourElement : public HbWidget
@@ -34,25 +34,19 @@
Q_OBJECT
public:
-
- /**
- * Constructor.
- */
- CalenDayHourElement(const QTime &time, QGraphicsItem *parent=0);
-
- /**
- * Destructor.
- */
+
+ CalenDayHourElement(const QTime &time, QGraphicsItem *parent = 0);
virtual ~CalenDayHourElement();
- /**
- *
- */
- void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget);
+ void setTime(const QTime &time);
+ QTime time() const;
+
+ void paint(QPainter * painter, const QStyleOptionGraphicsItem * option,
+ QWidget * widget);
private:
-
- CalenDayHourScrollArea *mContainer;
+
+ const CalenDayHourScrollArea *mContainer;
QTime mHour;
QColor mHourLineColor;
qreal mUnitInPixels;
--- a/calendarui/views/dayview/inc/calendayhourscrollarea.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendayhourscrollarea.h Mon Aug 23 16:00:50 2010 +0100
@@ -19,23 +19,30 @@
#define CALENDAYHOURSCROLLAREA_H_
// System includes
-#include <hbscrollarea.h>
#include <QDateTime>
+#include <HbScrollArea>
// User includes
#include "calendaycommonheaders.h"
-//forward declarations
+// Forward declarations
class CalenDayHourElement;
+#ifdef CALENVIEWS_DLL
+#define CALENDAYHOURSCROLLAREA_EXPORT Q_DECL_EXPORT
+#else
+#define CALENDAYHOURSCROLLAREA_EXPORT Q_DECL_IMPORT
+#endif
+
// Class declaration
-class CalenDayHourScrollArea : public HbScrollArea
+class CALENDAYHOURSCROLLAREA_EXPORT CalenDayHourScrollArea : public HbScrollArea
{
-Q_OBJECT
+ Q_OBJECT
public:
CalenDayHourScrollArea(QGraphicsItem *parent = 0);
virtual ~CalenDayHourScrollArea();
+
void setDateTime(const QDateTime &dateTime);
QDateTime dateTime() const;
--- a/calendarui/views/dayview/inc/calendayitem.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendayitem.h Mon Aug 23 16:00:50 2010 +0100
@@ -19,6 +19,7 @@
#define CALENDAYITEM_H
//System includes
+#include <QDateTime>
#include <hbabstractviewitem.h>
#include <hbtextitem.h>
#include <hbframeitem.h>
@@ -26,6 +27,7 @@
//Forward declarations
class AgendaEntry;
class CalenDayStatusStrip;
+class CalenDayContainer;
class CalenDayItem : public HbAbstractViewItem
@@ -35,13 +37,14 @@
Q_PROPERTY( bool backgroundFrame READ hasBackgroundFrame )
public:
- CalenDayItem();
+ CalenDayItem(const CalenDayContainer *container);
virtual ~CalenDayItem();
HbAbstractViewItem * createItem();
void updateChildItems();
- bool hasEventDescription() const { return mEventDesc->isVisible();}
- bool hasBackgroundFrame() const { return mBg->isVisible();}
-
+ bool hasEventDescription() const { return mEventDesc->isVisible(); }
+ bool hasBackgroundFrame() const { return mBg->isVisible(); }
+ const CalenDayContainer *container() const { return mContainer; }
+
protected:
void resizeEvent(QGraphicsSceneResizeEvent *event);
@@ -51,12 +54,14 @@
void setStatusStrip(const AgendaEntry &entry, bool allDayEvent);
bool mUpdated;
+ qreal mEventDescMinWidth;
+ qreal mFrameMinWidth;
+
HbFrameItem *mBg;
HbTextItem *mEventDesc;
+
CalenDayStatusStrip *mColorStripe;
- qreal mEventDescMinWidth;
- qreal mFrameMinWidth;
-
+ const CalenDayContainer *mContainer;
};
#endif // CALENDAYITEM_H
--- a/calendarui/views/dayview/inc/calendaymodelmanager.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendaymodelmanager.h Mon Aug 23 16:00:50 2010 +0100
@@ -17,12 +17,15 @@
#ifndef CALENDAYMODELMANAGER_H
#define CALENDAYMODELMANAGER_H
+// System includes
#include <QObject>
#include <QMap>
#include <QDateTime>
+// User includes
#include "calendaycommonheaders.h"
+// Forward declarations
class QAbstractItemModel;
class MCalenServices;
class CalenDayModel;
@@ -58,7 +61,7 @@
private:
void createAllModels();
void moveBackward();
- void moveForeward();
+ void moveForward();
private:
QMap<ModelDay, CalenDayModel*> mModels;
--- a/calendarui/views/dayview/inc/calendaystatusstrip.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendaystatusstrip.h Mon Aug 23 16:00:50 2010 +0100
@@ -77,16 +77,16 @@
qreal calculateMinuteHeight(const QTime &start, const QTime &end);
private:
- qreal mRange; //!<Distanse beatween lines
+ qreal mRange; //!<Distance between lines
QColor mColor;//!<Color of status stripe
CalenDayStatusStrip::DrawingStyle mDrawingStyle;//!<Specify style of drawing
/*!
- Orginal start and end time of event
+ Original start and end time of event
*/
QPair<QTime,QTime> mStartEndEventTime;
- static const qreal mMinute;//!<It keep info how much seconds are in minute
- static const qreal mMinimumTime;//!<It keep info about minimum timeline in minutes
+ static const qreal mMinute;//!<It keeps info how much seconds are in minute
+ static const qreal mMinimumTime;//!<It keeps info about minimum timeline in minutes
};
Q_DECLARE_METATYPE(CalenDayStatusStrip::DrawingStyle)
--- a/calendarui/views/dayview/inc/calendayutils.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendayutils.h Mon Aug 23 16:00:50 2010 +0100
@@ -38,8 +38,6 @@
HbMainWindow* mainWindow();
- bool isHorizontalSwipe(qreal angle) const;
-
/**
* Get event's start/end time fromm agenda entry.
* Start/end time are validated to be within the current day (the case of
@@ -50,7 +48,7 @@
* @param currentDate [in] current date
*/
void getEventValidStartEndTime( QDateTime& start, QDateTime& end,
- AgendaEntry& entry, QDateTime& currentDate );
+ const AgendaEntry& entry, QDateTime& currentDate );
protected:
CalenDayUtils();
--- a/calendarui/views/dayview/inc/calendayview.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/inc/calendayview.h Mon Aug 23 16:00:50 2010 +0100
@@ -144,6 +144,13 @@
public slots:
void changeView(TCalenCommandId viewId);
+
+private slots:
+ /**
+ * Scrolls content to correct position after view repopulation
+ */
+ void setupViewport();
+
private:
/**
*
@@ -159,25 +166,20 @@
* Connects view's slots.
*/
void setupSlots();
-
- /**
- * Scrolls content to correct position after view repopulation
- */
- void setupViewport();
-
+
private: // members related to view management and gesture handling
- CalenDayContentScrollArea* mContentScrollArea; //!< Scroll area for content (events)
-
- CalenDayContentWidget* mContentWidget; //!< Content widget
-
- CalenDayHourScrollArea* mHourScrollArea; //!< Scroll area for hour elements
-
CalenDayModelManager* mModelManager;
- QGraphicsLinearLayout* mVLayout;
+ CalenDayContentScrollArea* mContentScrollArea; //!< Scroll area for content
+ CalenDayContentWidget* mContentWidget; //!< Content widget
+ CalenDayHourScrollArea* mHourScrollArea; //!< Scroll area for hour elements
+ QGraphicsLinearLayout* mVLayout; //!< Vertical layout for day view
-
+ CalenDocLoader* mDocLoader; //!< Document loader for day view
+
+ bool mIsLaunching; //!< Indicates that view is launching first time
+
private:
XQSettingsManager* mSettingsManager;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/resources/calendayeventspane.css Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,4 @@
+CalenDayEventsPane {
+ pref-height: expr(2*var(hb-param-text-height-secondary) + 2*var(hb-param-margin-gene-middle-vertical) + 3un);
+ size-policy-vertical: fixed;
+}
\ No newline at end of file
--- a/calendarui/views/dayview/resources/calendayhourelement.css Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/resources/calendayhourelement.css Mon Aug 23 16:00:50 2010 +0100
@@ -1,5 +1,7 @@
-CalenDayHourElement{
- layout: customCalendarLayout;
+CalenDayHourElement {
+ layout: customCalendarLayout;
+ pref-height: expr(2*var(hb-param-text-height-secondary) + 2*var(hb-param-margin-gene-middle-vertical) + 3un);
+ size-policy-vertical: fixed;
}
CalenDayHourElement::time {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/resources/calendayhourscrollarea.css Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,4 @@
+CalenDayHourScrollArea {
+ pref-width: expr(2*var(hb-param-margin-gene-middle-horizontal) + 8.04un);
+ size-policy-horizontal: fixed;
+}
--- a/calendarui/views/dayview/resources/calendaywidgets.qrc Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/resources/calendaywidgets.qrc Mon Aug 23 16:00:50 2010 +0100
@@ -4,6 +4,8 @@
<file>calendayhourelement.widgetml</file>
<file>calendayitem.css</file>
<file>calendayitem.widgetml</file>
+ <file>calendayeventspane.css</file>
+ <file>calendayhourscrollarea.css</file>
<file>fade_out.fxml</file>
<file>fade_in.fxml</file>
</qresource>
--- a/calendarui/views/dayview/src/calendaycontainer.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendaycontainer.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -1,19 +1,20 @@
/*
-* 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 container - parent widget for events (CalenDayItem)
+ * and hours area widgets (CalenDayEventsPane)
+ * Responsible for positioning and resizing events widgets.
+ */
//System includes
#include <QTime>
@@ -24,10 +25,10 @@
#include <QPainter>
#endif
-#include <hbabstractitemview.h>
-#include <hbtextitem.h>
-#include <hbmodeliterator.h>
-#include <hbinstance.h>
+#include <HbAbstractItemView>
+#include <HbTextItem>
+#include <HbModelIterator>
+#include <HbInstance>
//User includes
#include "calendaycontainer.h"
@@ -37,29 +38,33 @@
#include "calendaymodel.h"
#include "calendayinfo.h"
#include "calendayview.h"
+#include "calenagendautils.h"
+#include "calendaycommonheaders.h"
-// -----------------------------------------------------------------------------
-// CalenDayContainer()
-// Constructor
-// -----------------------------------------------------------------------------
-//
+/*!
+ \class CalenDayContainer
+
+ \brief CalenDayContainer Item container class associated with model.
+ */
+
+/*!
+ \brief Constructor
+
+ Sets container initial geometry, creates hours area widgets.
+ \param parent Parent object
+ */
CalenDayContainer::CalenDayContainer(QGraphicsItem *parent) :
HbAbstractItemContainer(parent), mGeometryUpdated(false), mInfo(0)
{
getTimedEventLayoutValues(mLayoutValues);
-
- // Get the height of element
- qreal paneHeight = CalenDayUtils::instance()->hourElementHeight();
-
+
QGraphicsLinearLayout* timeLinesLayout = new QGraphicsLinearLayout(
Qt::Vertical, this);
- for (int i = 0; i < 24; i++) {
+ for (int i = 0; i < KCalenHoursInDay; i++) {
CalenDayEventsPane* element = new CalenDayEventsPane(this);
- element->setPreferredHeight(paneHeight);
- element->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
- // Draw top line at midnight
+ // Draw top line at midnight
if (i == 0) {
- element->drawTopLine(true);
+ element->setDrawTopLine(true);
}
timeLinesLayout->addItem(element);
}
@@ -69,68 +74,67 @@
setLayout(timeLinesLayout);
}
-// -----------------------------------------------------------------------------
-// ~CalenDayContainer()
-// Destructor
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Destructor
+ */
CalenDayContainer::~CalenDayContainer()
{
+ // Remove absorbers if exist
+ if (mAbsorbers.count()) {
+ qDeleteAll(mAbsorbers);
+ mAbsorbers.clear();
+ }
}
-// -----------------------------------------------------------------------------
-// itemAdded()
-//
-// -----------------------------------------------------------------------------
-//
-void CalenDayContainer::itemAdded( int index, HbAbstractViewItem *item,
- bool animate )
+/*
+ \reimp
+ */
+void CalenDayContainer::itemAdded(
+ int index,
+ HbAbstractViewItem *item,
+ bool animate)
{
Q_UNUSED( index )
Q_UNUSED( item )
Q_UNUSED( animate )
}
-// -----------------------------------------------------------------------------
-// reset()
-//
-// -----------------------------------------------------------------------------
-//
+
+/*
+ \brief Resets the state of container.
+
+ Removes absorbers, gets layout values and maintains current position.
+ */
void CalenDayContainer::reset()
{
- // remove absorbers if exist
- if (mAbsorbers.count())
- {
- qDeleteAll(mAbsorbers);
- mAbsorbers.clear();
- }
-
- // shrink event area when all-day events available after reset
- getTimedEventLayoutValues(mLayoutValues);
-
- // position need to be maintained while changing model
+ // Remove absorbers if exist
+ if (mAbsorbers.count()) {
+ qDeleteAll(mAbsorbers);
+ mAbsorbers.clear();
+ }
+
+ // Shrink event area when all-day events available after reset
+ getTimedEventLayoutValues(mLayoutValues);
+
+ // Position need to be maintained while changing model
QPointF position(pos());
HbAbstractItemContainer::reset();
- setPos( position );
+ setPos(position);
}
-// -----------------------------------------------------------------------------
-// itemRemoved()
-//
-// -----------------------------------------------------------------------------
-//
-void CalenDayContainer::itemRemoved( HbAbstractViewItem *item, bool animate )
+/*
+ \reimp
+ */
+void CalenDayContainer::itemRemoved(HbAbstractViewItem *item, bool animate)
{
Q_UNUSED( item )
Q_UNUSED( animate )
}
-// -----------------------------------------------------------------------------
-// viewResized()
-//
-// -----------------------------------------------------------------------------
-//
-void CalenDayContainer::viewResized (const QSizeF &size)
+/*
+ \reimp
+ */
+void CalenDayContainer::viewResized(const QSizeF &size)
{
resize(size);
if (!mGeometryUpdated) {
@@ -139,125 +143,126 @@
}
}
-// -----------------------------------------------------------------------------
-// createDefaultPrototype()
-//
-// -----------------------------------------------------------------------------
-//
+/*
+ \reimp
+ */
HbAbstractViewItem * CalenDayContainer::createDefaultPrototype() const
{
- CalenDayItem *calendarViewItem = new CalenDayItem;
+ CalenDayItem *calendarViewItem = new CalenDayItem(this);
return calendarViewItem;
}
-// -----------------------------------------------------------------------------
-// setItemModelIndex()
-//
-// -----------------------------------------------------------------------------
-//
-void CalenDayContainer::setItemModelIndex(HbAbstractViewItem *item,
- const QModelIndex &index)
+/*
+ \reimp
+ */
+void CalenDayContainer::setItemModelIndex(
+ HbAbstractViewItem *item,
+ const QModelIndex &index)
{
- QVariant variant = index.data( CalenDayEntry );
- AgendaEntry entry = variant.value<AgendaEntry>();
-
- if (entry.isTimedEntry()) {
- updateTimedEventGeometry( item, index );
+ QVariant variant = index.data(CalenDayEntry);
+ AgendaEntry entry = variant.value<AgendaEntry> ();
+
+ // Check for All Day Events and Timed entries
+ if (CalenAgendaUtils::isAlldayEvent(entry)) {
+ updateAllDayEventGeometry(item, index);
item->setParentItem(this);
- }
- else if( entry.type() == AgendaEntry::TypeEvent ){
- updateAllDayEventGeometry( item, index );
- item->setParentItem(this);
- }
- else {
- item->setVisible(false);
}
-
- // last item
+ else
+ if (entry.isTimedEntry()) {
+ updateTimedEventGeometry(item, index);
+ item->setParentItem(this);
+ }
+ else {
+ item->setVisible(false);
+ }
+
+ // Create touch event absorbers after last item
if (index.row() == index.model()->rowCount() - 1) {
- createTouchEventAbsorbers();
+ createTouchEventAbsorbers();
}
HbAbstractItemContainer::setItemModelIndex(item, index);
}
-// -----------------------------------------------------------------------------
-// updateTimedEventGeometry()
-// Updates geometry of a timed event.
-// -----------------------------------------------------------------------------
-//
-void CalenDayContainer::updateTimedEventGeometry(HbAbstractViewItem *item,
- const QModelIndex &index)
+
+/*!
+ \brief Set size and position of singe timed event widget (bubble)
+ \a item bubble widget
+ \a index pointing item data in model
+ */
+void CalenDayContainer::updateTimedEventGeometry(
+ HbAbstractViewItem *item,
+ const QModelIndex &index)
{
-//safety check
- if ( !mInfo ) {
+ // Safety check
+ if (!mInfo) {
return;
}
-
- QVariant variant = index.data( CalenDayEntry );
- AgendaEntry entry = variant.value<AgendaEntry>();
-
-//1. get 'virtual' event position from DayInfo
-//TODO: k.g.: Day Info should store model index instead of keeping redundant data
+
+ QVariant variant = index.data(CalenDayEntry);
+ AgendaEntry entry = variant.value<AgendaEntry> ();
+
+ // 1. Get 'virtual' event position from DayInfo
SCalenApptInfo apptInfo;
apptInfo.iIndex = index;
-
+
QDateTime start;
QDateTime end;
QDateTime currentDate;
- currentDate = static_cast<const CalenDayModel*>(index.model())->modelDate();
- CalenDayUtils::instance()->getEventValidStartEndTime( start, end, entry,
- currentDate );
+ currentDate
+ = static_cast<const CalenDayModel*> (index.model())->modelDate();
+ CalenDayUtils::instance()->getEventValidStartEndTime(start, end, entry,
+ currentDate);
apptInfo.iStartTime = start;
apptInfo.iEndTime = end;
-
+
TCalenInstanceId id = TCalenInstanceId::nullInstanceId();
id.mEntryLocalUid = index.row(); //index.row() - temporary ID
- id.mInstanceTime = apptInfo.iStartTime;
+ id.mInstanceTime = apptInfo.iStartTime;
apptInfo.iId = id;
apptInfo.iAllDay = 0;
apptInfo.iColor = 0xffff;
-
+
int startSlot, endSlot, columnIdx, columns;
- mInfo->GetLocation( apptInfo, startSlot, endSlot, columnIdx, columns );
-
+ mInfo->GetLocation(apptInfo, startSlot, endSlot, columnIdx, columns);
-//2. set timed event's geometry
- qreal eventStartX(mLayoutValues.eventAreaX );
+ // 2. Set timed event's geometry
+ qreal eventStartX(mLayoutValues.eventAreaX);
qreal eventStartY(0.0);
qreal eventWidth(mLayoutValues.eventAreaWidth);
qreal eventHeight(0.0);
-
- //event's startY/height
+
+ // Event's startY/height
eventStartY = startSlot * mLayoutValues.slotHeight;
eventHeight = (endSlot - startSlot) * mLayoutValues.slotHeight;
- //event's startX/width
+ // Event's startX/width
eventWidth /= columns;
-
- //In case when eventWidth will be smaller then 3.0un we need to
- //make spacings between events smaller.
- //Check whether it's possible to shring them so the bubbles
- //width can stay at 3.0un (time stripe + frame margins).
- qreal minWidth = 3.0 * mLayoutValues.unitInPixels;
- if(eventWidth - mLayoutValues.eventMargin < minWidth){
-
- //Calculate new margin value
- //from totalMarginSpace we need to subtract
- //mLayoutValues.eventMargin because first margin is always 1.5un
- qreal totalMarginSpace = mLayoutValues.eventAreaWidth - minWidth * columns - mLayoutValues.eventMargin;
+
+ // In case when eventWidth will be smaller then KCalenMinBubbleWidth [un]
+ // spacings between events should be smaller.
+ // Check whether it's possible to shrink them so the bubbles width
+ // can stay at KCalenMinBubbleWidth [un] (time stripe + frame margins).
+ qreal minWidth = KCalenMinBubbleWidth * mLayoutValues.unitInPixels;
+ if (eventWidth - mLayoutValues.eventMargin < minWidth) {
+
+ // Calculate new margin value
+ // from totalMarginSpace we need to subtract
+ // mLayoutValues.eventMargin because first margin is always 1.5un
+ qreal totalMarginSpace = mLayoutValues.eventAreaWidth - minWidth
+ * columns - mLayoutValues.eventMargin;
qreal newMarginValue = totalMarginSpace / (columns - 1);
-
- //check if we managed to pack all the events into space we have
- if(newMarginValue > 0){
-
+
+ // Check if we managed to pack all the events into space we have
+ if (newMarginValue > 0) {
eventWidth = minWidth;
}
- else{
- //there's not enough space
- //new minWidth it's 1.5un (time stripe only)
- minWidth = 1.5 * mLayoutValues.unitInPixels;
- totalMarginSpace = mLayoutValues.eventAreaWidth - minWidth * columns - mLayoutValues.eventMargin;
+ else {
+ // There's not enough space
+ // New minWidth is KCalenTimeStripWidth [un] (time stripe only)
+ minWidth = KCalenTimeStripWidth * mLayoutValues.unitInPixels;
+ totalMarginSpace = mLayoutValues.eventAreaWidth - minWidth * columns
+ - mLayoutValues.eventMargin;
newMarginValue = totalMarginSpace / (columns - 1);
eventWidth = minWidth;
}
@@ -265,138 +270,178 @@
//First column margin should be always 1.5un (mLayoutValues.eventMargin)
eventStartX += columnIdx * (eventWidth + newMarginValue) + mLayoutValues.eventMargin;
}
- else{
- //add margins between the event
+ else {
+ // Add margins between the event
eventStartX += columnIdx * eventWidth + mLayoutValues.eventMargin;
eventWidth -= mLayoutValues.eventMargin;
}
-
- QRectF eventGeometry( eventStartX, eventStartY, eventWidth, eventHeight );
- item->setGeometry(eventGeometry);}
-
-// -----------------------------------------------------------------------------
-// updateAllDayEventGeometry()
-// Updates geometry of a timed event.
-// -----------------------------------------------------------------------------
-//
-void CalenDayContainer::updateAllDayEventGeometry(HbAbstractViewItem *item,
- const QModelIndex &index)
-{
- //safety check
- if ( !mInfo ) {
- return;
- }
-
- QVariant variant = index.data( CalenDayEntry );
- AgendaEntry entry = variant.value<AgendaEntry>();
-
- //1. get 'virtual' event position from DayInfo
- //TODO: k.g.: Day Info should store model index instead of keeping redundant data
- SCalenApptInfo apptInfo;
- apptInfo.iIndex = index;
-
-
- QDateTime start;
- QDateTime end;
- QDateTime currentDate;
- currentDate = static_cast<const CalenDayModel*>(index.model())->modelDate();
- CalenDayUtils::instance()->getEventValidStartEndTime( start, end, entry,
- currentDate );
- apptInfo.iStartTime = start;
- apptInfo.iEndTime = end;
-
- TCalenInstanceId id = TCalenInstanceId::nullInstanceId();
- id.mEntryLocalUid = index.row(); //index.row() - temporary ID
- id.mInstanceTime = apptInfo.iStartTime;
- apptInfo.iId = id;
- apptInfo.iAllDay = true;
- apptInfo.iColor = 0xffff;
-
- int startSlot, endSlot, columnIdx, columns;
- mInfo->GetLocation( apptInfo, startSlot, endSlot, columnIdx, columns );
-
- //2. set timed event's geometry
- qreal eventStartX(0.0);
- qreal eventStartY(0.0);
- qreal eventWidth(mLayoutValues.eventAreaX);
- qreal eventHeight = (endSlot - startSlot) * mLayoutValues.slotHeight;
-
-
- //event's startX/width
- if ( columns > 1 ) {
- eventWidth /= columns;
- eventStartX += columnIdx * eventWidth + mLayoutValues.eventMargin;
- //add margins between the event
- eventWidth -= mLayoutValues.eventMargin;
- } else {
- eventStartX += mLayoutValues.eventMargin;
- eventWidth -= mLayoutValues.eventMargin;
- }
-
- QRectF eventGeometry( eventStartX, eventStartY, eventWidth, eventHeight );
- item->setGeometry(eventGeometry);
-
+ QRectF eventGeometry(eventStartX, eventStartY, eventWidth, eventHeight);
+ item->setGeometry(eventGeometry);
}
-// -----------------------------------------------------------------------------
-// movingBackwards()
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Set size and position of singe all-day event widget (bubble)
+ \a item bubble widget
+ \a index pointing item data in model
+ */
+void CalenDayContainer::updateAllDayEventGeometry(
+ HbAbstractViewItem *item,
+ const QModelIndex &index)
+{
+ // Safety check
+ if (!mInfo) {
+ return;
+ }
+
+ QVariant variant = index.data(CalenDayEntry);
+ AgendaEntry entry = variant.value<AgendaEntry> ();
+
+ // 1. Get 'virtual' event position from DayInfo
+ SCalenApptInfo apptInfo;
+ apptInfo.iIndex = index;
+
+ QDateTime start;
+ QDateTime end;
+ QDateTime currentDate;
+ currentDate
+ = static_cast<const CalenDayModel*> (index.model())->modelDate();
+ CalenDayUtils::instance()->getEventValidStartEndTime(start, end, entry,
+ currentDate);
+ apptInfo.iStartTime = start;
+ apptInfo.iEndTime = end;
+
+ TCalenInstanceId id = TCalenInstanceId::nullInstanceId();
+ id.mEntryLocalUid = index.row(); //index.row() - temporary ID
+ id.mInstanceTime = apptInfo.iStartTime;
+ apptInfo.iId = id;
+ apptInfo.iAllDay = true;
+ apptInfo.iColor = 0xffff;
+
+ int startSlot, endSlot, columnIdx, columns;
+ mInfo->GetLocation(apptInfo, startSlot, endSlot, columnIdx, columns);
+
+ // 2. Set timed event's geometry
+ qreal eventStartX(0.0);
+ qreal eventStartY(0.0);
+ qreal eventWidth(mLayoutValues.eventAreaX);
+ qreal eventHeight = (endSlot - startSlot) * mLayoutValues.slotHeight;
+
+ // Event's startX/width
+ if (columns > 1) {
+ eventWidth /= columns;
+ eventStartX += columnIdx * eventWidth + mLayoutValues.eventMargin;
+ // Add margins between the event
+ eventWidth -= mLayoutValues.eventMargin;
+ }
+ else {
+ eventStartX += mLayoutValues.eventMargin;
+ eventWidth -= mLayoutValues.eventMargin;
+ }
+
+ QRectF eventGeometry(eventStartX, eventStartY, eventWidth, eventHeight);
+ item->setGeometry(eventGeometry);
+}
+
+
+/*!
+ \brief Gets event layout values
+ \a layoutValues structure to be filled with layout data
+ */
void CalenDayContainer::getTimedEventLayoutValues(LayoutValues& layoutValues)
{
- // get the width of content area
+ // Get the width of content area
qreal contentWidth = CalenDayUtils::instance()->contentWidth();
-//1.time column width -> eventAreaX[out]
+
+ // 1. Time column width -> eventAreaX[out]
HbStyle style;
HbDeviceProfile deviceProfile;
layoutValues.unitInPixels = deviceProfile.unitValue();
-
- if ( mInfo && mInfo->AlldayCount())
- { // 9.5 -> all-day area width
- layoutValues.eventAreaX = 9.5 * layoutValues.unitInPixels;
- }
- else
- {
- layoutValues.eventAreaX = 0;
- }
-
-//2. event area width -> eventAreaWidth[out]
+
+ if (mInfo && mInfo->AlldayCount()) {
+ layoutValues.eventAreaX = KCalenAllDayEventArea * contentWidth;
+ }
+ else {
+ layoutValues.eventAreaX = 0;
+ }
+
+ // 2. event area width -> eventAreaWidth[out]
qreal emptyRightColumnWidth(0.0);
- emptyRightColumnWidth = 6.0 * layoutValues.unitInPixels; //pix (according to UI spec)
- layoutValues.eventAreaWidth = contentWidth - emptyRightColumnWidth - layoutValues.eventAreaX ;
-//3. margins between the overlapping events -> eventMargin[out]
- layoutValues.eventMargin = 1.5 * layoutValues.unitInPixels;
-//4. half-hour slot'h height -> slotHeight[out]
- //curent slot height corresponds to half an hour
- layoutValues.slotHeight =
- CalenDayUtils::instance()->hourElementHeight() / 2;
-
- // 8.2 un (min. touchable event) from layout guide
- layoutValues.maxColumns = layoutValues.eventAreaWidth / (8.2 * layoutValues.unitInPixels);
+ emptyRightColumnWidth = KCalenEmptyRightColumnWidth
+ * layoutValues.unitInPixels;
+ layoutValues.eventAreaWidth = contentWidth - emptyRightColumnWidth
+ - layoutValues.eventAreaX;
+
+ // 3. margins between the overlapping events -> eventMargin[out]
+ layoutValues.eventMargin = KCalenSpaceBeetwenEvents
+ * layoutValues.unitInPixels;
+
+ // 4. half-hour slot'h height -> slotHeight[out]
+ layoutValues.slotHeight = CalenDayUtils::instance()->hourElementHeight()
+ / KCalenSlotsInHour;
+
+ // check if we should create absorber over some overlapping region
+ layoutValues.maxColumns = layoutValues.eventAreaWidth
+ / (KCalenMinTouchableEventWidth * layoutValues.unitInPixels);
}
-// -----------------------------------------------------------------------------
-// setDayInfo()
-// Sets day's info structer to the container.
-// -----------------------------------------------------------------------------
-//
-void CalenDayContainer::setDayInfo( CalenDayInfo* dayInfo )
+
+/*!
+ \brief Sets day's info structure to the container.
+ \a dayInfo day's info data
+
+ \sa CalenDayInfo, CalenDayContainer::dayInfo
+ */
+void CalenDayContainer::setDayInfo(CalenDayInfo* dayInfo)
{
mInfo = dayInfo;
}
+/*!
+ \brief It return pointer to info structure of container.
+
+ \sa CalenDayInfo, CalenDayContainer::setDayInfo
+ */
+CalenDayInfo* CalenDayContainer::dayInfo()
+{
+ return mInfo;
+}
+
+/*!
+ \brief Sets date to the container.
+ Changes according to model which is connected to given view.
+
+ \a date Date of container
+ */
+void CalenDayContainer::setDate(const QDate &date)
+{
+ mDate = date;
+}
+
// -----------------------------------------------------------------------------
-// orientationChanged()
-// Slot handles layout switch.
+// date()
+// Returns date of the container.
// -----------------------------------------------------------------------------
//
+/*!
+ \brief Returns date of the container.
+
+ \sa date Date of container
+ */
+const QDate &CalenDayContainer::date() const
+{
+ return mDate;
+}
+
+/*!
+ \brief Slot handles layout switch.
+ \a orientation current device orientation
+ */
void CalenDayContainer::orientationChanged(Qt::Orientation orientation)
{
- getTimedEventLayoutValues(mLayoutValues);
-
+ getTimedEventLayoutValues(mLayoutValues);
+
Q_UNUSED( orientation )
QList<HbAbstractViewItem *> items = this->items();
int count(items.count());
@@ -405,127 +450,149 @@
if (modelIndex.isValid()) {
QVariant variant = modelIndex.data(CalenDayEntry);
AgendaEntry entry = variant.value<AgendaEntry> ();
- if (entry.isTimedEntry()) {
+ if (entry.isTimedEntry() && !CalenAgendaUtils::isAlldayEvent(entry)) {
updateTimedEventGeometry(items[i], modelIndex);
}
+ else
+ if (CalenAgendaUtils::isAlldayEvent(entry)) {
+ updateAllDayEventGeometry(items[i], modelIndex);
+ }
}
}
-
+
createTouchEventAbsorbers();
}
-// -----------------------------------------------------------------------------
-// createTouchEventAbsorbers()
-// Creates absorbers which prevent touching to small items
-// -----------------------------------------------------------------------------
-//
+
+/*!
+ \brief Creates absorbers which prevent touching to small items
+ According to UI spec items smaller than 8.2 un are untouchable
+ */
void CalenDayContainer::createTouchEventAbsorbers()
{
- // remove absorbers if exist
- if (mAbsorbers.count())
- {
- qDeleteAll(mAbsorbers);
- mAbsorbers.clear();
- }
-
- const QList<CalenTimeRegion>& regionList = mInfo->RegionList();
-
- for(int i=0; i < regionList.count(); i++)
- {
- if(regionList[i].iColumns.count() > mLayoutValues.maxColumns )
- {
- TouchEventAbsorber* absorber =
- crateAbsorberBetweenSlots(regionList[i].iStartSlot, regionList[i].iEndSlot);
-
- mAbsorbers.append(absorber);
- }
- }
-
+ // remove absorbers if exist
+ if (mAbsorbers.count()) {
+ qDeleteAll(mAbsorbers);
+ mAbsorbers.clear();
+ }
+
+ // Create absorber for all-day events
+ Qt::Orientation orientation = CalenDayUtils::instance()->orientation();
+ int allDayCount = mInfo->AlldayCount();
+
+ if ((orientation == Qt::Vertical
+ && allDayCount > KCalenTouchableAllDayEventsCountPortrait)
+ || (orientation == Qt::Horizontal
+ && allDayCount > KCalenTouchableAllDayEventsCountLandscape)) {
+ TouchEventAbsorber* absorber = crateAbsorberBetweenSlots(0, 0, true);
+ mAbsorbers.append(absorber);
+ }
+
+ // Create absorbers for timed events
+ const QList<CalenTimeRegion>& regionList = mInfo->RegionList();
+ for (int i = 0; i < regionList.count(); i++) {
+ if (regionList[i].iColumns.count() > mLayoutValues.maxColumns) {
+ TouchEventAbsorber* absorber = crateAbsorberBetweenSlots(
+ regionList[i].iStartSlot, regionList[i].iEndSlot, false);
+
+ mAbsorbers.append(absorber);
+ }
+ }
}
-// -----------------------------------------------------------------------------
-// crateAbsorberBetweenSlots()
-// Creates single absorber in given location
-// -----------------------------------------------------------------------------
-//
-TouchEventAbsorber *CalenDayContainer::crateAbsorberBetweenSlots
- (int startSlot, int endSlot)
+
+/*!
+ \brief Creates single absorber in given location
+ \a startSlot absorber area starts from there
+ \a endSlot absobrber area ends here
+ \a forAllDayEvents if true absorber in all-day events area is created
+ */
+TouchEventAbsorber *CalenDayContainer::crateAbsorberBetweenSlots(
+ int startSlot,
+ int endSlot,
+ bool forAllDayEvents)
{
TouchEventAbsorber *absorber = new TouchEventAbsorber(this);
absorber->setZValue(1000);
absorber->setVisible(true);
-
- absorber->setGeometry( mLayoutValues.eventAreaX, // x
- startSlot * mLayoutValues.slotHeight, // y
- mLayoutValues.eventAreaWidth, // w
- (endSlot-startSlot) * mLayoutValues.slotHeight ); // h
-
+ if (!forAllDayEvents) {
+ absorber->setGeometry(mLayoutValues.eventAreaX, // x
+ startSlot * mLayoutValues.slotHeight, // y
+ mLayoutValues.eventAreaWidth, // w
+ (endSlot - startSlot) * mLayoutValues.slotHeight); // h
+ }
+ else {
+ absorber->setGeometry(0, 0, mLayoutValues.eventAreaX,
+ KCalenHoursInDay * KCalenSlotsInHour * mLayoutValues.slotHeight);
+ }
+
return absorber;
}
-// -----------------------------------------------------------------------------
-// TouchEventAbsorber::gestureEvent()
-// Handles tap event on overlapping area (currently it leads to Agenda View -
-// as described in UI spec)
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Handles tap event on overlapping area
+ Currently it leads to Agenda View - as described in UI spec
+ \a event qt gesture event
+ */
void TouchEventAbsorber::gestureEvent(QGestureEvent *event)
{
QTapGesture *tapGesture = qobject_cast<QTapGesture*> (event->gesture(
Qt::TapGesture));
- if (tapGesture && tapGesture->state() == Qt::GestureFinished)
- {
+ if (tapGesture && tapGesture->state() == Qt::GestureFinished) {
CalenDayView* dayView = static_cast<CalenDayView*>
(CalenDayUtils::instance()->mainWindow()->currentView());
dayView->changeView(ECalenAgendaView);
- }
+ }
}
-// -----------------------------------------------------------------------------
-// TouchEventAbsorber()
-// default ctor
-// -----------------------------------------------------------------------------
-//
-TouchEventAbsorber::TouchEventAbsorber(QGraphicsItem *parent) : HbWidget(parent)
+/*!
+ \brief Constructor
+ */
+TouchEventAbsorber::TouchEventAbsorber(QGraphicsItem *parent) :
+ HbWidget(parent)
{
#ifdef _DEBUG
setFlag(QGraphicsItem::ItemHasNoContents, false);
#endif
- grabGesture(Qt::TapGesture);
+ grabGesture(Qt::TapGesture);
}
-// -----------------------------------------------------------------------------
-// TouchEventAbsorber()
-// default dtor
-// -----------------------------------------------------------------------------
-//
+
+/*!
+ \brief Destructor
+
+ Sets container initial geometry, creates hours area widgets.
+ */
TouchEventAbsorber::~TouchEventAbsorber()
{
-
+
}
-// -----------------------------------------------------------------------------
-// TouchEventAbsorber::paint()
-// used for debugging purposes to see absorbers areas
-// -----------------------------------------------------------------------------
-//
+
+/*!
+ \brief Used for debugging purposes to see absorbers areas
+ Not active in release builds!
+
+ */
#ifdef _DEBUG
-void TouchEventAbsorber::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
- QWidget *widget)
+void TouchEventAbsorber::paint(
+ QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget)
{
- Q_UNUSED(option)
- Q_UNUSED(widget)
-
- painter->save();
- QPen pen;
- pen.setWidth(2);
- pen.setColor(Qt::red);
- painter->setPen(pen);
- painter->drawRect(boundingRect());
- painter->restore();
+ Q_UNUSED(option)
+ Q_UNUSED(widget)
+
+ painter->save();
+ QPen pen;
+ pen.setWidth(2);
+ pen.setColor(Qt::red);
+ painter->setPen(pen);
+ painter->drawRect(boundingRect());
+ painter->restore();
}
#endif
// End of File
--- a/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,6 +26,25 @@
#include "calendaycontentscrollarea.h"
#include "calendayutils.h"
+// Constants
+/*!
+ Default timeout for scrolling between days [ms]
+ */
+const int KCalenScrollDaysTimeout = 600;
+
+/*!
+ Value [%] defines how long (depending on content area width) should horizontal
+ pan gesture be to change day to previous/next.
+ If the gesture is shorter - current view is not changed.
+ */
+const int KCalenHScrollMoveParam = 30; //!< Percentage
+
+/*!
+ Value [degree] defines the max. angle of swipe gesture which should change day.
+ */
+const qreal KCalenSwipeAngle = 30;
+
+
/*!
\class CalenDayContentScrollArea
\brief Scrollable container class for content widgets.
@@ -44,12 +63,7 @@
CalenDayContentScrollArea::CalenDayContentScrollArea(QGraphicsItem *parent) :
HbScrollArea(parent), mPanDayDirection(ECalenPanNotSet), mIsMoving(false),
mMoveDirection(ECalenScrollNoDayChange)
-{
- // Set scroll settings
- setScrollDirections(Qt::Horizontal);
- setClampingStyle(StrictClamping);
- setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
-
+{
#ifdef CALENDAYVIEW_PANNING_ENABLED
grabGesture(Qt::PanGesture);
ungrabGesture(Qt::SwipeGesture);
@@ -61,6 +75,10 @@
// Get the width of content area and orientation of screen
mContentWidth = CalenDayUtils::instance()->contentWidth();
mOrientation = CalenDayUtils::instance()->orientation();
+
+ // Fix the width of scroll area
+ setMinimumWidth(mContentWidth);
+ setMaximumWidth(mContentWidth);
// Connect to main window's orientationChanged SIGNAL to handle orientation
// switching
@@ -214,7 +232,7 @@
mStartPosition = contentWidget()->pos();
qreal swipeAngle = swipeGesture->sceneSwipeAngle();
- if (CalenDayUtils::instance()->isHorizontalSwipe(swipeAngle)) {
+ if (isHorizontalSwipe(swipeAngle)) {
if (QSwipeGesture::Left ==
swipeGesture->sceneHorizontalDirection()) {
mMoveDirection = ECalenScrollToNext;
@@ -373,6 +391,23 @@
}
/*!
+ \brief isHorizontalSwipe
+
+ \return TRUE if horizontal swipe was recognized (angle in specific range)
+ */
+bool CalenDayContentScrollArea::isHorizontalSwipe(qreal angle) const
+{
+ bool isHSwipe = false;
+ if ((angle < KCalenSwipeAngle) ||
+ ((angle > 180 - KCalenSwipeAngle) && (angle < 180 + KCalenSwipeAngle)) ||
+ (angle > 360 - KCalenSwipeAngle)) {
+ isHSwipe = true;
+ }
+
+ return isHSwipe;
+}
+
+/*!
\brief Slot which is called when moving of scroll area is finished.
Resets internal isMoving flag.
@@ -402,7 +437,13 @@
// Update the width of content area
mContentWidth = CalenDayUtils::instance()->contentWidth();
mOrientation = orientation;
-
+
+ // Fix the width of scroll area
+ setMinimumWidth(mContentWidth);
+ setMaximumWidth(mContentWidth);
+
+ scrollToMiddleWidget();
+
// Reset flag related to moving
mPanDayDirection = ECalenPanNotSet;
mMoveDirection = ECalenScrollNoDayChange;
--- a/calendarui/views/dayview/src/calendayeventspane.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendayeventspane.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -62,12 +62,20 @@
\param drawTopLine Flag to be set if top line should be drawn.
*/
-void CalenDayEventsPane::drawTopLine(bool drawTopLine)
+void CalenDayEventsPane::setDrawTopLine(bool drawTopLine)
{
mDrawTopLine = drawTopLine;
}
/*!
+ \brief It return if top line is drawed.
+ */
+bool CalenDayEventsPane::isTopLineDrawed() const
+{
+ return mDrawTopLine;
+}
+
+/*!
\brief Paints the item with given painter.
\param painter
--- a/calendarui/views/dayview/src/calendayhourelement.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendayhourelement.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -1,62 +1,76 @@
/*
-* 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
+// System includes
#include <QGraphicsLinearLayout>
#include <QPainter>
-#include <hbtextitem.h>
-#include <hbstyle.h>
-#include <hbcolorscheme.h>
-#include <hbfontspec.h>
-#include <hbextendedlocale.h>
+#include <HbTextItem>
+#include <HbStyle>
+#include <HbColorScheme>
+#include <HbFontSpec>
+#include <HbExtendedLocale>
-//User includes
+// User includes
#include "calendayhourelement.h"
#include "calendaycontainer.h"
#include "calendayhourscrollarea.h"
// Constants
+/*!
+ \brief Time format is: [0-9][0-9]:[0-9][0-9]
+ */
+const int KCalenTimeFormatLength = 5;
/*!
- \brief CalenDayHourElement()
- Constructor
-*/
-CalenDayHourElement::CalenDayHourElement(const QTime &time, QGraphicsItem *parent) :
+ \class CalenDayHourElement
+ \brief Hour element widget for Calendar's Day View
+ */
+
+/*!
+ \brief Constructor
+
+ \param time Time assigned to widget
+ \param parent Widget's parent
+ */
+CalenDayHourElement::CalenDayHourElement(
+ const QTime &time,
+ QGraphicsItem *parent) :
HbWidget(parent), mHour(time)
{
// Necessary when widget implements own paint method
- setFlag(QGraphicsItem::ItemHasNoContents, false);
+ setFlag(QGraphicsItem::ItemHasNoContents, false);
HbDeviceProfile deviceProfile;
mUnitInPixels = deviceProfile.unitValue();
-
- mHourLineColor = HbColorScheme::color("qtc_cal_day_hour_lines");
- //Create text items
+ // Initialize hour line color
+ mHourLineColor = HbColorScheme::color(KCalenHourLineColor);
+
+ // Create text items
HbExtendedLocale systemLocale = HbExtendedLocale::system();
- //Get current time format and (if there's a need) separate time from am/pm text
+ // Get current time format and (if there's a need) separate time from am/pm text
QChar timeSeparator = ' ';
- QStringList timeTextList = systemLocale.format(time, r_qtn_time_usual_with_zero).split(
- timeSeparator);
+ QStringList timeTextList = systemLocale.format(time,
+ r_qtn_time_usual_with_zero).split(timeSeparator);
- //prepend 0 if needed to achieve format - 01:00
+ // If needed, prepend '0' to get proper time format: [0-9][0-9]:[0-9][0-9]
QString timeString = timeTextList[0];
- if (timeString.length() < 5) {
+ if (timeString.length() < KCalenTimeFormatLength) {
timeString.prepend('0');
}
@@ -71,73 +85,91 @@
HbStyle::setItemName(timeTextItem, QLatin1String("time"));
HbStyle::setItemName(ampmTextItem, QLatin1String("ampm"));
+ // Parent container is needed to update widget's time
mContainer = static_cast<CalenDayHourScrollArea*> (parent);
-
}
/*!
- \brief CalenDayHourElement()
- Destructor
-*/
+ \brief Destructor
+ */
CalenDayHourElement::~CalenDayHourElement()
{
}
/*!
- \brief CalenDayHourElement()
- paint
-*/
+ \brief Customized paint() function
+
+ \param painter Painter
+ \param option Style option
+ \param widget
+ */
void CalenDayHourElement::paint(
- QPainter * painter,
- const QStyleOptionGraphicsItem * option,
- QWidget * widget)
+ QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget)
{
Q_UNUSED(widget);
+
+ painter->save();
QRectF drawArea = option->rect;
- const qreal hourLineThickness = 0.15; //un (according to UI spec)
- const qreal timeLineThickness = 0.75; //un (according to UI spec)
-
- painter->save();
-
- //Draw full hour line
- QPen linePen = QPen(mHourLineColor, hourLineThickness * mUnitInPixels);
+ // Draw full hour line
+ QPen linePen = QPen(mHourLineColor, KCalenHourLineThickness * mUnitInPixels);
painter->setPen(linePen);
+
QLineF fullHourLine(drawArea.bottomLeft(), drawArea.bottomRight());
-
painter->drawLine(fullHourLine);
- //Draw extra line on top for midnight
+ // Draw extra line on top for midnight
if (mHour.hour() == 0) {
fullHourLine = QLineF(drawArea.topLeft(), drawArea.topRight());
painter->drawLine(fullHourLine);
- }
-
+ }
+
QDateTime currentDateTime = QDateTime::currentDateTime();
- //Draw the time line in theme color
+ // Draw the time line in theme color
if (mContainer) {
QDateTime containersDateTime = mContainer->dateTime();
-
- if (currentDateTime.date() == containersDateTime.date() && currentDateTime.time().hour()
- == mHour.hour()) {
+
+ if (currentDateTime.date() == containersDateTime.date()
+ && currentDateTime.time().hour() == mHour.hour()) {
+
+ qreal currentTimeY = drawArea.height()
+ * currentDateTime.time().minute() / 60;
- qreal currentTimeY = drawArea.height() * currentDateTime.time().minute() / 60;
-
- QColor color = HbColorScheme::color("qtc_cal_month_current_day");
-
- painter->setPen(QPen(color, timeLineThickness * mUnitInPixels, Qt::SolidLine,
- Qt::FlatCap));
- QLineF currentTimeline(drawArea.left(), drawArea.top() + currentTimeY, drawArea.right(), drawArea.top()
- + currentTimeY);
+ QColor color = HbColorScheme::color(KCalenTimeLineColor);
+ painter->setPen(QPen(color, KCalenTimeLineThickness * mUnitInPixels,
+ Qt::SolidLine, Qt::FlatCap));
+ QLineF currentTimeline(drawArea.left(), drawArea.top() + currentTimeY,
+ drawArea.right(), drawArea.top() + currentTimeY);
painter->drawLine(currentTimeline);
-
}
}
painter->restore();
}
+/*!
+ \brief Sets time for hour element.
+
+ \param time Time to be set for hour element
+ */
+void CalenDayHourElement::setTime(const QTime &time)
+{
+ mHour = time;
+}
+
+/*!
+ \brief Returns time of hour element.
+
+ \return Time of hour element
+ */
+QTime CalenDayHourElement::time() const
+{
+ return mHour;
+}
+
// End of File
--- a/calendarui/views/dayview/src/calendayhourscrollarea.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendayhourscrollarea.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -39,18 +39,10 @@
\param parent The parent of scroll area widget
*/
CalenDayHourScrollArea::CalenDayHourScrollArea(QGraphicsItem *parent) :
- HbScrollArea(parent),
- mDateTime(QDateTime())
+ HbScrollArea(parent), mDateTime(QDateTime())
{
- // Set scroll settings
- setScrollDirections(Qt::Vertical);
- setScrollingStyle(HbScrollArea::PanWithFollowOn);
- setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
- grabGesture(Qt::PanGesture, Qt::ReceivePartialGestures);
-
- // Get height and width of hour elements and set fixed size policy
- qreal hourElementHeight = CalenDayUtils::instance()->hourElementHeight();
- qreal hourElementWidth = CalenDayUtils::instance()->hourElementWidth();
+ // Grab pan gestures
+ grabGesture(Qt::PanGesture);
// Create widget for hour elements
HbWidget *hourWidget = new HbWidget();
@@ -58,24 +50,14 @@
// Create and insert hour elements into vertical layout
QGraphicsLinearLayout* hourLayout = new QGraphicsLinearLayout(Qt::Vertical,
NULL);
- for (int i = 0; i < 24; i++) {
+ for (int i = 0; i < KCalenHoursInDay; i++) {
CalenDayHourElement* element = new CalenDayHourElement(QTime(i, 0),
this);
- element->setPreferredWidth(hourElementWidth);
- element->setPreferredHeight(hourElementHeight);
- element->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
- QSizePolicy::Fixed));
hourLayout->addItem(element);
-
mHourElements.append(element);
}
-
hourLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
hourLayout->setSpacing(0.0);
-
- // Fix the size of scroll area
- setMinimumWidth(hourElementWidth);
- setMaximumWidth(hourElementWidth);
// Apply hour layout for new widget and set content widget to scroll area
hourWidget->setLayout(hourLayout);
@@ -87,6 +69,7 @@
*/
CalenDayHourScrollArea::~CalenDayHourScrollArea()
{
+ mHourElements.clear();
}
/*!
@@ -123,21 +106,23 @@
/*!
\brief Scroll view to given hour.
- \param An hour In 24 hour format (0 - 23)
+ \param An hour in 24 hour format (0 - 23)
*/
void CalenDayHourScrollArea::scrollToHour(int hour)
{
+ Q_ASSERT((hour > -1) && (hour < KCalenHoursInDay));
+
CalenDayHourElement *hourElement = mHourElements.at(hour);
QRectF hourElementRect = hourElement->rect();
hourElementRect = hourElement->mapRectToParent(hourElementRect);
QPointF newPos = hourElementRect.topLeft();
- //Ensure that we won't scroll out of bound
+ // Ensure that we won't scroll out of bound
CalenDayHourElement *lastElement = mHourElements.last();
qreal bottomEdge = lastElement->mapRectToParent(lastElement->rect()).bottom();
qreal viewHeight = rect().height();
- if(bottomEdge - newPos.y() < viewHeight){
+ if (bottomEdge - newPos.y() < viewHeight) {
newPos.setY(bottomEdge - viewHeight);
}
--- a/calendarui/views/dayview/src/calendayitem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendayitem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -28,27 +28,26 @@
#include "calendayitem.h"
#include "calendaystatusstrip.h"
#include "calendaymodel.h"
+#include "calendayutils.h"
+#include "calenagendautils.h"
+#include "calendaycontainer.h"
-// -----------------------------------------------------------------------------
-// CalenDayItem()
-// Constructor.
-// -----------------------------------------------------------------------------
-//
-CalenDayItem::CalenDayItem():
- mUpdated(false), mBg(0), mEventDesc(0), mColorStripe(0),
+/*!
+ \brief Constructor.
+*/
+CalenDayItem::CalenDayItem(const CalenDayContainer *container):
+ mContainer(container), mUpdated(false), mBg(0), mEventDesc(0), mColorStripe(0),
mEventDescMinWidth(0.0), mFrameMinWidth(0.0)
{
}
-// -----------------------------------------------------------------------------
-// CalenBCDayView()
-// Copy constructor.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Constructor.
+*/
CalenDayItem::CalenDayItem(const CalenDayItem & source) :
- HbAbstractViewItem(source), mUpdated(false), mBg(0), mEventDesc(0),
+ HbAbstractViewItem(source), mContainer(source.container()), mUpdated(false), mBg(0), mEventDesc(0),
mColorStripe(0), mEventDescMinWidth(0.0), mFrameMinWidth(0.0)
-{
+{
// TODO: "qtg_fr_btn_pressed" need to replaced with qtg_fr_cal_meeting_bg
// when available
mBg = new HbFrameItem("qtg_fr_btn_pressed", HbFrameDrawer::NinePieces, this);
@@ -82,21 +81,21 @@
//Minimum width is assured by widgetml and css
//additionally called here to prevent minimum size hint caching inside effectiveSizeHint
setMinimumWidth(stripeWidth);
+
}
-// -----------------------------------------------------------------------------
-// ~CalenDayItem()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Destructor.
+*/
CalenDayItem::~CalenDayItem()
{
}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Creates new instance of day item.
+
+ \return New instance of day item.
+*/
HbAbstractViewItem * CalenDayItem::createItem()
{
CalenDayItem* newItem = new CalenDayItem(*this);
@@ -104,36 +103,36 @@
}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Sets data to be displayed on item.
+*/
void CalenDayItem::updateChildItems()
{
- // there is no need to update items after creation
- if (!mUpdated)
- {
- AgendaEntry entry;
- entry = modelIndex().data( CalenDayEntry ).value<AgendaEntry>();
-
- bool isAllDayEvent = (entry.type() == AgendaEntry::TypeEvent)
- && !entry.isTimedEntry();
-
- setDescription(entry, isAllDayEvent);
- setStatusStrip(entry, isAllDayEvent);
-
- mUpdated = true;
- }
-
- //TODO: check if needed
- //repolish();
- //HbAbstractViewItem::updateChildItems();
+ // there is no need to update items after creation
+ if (!mUpdated) {
+ AgendaEntry entry;
+ entry = modelIndex().data(CalenDayEntry).value<AgendaEntry>();
+
+ bool isAllDayEvent = CalenAgendaUtils::isAlldayEvent(entry);
+
+ setDescription(entry, isAllDayEvent);
+ setStatusStrip(entry, isAllDayEvent);
+
+ mUpdated = true;
+ }
+
+ //TODO: check if needed
+ //repolish();
+ //HbAbstractViewItem::updateChildItems();
}
-// -----------------------------------------------------------------------------
-// setDescription()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Adds event description for the item.
+
+ \param entry An for which description needs to be displayed.
+ \param allDayEvent Flag that indicates whether an item is all day event
+*/
void CalenDayItem::setDescription(const AgendaEntry &entry, bool allDayEvent)
{
QString description(entry.summary());
@@ -179,23 +178,31 @@
\brief It set all needed things for status strip from Agenda Entry.
\param entry Status Strip is created from Agenda Entry
- */
+*/
void CalenDayItem::setStatusStrip(const AgendaEntry &entry, bool allDayEvent)
{
QColor color = HbColorScheme::color("qtc_cal_month_current_day");
mColorStripe->setColor(color);
if (!allDayEvent) {
- mColorStripe->setStartEndTime(entry.startTime().time(),
- entry.endTime().time());
- } else {
- // This is workaround for displaying all-day events.
- // Now for MS Outlook compability all-day events' start and end time is
- // 00:00:00 and 00:00:00 next day respectively.
- // To draw it correctly we need times like those visible for user in
- // editor: 00:00:00 to 23:59:59 (the same day)
- mColorStripe->setStartEndTime(entry.startTime().time(),
- entry.endTime().time().addSecs(-1));
+
+ QDateTime startTime;
+ QDateTime endTime;
+ QDateTime currentDateTime;
+ currentDateTime.setDate(container()->date());
+
+ CalenDayUtils::instance()->getEventValidStartEndTime(startTime, endTime, entry,
+ currentDateTime);
+
+ mColorStripe->setStartEndTime(startTime.time(), endTime.time());
+ }
+ else {
+ // This is workaround for displaying all-day events.
+ // Now for MS Outlook compability all-day events' start and end time is
+ // 00:00:00 and 00:00:00 next day respectively.
+ // To draw it correctly we need times like those visible for user in
+ // editor: 00:00:00 to 23:59:59 (the same day)
+ mColorStripe->setStartEndTime(entry.startTime().time(), entry.endTime().time().addSecs(-1));
}
switch (entry.status()) {
@@ -214,6 +221,11 @@
}
}
+/*!
+ \brief Reimplemented from HbWidget. Handles resize event.
+
+ \param event Instance of an event to be handled.
+*/
void CalenDayItem::resizeEvent(QGraphicsSceneResizeEvent *event)
{
Q_UNUSED(event)
--- a/calendarui/views/dayview/src/calendayitemview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendayitemview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -30,14 +30,13 @@
#include "calendaymodel.h"
#include "calenservices.h"
#include "calencontext.h"
+#include "calenagendautils.h"
#include "CalenUid.h"
-// -----------------------------------------------------------------------------
-// CalenDayItemView()
-// Constructor
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Constructor
+*/
CalenDayItemView::CalenDayItemView( MCalenServices &services, HbModelIterator *iterator, QGraphicsItem *parent )
: HbAbstractItemView(mContainer = new CalenDayContainer(), iterator, parent),
mServices( services )
@@ -71,53 +70,44 @@
setupContextMenu();
}
-// -----------------------------------------------------------------------------
-// ~CalenDayItemView()
-// Destructor
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Destructor
+*/
CalenDayItemView::~CalenDayItemView()
{
delete mInfo;
}
-// -----------------------------------------------------------------------------
-// scrollTo()
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Scrolls to given index
+*/
void CalenDayItemView::scrollTo(const QModelIndex &index, HbAbstractItemView::ScrollHint hint)
{
HbAbstractItemView::scrollTo(index, hint);
}
-// -----------------------------------------------------------------------------
-// reset()
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Currently empty implementation.
+*/
void CalenDayItemView::reset()
{
-// CalenDayItemView::reset();
+
}
-// -----------------------------------------------------------------------------
-// modelAboutToBeReset()
-// 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()
{
}
-// -----------------------------------------------------------------------------
-// modelReset()
-// Handles signal that is emitted when reset() is called, after 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 ) {
@@ -125,12 +115,14 @@
}
//reset day info
mInfo->Reset();
-
+
CalenDayModel* model(0);
model = static_cast<CalenDayModel*>(this->model());
if ( !model ) {
return;
}
+
+ mContainer->setDate(model->modelDate().date());
int rowCount = model->rowCount( );
SCalenApptInfo apptInfo;
for( int row = 0; row < rowCount; row++ ) {
@@ -154,12 +146,12 @@
apptInfo.iId = id;
apptInfo.iColor = 0xffff;
- if ( entry.isTimedEntry() )
+ if ( entry.isTimedEntry() && !CalenAgendaUtils::isAlldayEvent(entry))
{
apptInfo.iAllDay = false;
mInfo->InsertTimedEvent( apptInfo );
}
- else if( entry.type() == AgendaEntry::TypeEvent) //all-day event
+ else if(CalenAgendaUtils::isAlldayEvent(entry)) //all-day event
{
apptInfo.iAllDay = true;
mInfo->InsertAlldayEvent( apptInfo );
@@ -169,11 +161,11 @@
HbAbstractItemView::reset();
}
-// -----------------------------------------------------------------------------
-// scrollVertically()
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Scrolls view vertically to the given position.
+
+ \param newPosition position to scroll to.
+*/
void CalenDayItemView::scrollVertically( const QPointF &newPosition )
{
QPointF currentPos = contentWidget()->pos();
@@ -183,31 +175,31 @@
}
}
-// -----------------------------------------------------------------------------
-// itemPressed()
-// This function is called when a touch down event is received within Abstract view item that is representing index.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \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 )
{
Q_UNUSED( position )
}
-// -----------------------------------------------------------------------------
-// itemReleased()
-// This function is called when a touch release event is received within Abstract view item that is representing 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 )
{
Q_UNUSED( position )
}
-// -----------------------------------------------------------------------------
-// itemActivated()
-// This function is called when the item specified by index is activated by the user.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \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 )
{
Q_UNUSED( position )
@@ -220,11 +212,12 @@
}
}
-// -----------------------------------------------------------------------------
-// itemLongPressed()
-// 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.
+*/
void CalenDayItemView::itemLongPressed(HbAbstractViewItem* item, QPointF coords)
{
QModelIndex index = item->modelIndex();
@@ -236,11 +229,11 @@
}
}
-// -----------------------------------------------------------------------------
-// orientationChanged()
-// 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 )
{
// Update the width of screen
@@ -252,41 +245,33 @@
}
}
-// -----------------------------------------------------------------------------
-// openSelectedItem()
-// Opens currently selected model item.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Opens currently selected model item.
+*/
void CalenDayItemView::openSelectedItem()
{
issueCommandOnSelectedItem( ECalenEventView );
}
-// -----------------------------------------------------------------------------
-// editSelectedItem()
-// Edits currently selected model item.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Edits currently selected model item.
+*/
void CalenDayItemView::editSelectedItem()
{
issueCommandOnSelectedItem( ECalenEditCurrentEntry );
}
-// -----------------------------------------------------------------------------
-// deleteSelectedIten()
-// Deletes currently selected model item.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Deletes currently selected model item.
+*/
void CalenDayItemView::deleteSelectedItem()
{
issueCommandOnSelectedItem( ECalenDeleteCurrentEntry );
}
-// -----------------------------------------------------------------------------
-// setupSlots()
-// Connects item view's slots.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Connects item view's slots.
+*/
void CalenDayItemView::setupSlots()
{
// Connect to main window's orientationChanged signal to handle orientation
@@ -317,11 +302,9 @@
this, SLOT(itemLongPressed(HbAbstractViewItem*, QPointF)));
}
-// -----------------------------------------------------------------------------
-// setupSlots()
-// Creates Context menu.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Creates context menu.
+*/
void CalenDayItemView::setupContextMenu()
{
mContextMenu = new HbMenu();
@@ -340,11 +323,11 @@
}
}
-// -----------------------------------------------------------------------------
-// issueCommandOnSelectedItem()
-// Sets context to currently selected model item and issues calendar 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);
@@ -377,11 +360,9 @@
return retVal;
}
-// -----------------------------------------------------------------------------
-// clearSelectionInModel()
-// Clears current selection in Selection Model.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Clears current selection in Selection Model.
+*/
void CalenDayItemView::clearSelectionInModel()
{
QItemSelectionModel* selModel(selectionModel());
--- a/calendarui/views/dayview/src/calendaymodel.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendaymodel.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -15,99 +15,92 @@
*
*/
-
-
+// System includes
#include <calenservices.h>
#include <agendautil.h>
+
+// User includes
#include "calendaymodel.h"
/*!
- BC Day Model constructor
- \a date defined day for which entries will be fetched \a services is handle to
- organizer services \a parent
+ BC Day Model constructor
+ \a date defined day for which entries will be fetched \a services is handle to
+ organizer services \a parent
*/
-CalenDayModel::CalenDayModel(const QDateTime &date, MCalenServices &services,
- QObject *parent)
- : QAbstractListModel(parent), mServices(services)
+CalenDayModel::CalenDayModel(const QDateTime &date, MCalenServices &services, QObject *parent) :
+ QAbstractListModel(parent), mServices(services)
{
- if (date.isValid())
- {
- loadAndStoreInstances(date);
- }
+ if (date.isValid()) {
+ loadAndStoreInstances(date);
+ }
}
/*
- \reimp
+ \reimp
*/
-int CalenDayModel::rowCount( const QModelIndex &parent ) const
+int CalenDayModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED( parent )
return mEntryList.count();
}
/*
- \reimp
+ \reimp
*/
QVariant CalenDayModel::data(const QModelIndex &index, int role) const
{
- if (!index.isValid())
- {
+ if (!index.isValid()) {
return QVariant();
- }
+ }
- if (index.row() >= mEntryList.count())
- {
+ if (index.row() >= mEntryList.count()) {
return QVariant();
- }
+ }
- if (role == CalenDayEntry)
- {
+ if (role == CalenDayEntry) {
return mEntryList.at(index.row());
- }
- else
- {
+ }
+ else {
return QVariant();
- }
+ }
}
/*!
- Resets model. Old events are removed. Evenets for given day are fetched.
- \a date defined day for which entries will be fetched
+ Resets model. Old events are removed. Evenets for given day are fetched.
+ \a date defined day for which entries will be fetched
*/
void CalenDayModel::refreshModel(const QDateTime &date)
{
- beginResetModel();
- loadAndStoreInstances(date);
- endResetModel();
-}
-
-
-/*!
- Fetches entries via. organizer API and stores it in member container
- */
-void CalenDayModel::loadAndStoreInstances(const QDateTime &date)
-{
- mDateTime = date;
- //Filter flags
- AgendaUtil::FilterFlags filter = AgendaUtil::FilterFlags(
- AgendaUtil::IncludeAppointments | AgendaUtil::IncludeEvents);
- QList<AgendaEntry> list;
- // Fetch the instance list from the agenda interface
- list = mServices.agendaInterface()->createEntryIdListForDay(date, filter);
-
- mEntryList.clear();
-
- foreach(AgendaEntry entry, list)
- {
- mEntryList.append(QVariant::fromValue(entry));
- }
+ beginResetModel();
+ loadAndStoreInstances(date);
+ endResetModel();
}
/*!
- Retruns date (day). Model holds events for this day.
+ Fetches entries via. organizer API and stores it in member container
+ */
+void CalenDayModel::loadAndStoreInstances(const QDateTime &date)
+{
+ mDateTime = date;
+ //Filter flags
+ AgendaUtil::FilterFlags filter = AgendaUtil::FilterFlags(AgendaUtil::IncludeAppointments
+ | AgendaUtil::IncludeEvents);
+ QList<AgendaEntry> list;
+ // Fetch the instance list from the agenda interface
+ list = mServices.agendaInterface()->createEntryIdListForDay(date, filter);
+
+ mEntryList.clear();
+
+ foreach(AgendaEntry entry, list){
+ mEntryList.append(QVariant::fromValue(entry));
+ }
+}
+
+/*!
+ Retruns date (day). Model holds events for this day.
*/
QDateTime CalenDayModel::modelDate() const
{
- return mDateTime;
+ return mDateTime;
}
--- a/calendarui/views/dayview/src/calendaymodelmanager.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendaymodelmanager.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,146 +22,136 @@
#include "calendaymodel.h"
/*!
- BC Model Manager constructor. Model manager use calendar context to
- populate models with proper events.
- \a services is handle to organizer services \a emptyModels if true created models
- are not populated with events \a parent
+ BC Model Manager constructor. Model manager use calendar context to
+ populate models with proper events.
+ \a services is handle to organizer services \a emptyModels if true created models
+ are not populated with events \a parent
*/
-CalenDayModelManager::CalenDayModelManager(MCalenServices &services, bool emptyModels,
- QObject *parent)
- : QObject(parent), mServices (services)
+CalenDayModelManager::CalenDayModelManager(
+ MCalenServices &services,
+ bool emptyModels,
+ QObject *parent) :
+ QObject(parent), mServices(services)
{
- if (emptyModels)
- {
- mCurrentDayTime = QDateTime();
- }
- else
- {
- mCurrentDayTime = mServices.Context().focusDateAndTime();
- }
- createAllModels();
+ if (emptyModels) {
+ mCurrentDayTime = QDateTime();
+ }
+ else {
+ mCurrentDayTime = mServices.Context().focusDateAndTime();
+ }
+ createAllModels();
}
CalenDayModelManager::~CalenDayModelManager()
{
- // not needed now
+ // not needed now
}
-
void CalenDayModelManager::viewsScrollingFinished(CalenScrollDirection scrollTo)
- {
- if (scrollTo == ECalenScrollToNext)
- {
- moveForeward();
- }
- else
- {
- moveBackward();
- }
- }
-
+{
+ if (scrollTo == ECalenScrollToNext) {
+ moveForward();
+ }
+ else {
+ moveBackward();
+ }
+}
/*!
- Reorganize models after move to previous day.
+ Reorganize models after move to previous day.
*/
void CalenDayModelManager::moveBackward()
{
- mCurrentDayTime = mServices.Context().focusDateAndTime();
+ mCurrentDayTime = mServices.Context().focusDateAndTime();
- CalenDayModel* tmp = mModels[NextDay];
- tmp->refreshModel( mCurrentDayTime.addDays(-1));
-
- mModels[NextDay] = mModels[CurrentDay];
- mModels[CurrentDay] = mModels[PreviousDay];
- mModels[PreviousDay] = tmp;
+ CalenDayModel* tmp = mModels[NextDay];
+ tmp->refreshModel(mCurrentDayTime.addDays(-1));
+
+ mModels[NextDay] = mModels[CurrentDay];
+ mModels[CurrentDay] = mModels[PreviousDay];
+ mModels[PreviousDay] = tmp;
}
/*!
- Reorganize models after move to next day.
+ Reorganize models after move to next day.
*/
-void CalenDayModelManager::moveForeward()
+void CalenDayModelManager::moveForward()
{
- mCurrentDayTime = mServices.Context().focusDateAndTime();
-
- CalenDayModel* tmp = mModels[PreviousDay];
- tmp->refreshModel( mCurrentDayTime.addDays(1));
-
- mModels[PreviousDay] = mModels[CurrentDay];
- mModels[CurrentDay] = mModels[NextDay];
- mModels[NextDay] = tmp;
+ mCurrentDayTime = mServices.Context().focusDateAndTime();
+
+ CalenDayModel* tmp = mModels[PreviousDay];
+ tmp->refreshModel(mCurrentDayTime.addDays(1));
+
+ mModels[PreviousDay] = mModels[CurrentDay];
+ mModels[CurrentDay] = mModels[NextDay];
+ mModels[NextDay] = tmp;
}
/*!
- Returns given model
- /a day defines model, can be (PreviousDay, CurrentDay, NextDay) only.
+ Returns given model
+ /a day defines model, can be (PreviousDay, CurrentDay, NextDay) only.
*/
QAbstractItemModel &CalenDayModelManager::getModel(ModelDay day)
{
- return *(mModels[day]);
+ return *(mModels[day]);
}
/*!
- Creates all models objects durring construction.
+ Creates all models objects durring construction.
*/
void CalenDayModelManager::createAllModels()
{
-
- mModels[CurrentDay] = new CalenDayModel(mCurrentDayTime, mServices, this);
-
- QDateTime previousDayTime;
- QDateTime nextDayTime;
-
- if (mCurrentDayTime.isValid())
- {
- previousDayTime = mCurrentDayTime.addDays(-1);
- nextDayTime = mCurrentDayTime.addDays(1);
- }
-
- mModels[PreviousDay] = new CalenDayModel(previousDayTime, mServices, this);
- mModels[NextDay] = new CalenDayModel(nextDayTime, mServices, this);
+
+ mModels[CurrentDay] = new CalenDayModel(mCurrentDayTime, mServices, this);
+
+ QDateTime previousDayTime;
+ QDateTime nextDayTime;
+
+ if (mCurrentDayTime.isValid()) {
+ previousDayTime = mCurrentDayTime.addDays(-1);
+ nextDayTime = mCurrentDayTime.addDays(1);
+ }
+
+ mModels[PreviousDay] = new CalenDayModel(previousDayTime, mServices, this);
+ mModels[NextDay] = new CalenDayModel(nextDayTime, mServices, this);
}
-
/*!
- Refetch data for all models. Context calendar is used to fill models
- with correct events. Should be used for full (three days) repopulation.
+ Refetch data for all models. Context calendar is used to fill models
+ with correct events. Should be used for full (three days) repopulation.
*/
void CalenDayModelManager::refreshAllModels()
- {
- mCurrentDayTime = mServices.Context().focusDateAndTime();
+{
+ mCurrentDayTime = mServices.Context().focusDateAndTime();
- mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(-1));
- mModels[CurrentDay]->refreshModel(mCurrentDayTime);
- mModels[NextDay]->refreshModel(mCurrentDayTime.addDays(1));
- }
+ mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(-1));
+ mModels[CurrentDay]->refreshModel(mCurrentDayTime);
+ mModels[NextDay]->refreshModel(mCurrentDayTime.addDays(1));
+}
/*!
- Refetch data given day model. Context calendar is used to fill model
- with correct events.
- /a day defines model, can be (PreviousDay, CurrentDay, NextDay) only.
+ Refetch data given day model. Context calendar is used to fill model
+ with correct events.
+ /a day defines model, can be (PreviousDay, CurrentDay, NextDay) only.
*/
void CalenDayModelManager::refreshSingleModel(CalenDayModelManager::ModelDay day)
- {
- switch (day)
- {
- case PreviousDay:
- {
- mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(-1));
- }
- break;
- case CurrentDay:
- {
- mModels[CurrentDay]->refreshModel(mCurrentDayTime);
- }
- break;
- case NextDay:
- {
- mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(1));
- }
- break;
- default:
- break;
- }
- }
+{
+ switch (day) {
+ case PreviousDay: {
+ mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(-1));
+ }
+ break;
+ case CurrentDay: {
+ mModels[CurrentDay]->refreshModel(mCurrentDayTime);
+ }
+ break;
+ case NextDay: {
+ mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(1));
+ }
+ break;
+ default:
+ break;
+ }
+}
// End of File
--- a/calendarui/views/dayview/src/calendaystatusstrip.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendaystatusstrip.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -43,7 +43,7 @@
}
/*!
- \brief Return range beatween two filled lines in StripWithLines drawing
+ \brief Returns range between two filled lines in StripWithLines drawing
styles.
\sa CalenDayStatusStrip::DrawingStyle, setRange
@@ -54,7 +54,7 @@
}
/*!
- \brief Return color drawing
+ \brief Returns color drawing
\sa setColor
*/
@@ -64,7 +64,7 @@
}
/*!
- \brief Return style of drawing.
+ \brief Returns style of drawing.
\sa CalenDayStatusStrip::DrawingStyle, setDrawingStyle
*/
@@ -74,7 +74,7 @@
}
/*!
- \brief Return orginal start and entime fo event
+ \brief Returns original start and entime fo event
\sa setStartEndTime
*/
@@ -84,10 +84,10 @@
}
/*!
- \brief It set range beatween two filled lines in StripWithLines drawing
+ \brief It sets range between two filled lines in StripWithLines drawing
styles.
- \param range Range beatween two filled lines
+ \param range Range between two filled lines
\sa CalenDayStatusStrip::DrawingStyle, range
*/
@@ -97,7 +97,7 @@
}
/*!
- \brief It set color drawing
+ \brief It sets color drawing
\param stripColor Color of drawing
@@ -109,7 +109,7 @@
}
/*!
- \brief It set drawing style of strip
+ \brief It sets drawing style of strip
\param drawingStyle Style of strip drawing.
@@ -122,7 +122,7 @@
}
/*!
- It set start and end time of event
+ It sets start and end time of event
\param startTime Start of event
\param endTime End of event
@@ -223,7 +223,7 @@
}
/*!
- \brief It preapre points to draw filled polygon when StripWithLines style is
+ \brief It preapres points to draw filled polygon when StripWithLines style is
on.
*/
QPolygonF
@@ -238,7 +238,7 @@
}
/*!
- Return time for position 0 and height in widget
+ Returns time for position 0 and height in widget
\param startTime Start of event
\param endTime End of event
@@ -263,7 +263,7 @@
if (endTime.minute() == 0) {
end = endTime;
}
- else if (endTime.hour() == 23) {
+ else if (endTime.hour() == 23 and endTime.minute() > 30) {
end = QTime(endTime.hour(), 59);
}
else if (endTime.minute() <= 30) {
@@ -277,7 +277,7 @@
}
/*!
- Calculate 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)
--- a/calendarui/views/dayview/src/calendayutils.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendayutils.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -131,28 +131,11 @@
}
/*!
- \brief isHorizontalSwipe
-
- \return TRUE if horizontal swipe was recognized (angle in specific range)
- */
-bool CalenDayUtils::isHorizontalSwipe(qreal angle) const
-{
- bool isHSwipe = false;
- if ((angle < KCalenSwipeAngle) ||
- ((angle > 180 - KCalenSwipeAngle) && (angle < 180 + KCalenSwipeAngle)) ||
- (angle > 360 - KCalenSwipeAngle)) {
- isHSwipe = true;
- }
-
- return isHSwipe;
-}
-
-/*!
\brief getEventValidStartEndTime
\brief Get event's valid start/end time from agenda entry.
*/
void CalenDayUtils::getEventValidStartEndTime( QDateTime& start, QDateTime& end,
- AgendaEntry& entry, QDateTime& currentDate )
+ const AgendaEntry& entry, QDateTime& currentDate )
{
start = entry.startTime();
end = entry.endTime();
--- a/calendarui/views/dayview/src/calendayview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/src/calendayview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -15,10 +15,11 @@
*
*/
-//system includes
+// System includes
#include <QDateTime>
#include <QGraphicsLinearLayout>
#include <xqsettingsmanager.h>
+#include <HbWidget>
#include <hbaction.h>
#include <hbmenu.h>
#include <hbmainwindow.h>
@@ -27,8 +28,10 @@
#include <hbgroupbox.h>
#include <hbextendedlocale.h>
#include <agendautil.h>
-//user includes
+
+// User includes
#include "calendayview.h"
+#include "calencommon.h"
#include "calencontext.h"
#include "calenservices.h"
#include "calendocloader.h"
@@ -44,63 +47,24 @@
//constants
-// -----------------------------------------------------------------------------
-// CalenDayView()
-// Constructor.
-// -----------------------------------------------------------------------------
-//
+
+/*!
+ \brief Constructor
+*/
CalenDayView::CalenDayView(MCalenServices &services) :
CalenNativeView(services), mContentScrollArea(NULL), mContentWidget(NULL),
- mHourScrollArea(NULL), mSettingsManager(NULL),
- mRegionalInfo(XQSettingsKey::TargetCentralRepository, KCRUidCalendar,
- KCalendarShowRegionalInfo),
- mServices(services), mRegionalInfoGroupBox(NULL), mGoToTodayMenuAction(NULL)
+ mHourScrollArea(NULL), mVLayout(NULL), mDocLoader(NULL), mIsLaunching(
+ true), mSettingsManager(NULL), mRegionalInfo(
+ XQSettingsKey::TargetCentralRepository, KCRUidCalendar,
+ KCalendarShowRegionalInfo), mServices(services),
+ mRegionalInfoGroupBox(NULL), mGoToTodayMenuAction(NULL)
{
setupMenu();
-
+
// Create model manager
- mModelManager = new CalenDayModelManager(mServices, true, this);
-
- mVLayout = new QGraphicsLinearLayout(Qt::Vertical, NULL);
- mVLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- mVLayout->setSpacing(0.0);
-
- // Create heading label and insert into layout
- mHeadingLabel = new HbGroupBox();
- HbEffect::add(mHeadingLabel, ":/fade_out.fxml", "fadeOut");
- HbEffect::add(mHeadingLabel, ":/fade_in.fxml", "fadeIn");
-
+ mModelManager = new CalenDayModelManager(mServices, true, this);
mSettingsManager = new XQSettingsManager(this);
-
- // Add day info
- mVLayout->addItem(mHeadingLabel);
-
- //show regional info if set so
- showRegionalInformationFadeIn();
mSettingsManager->startMonitoring(mRegionalInfo);
-
- // Put hour scroll area and content scroll area into horizontal layout
- QGraphicsLinearLayout *hLayout = new QGraphicsLinearLayout(Qt::Horizontal, NULL);
- hLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- hLayout->setSpacing(0.0);
-
- // Create scroll area for content (events)
- mContentScrollArea = new CalenDayContentScrollArea(this);
-
- // Create and apply central widget for scroll area
- mContentWidget = new CalenDayContentWidget(*mModelManager, mContentScrollArea);
- mContentScrollArea->setContentWidget(mContentWidget);
-
- // Create scroll area for hour elements
- mHourScrollArea = new CalenDayHourScrollArea(this);
-
- hLayout->addItem(mHourScrollArea);
- hLayout->addItem(mContentScrollArea);
-
- mVLayout->addItem(hLayout);
- setLayout(mVLayout);
-
- setupSlots();
//setup Back functionality
if (ECalenDayView != mServices.getFirstView()) {
@@ -114,34 +78,35 @@
HbStyleLoader::registerFilePath(":/calendayhourelement.widgetml");
HbStyleLoader::registerFilePath(":/calendayitem.css");
HbStyleLoader::registerFilePath(":/calendayitem.widgetml");
+ HbStyleLoader::registerFilePath(":/calendayeventspane.css");
+ HbStyleLoader::registerFilePath(":/calendayhourscrollarea.css");
}
-// -----------------------------------------------------------------------------
-// ~CalenDayView()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Destructor
+*/
CalenDayView::~CalenDayView()
{
- mSettingsManager->stopMonitoring(mRegionalInfo);
+ mSettingsManager->stopMonitoring(mRegionalInfo);
+ if (mDocLoader) {
+ delete mDocLoader;
+ mDocLoader = NULL;
+ }
}
-// -----------------------------------------------------------------------------
-// onLocaleChanged()
-// Handles locale change.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Handles locale change.
+
+ \param reason the reason of a change
+*/
void CalenDayView::onLocaleChanged(int reason)
{
Q_UNUSED( reason )
}
-// -----------------------------------------------------------------------------
-// From CalenView
-// doPopulation()
-// Handles view (re)population.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Reimplemented from CalenView. Handles view (re)population
+*/
void CalenDayView::doPopulation()
{
// Triggers fading effect for heading label
@@ -162,59 +127,88 @@
mGoToTodayMenuAction->setVisible(true);
}
- setupViewport();
+ // Call async. if the view is loaded first time (fix to ou1cimx1#482516)
+ if (mIsLaunching) {
+ mIsLaunching = false;
+ QMetaObject::invokeMethod(this, "setupViewport", Qt::QueuedConnection);
+ } else {
+ setupViewport();
+ }
populationComplete();
}
-// -----------------------------------------------------------------------------
-// From CalenView
-// populationComplete()
-// Informs the organizer that the view's population is complete.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Reimplemented from CalenView. Informs the organizer that the view's population is complete.
+*/
void CalenDayView::populationComplete()
{
CalenNativeView::populationComplete();
}
-// -----------------------------------------------------------------------------
-// From MCalenNotificationHandler
-// HandleNotification()
-// The function handles calendar notifications.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Reimplemented from MCalenNotificationHandler. The function handles calendar notifications
+
+ \param notification notification type
+*/
void CalenDayView::HandleNotification(const TCalenNotification notification)
{
Q_UNUSED( notification )
}
-// -----------------------------------------------------------------------------
-// setupView()
-// Sets up the view accroding to the 'xml'
-// -----------------------------------------------------------------------------
-//
+
+/*!
+ \brief Sets up the view accroding to the 'xml'
+
+ \param docLoader Pointer to document loader
+*/
void CalenDayView::setupView(CalenDocLoader* docLoader)
{
- Q_UNUSED( docLoader )
+ // Store document loader for further use
+ mDocLoader = docLoader;
+
+ // Get vertical layout from day view
+ mVLayout = static_cast<QGraphicsLinearLayout *> (this->layout());
+
+ // Set up day info
+ mHeadingLabel = qobject_cast<HbGroupBox *> (mDocLoader->findWidget(
+ CALEN_DAYVIEW_DAYINFO));
+ HbEffect::add(mHeadingLabel, ":/fade_out.fxml", "fadeOut");
+ HbEffect::add(mHeadingLabel, ":/fade_in.fxml", "fadeIn");
+
+ // Set up hour scroll area
+ mHourScrollArea
+ = static_cast<CalenDayHourScrollArea *> (mDocLoader->findWidget(
+ CALEN_DAYVIEW_HOURSCROLLAREA));
+
+ // Set up content scroll area
+ mContentScrollArea
+ = static_cast<CalenDayContentScrollArea *> (mDocLoader->findWidget(
+ CALEN_DAYVIEW_CONTENTSCROLLAREA));
+ mContentWidget = new CalenDayContentWidget(*mModelManager, NULL);
+ mContentScrollArea->setContentWidget(mContentWidget);
+
+ // Set up regional info if variant is correct
+ showRegionalInformationFadeIn();
+
+ setupSlots();
}
//private slots
-// -----------------------------------------------------------------------------
-// onBack()
-// Handles 'back' functionality;
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Handles 'back' functionality
+*/
void CalenDayView::onBack()
{
TRAP_IGNORE(mServices.IssueCommandL(ECalenMonthView));
}
-// -----------------------------------------------------------------------------
-// dayChange()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Slot that handles first phase of day change
+
+ \param direction indicates to which day view needs to be scrolled (previous or next day)
+*/
void CalenDayView::dayChangeStarted(CalenScrollDirection direction)
{
if (direction == ECalenScrollToNext) {
@@ -240,29 +234,28 @@
mServices.Context().setFocusDate(mDate);
}
-// -----------------------------------------------------------------------------
-// dayChanged()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Slot that is triggered when operation of day change is completed
+
+ \param direction ndicates to which day view was scrolled (previous or next day)
+*/
void CalenDayView::dayChanged(CalenScrollDirection direction)
{
mModelManager->viewsScrollingFinished(direction);
mHourScrollArea->setDateTime(mDate);
}
-// -----------------------------------------------------------------------------
-// getCurrentDate()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Gets current date from context
+*/
void CalenDayView::getCurrentDate()
{
mDate = CalenNativeView::mServices.Context().focusDateAndTime();
}
-// -----------------------------------------------------------------------------
-// setupMenu()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Sets the menu for day view
+*/
void CalenDayView::setupMenu()
{
menu()->addAction(hbTrId("txt_calendar_opt_new_event"), this, SLOT(runNewMeeting()));
@@ -282,7 +275,7 @@
}
/*!
- \brief Ot change Day view to Agenda View
+ \brief To change Day view to Agenda View
*/
void CalenDayView::runChangeToAgendaView()
{
@@ -297,10 +290,9 @@
TRAP_IGNORE(mServices.IssueCommandL(ECalenRegionalPluginTapEvent));
}
-// -----------------------------------------------------------------------------
-// setupSlots()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This is a helper function to established connections between signals and slots
+*/
void CalenDayView::setupSlots()
{
// Connecting other view-related signals/slots
@@ -330,10 +322,9 @@
this, SLOT(showHideRegionalInformationChanged(XQSettingsKey, QVariant)));
}
-// -----------------------------------------------------------------------------
-// runNewMeeting()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This slot triggers new meeting creation view
+*/
void CalenDayView::runNewMeeting()
{
QDateTime dateTime(mDate);
@@ -341,13 +332,12 @@
dateTime.setTime(mServices.Context().defaultCalTimeForViewsL().time());
mServices.Context().setFocusDateAndTime(dateTime);
mServices.IssueCommandL(ECalenNewMeeting)
- );
+ );
}
-// -----------------------------------------------------------------------------
-// runGoToToday()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This slot switches current view to today
+*/
void CalenDayView::runGoToToday()
{
mServices.Context().setFocusDateAndTime(CalenDateUtils::today());
@@ -356,21 +346,23 @@
}
-// -----------------------------------------------------------------------------
-// changeView()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This slot switches current view to the given by id
+
+ \param viewId id of the view that needs to be displayed
+*/
void CalenDayView::changeView(TCalenCommandId viewId)
{
TRAP_IGNORE(mServices.IssueCommandL(viewId));
}
-// ----------------------------------------------------------------------------
-// CalenDayView::setHeadingText
-// Sets heading text according to date from model and locale.
-// It's connected to modelReset signal
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief Sets heading text according to date from model and locale.
+ It's connected to modelReset signal.
+
+ \param status Parameter required in order to call this slot autmatically
+ when an effect is complete.
+*/
void CalenDayView::setHeadingText(const HbEffect::EffectStatus &status)
{
Q_UNUSED(status)
@@ -391,123 +383,101 @@
HbEffect::start(mHeadingLabel, "fadeIn");
}
-// ----------------------------------------------------------------------------
-// CalenDayView::showHideRegionalInformation
-// To run effect on lunar data label
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief Displays regional information
+
+ \param status Parameter required in order to call this slot autmatically
+ when an effect is complete.
+*/
void CalenDayView::showRegionalInformation(const HbEffect::EffectStatus &status)
{
Q_UNUSED(status);
showRegionalInformationFadeIn();
}
-// ----------------------------------------------------------------------------
-// CalenDayView::showRegionalInformationFadeIn
-// To run effect on lunar data label and change text according to date change
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief Runs effect on lunar data label and change text according to date change.
+*/
void CalenDayView::showRegionalInformationFadeIn()
- {
+{
showHideRegionalInformationChanged(mRegionalInfo, 3);
HbEffect::start(mRegionalInfoGroupBox, "fadeIn");
- }
-
-// ----------------------------------------------------------------------------
-// CalenDayView::showHideRegionalInformationChanged
-// To Show and hide regional plugin label depends upon settings
-// ----------------------------------------------------------------------------
-//
-void CalenDayView::showHideRegionalInformationChanged(const XQSettingsKey& key, const QVariant&)
- {
- if (key.key() == mRegionalInfo.key())
- {
- int showRegionalInfo =
- mSettingsManager->readItemValue(mRegionalInfo).toUInt();
+}
- if (showRegionalInfo)
- {
- QString *pluginString = pluginText();
- if (pluginString)
- {
- if (!mRegionalInfoGroupBox)
- {
- mRegionalInfoGroupBox = new HbGroupBox();
- CalenPluginLabel *regionalInfo = new CalenPluginLabel(
- mServices, this);
- HbEffect::add(mRegionalInfoGroupBox, ":/fade_out.fxml",
- "fadeOut");
- HbEffect::add(mRegionalInfoGroupBox, ":/fade_in.fxml", "fadeIn");
-
- // add margins to calenpluginlabel
+/*!
+ \brief To Show and hide regional plugin label depends upon settings.
+*/
+void CalenDayView::showHideRegionalInformationChanged(
+ const XQSettingsKey& key,
+ const QVariant&)
+{
+ if (key.key() == mRegionalInfo.key()) {
+ int showRegionalInfo =
+ mSettingsManager->readItemValue(mRegionalInfo).toUInt();
- HbStyle style;
- HbDeviceProfile deviceProfile;
- qreal marginLeft = 0.0;
- qreal marginRight = 0.0;
- qreal marginTop = 0.0;
- qreal marginBottom = 0.0;
- style.parameter(QString("hb-param-margin-gene-left"), marginLeft, deviceProfile);
- style.parameter(QString("hb-param-margin-gene-right"), marginRight, deviceProfile);
- style.parameter(QString("hb-param-margin-gene-top"), marginTop, deviceProfile);
- style.parameter(QString("hb-param-margin-gene-bottom"), marginBottom, deviceProfile);
-
- regionalInfo->setContentsMargins(1, 1, 1, 1);
-
- // qreal width = mRegionalInfoGroupBox->size().width();
- // qreal height = mRegionalInfoGroupBox->size().height() + marginTop + marginBottom;
-
- // mRegionalInfoGroupBox->resize(width, height);
-
- mRegionalInfoGroupBox->setContentWidget(regionalInfo);
- }
+ if (showRegionalInfo) {
+ QString *pluginString = pluginText();
+ if (pluginString) {
+ if (!mRegionalInfoGroupBox) {
+ mRegionalInfoGroupBox = qobject_cast<HbGroupBox *> (
+ mDocLoader->findWidget(CALEN_DAYVIEW_REGIONALINFO));
+ CalenPluginLabel *regionalInfo = new CalenPluginLabel(
+ mServices, this);
+ HbEffect::add(mRegionalInfoGroupBox, ":/fade_out.fxml",
+ "fadeOut");
+ HbEffect::add(mRegionalInfoGroupBox, ":/fade_in.fxml",
+ "fadeIn");
+ regionalInfo->setContentsMargins(1, 1, 1, 1);
+ mRegionalInfoGroupBox->setContentWidget(regionalInfo);
+ }
- if (pluginEnabled())
- {
- HbLabel *pluginInfoLabel = qobject_cast<HbLabel *> (
- mRegionalInfoGroupBox->contentWidget());
-
- pluginInfoLabel->setPlainText(*pluginString);
-
- mVLayout->insertItem(1, mRegionalInfoGroupBox);
- }
- }
- }
- else
- {
+ if (pluginEnabled()) {
+ HbLabel *pluginInfoLabel = qobject_cast<HbLabel *> (
+ mRegionalInfoGroupBox->contentWidget());
- if (mRegionalInfoGroupBox)
- {
- mVLayout->removeItem(mRegionalInfoGroupBox);
- delete mRegionalInfoGroupBox;
- mRegionalInfoGroupBox = NULL;
- }
- }
- }
- }
+ pluginInfoLabel->setPlainText(*pluginString);
+ mVLayout->insertItem(1, mRegionalInfoGroupBox);
+ }
+ }
+ }
+ else {
+ if (mRegionalInfoGroupBox) {
+ mVLayout->removeItem(mRegionalInfoGroupBox);
+ delete mRegionalInfoGroupBox;
+ mRegionalInfoGroupBox = NULL;
+ }
+ }
+ }
+}
-// ----------------------------------------------------------------------------
-// CalenDayView::setupViewport
-// Scrolls view according to current day and events
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief Scrolls view according to current day and events.
+*/
void CalenDayView::setupViewport()
{
QDateTime currentTime = QDateTime::currentDateTime();
-
- //Filter flags (only timed events)
- AgendaUtil::FilterFlags filter = AgendaUtil::FilterFlags(
- AgendaUtil::IncludeAppointments );
- QList<AgendaEntry> list;
- // Fetch the instance list from the agenda interface
- list = mServices.agendaInterface()->fetchEntriesInRange(currentTime, currentTime, filter);
-
+
// If we have event in current day and hour, scroll to this event
- if(mDate.date() == currentTime.date() && !list.isEmpty()){
- int hourToScrollTo(list.first().startTime().time().hour());
- mHourScrollArea->scrollToHour(hourToScrollTo);
+ if (mDate.date() == currentTime.date()){
+
+ QDateTime midnight = currentTime;
+ midnight.setTime(QTime(23, 59));
+
+ //Filter flags (only timed events)
+ AgendaUtil::FilterFlags filter = AgendaUtil::FilterFlags(AgendaUtil::IncludeAppointments);
+ QList<AgendaEntry> list;
+ // Fetch the instance list from the agenda interface
+ list = mServices.agendaInterface()->fetchEntriesInRange(currentTime, midnight, filter);
+
+ if(!list.isEmpty()){
+ int hourToScrollTo(list.first().startTime().time().hour());
+ mHourScrollArea->scrollToHour(hourToScrollTo);
+ }
+ else{
+ mHourScrollArea->scrollToHour(currentTime.time().hour());
+ }
}
- else{
+ else {
//Scroll view to 7am
mHourScrollArea->scrollToHour(7);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/calendaycontainertest.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,40 @@
+/*
+* 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: Class inherit CalenDayContainer needed to test
+*
+*/
+
+#ifndef CALENDAYCONTAINERTEST_H
+#define CALENDAYCONTAINERTEST_H
+
+#include <QObject>
+#include "calendaycontainer.h"
+
+class CalenDayContainerTest : public CalenDayContainer
+{
+ Q_OBJECT
+
+public:
+ CalenDayContainerTest(QGraphicsItem *parent = 0)
+ : CalenDayContainer(parent)
+ {
+
+ }
+
+
+ friend class TestCalenDayContainer;
+};
+
+#endif
+
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/calendayinfo.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/calendayinfo.h Mon Aug 23 16:00:50 2010 +0100
@@ -86,13 +86,18 @@
public:
- CalenDayInfo(TSlotsInHour aSlotsInHour) {
+ CalenDayInfo(TSlotsInHour aSlotsInHour)
+ {
Q_UNUSED(aSlotsInHour)
}
- virtual ~CalenDayInfo();
+ virtual ~CalenDayInfo()
+ {
+
+ }
void GetLocation( const SCalenApptInfo& aItemInfo, int& aStartSlot,
- int& aEndSlot, int& aColumnIndex, int& aColumns ) {
+ int& aEndSlot, int& aColumnIndex, int& aColumns )
+ {
Q_UNUSED(aItemInfo)
Q_UNUSED(aStartSlot)
Q_UNUSED(aEndSlot)
@@ -100,14 +105,29 @@
Q_UNUSED(aColumns)
}
- int AlldayCount() {
+ int AlldayCount()
+ {
return 0;
}
- const QList<CalenTimeRegion>& RegionList() const {
+ const QList<CalenTimeRegion>& RegionList() const
+ {
return mList;
}
+ void InsertAlldayEvent( const SCalenApptInfo& aItemInfo )
+ {
+ Q_UNUSED(aItemInfo)
+
+ CalenTimeRegion region;
+
+ region.iStartSlot = 10;
+ region.iEndSlot = 13;
+ region.iColumns << CalenTimeColumn();
+
+ mList << region;
+ }
+
public:
QList<CalenTimeRegion> mList;
};
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/caleninstanceid.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/caleninstanceid.h Mon Aug 23 16:00:50 2010 +0100
@@ -18,6 +18,8 @@
#ifndef CALENINSTANCEID_H
#define CALENINSTANCEID_H
+#include <agendaentry.h>
+
/*!
Mocked class TCalenInstanceId
*/
@@ -32,6 +34,15 @@
return TCalenInstanceId();
}
+ static TCalenInstanceId create( const AgendaEntry& entry )
+ {
+ TCalenInstanceId id;
+ id.mEntryLocalUid = entry.id();
+ id.mInstanceTime = entry.startTime();
+ id.mType = entry.type();
+ return id;
+ }
+
public: // data members
ulong mEntryLocalUid;
QDateTime mInstanceTime;
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -11,16 +11,29 @@
*
* Contributors:
*
- * Description: Test class for CalenDayContainerWidget
+ * Description: Test class for CalenDayContainer
*
*/
#include <QtTest/QtTest>
-#include "calendaycontainer.h"
+#include <HbEffect>
+#include <HbWidget>
+#include <HbAbstractViewItem>
+
+#include "calendayinfo.h"
+#include "calendaymodel.h"
+
+#define private public
+
+
+#include "calendaycontainertest.h"
+
+QVariantList MOCK_EVENTS_LIST;
+QDateTime MOCK_EVENTS_DATE;
// Test variables
QRectF gTestWindowRect = QRectF(0, 0, 10, 20);
-Qt::Orientation gTestOrientation = Qt::Horizontal;
+Qt::Orientation gTestOrientation = Qt::Vertical;
class TestCalenDayContainer : public QObject
{
@@ -37,16 +50,28 @@
void cleanup();
void testConstructors();
+ void testSetGetDayInfo();
+ void testItemAdded();
+ void testItemRemoved();
+ void testReset();
+ void testViewResized();
+ void testOrientationChanged();
+ void testCreateDefaultPrototype();
+ void testGetTimedEventLayoutValues();
+ void testCreateTouchEventAbsorbers();
+ void testCrateAbsorberBetweenSlots();
+
private:
- CalenDayContainer *mContainer;
+ CalenDayContainerTest *mContainer;
+ CalenDayInfo *mInfo;
};
/*!
Constructor
*/
TestCalenDayContainer::TestCalenDayContainer() :
- mContainer(NULL)
+ mContainer(NULL), mInfo(NULL)
{
}
@@ -79,7 +104,36 @@
*/
void TestCalenDayContainer::init()
{
- mContainer = new CalenDayContainer();
+ mContainer = new CalenDayContainerTest();
+ mInfo = new CalenDayInfo(CalenDayInfo::EOne);
+
+
+ MOCK_EVENTS_DATE = QDateTime(QDate(12,07,2010),QTime(6,0));
+
+ QDateTime dateTimeStart1(QDate(12,07,2010),QTime(7,0));
+ QDateTime dateTimeEnd1(QDate(12,07,2010),QTime(10,0));
+ QDateTime dateTimeStart2(QDate(12,07,2010),QTime(11,0));
+ QDateTime dateTimeEnd2(QDate(12,07,2010),QTime(12,0));
+ QDateTime dateTimeStart3(QDate(12,07,2010),QTime(12,45));
+ QDateTime dateTimeEnd3(QDate(12,07,2010),QTime(18,45));
+
+ AgendaEntry entry1;
+ AgendaEntry entry2;
+ AgendaEntry entry3;
+
+ entry1.setStartAndEndTime(dateTimeStart1,dateTimeEnd1);
+ entry2.setStartAndEndTime(dateTimeStart2,dateTimeEnd2);
+ entry3.setStartAndEndTime(dateTimeStart3,dateTimeEnd3);
+
+ SCalenApptInfo calenInfo;
+ calenInfo.iStatus = AgendaEntry::Confirmed;
+ calenInfo.iId = TCalenInstanceId::create(entry1);
+ mInfo->InsertAlldayEvent(calenInfo);
+ mInfo->InsertAlldayEvent(calenInfo);
+
+ MOCK_EVENTS_LIST << QVariant::fromValue(entry1);
+ MOCK_EVENTS_LIST << QVariant::fromValue(entry2);
+ MOCK_EVENTS_LIST << QVariant::fromValue(entry3);
}
/*!
@@ -91,6 +145,10 @@
delete mContainer;
mContainer = NULL;
}
+ if (mInfo) {
+ delete mInfo;
+ mInfo = NULL;
+ }
}
/*!
@@ -101,15 +159,148 @@
void TestCalenDayContainer::testConstructors()
{
//1)
- CalenDayContainer *testContainer = 0;
+ CalenDayContainerTest *testContainer = 0;
QVERIFY(!testContainer);
//2)
- testContainer = new CalenDayContainer();
+ testContainer = new CalenDayContainerTest();
QVERIFY(testContainer);
delete testContainer;
}
+/*!
+ Test function to check set and get day info
+ Test after set if info day is good
+ */
+void TestCalenDayContainer::testSetGetDayInfo()
+{
+ QVERIFY(mContainer->dayInfo() ==0);
+ mContainer->setDayInfo(mInfo);
+
+ QVERIFY(mContainer->dayInfo()!=0);
+}
+
+/*!
+ Function not implemented
+ */
+void TestCalenDayContainer::testItemAdded()
+{
+ //function dosen't do nothing. It will be updated after code changes
+}
+
+/*!
+ Function not implemented
+ */
+void TestCalenDayContainer::testItemRemoved()
+{
+ //function dosen't do nothing. It will be updated after code changes
+}
+
+/*!
+ Test reset of caontainer based on absorders
+ */
+void TestCalenDayContainer::testReset()
+{
+ QVERIFY(mContainer->mAbsorbers.count() == 0);
+ mContainer->mAbsorbers << mContainer->crateAbsorberBetweenSlots(0,1,false);
+ QVERIFY(mContainer->mAbsorbers.count() == 1);
+ mContainer->reset();
+ QVERIFY(mContainer->mAbsorbers.count() == 0);
+}
+
+/*!
+ Test is view of container is good resized.
+ 1)test if size is changed
+ 2)test if new size is good set
+ */
+void TestCalenDayContainer::testViewResized()
+{
+ QSizeF size = mContainer->size();
+ //set new size
+ QSizeF newSize(size.width()+100,size.height()+100);
+ mContainer->viewResized(newSize);
+ //1)
+ QVERIFY(size != mContainer->size());
+ //2)
+ QCOMPARE(mContainer->size(),newSize);
+}
+
+/*!
+ It test change of orientation based on count of absorbers
+ */
+void TestCalenDayContainer::testOrientationChanged()
+{
+ mContainer->setDayInfo(mInfo);
+ QVERIFY(mContainer->mAbsorbers.count() == 0);
+
+ mContainer->orientationChanged(Qt::Vertical);
+
+ QVERIFY(mContainer->mAbsorbers.count() != 0);
+}
+
+/*!
+ Test creating item prototype
+ */
+void TestCalenDayContainer::testCreateDefaultPrototype()
+{
+ HbAbstractViewItem *testItem = 0;
+ QVERIFY(!testItem);
+
+ testItem = mContainer->createDefaultPrototype();
+
+ QVERIFY(testItem);
+
+ delete testItem;
+}
+
+/*!
+ Test geting timed layouts.
+ */
+void TestCalenDayContainer::testGetTimedEventLayoutValues()
+{
+ CalenDayContainer::LayoutValues layoutValues;
+
+ QVERIFY(layoutValues.eventAreaWidth == 0);
+ QVERIFY(layoutValues.eventAreaX == 0);
+ QVERIFY(layoutValues.eventMargin == 0);
+ QVERIFY(layoutValues.maxColumns == 0);
+ QVERIFY(layoutValues.slotHeight == 0);
+ QVERIFY(layoutValues.unitInPixels == 0);
+
+ mContainer->getTimedEventLayoutValues(layoutValues);
+
+ QVERIFY(layoutValues.eventAreaWidth != 0);
+ QVERIFY(layoutValues.eventAreaX == 0);
+ QVERIFY(layoutValues.eventMargin != 0);
+ QVERIFY(layoutValues.maxColumns != 0);
+ QVERIFY(layoutValues.slotHeight != 0);
+ QVERIFY(layoutValues.unitInPixels != 0);
+}
+
+/*!
+ Test creating touch event absorbers.
+ */
+void TestCalenDayContainer::testCreateTouchEventAbsorbers()
+{
+ mContainer->setDayInfo(mInfo);
+ QVERIFY(mContainer->mAbsorbers.count() == 0);
+ mContainer->createTouchEventAbsorbers();
+ QVERIFY(mContainer->mAbsorbers.count() != 0);
+}
+
+/*!
+ test creating touch absorber beatween slots.
+ */
+void TestCalenDayContainer::testCrateAbsorberBetweenSlots()
+{
+ TouchEventAbsorber* testValue = 0;
+ QVERIFY(!testValue);
+ testValue = mContainer->crateAbsorberBetweenSlots(0,1,false);
+ QVERIFY(testValue);
+ delete testValue;
+}
+
+
QTEST_MAIN(TestCalenDayContainer);
#include "unittest_calendaycontainer.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro Mon Aug 23 16:00:50 2010 +0100
@@ -35,7 +35,8 @@
./../../../../../inc/
# Input
-HEADERS += calendaycontainer.h \
+HEADERS += calendaycontainertest.h \
+ calendaycontainer.h \
calendayutils.h \
calendayeventspane.h \
calendayitem.h \
@@ -53,11 +54,6 @@
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
MMP_RULES += "USERINCLUDE ."
-
- INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-
- LIBS += -lagendainterface \
- -lxqsettingsmanager
BLD_INF_RULES.prj_testexports += \
"./rom/unittest_calendaycontainer.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendaycontainer.iby)"
@@ -65,7 +61,8 @@
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
LIBS += -lagendainterface \
- -lcalencommonutils
+ -lcalencommonutils \
+ -lxqsettingsmanager
}
# End of file --Don't remove this.
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -18,8 +18,16 @@
#include <QtTest/QtTest>
#include <QPen>
+#include <QPainter>
+#include <QImage>
+#include <QGraphicsScene>
+#include <hbstyleloader.h>
+
#include "calendayeventspane.h"
+const qreal WIDGET_WIDTH = 300;
+const qreal WIDGET_HEIGHT = 1000;
+
class TestCalenEventsPane : public QObject
{
Q_OBJECT
@@ -35,6 +43,8 @@
void cleanup();
void testConstructors();
+ void testSetGetTopLineDrawing();
+ void testContentDrawing();
private:
CalenDayEventsPane *mEventsPane;
@@ -62,6 +72,11 @@
*/
void TestCalenEventsPane::initTestCase()
{
+ HbStyleLoader::registerFilePath(":/calendayhourelement.css");
+ HbStyleLoader::registerFilePath(":/calendayhourelement.widgetml");
+ HbStyleLoader::registerFilePath(":/calendayitem.css");
+ HbStyleLoader::registerFilePath(":/calendayitem.widgetml");
+ HbStyleLoader::registerFilePath(":/calendayeventspane.css");
}
/*!
@@ -108,5 +123,70 @@
delete testEventsPane;
}
+/*!
+ Test setting and getting info about top line drawing
+ 1. Test first set of value
+ 2. Test change value
+ */
+void TestCalenEventsPane::testSetGetTopLineDrawing()
+{
+ //1)
+ mEventsPane->setDrawTopLine(true);
+ QCOMPARE(mEventsPane->isTopLineDrawed(),true);
+ //2)
+ mEventsPane->setDrawTopLine(false);
+ QCOMPARE(mEventsPane->isTopLineDrawed(),false);
+}
+
+/*!
+ Test drawing content of widget
+ 1. Test without top line draw
+ 2. Test with top line draw
+ */
+void TestCalenEventsPane::testContentDrawing()
+{
+ mEventsPane->resize(WIDGET_WIDTH,WIDGET_HEIGHT);
+ QGraphicsScene scene;
+ scene.addItem(mEventsPane);
+
+ //resize widget to be bigger than (0,0)
+ QSize size = mEventsPane->size().toSize();
+ QRect viewRectangle(0,10,size.width(),size.height()-20);
+ //create image that will simulate widget where painting should be done
+ QPixmap img(size);
+ //create painter which will be used to paint
+ QPainter painter;
+
+ //1)
+ mEventsPane->setDrawTopLine(false);
+ painter.begin(&img);
+ painter.setViewport(viewRectangle);
+ painter.setRenderHint(QPainter::Antialiasing);
+ //fill image with white color to have better filings with look of "paper"
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::white));
+ scene.render(&painter);
+ painter.end();
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenEventsPane_testContentDrawing_false.png");
+#endif
+
+ //2)
+ mEventsPane->setDrawTopLine(true);
+ painter.begin(&img);
+ painter.setViewport(viewRectangle);
+ painter.setRenderHint(QPainter::Antialiasing);
+ //fill image with white color to have better filings with look of "paper"
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::white));
+ scene.render(&painter);
+ painter.end();
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenEventsPane_testContentDrawing_true.png");
+#endif
+
+ scene.removeItem(mEventsPane);
+}
+
QTEST_MAIN(TestCalenEventsPane);
#include "unittest_calendayeventspane.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.pro Mon Aug 23 16:00:50 2010 +0100
@@ -17,6 +17,10 @@
TEMPLATE = app
TARGET = unittest_calendayeventspane
+#uncoment it if want to get images from test where it is posible.
+#it need folder in c:/unittest path
+#DEFINES += SAVE_IMAGES
+
MOC_DIR = moc
CONFIG += qtestlib
@@ -37,6 +41,8 @@
SOURCES += unittest_calendayeventspane.cpp \
calendayeventspane.cpp
+RESOURCES += ../../../resources/calendaywidgets.qrc
+
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
MMP_RULES += "USERINCLUDE ."
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/calendayhourelementtest.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,43 @@
+/*
+* 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 CALENDAYHOURELEMENTTEST_H
+#define CALENDAYHOURELEMENTTEST_H
+
+//User includes
+#include "calendayhourelement.h"
+
+
+class CalenDayHourElementTest : public CalenDayHourElement
+{
+ Q_OBJECT
+
+public:
+
+ /**
+ * Constructor.
+ */
+ CalenDayHourElementTest(const QTime &time, QGraphicsItem *parent=0)
+ : CalenDayHourElement(time,parent)
+ {
+
+ }
+
+ friend class TestCalenDayHourElement;
+};
+
+#endif // CALENDAYHOURELEMENT_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -11,13 +11,22 @@
*
* Contributors:
*
- * Description: Test class for CalenDayContentWidget
+ * Description: Test class for TestCalenDayHourElement
*
*/
#include <QGraphicsItem>
#include <QtTest/QtTest>
-#include "calendayhourelement.h"
+#include "calendayhourelementtest.h"
+#include "calendayhourscrollarea.h"
+
+#include <QPainter>
+#include <QImage>
+#include <QPair>
+#include <QDateTime>
+
+const qreal WIDGET_WIDTH = 50;
+const qreal WIDGET_HEIGHT = 150;
class TestCalenDayHourElement : public QObject
{
@@ -34,9 +43,13 @@
void cleanup();
void testConstructors();
+ void testSetGetTime();
+ void testPaint_data();
+ void testPaint();
private:
- CalenDayHourElement *mHourElement;
+ CalenDayHourElementTest *mHourElement;
+ CalenDayHourScrollArea *mContainer;
QTime mTime;
};
@@ -77,7 +90,9 @@
*/
void TestCalenDayHourElement::init()
{
- mHourElement = new CalenDayHourElement(mTime);
+ mTime = QTime(12,0,0);
+ mContainer = new CalenDayHourScrollArea();
+ mHourElement = new CalenDayHourElementTest(mTime,mContainer);
}
/*!
@@ -99,15 +114,101 @@
void TestCalenDayHourElement::testConstructors()
{
//1)
- CalenDayHourElement *testHourElement = 0;
+ CalenDayHourElementTest *testHourElement = 0;
QVERIFY(!testHourElement);
- testHourElement = new CalenDayHourElement(mTime);
+ testHourElement = new CalenDayHourElementTest(mTime,mContainer);
QVERIFY(testHourElement);
delete testHourElement;
}
+/*!
+ \brief It test is setting and getting of time works good.
+
+ 0)Test if time from constructor works good
+ 1)Test set new time
+ 2)Change time and test new
+ */
+void TestCalenDayHourElement::testSetGetTime()
+{
+ //0)
+ QVERIFY(mTime == mHourElement->time());
+
+ QTime testValue(15,15,15);
+ //1)
+ mHourElement->setTime(testValue);
+
+ QVERIFY(testValue == mHourElement->time());
+
+ //2)
+ testValue = QTime(10,10,10);
+
+ mHourElement->setTime(testValue);
+ QVERIFY(testValue == mHourElement->time());
+}
+
+/*!
+ \brief Test data for \sa testPaint
+
+ Tested data:
+ 1)Hour is eual 0
+ 2)Hour is bigger than 0
+ 3)Test current time
+ */
+void TestCalenDayHourElement::testPaint_data()
+{
+ QTest::addColumn<QDateTime>("testedValue");
+ QTest::addColumn<QString>("testName");
+
+ QTest::newRow("hour = 0") << QDateTime(QDate(2010,06,26),QTime(0,10,0))
+ << QString("hour = 0");
+ QTest::newRow("hour != 0") << QDateTime(QDate(2010,06,26),QTime(15,15,15))
+ << QString("hour != 0");
+ QTest::newRow("current time") << QDateTime::currentDateTime()
+ << QString("current time");
+}
+
+/*!
+ \brief Test painting method
+
+ It check painting based on given time.
+ \sa testPaint_data
+ */
+void TestCalenDayHourElement::testPaint()
+{
+
+ //get data to test
+ QFETCH(QDateTime, testedValue);
+ QFETCH(QString, testName);
+
+ mHourElement->setTime(testedValue.time());
+
+ //set date to check
+ mContainer->setDateTime(testedValue);
+
+ QStyleOptionGraphicsItem * option = new QStyleOptionGraphicsItem();
+ //preapre drawed area smaller because of drawing lines on corners
+ option->rect = QRect(10,10,WIDGET_WIDTH-20,WIDGET_HEIGHT/2);
+ mHourElement->resize(WIDGET_WIDTH,WIDGET_HEIGHT);
+ QSize size = mHourElement->size().toSize();
+
+ //create image that will simulate widget where painting should be done
+ QImage img(size,QImage::Format_RGB32);
+ //create painter which will be used to paint
+ QPainter painter(&img);
+ //fill image with grey color to have better filings with look of "paper"
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ //run paint
+ mHourElement->paint(&painter,option,0);
+
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourElement_testPaint_" + testName + ".jpg");
+
+#endif
+}
+
QTEST_MAIN(TestCalenDayHourElement);
#include "unittest_calendayhourelement.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.pro Mon Aug 23 16:00:50 2010 +0100
@@ -11,7 +11,7 @@
#
# Contributors:
#
-# Description: calendaycontentwidget test project file
+# Description: calendayhourelement test project file
#
TEMPLATE = app
@@ -22,22 +22,33 @@
CONFIG += qtestlib
CONFIG += symbian_test
CONFIG += hb
+
+#uncoment it if want to get images from test where it is posible.
+#it need folder in c:/unittest path
+#DEFINES += SAVE_IMAGES
+
+DEFINES += CALENVIEWS_DLL
INCLUDEPATH += . \
../../../inc/ \
+ ./../../../../inc/ \
+ ./../../../../../inc/
DEPENDPATH += . \
../../../inc/ \
../../../src/
# Input
-HEADERS += calendayhourelement.h \
- calendayhourscrollarea.h
+HEADERS += calendayhourelementtest.h \
+ calendayhourelement.h \
+ calendayhourscrollarea.h \
+ calendayutils.h
SOURCES += unittest_calendayhourelement.cpp \
calendayhourelement.cpp \
- calendayhourscrollarea.cpp
+ calendayhourscrollarea.cpp \
+ calendayutils.cpp
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
@@ -45,6 +56,11 @@
BLD_INF_RULES.prj_testexports += \
"./rom/unittest_calendayhourelement.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendayhourelement.iby)"
+
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
+ LIBS += -lagendainterface \
+ -lcalencommonutils
}
# End of file --Don't remove this.
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -17,8 +17,16 @@
#include <QGraphicsItem>
#include <QtTest/QtTest>
+#include <QPainter>
+#include <QImage>
+#include <QGraphicsScene>
+#include <hbstyleloader.h>
+
#include "calendayhourscrollarea.h"
+const qreal WIDGET_WIDTH = 300;
+const qreal WIDGET_HEIGHT = 1000;
+
class TestCalenDayHourScrollArea : public QObject
{
Q_OBJECT
@@ -34,6 +42,9 @@
void cleanup();
void testConstructors();
+ void testSetGetDateTime();
+ void testScrollToHour();
+ void testscrollVertically();
private:
CalenDayHourScrollArea *mHourScrollArea;
@@ -61,6 +72,11 @@
*/
void TestCalenDayHourScrollArea::initTestCase()
{
+ HbStyleLoader::registerFilePath(":/calendayhourelement.css");
+ HbStyleLoader::registerFilePath(":/calendayhourelement.widgetml");
+ HbStyleLoader::registerFilePath(":/calendayitem.css");
+ HbStyleLoader::registerFilePath(":/calendayitem.widgetml");
+ HbStyleLoader::registerFilePath(":/calendayeventspane.css");
}
/*!
@@ -108,5 +124,142 @@
delete testHourScrollArea;
}
+/*!
+ \brief It test seting and geting datetime.
+ 1. Test first setting datetime
+ 2. Test datetime after change
+ */
+void TestCalenDayHourScrollArea::testSetGetDateTime()
+{
+ QDateTime testValue(QDate(2010,06,29),QTime(8,42,10));
+ //1)
+ mHourScrollArea->setDateTime(testValue);
+ QCOMPARE(mHourScrollArea->dateTime(),testValue);
+
+ //2)
+ testValue = QDateTime(QDate(2011,7,30),QTime(9,43,11));
+ mHourScrollArea->setDateTime(testValue);
+ QCOMPARE(mHourScrollArea->dateTime(),testValue);
+}
+
+/*!
+ \brief It test scrolling to given hour.
+ To draw result on image uncomment SAVE_IMAGES in pro file
+ 1. Test scroll to 0h
+ 2. Test scroll to 12h
+ 3. Test scroll to 20h
+ */
+void TestCalenDayHourScrollArea::testScrollToHour()
+{
+ mHourScrollArea->resize(WIDGET_WIDTH,WIDGET_HEIGHT);
+ QGraphicsScene scene;
+ scene.addItem(mHourScrollArea);
+ QDateTime testValue(QDate(2010,06,29),QTime(8,42,10));
+ mHourScrollArea->setDateTime(testValue);
+ //resize widget to be bigger than (0,0)
+ QSize size = mHourScrollArea->size().toSize();
+
+ //create image that will simulate widget where painting should be done
+ QPixmap img(size);
+ //create painter which will be used to paint
+ QPainter painter;
+
+ //0
+ mHourScrollArea->scrollToHour(0);
+ painter.begin(&img);
+ painter.setRenderHint(QPainter::Antialiasing);
+ //fill image with white color to have better filings with look of "paper"
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ scene.render(&painter);
+ painter.end();
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourScrollArea_testScrollToHour_0.png");
+#endif
+ //1
+
+ mHourScrollArea->scrollToHour(12);
+ painter.begin(&img);
+ painter.setRenderHint(QPainter::Antialiasing);
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ scene.render(&painter);
+ painter.end();
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourScrollArea_testScrollToHour_12.png");
+#endif
+ //2
+
+ mHourScrollArea->scrollToHour(20);
+ painter.begin(&img);
+ painter.setRenderHint(QPainter::Antialiasing);
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ scene.render(&painter);
+ painter.end();
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourScrollArea_testScrollToHour_20.png");
+#endif
+ scene.removeItem(mHourScrollArea);
+}
+
+/*!
+ \brief It test scrolling to vertical position.
+ To draw result on image uncomment SAVE_IMAGES in pro file
+ 1. Test scroll to QPoint(0,250)
+ 2. Test scroll to QPoint(0,500)
+ 3. Test scroll to QPoint(0,2000)
+ */
+void TestCalenDayHourScrollArea::testscrollVertically()
+{
+ mHourScrollArea->resize(WIDGET_WIDTH,WIDGET_HEIGHT);
+ QGraphicsScene scene;
+ scene.addItem(mHourScrollArea);
+ QDateTime testValue(QDate(2010,06,29),QTime(8,42,10));
+ mHourScrollArea->setDateTime(testValue);
+ //resize widget to be bigger than (0,0)
+ QSize size = mHourScrollArea->size().toSize();
+
+ //create image that will simulate widget where painting should be done
+ QPixmap img(size);
+ //create painter which will be used to paint
+ QPainter painter;
+
+ //0
+ mHourScrollArea->scrollVertically(QPoint(10,250));
+ painter.begin(&img);
+ painter.setRenderHint(QPainter::Antialiasing);
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ scene.render(&painter);
+ painter.end();
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourScrollArea_testscrollVertically_250.png");
+#endif
+ //1
+ mHourScrollArea->scrollVertically(QPoint(10,500));
+ painter.begin(&img);
+ painter.setRenderHint(QPainter::Antialiasing);
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ scene.render(&painter);
+ painter.end();
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourScrollArea_testscrollVertically_500.png");
+#endif
+ //2
+ mHourScrollArea->scrollVertically(QPoint(10,2000));
+ painter.begin(&img);
+ painter.setRenderHint(QPainter::Antialiasing);
+ painter.fillRect(0,0,size.width(),size.height(),QColor(Qt::gray));
+ scene.render(&painter);
+ painter.end();
+#ifdef SAVE_IMAGES
+ //save drawed image
+ img.save("c:/unittest/TestCalenDayHourScrollArea_testscrollVertically_2000.png");
+#endif
+ scene.removeItem(mHourScrollArea);
+}
+
QTEST_MAIN(TestCalenDayHourScrollArea);
#include "unittest_calendayhourscrollarea.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro Mon Aug 23 16:00:50 2010 +0100
@@ -17,6 +17,12 @@
TEMPLATE = app
TARGET = unittest_calendayhourscrollarea
+#uncoment it if want to get images from test where it is posible.
+#it need folder in c:/unittest path
+#DEFINES += SAVE_IMAGES
+
+DEFINES += CALENVIEWS_DLL
+
MOC_DIR = moc
CONFIG += qtestlib
@@ -45,6 +51,8 @@
calendayhourscrollarea.cpp \
calendayutils.cpp
+RESOURCES += ../../../resources/calendaywidgets.qrc
+
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
MMP_RULES += "USERINCLUDE ."
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -16,12 +16,16 @@
*/
#include <QGraphicsItem>
#include <QtTest/QtTest>
+#include <QDebug>
#include <HbMainWindow>
+#include "calendaycommonheaders.h"
+#include "calendayutils.h"
+
+#define private public
#include "calendayinfo.h"
-#include "calendaycommonheaders.h"
class TestCalenDayInfo : public QObject
{
@@ -37,6 +41,21 @@
void init();
void cleanup();
+ void testReset();
+ void testInsertTimedEvent();
+ void testInsertUntimedEvent();
+ void testInsertAlldayEvent();
+ void testSuggestedUntimedSlotPos();
+ void testNeededUntimedSlotCount();
+ void testFirstOccupiedSlot();
+ void testLastOccupiedSlot();
+ void testEarliestEndSlot();
+ void testLastStartSlot();
+ void testSlotIndexForStartTime();
+ void testSlotIndexForEndTime();
+ void testAlldayCount();
+ void testTodoCount();
+
void testConstructors();
private:
@@ -49,7 +68,7 @@
TestCalenDayInfo::TestCalenDayInfo() :
mInfo(NULL)
{
-
+ qDebug() << "test start";
}
/*!
@@ -57,7 +76,7 @@
*/
TestCalenDayInfo::~TestCalenDayInfo()
{
-
+
}
/*!
@@ -94,6 +113,259 @@
}
}
+void TestCalenDayInfo::testReset()
+ {
+ SCalenApptInfo info;
+ mInfo->InsertAlldayEvent(info);
+ mInfo->InsertTimedEvent(info);
+
+ mInfo->Reset();
+
+ QCOMPARE (mInfo->iAlldayEvents.length(), 0);
+ QCOMPARE (mInfo->iRegionList.length(), 0);
+ }
+
+void TestCalenDayInfo::testInsertTimedEvent()
+ {
+ SCalenApptInfo info;
+ info.iStartTime = QDateTime(QDate(2010, 7, 10), QTime(23, 45, 45));
+
+ info.iEndTime = QDateTime(QDate(2010, 7, 10), QTime(23, 49, 45));
+ mInfo->InsertTimedEvent(info);
+
+ QCOMPARE (mInfo->iRegionList.count(), 1);
+ }
+
+void TestCalenDayInfo::testInsertUntimedEvent()
+ {
+
+ }
+
+void TestCalenDayInfo::testInsertAlldayEvent()
+ {
+ SCalenApptInfo info;
+ info.iId = TCalenInstanceId::nullInstanceId();
+ info.iStatus = AgendaEntry::StatusUnknown;
+
+ mInfo->InsertAlldayEvent(info);
+
+ QCOMPARE(mInfo->iAlldayEvents.length(), 1);
+ }
+
+void TestCalenDayInfo::testSuggestedUntimedSlotPos()
+ {
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ //iregionlist.length = 0
+ mInfo->iRegionList.clear();
+ QCOMPARE(mInfo->SuggestedUntimedSlotPos(), 16);
+
+ //iregionlist.length <> 0
+ CalenTimeRegion region;
+ region.iStartSlot = 10;
+ mInfo->iRegionList.append(region);
+
+ QCOMPARE(mInfo->SuggestedUntimedSlotPos(), 10);
+ }
+
+void TestCalenDayInfo::testNeededUntimedSlotCount()
+ {
+ mInfo->iUntimedEvents.append(TCalenInstanceId());
+ QCOMPARE(mInfo->iUntimedEvents.count(), mInfo->NeededUntimedSlotCount());
+
+ mInfo->iTodoEvents.append(TCalenInstanceId());
+ QCOMPARE(mInfo->iUntimedEvents.count() + 1, mInfo->NeededUntimedSlotCount());
+ }
+
+void TestCalenDayInfo::testFirstOccupiedSlot()
+ {
+ mInfo->iUntimedSlotCount = 0;
+ QCOMPARE(mInfo->FirstOccupiedSlot(), -1);
+
+ mInfo->iUntimedSlotCount = 1;
+ mInfo->iFirstUntimedSlot = 8;
+ QCOMPARE(mInfo->FirstOccupiedSlot(), 8);
+
+ mInfo->iUntimedSlotCount = 0;
+ CalenTimeRegion region;
+ region.iStartSlot = 16;
+
+ mInfo->iRegionList.append(region);
+ QCOMPARE(mInfo->FirstOccupiedSlot(), 16);
+ }
+
+void TestCalenDayInfo::testLastOccupiedSlot()
+ {
+ mInfo->iUntimedSlotCount = 0;
+ QCOMPARE(mInfo->LastOccupiedSlot(), -1);
+
+ mInfo->iUntimedSlotCount = 1;
+ mInfo->iFirstUntimedSlot = 8;
+ QCOMPARE(mInfo->LastOccupiedSlot(), 8);
+
+ CalenTimeRegion region;
+ region.iEndSlot = 16;
+ mInfo->iRegionList.append(region);
+ QCOMPARE(mInfo->LastOccupiedSlot(), 16);
+ }
+
+void TestCalenDayInfo::testEarliestEndSlot()
+ {
+ mInfo->iUntimedSlotCount = 10;
+ mInfo->iEmptyUntimedSlots = 10;
+ mInfo->iEarliestEndSlot = 2;
+
+ QCOMPARE(mInfo->EarliestEndSlot(), -1);
+
+ CalenTimeRegion region;
+ region.iEndSlot = 16;
+ mInfo->iRegionList.append(region);
+ QCOMPARE(mInfo->EarliestEndSlot(), 12);
+
+ mInfo->iUntimedSlotCount = 15;
+ mInfo->iEmptyUntimedSlots = 10;
+ mInfo->iFirstUntimedSlot = 2;
+
+ QCOMPARE(mInfo->EarliestEndSlot(), 13);
+ }
+
+void TestCalenDayInfo::testLastStartSlot()
+ {
+
+ mInfo->iUntimedSlotCount = 5;
+ mInfo->iEmptyUntimedSlots = 5;
+ QCOMPARE(mInfo->LastStartSlot(), -1);
+
+ mInfo->iUntimedSlotCount = 8;
+ mInfo->iEmptyUntimedSlots = 5;
+ mInfo->iFirstUntimedSlot = 10;
+ QCOMPARE(mInfo->LastStartSlot(), 17);
+
+ CalenTimeRegion region;
+ region.iEndSlot = 16;
+ mInfo->iRegionList.append(region);
+ mInfo->iLastStartSlot = 5;
+ mInfo->iUntimedSlotCount = 8;
+ QCOMPARE(mInfo->LastStartSlot(), 13);
+ }
+
+void TestCalenDayInfo::testSlotIndexForStartTime()
+ {
+ QDateTime dt;
+ dt.setTime(QTime(10, 5, 0));
+ mInfo->iSlotsInHour = CalenDayInfo::EOne;
+ mInfo->iUntimedSlotCount = 0;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 10);
+
+ qDebug() << dt.time().hour() << ":" << dt.time().minute();
+
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 20);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EThree;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 30);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EFour;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 40);
+ //---------
+
+ dt.setTime(QTime(10, 20, 0));
+
+ mInfo->iSlotsInHour = CalenDayInfo::EOne;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 10);
+
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 20);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EThree;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 31);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EFour;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 41);
+
+ //---------
+
+ dt.setTime(QTime(10, 35, 0));
+
+ mInfo->iSlotsInHour = CalenDayInfo::EOne;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 10);
+
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 21);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EThree;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 31);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EFour;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 42);
+
+ //---------
+ dt.setTime(QTime(10, 45, 0));
+
+ mInfo->iSlotsInHour = CalenDayInfo::EOne;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 10);
+
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 21);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EThree;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 32);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EFour;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 43);
+
+ }
+
+void TestCalenDayInfo::testSlotIndexForEndTime()
+ {
+
+ }
+
+void TestCalenDayInfo::testAlldayCount()
+ {
+ QCOMPARE(mInfo->AlldayCount(), 0);
+ mInfo->iAlldayEvents.append(CalenTimedEventInfo());
+ QCOMPARE(mInfo->AlldayCount(), 1);
+ }
+
+void TestCalenDayInfo::testTodoCount()
+ {
+ QCOMPARE(mInfo->TodoCount(), 0);
+ mInfo->iTodoEvents.append(TCalenInstanceId());
+ QCOMPARE(mInfo->TodoCount(), 1);
+ }
+
/*!
Test function for constructors
1. Test if CalenDayInfo is not initialized
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.pro Mon Aug 23 16:00:50 2010 +0100
@@ -46,7 +46,8 @@
SOURCES += unittest_calendayinfo.cpp \
- calendayinfo.cpp
+ calendayinfo.cpp \
+ calendayutils.cpp
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
@@ -54,6 +55,9 @@
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+ LIBS += -lcalencommonutils \
+ -lagendainterface
+
BLD_INF_RULES.prj_testexports += \
"./rom/unittest_calendayinfo.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendayinfo.iby)"
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayinfo.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,137 @@
+/*
+* Copyright (c) 2007-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 CalenDayItem class
+*
+*/
+
+#ifndef CALENDAYINFO_H
+#define CALENDAYINFO_H
+
+#include <calinstance.h>
+#include "caleninstanceid.h"
+
+const int KFSCalMaxDescriptionLength = 100;
+
+/*!
+ Mocked struct SCalenApptInfo
+ */
+struct SCalenApptInfo
+{
+ QModelIndex iIndex;
+ QDateTime iStartTime;
+ QDateTime iEndTime;
+ bool iAllDay;
+ TCalenInstanceId iId;
+ AgendaEntry::Status iStatus;
+ TBufC<KFSCalMaxDescriptionLength> iSummary;
+ TUint32 iColor;
+};
+
+/*!
+ Mocked class CalenTimeColumn
+ */
+class CalenTimeColumn
+{
+public:
+ CalenTimeColumn() {
+
+ }
+
+ ~CalenTimeColumn() {
+
+ }
+};
+
+/*!
+ Mocked class CalenTimeRegion
+ */
+class CalenTimeRegion
+{
+public:
+ CalenTimeRegion() {
+
+ }
+
+ ~CalenTimeRegion() {
+
+ }
+
+ QList<CalenTimeColumn> iColumns;
+
+ int iStartSlot;
+ int iEndSlot;
+};
+
+/*!
+ Mocked class CalenDayInfo
+ */
+class CalenDayInfo
+{
+public:
+ enum TSlotsInHour
+ {
+ EOne = 1, ETwo, EThree, EFour
+ };
+
+public:
+
+ CalenDayInfo(TSlotsInHour aSlotsInHour)
+ {
+ Q_UNUSED(aSlotsInHour)
+ }
+ virtual ~CalenDayInfo()
+ {
+
+ }
+
+ void GetLocation( const SCalenApptInfo& aItemInfo, int& aStartSlot,
+ int& aEndSlot, int& aColumnIndex, int& aColumns )
+ {
+ Q_UNUSED(aItemInfo)
+ Q_UNUSED(aStartSlot)
+ Q_UNUSED(aEndSlot)
+ Q_UNUSED(aColumnIndex)
+ Q_UNUSED(aColumns)
+ }
+
+ int AlldayCount()
+ {
+ return 0;
+ }
+
+ const QList<CalenTimeRegion>& RegionList() const
+ {
+ return mList;
+ }
+
+ void InsertAlldayEvent( const SCalenApptInfo& aItemInfo )
+ {
+ Q_UNUSED(aItemInfo)
+
+ CalenTimeRegion region;
+
+ region.iStartSlot = 10;
+ region.iEndSlot = 13;
+ region.iColumns << CalenTimeColumn();
+
+ mList << region;
+ }
+
+public:
+ QList<CalenTimeRegion> mList;
+};
+
+#endif // CALENDAYINFO_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayview.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,73 @@
+/*
+* 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 CalenDayItem class
+*
+*/
+
+#ifndef CALENSERVICES_H
+#define CALENSERVICES_H
+
+/*!
+ Mocked class MCalenServices
+ */
+class MCalenServices
+{
+public:
+ MCalenServices() {
+
+ }
+
+ ~MCalenServices() {
+
+ }
+};
+
+#endif // CALENSERVICES_H
+
+#ifndef CALEDAYVIEW_H
+#define CALEDAYVIEW_H
+
+#include <HbView>
+
+enum TCalenCommandId
+{
+ ECalenMonthView = 0,
+ ECalenWeekView,
+ ECalenAgendaView
+};
+
+/*!
+ Mocked class CalenDayView
+ */
+class CalenDayView : public HbView
+{
+public:
+
+ CalenDayView(MCalenServices &services) {
+ Q_UNUSED(services)
+ }
+
+ virtual ~CalenDayView() {
+
+ }
+
+ void changeView(TCalenCommandId viewId) {
+ Q_UNUSED(viewId)
+ }
+};
+
+#endif // CALEDAYVIEW_H
+
+//End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/caleninstanceid.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,55 @@
+/*
+* 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 CalenDayItem class
+*
+*/
+
+#ifndef CALENINSTANCEID_H
+#define CALENINSTANCEID_H
+
+#include <agendaentry.h>
+
+/*!
+ Mocked class TCalenInstanceId
+ */
+class TCalenInstanceId
+{
+public:
+ TCalenInstanceId() {
+
+ }
+
+ static TCalenInstanceId nullInstanceId() {
+ return TCalenInstanceId();
+ }
+
+ static TCalenInstanceId create( const AgendaEntry& entry )
+ {
+ TCalenInstanceId id;
+ id.mEntryLocalUid = entry.id();
+ id.mInstanceTime = entry.startTime();
+ id.mType = entry.type();
+ return id;
+ }
+
+public: // data members
+ ulong mEntryLocalUid;
+ QDateTime mInstanceTime;
+ AgendaEntry::Type mType;
+ bool mInstanceViewed;
+};
+
+#endif // CALENINSTANCEID_H
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/hbinstance.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,98 @@
+/*
+* 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 CalenDayItem class
+*
+*/
+
+#ifndef HBMAINWINDOW_H
+#define HBMAINWINDOW_H
+
+#include <HbView>
+
+// 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 <QList>
+
+/*!
+ Mocked class HbInstance (simulating hbinstance in unittests)
+ */
+class HbInstance
+{
+public:
+
+ static HbInstance *instance() {
+ return new HbInstance();
+ }
+
+ QList<HbMainWindow *> 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<HbMainWindow *> mMainWindows;
+};
+
+#endif // HBINSTANCE_H
+
+// End of File
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -11,15 +11,27 @@
*
* Contributors:
*
- * Description: Test class for CalenDayContentWidget
+ * Description: Test class for CalenDayItem
*
*/
#include <QGraphicsItem>
#include <QtTest/QtTest>
+#include <QGraphicsSceneEvent>
+#include <QDebug>
+#include "agendaentry.h"
+#include "calendaycontainer.h"
+
+#define private public
+#define protected public
+
#include "calendayitem.h"
+
+QRectF gTestWindowRect;
+Qt::Orientation gTestOrientation;
+
class TestCalenDayItem : public QObject
{
Q_OBJECT
@@ -34,18 +46,22 @@
void init();
void cleanup();
+ void testCreateItem();
+ void testUpdateChildItems();
+ void testHasEventDescription();
+ void testHasBackgroundFrame();
+
void testConstructors();
- void testCreateItem();
-
private:
CalenDayItem *mItem;
+ CalenDayContainer *mContainer;
};
/*!
Constructor
*/
TestCalenDayItem::TestCalenDayItem() :
- mItem(NULL)
+ mItem(NULL), mContainer(NULL)
{
}
@@ -78,7 +94,11 @@
*/
void TestCalenDayItem::init()
{
- mItem = new CalenDayItem();
+ mContainer = new CalenDayContainer();
+ mItem = new CalenDayItem(mContainer);
+
+ mItem->mBg = new HbFrameItem();
+ mItem->mEventDesc = new HbTextItem(0);
}
/*!
@@ -90,6 +110,11 @@
delete mItem;
mItem = NULL;
}
+
+ if (mContainer) {
+ delete mContainer;
+ mContainer = NULL;
+ }
}
/*!
@@ -104,23 +129,70 @@
QVERIFY(!testItem);
//2)
- testItem = new CalenDayItem();
+ testItem = new CalenDayItem(mContainer);
QVERIFY(testItem);
delete testItem;
}
/*!
- Test function for creating new abstract items.
- 1. Test if item is created
- 2. Test if is the same as orginal.
+ Test function for creating new abstract items.
+ 1. Test if item is created
+ 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);
+ }
+
+void TestCalenDayItem::testHasBackgroundFrame()
+ {
+ QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent();
+ qreal width = mItem->rect().width();
+
+
+ mItem->mFrameMinWidth = width - 4;
+ mItem->resizeEvent(event);
+
+ QVERIFY(mItem->hasBackgroundFrame() == true);
+
+ mItem->mFrameMinWidth = width + 8;
+ mItem->resizeEvent(event);
+
+ QVERIFY(mItem->hasBackgroundFrame() == false);
+ }
QTEST_MAIN(TestCalenDayItem);
#include "unittest_calendayitem.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Mon Aug 23 16:00:50 2010 +0100
@@ -11,7 +11,7 @@
#
# Contributors:
#
-# Description: calendaycontentwidget test project file
+# Description: calendayitem test project file
#
TEMPLATE = app
@@ -25,20 +25,32 @@
INCLUDEPATH += . \
../../../inc/ \
- ../../../../inc/
+ ./../../../../inc/ \
+ ./../../../../../inc/
DEPENDPATH += . \
../../../inc/ \
- ../../../src/
+ ../../../src/ \
+ ./../../../../inc/ \
+ ./../../../../../inc/
# Input
HEADERS += calendayitem.h \
- calendaystatusstrip.h
+ calendaystatusstrip.h \
+ calendaycontainer.h \
+ calendayutils.h \
+ calendayeventspane.h \
+ calendaymodel.h \
+ calendaycommonheaders.h
SOURCES += unittest_calendayitem.cpp \
calendayitem.cpp \
- calendaystatusstrip.cpp
+ calendaystatusstrip.cpp \
+ calendaycontainer.cpp \
+ calendayutils.cpp \
+ calendayeventspane.cpp \
+ calendaymodel.cpp
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
@@ -46,7 +58,9 @@
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
- LIBS += -lagendainterface
+ LIBS += -lagendainterface \
+ -lcalencommonutils \
+ -lxqsettingsmanager
BLD_INF_RULES.prj_testexports += \
"./rom/unittest_calendayitem.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendayitem.iby)"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendaycontainer.h Mon Jul 19 15:12:16 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#ifndef CALENDAYCONTAINER_H
-#define CALENDAYCONTAINER_H
-
-//System includes
-#include <QDateTime>
-
-#include "../../../../../mw/hb/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h"
-
-//User includes
-
-//Forward declarations
-#include "calendayinfo.h"
-
-class CalenDayContainer : public HbAbstractItemContainer
-{
- Q_OBJECT
-
-public:
-
- /**
- * Constructor.
- */
- CalenDayContainer(QGraphicsItem *parent = 0)
- {
- Q_UNUSED(parent);
- }
-
- /**
- * Destructor.
- */
- ~CalenDayContainer(){}
-
- /**
- *
- */
- void itemAdded (int index, HbAbstractViewItem *item, bool animate)
- {
- Q_UNUSED(index);
- Q_UNUSED(item);
- Q_UNUSED(animate);
- }
-
- /**
- *
- */
- void itemRemoved (HbAbstractViewItem *item, bool animate)
- {
- Q_UNUSED(item);
- Q_UNUSED(animate);
- }
-
- /**
- *
- */
- //void reset();
-
- /**
- *
- */
- void viewResized (const QSizeF &size)
- {
- Q_UNUSED(size);
- }
-
- /**
- * Sets day's info structer to the container.
- *
- * @param dayInfo Day info.
- */
- void setDayInfo( CalenDayInfo* dayInfo )
- {
- Q_UNUSED(dayInfo);
- }
-
-public slots:
-
- /**
- * Slot handles layout switch.
- * @param orientation Current device orientation
- */
- void orientationChanged(Qt::Orientation orientation)
- {
- Q_UNUSED(orientation);
- }
-
-protected:
-
- /**
- *
- */
- HbAbstractViewItem * createDefaultPrototype() const{ return 0;}
-
- /**
- *
- */
- // void setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index);
-
- /**
- * Updates geometry of a timed event.
- */
- // void updateTimedEventGeometry(HbAbstractViewItem *item,
- // const QModelIndex &index);
-
- /**
- * Updates geometry of a all-day events
- */
- // void updateAllDayEventGeometry(HbAbstractViewItem *item,
- // const QModelIndex &index);
-
- /**
- * Structure with event layout values.
- *
- * eventAreaX X value for event area start.
- * eventAreaWidth The width of event area.
- * eventMargin Margins between the multiple events.
- * slotHeight Half hour slot's height.
- * unitInPixels no. of pixels in 1un
- */
-
- /*struct LayoutValues {
- LayoutValues()
- :eventAreaX(0),
- eventAreaWidth(0),
- eventMargin(0),
- slotHeight(0),
- unitInPixels(0),
- maxColumns(0)
- {}
-
- qreal eventAreaX;
- qreal eventAreaWidth;
- qreal eventMargin;
- qreal slotHeight;
- qreal unitInPixels;
- int maxColumns;
- };
- */
- /**
- * Gets event layout values.
- *
- * @param layoutValues structure to be filled with layout data
- */
- //void getTimedEventLayoutValues(LayoutValues& layoutValues);
-
-
- /**
- * creates absorbers which prevent touching to small items
- * (according to UI spec items smaller than ... are untouchable)
- */
- //void createTouchEventAbsorbers();
-
- /**
- *
- */
- //TouchEventAbsorber* crateAbsorberBetweenSlots(int startSlot, int endSlot);
-
-private:
-
- //bool mGeometryUpdated;
-
- //QDateTime mDateTime;
-
- /**
- * Day event info.
- * Not own.
- */
- //CalenDayInfo* mInfo;
-
- // LayoutValues mLayoutValues;
- //QList<TouchEventAbsorber*> mAbsorbers;
-};
-
-
-
-class TouchEventAbsorber : public HbWidget
- {
- Q_OBJECT
- public:
- TouchEventAbsorber(QGraphicsItem *parent=0);
- ~TouchEventAbsorber();
-
- protected:
- void gestureEvent(QGestureEvent *event);
-
-#ifdef _DEBUG
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
- QWidget *widget);
-#endif
-
- };
-
-#endif // CALENDAYCONTAINER_H
-
-// End of File
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendayinfo.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendayinfo.h Mon Aug 23 16:00:50 2010 +0100
@@ -1,214 +1,143 @@
/*
- * 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:
- *
- */
+* Copyright (c) 2007-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 CalenDayItemView class
+*
+*/
#ifndef CALENDAYINFO_H
#define CALENDAYINFO_H
-#include <QtGlobal>
+#include <calinstance.h>
#include "caleninstanceid.h"
-#include <QtGui>
+#include <hb_calencommands.hrh>
-//from hb_calencommands.hrh
+const int KFSCalMaxDescriptionLength = 100;
-enum TCalenCommandId
- {
- ECalenMonthView,
- ECalenWeekView,
- ECalenAgendaView,
- ECalenDayView,
- ECalenTodoEditor,
- ECalenTodoEditorDone,
- ECalenForwardsToDayView,
- ECalenNextView,
- ECalenPrevView,
- ECalenSwitchView,
- ECalenShowToolbar,
- ECalenHideToolbar,
- ECalenUpdateToolbar,
- ECalenHidePreview,
- ECalenShowPreview,
- ECalenStartActiveStep,
- ECalenGotoToday,
- ECalenGotoDate,
- ECalenEventView,
- ECalenCmdPromptThenEdit,
- ECalenFasterAppExit,
- ECalenShowNextDay,
- ECalenShowPrevDay,
- ECalenNewMeeting,
- ECalenNewAnniv,
- ECalenNewDayNote,
- ECalenNewReminder,
- ECalenNewMeetingRequest,
- ECalenNewEntry,
- ECalenEditCurrentEntry,
- ECalenEditSeries,
- ECalenEditOccurrence,
- ECalenEditEntryFromViewer,
- ECalenViewCurrentEntry,
- ECalenNotifyFocusChange,
- ECalenCompleteTodo,
- ECalenRestoreTodo,
- ECalenSend,
- ECalenDeleteCurrentEntry,
- ECalenDeleteEntryWithoutQuery,
- ECalenDeleteSeries,
- ECalenDeleteCurrentOccurrence,
- ECalenDeleteAllEntries,
- ECalenDeleteEntriesBeforeDate,
- ECalenCancelDelete,
- ECalenDeleteEntryFromViewer,
- ECalenShowSettings,
- ECalenGetLocation,
- ECalenShowLocation,
- ECalenGetLocationAndSave,
- ECalenMissedAlarmsView,
- ECalenMissedEventView,
- ECalenCmdClear,
- ECalenCmdClearAll,
- ECalenCmdGotoCalendar,
- ECalenMissedAlarmsViewFromIdle,
- ECalenMissedEventViewFromIdle,
- ECalenLastCommand,
- ECalenRegionalPluginTapEvent
- };
-
-//////////////////end of hb_calencommands.hrh
-
+/*!
+ Mocked struct SCalenApptInfo
+ */
struct SCalenApptInfo
- {
+{
QModelIndex iIndex;
QDateTime iStartTime;
QDateTime iEndTime;
bool iAllDay;
TCalenInstanceId iId;
-// AgendaEntry::Status iStatus;
-// AgendaEntry::TReplicationStatus iReplicationStatus;
- // TBufC<KFSCalMaxDescriptionLength> iSummary;
+ AgendaEntry::Status iStatus;
+ TBufC<KFSCalMaxDescriptionLength> iSummary;
TUint32 iColor;
- };
+};
+
+/*!
+ Mocked class CalenTimeColumn
+ */
+class CalenTimeColumn
+{
+public:
+ CalenTimeColumn() {
+
+ }
+
+ ~CalenTimeColumn() {
+
+ }
+};
+/*!
+ Mocked class CalenTimeRegion
+ */
+class CalenTimeRegion
+{
+public:
+ CalenTimeRegion() {
+
+ }
+
+ ~CalenTimeRegion() {
+
+ }
+
+ QList<CalenTimeColumn> iColumns;
+
+ int iStartSlot;
+ int iEndSlot;
+};
+
+/*!
+ Mocked class CalenDayInfo
+ */
class CalenDayInfo
{
public:
+ enum TSlotsInHour
+ {
+ EOne = 1, ETwo, EThree, EFour
+ };
- enum TSlotsInHour
- {
- EOne = 1,
- ETwo,
- EThree,
- EFour
- };
+public:
-public: // Constructors and destructor
-
- /**
- * C++ default constructor.
- */
- CalenDayInfo( TSlotsInHour aSlotsInHour ) {Q_UNUSED(aSlotsInHour);}
-
-public:
+ CalenDayInfo(TSlotsInHour aSlotsInHour)
+ {
+ Q_UNUSED(aSlotsInHour)
+ }
+ virtual ~CalenDayInfo()
+ {
+
+ }
void Reset() {}
void InsertTimedEvent( const SCalenApptInfo& aItemInfo ) {Q_UNUSED(aItemInfo);}
-
- //void InsertUntimedEvent( AgendaEntry::Type aType,
- // const TCalenInstanceId& aId );
-
- void InsertAlldayEvent( const SCalenApptInfo& aItemInfo ){Q_UNUSED(aItemInfo);}
-
- //static bool IsAlldayEvent( QDateTime aStart, QDateTime aEnd );
-
-
- //int SuggestedUntimedSlotPos();
-
- //int NeededUntimedSlotCount();
-
- //int UpdateUntimedPos( int aSlot = -1, int aUntimedCount = 0 );
-
- //int FirstOccupiedSlot();
-
- //int LastOccupiedSlot();
-
- //int EarliestEndSlot();
- //int LastStartSlot();
-
-
- //int SlotIndexForStartTime( QDateTime aStartTime );
-
- //int SlotIndexForEndTime( QDateTime aStartTime );
-
- //void GetLocation( const SCalenApptInfo& aItemInfo,
- // int& aStartSlot,
- // int& aEndSlot,
- // int& aColumnIndex,
- // int& aColumns );
-
- //int AlldayCount();
-
- //int TodoCount();
-
- //bool IsHourStartSlot( const int& aSlotIndex ) const;
-
- //bool IsExtraSlot( const int& aSlotIndex ) const;
-
- //int HourFromSlotIndex( const int& aSlotIndex ) const;
-
- //int SlotIndexFromHour( int aHour );
-
- //int RoundHourUp( int aSlot );
-
- //int RoundHourDown( int aSlot );
-
- //void GetSelectedSlot( int& aSlot, int& aRegion, int& aColumnIndex, int& aColumns );
-
- //bool MoveSelection( TScrollDirection aDirection );
-
- //void MoveSelectionInEvent( TScrollDirection aDirection );
-
- //void UpdateSelectionInEvent();
-
- //bool IsEventSelected() const;
-
- // bool IsMultipleEventsSelected() const;
-
- //bool IsAlldayEventSelected() const;
-
- //TCalenInstanceId SelectedEvent();
-
- //int SelectEvent( const TCalenInstanceId& aId );
-
- //TCalenInstanceId UntimedEvent( int aIndex );
-
- //const CalenTimedEventInfo& AlldayEvent( int aIndex );
-
- //void SelectSlot( int aSlot );
-
-
- //const QList<CalenTimeRegion>& RegionList() const;
-
-
- //void GetEventIntervals( QList<CalenEventInterval>& aArray ) const;
-
-
- // CalenSlotInterval SelectedInterval();
+
+
+ void GetLocation( const SCalenApptInfo& aItemInfo, int& aStartSlot,
+ int& aEndSlot, int& aColumnIndex, int& aColumns )
+ {
+ Q_UNUSED(aItemInfo)
+ Q_UNUSED(aStartSlot)
+ Q_UNUSED(aEndSlot)
+ Q_UNUSED(aColumnIndex)
+ Q_UNUSED(aColumns)
+ }
+
+ int AlldayCount()
+ {
+ return 0;
+ }
- // bool SetSelectionInRegion( int aRegion, int aColumn, int aSlot );
+ const QList<CalenTimeRegion>& RegionList() const
+ {
+ return mList;
+ }
+
+ void InsertAlldayEvent( const SCalenApptInfo& aItemInfo )
+ {
+ Q_UNUSED(aItemInfo)
+
+ CalenTimeRegion region;
+
+ region.iStartSlot = 10;
+ region.iEndSlot = 13;
+ region.iColumns << CalenTimeColumn();
+
+ mList << region;
+ }
+
+public:
+ QList<CalenTimeRegion> mList;
};
-#endif
+#endif // CALENDAYINFO_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendayview.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,74 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Mocked classes for testing CalenDayContainer class
+*
+*/
+
+#ifndef CALENSERVICES_H
+#define CALENSERVICES_H
+
+/*!
+ Mocked class MCalenServices
+ */
+class MCalenServices
+{
+public:
+ MCalenServices() {
+
+ }
+
+ ~MCalenServices() {
+
+ }
+};
+
+#endif // CALENSERVICES_H
+
+#ifndef CALEDAYVIEW_H
+#define CALEDAYVIEW_H
+
+#include <HbView>
+
+/*
+enum TCalenCommandId
+{
+ ECalenMonthView = 0,
+ ECalenWeekView,
+ ECalenAgendaView
+};
+*/
+/*!
+ Mocked class CalenDayView
+ */
+class CalenDayView : public HbView
+{
+public:
+
+ CalenDayView(MCalenServices &services) {
+ Q_UNUSED(services)
+ }
+
+ virtual ~CalenDayView() {
+
+ }
+
+ void changeView(TCalenCommandId viewId) {
+ Q_UNUSED(viewId)
+ }
+};
+
+#endif // CALEDAYVIEW_H
+
+//End of file
+
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calenservices.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calenservices.h Mon Aug 23 16:00:50 2010 +0100
@@ -20,6 +20,8 @@
#include "calencontext.h"
+extern quint32 SELECTED_COMMAND;
+
/*!
Mocked class MCalenServices
*/
@@ -36,7 +38,12 @@
MCalenContext Context() {return MCalenContext();}
- bool IssueCommandL( quint32 aCommand ) {Q_UNUSED(aCommand); return true;}
+ bool IssueCommandL( quint32 aCommand )
+ {
+ SELECTED_COMMAND = aCommand;
+
+ return true;
+ }
};
#endif // CALENSERVICES_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/hbinstance.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/hbinstance.h Mon Aug 23 16:00:50 2010 +0100
@@ -18,29 +18,28 @@
#ifndef HBMAINWINDOW_H
#define HBMAINWINDOW_H
-#include <QObject>
-#include <QtGlobal>
-#include <QRectF>
+#include <HbView>
// Test variables
extern QRectF gTestWindowRect;
extern Qt::Orientation gTestOrientation;
-
-
/*!
Mocked class HbMainWindow (simulating window in unittests)
*/
-class HbMainWindow
-: public QObject
-{
+class HbMainWindow : public QObject
+{
Q_OBJECT
public:
- HbMainWindow(QObject *parent = 0) : QObject(parent){
- Q_UNUSED(parent);
+ HbMainWindow() {
+ mView = new HbView();
}
~HbMainWindow() {
+ if (mView) {
+ delete mView;
+ mView = 0;
+ }
}
QRectF layoutRect() const {
@@ -50,8 +49,12 @@
Qt::Orientation orientation() const {
return gTestOrientation;
}
-signals:
- void orientationChanged(Qt::Orientation);
+
+ HbView *HbMainWindow::currentView() const {
+ return mView;
+ }
+
+ HbView *mView;
};
#endif // HBMAINWINDOW_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,11 +19,19 @@
#include <QtTest/QtTest>
#include "calenservices.h"
+
+#include <hbabstractitemview.h>
+#include <hbmenu.h>
+
+#define private public
+
#include "calendayitemview.h"
+
// Test variables
QRectF gTestWindowRect = QRectF(0, 0, 10, 20);
Qt::Orientation gTestOrientation = Qt::Horizontal;
+quint32 SELECTED_COMMAND = 0;
class TestCalenItemView : public QObject
{
@@ -40,8 +48,13 @@
void cleanup();
void testConstructors();
+ void testIssueCommandOnSelectedItem();
+ void testOpenSelectedItem();
+ void testEditSelectedItem();
+ void testDeleteSelectedItem();
private:
MCalenServices mMCalenServices;
+ CalenDayItemView *mCalenDayItemView;
};
@@ -66,6 +79,7 @@
*/
void TestCalenItemView::initTestCase()
{
+
}
/*!
@@ -81,7 +95,9 @@
*/
void TestCalenItemView::init()
{
-
+ HbModelIterator *iterator = new HbModelIterator();
+ mCalenDayItemView = new CalenDayItemView(mMCalenServices,iterator,0);
+ SELECTED_COMMAND = 0;
}
/*!
@@ -89,7 +105,10 @@
*/
void TestCalenItemView::cleanup()
{
-
+ if(mCalenDayItemView){
+ delete mCalenDayItemView;
+ mCalenDayItemView = NULL;
+ }
}
/*!
@@ -110,5 +129,37 @@
delete testItemView;
}
+void TestCalenItemView::testIssueCommandOnSelectedItem()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->issueCommandOnSelectedItem((quint32)ECalenEventView);
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEventView);
+#endif
+}
+
+void TestCalenItemView::testOpenSelectedItem()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->openSelectedItem();
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEventView);
+#endif
+}
+
+void TestCalenItemView::testEditSelectedItem()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->editSelectedItem();
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEditCurrentEntry);
+#endif
+}
+
+void TestCalenItemView::testDeleteSelectedItem()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->deleteSelectedItem();
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenDeleteCurrentEntry);
+#endif
+}
+
QTEST_MAIN(TestCalenItemView);
#include "unittest_calendayitemview.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.pro Mon Aug 23 16:00:50 2010 +0100
@@ -45,13 +45,20 @@
calendaycontainer.h \
calendayutils.h \
hbinstance.h \
- calendaymodel.h
-
+ calendaymodel.h \
+ calendayeventspane.h \
+ calendayitem.h \
+ calendayview.h \
+ calendaystatusstrip.h
SOURCES += unittest_calendayitemview.cpp \
calendayitemview.cpp \
- calendayutils.cpp
-
+ calendayutils.cpp \
+ calendaycontainer.cpp \
+ calendayeventspane.cpp \
+ calendayitem.cpp \
+ calendaystatusstrip.cpp
+
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
MMP_RULES += "USERINCLUDE ."
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -35,6 +35,11 @@
void testConstructors();
+ void testRowCount();
+ void testData();
+ void testRefreshModel();
+ void testModelDate();
+
private:
QDateTime mDateTime;
MCalenServices *mServices;
@@ -114,5 +119,43 @@
delete testModel;
}
+void TestCalenDayModel::testRowCount()
+ {
+ mModel->refreshModel(QDateTime());
+ QCOMPARE(mModel->rowCount(QModelIndex()), 1);
+ }
+
+void TestCalenDayModel::testData()
+ {
+ mModel->refreshModel(QDateTime());
+
+ QVariant var = mModel->data(QModelIndex(), Qt::UserRole + 1);
+ QString typeName(var.typeName());
+ QCOMPARE(typeName, QString());
+ mModel->refreshModel(QDateTime());
+
+ var = mModel->data(QModelIndex(), Qt::UserRole + 1);
+ typeName = QString(var.typeName());
+ QCOMPARE(typeName, QString(""));
+
+ }
+
+void TestCalenDayModel::testRefreshModel()
+ {
+ QDateTime date(QDate(2001, 1, 2), QTime(1, 0, 0));
+ mModel->refreshModel(date);
+
+ QCOMPARE(date, mModel->modelDate());
+ }
+
+void TestCalenDayModel::testModelDate()
+ {
+ QDateTime date(QDate(2001, 1, 1), QTime(0, 0, 0));
+ mModel->refreshModel(date);
+
+ QCOMPARE(date, mModel->modelDate());
+ }
+
+
QTEST_MAIN(TestCalenDayModel);
#include "unittest_calendaymodel.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/unittest_calendaymodelmanager.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/unittest_calendaymodelmanager.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -17,6 +17,7 @@
#include <QtTest/QtTest>
#include "calenservices.h"
+#include "calendaymodel.h"
#include "calendaymodelmanager.h"
class TestCalenDayModelManager : public QObject
@@ -33,9 +34,14 @@
void init();
void cleanup();
+ void testGetModel();
+ void testRefreshAllModels();
+ void testRefreshSingleModel();
+
void testConstructors();
private:
+ MCalenServices services;
CalenDayModelManager *mManager;
};
@@ -76,7 +82,7 @@
*/
void TestCalenDayModelManager::init()
{
- //mManager = new CalenDayModelManager();
+ mManager = new CalenDayModelManager(services, false);
}
/*!
@@ -84,10 +90,10 @@
*/
void TestCalenDayModelManager::cleanup()
{
- // if (mManager) {
- // delete mManager;
- // mManager = NULL;
- // }
+ if (mManager) {
+ delete mManager;
+ mManager = NULL;
+ }
}
/*!
@@ -115,5 +121,28 @@
delete testManager2;
}
+void TestCalenDayModelManager::testGetModel()
+ {
+ MCalenServices services;
+ CalenDayModel* model = static_cast<CalenDayModel*>(&(mManager->getModel(CalenDayModelManager::CurrentDay)));
+ QCOMPARE(model->modelDate(), services.Context().focusDateAndTime());
+ }
+
+void TestCalenDayModelManager::testRefreshAllModels()
+ {
+
+ }
+
+void TestCalenDayModelManager::testRefreshSingleModel()
+ {
+ mManager->refreshSingleModel(CalenDayModelManager::CurrentDay);
+ QVERIFY(mManager);
+ mManager->refreshSingleModel(CalenDayModelManager::PreviousDay);
+ QVERIFY(mManager);
+ mManager->refreshSingleModel(CalenDayModelManager::NextDay);
+ QVERIFY(mManager);
+ }
+
+
QTEST_MAIN(TestCalenDayModelManager);
#include "unittest_calendaymodelmanager.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -277,6 +277,10 @@
<< 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);
}
/*!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbdeviceprofile.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBDEVICEPROFILE_H
+#define HBDEVICEPROFILE_H
+
+#include <hbglobal.h>
+#include <QtGlobal>
+#include <QDebug>
+#include <QSizeF>
+#include <QSize>
+#include <QStringList>
+#include <QSharedDataPointer>
+
+extern qreal unitInPix;
+extern Qt::Orientation orient;
+extern qreal angle;
+extern qreal ppm;
+
+class HbMainWindow;
+class HbTheme;
+
+QT_BEGIN_NAMESPACE
+class QGraphicsItem;
+QT_END_NAMESPACE
+
+class HB_CORE_EXPORT HbDeviceProfile
+{
+public:
+ HbDeviceProfile(){QString s = "string";}
+ HbDeviceProfile(const HbDeviceProfile &other){Q_UNUSED(other);}
+
+ Qt::Orientation orientation() const {return orient;}
+ qreal orientationAngle() const {return angle;}
+ qreal unitValue() const {return unitInPix;}
+ qreal ppmValue() const {return ppm;}
+};
+
+#endif // HBDEVICEPROFILE_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbinstance.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbinstance.h Mon Aug 23 16:00:50 2010 +0100
@@ -41,6 +41,11 @@
Qt::Orientation orientation() const {
return gTestOrientation;
}
+
+ QList<HbMainWindow*> allMainWindows(){
+ QList<HbMainWindow*> list;
+ return list;
+ }
};
#endif // HBMAINWINDOW_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbstyle.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,277 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+ ** All rights reserved.
+ ** Contact: Nokia Corporation (developer.feedback@nokia.com)
+ **
+ ** This file is part of the HbCore module of the UI Extensions for Mobile.
+ **
+ ** GNU Lesser General Public License Usage
+ ** This file may be used under the terms of the GNU Lesser General Public
+ ** License version 2.1 as published by the Free Software Foundation and
+ ** appearing in the file LICENSE.LGPL included in the packaging of this file.
+ ** Please review the following information to ensure the GNU Lesser General
+ ** Public License version 2.1 requirements will be met:
+ ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ **
+ ** In addition, as a special exception, Nokia gives you certain additional
+ ** rights. These rights are described in the Nokia Qt LGPL Exception
+ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ **
+ ** If you have questions regarding the use of this file, please contact
+ ** Nokia at developer.feedback@nokia.com.
+ **
+ ****************************************************************************/
+
+#ifndef HBSTYLE_H
+#define HBSTYLE_H
+
+#include <hbglobal.h>
+#include <QWindowsStyle>
+#include <QGraphicsItem>
+#include <QStyleOptionGraphicsItem>
+#include <hbicon.h>
+#include <hbdeviceprofile.h>
+
+extern qreal param_value;
+
+class HbStyle : public QObject
+ {
+Q_OBJECT
+public:
+ HbStyle() {}
+ ~HbStyle() {}
+
+ // HbStyle::Primitive enums are DEPRECATED
+ enum Primitive
+ {
+ P_None,
+ P_PushButton_icon,
+ P_PushButton_text,
+ P_PushButton_additionaltext,
+ P_PushButton_background,
+ P_PushButton_toucharea,
+ P_PushButton_focus,
+ P_DataGroup_background,
+ P_DataGroupComboBackground,
+ P_DataGroup_heading,
+ P_DataGroup_description,
+ P_DataForm_heading,
+ P_DataForm_heading_background,
+ P_DataForm_description,
+ P_DataGroup_icon,
+ P_ToolButton_frame,
+ P_ToolButton_text,
+ P_ToolButton_icon,
+ P_Slider_thumb,
+ P_SliderElement_text,
+ P_SliderElement_icon,
+ P_SliderElement_increase,
+ P_SliderElement_decrease,
+ P_Slider_groove,
+ P_Slider_progressgroove,
+ P_ItemViewItem_checkbox,
+ P_ItemViewItem_radiobutton,
+ P_ItemViewItem_selection,
+ P_LineEdit_frame_normal,
+ P_LineEdit_frame_highlight,
+ P_TextEdit_frame_normal,
+ P_TextEdit_frame_highlight,
+ P_Edit_text,
+ P_Label_text,
+ P_Label_icon,
+ P_MenuItem_frame,
+ P_MenuItem_focus,
+ P_MenuItem_text,
+ P_MenuItem_submenuindicator,
+ P_MenuItem_checkindicator,
+ P_MenuItem_separator,
+ P_ScrollBar_groove,
+ P_ScrollBar_handle,
+ P_ScrollBar_toucharea,
+ P_Popup_background,
+ P_Popup_background_weak,
+ P_Popup_heading_frame,
+ P_ToolTip_background,
+ P_MessageBox_icon,
+ P_ItemViewItem_background,
+ P_ListViewItem_text,
+ P_ListViewItem_richtext,
+ P_ListViewItem_icon,
+ P_ItemHighlight_background,
+ P_ToolBarExtension_background,
+ P_GridViewItem_text,
+ P_GridViewItem_icon,
+ P_CheckBox_text,
+ P_CheckBox_icon,
+ P_CheckBox_toucharea,
+ P_Fade_background,
+ P_TitlePane_background,
+ P_TitlePane_text,
+ P_TitlePane_icon,
+ P_TitleBar_toucharea,
+ P_SignalIndicator_icon,
+ P_SignalLevel_background,
+ P_SignalLevel_icon,
+ P_BatteryIndicator_icon,
+ P_BatteryLevel_background,
+ P_BatteryLevel_icon,
+ P_IndicatorGroup_icon1,
+ P_IndicatorGroup_icon2,
+ P_IndicatorGroup_icon3,
+ P_IndicatorGroup_icon4,
+ P_ProgressBar_frame,
+ P_ProgressBar_track,
+ P_ProgressBar_waittrack,
+ P_ProgressBar_mintext,
+ P_ProgressBar_maxtext,
+ P_NavigationButton_background,
+ P_IndicatorButton_background,
+ P_IndicatorButton_handleindication,
+ P_ItemViewItem_frame,
+ P_SelectionControl_selectionstart,
+ P_SelectionControl_selectionend,
+ P_TreeViewItem_expandicon,
+ P_Label_richtext,
+ P_RatingSlider_track,
+ P_RatingSlider_frame,
+ P_RatingSlider_toucharea,
+ P_ProgressSlider_frame,
+ P_ProgressSlider_track,
+ P_ProgressSlider_slidertrack,
+ P_ProgressSlider_toucharea,
+ P_ProgressSliderHandle_background, // deprecated
+ P_ProgressSliderHandle_icon,
+ P_ProgressSliderHandle_toucharea,
+ P_RatingSlider_layout,
+ P_ScrollArea_continuationbottom,
+ P_ScrollArea_continuationtop,
+ P_ScrollArea_continuationleft,
+ P_ScrollArea_continuationright,
+ P_ItemViewItem_focus,
+ P_NotificationDialog_icon,
+ P_NotificationDialog_text,
+ P_NotificationDialog_title,
+ P_NotificationDialog_frame,
+ P_ComboBox_background,
+ P_ComboBoxPopup_background,
+ P_ComboBoxButton_toucharea,
+ P_ComboBox_text,
+ P_DataItem_background,
+ P_DataItem_separator,
+ P_ColorGridViewItem_colorIcon,
+ P_ColorGridViewItem_borderIcon,
+ P_ColorGridViewItem_checkIcon,
+ P_ComboBox_button,
+ P_ProgressDialog_icon,
+ P_ProgressDialog_text,
+ P_DataItem_label,
+ P_DataItem_description,
+ P_SliderElement_touchincrease,
+ P_SliderElement_touchdecrease,
+ P_SliderElement_touchhandle,
+ P_SliderElement_touchgroove,
+ P_SliderTickMark_majoricon,
+ P_SliderTickMark_minoricon,
+ P_SliderTickMark_majorlabel,
+ P_SliderTickMark_minorlabel,
+ P_QueryInputMode_image,
+ P_GroupBoxHeading_icon,
+ P_GroupBoxHeading_text,
+ P_GroupBoxMarquee_text,
+ P_GroupBoxHeading_background,
+ P_GroupBoxContent_background,
+ P_DataItem_icon,
+ P_ItemViewItem_touchmultiselection,
+ P_TumbleView_background,
+ P_TumbleView_frame,
+ P_TumbleView_highlight,
+ P_DateTimePicker_background,
+ P_DateTimePicker_frame,
+ P_DateTimePicker_separator,
+ P_IndexFeedback_popup_text,
+ P_IndexFeedback_popup_background,
+ P_SliderPopup_background,
+ P_StatusBar_background,
+ P_StatusBar_timetext,
+ P_InputDialog_text,
+ P_InputDialog_additionaltext,
+ P_Last, // Keep this always as the LAST item in the active primitives list!
+
+ P_Deprecated = 0x000f0000,
+ // Deprecated enumerations
+ // These are DEPRECATED, replace or remove from widget/app sources !!
+ P_ProgressBar_toucharea = P_ProgressSlider_toucharea, // DEPRECATED
+ P_ProgressBar_slidertrack = P_ProgressSlider_track, // DEPRECATED
+ P_ProgressSlider_handleicon = P_ProgressSliderHandle_icon, // DEPRECATED
+ P_InputDialog_additional_text = P_InputDialog_additionaltext, //deprecated
+
+ P_NotUsed = 0x00f00000,
+ P_MessageBox_text, //deprecated ,not used.
+ P_ProgressSlider_handle, // DEPRECATED, NOT USED
+ P_ProgressBar_text, // DEPRECATED, NOT USED
+
+ P_CustomBase = 0x0f000000
+ };
+
+ QGraphicsItem *createPrimitive(HbStyle::Primitive primitive,
+ QGraphicsItem *parent = 0) const
+ {
+ Q_UNUSED(primitive);
+ Q_UNUSED(parent);
+ return 0;
+ }
+ void updatePrimitive(QGraphicsItem *item,
+ HbStyle::Primitive primitive, const QStyleOption *option) const
+ {
+ Q_UNUSED(item);
+ Q_UNUSED(primitive);
+ Q_UNUSED(option);
+ }
+
+ int registerPlugin(const QString &pluginName)
+ {
+ Q_UNUSED(pluginName);
+ return 0;
+ }
+ void unregisterPlugin(const QString &pluginName)
+ {
+ Q_UNUSED(pluginName);
+ }
+
+ static void setItemName(QGraphicsItem *item, const QString &name)
+ {
+ Q_UNUSED(item);
+ Q_UNUSED(name);
+ }
+ static QString itemName(const QGraphicsItem *item)
+ {
+ Q_UNUSED(item);
+ return "";
+ }
+
+ bool parameter(const QString ¶m, qreal &value,
+ const HbDeviceProfile &profile = HbDeviceProfile()) const
+ {
+ Q_UNUSED(param);
+ Q_UNUSED(value);
+ Q_UNUSED(profile);
+ value = param_value;
+ return false;
+ }
+/* void parameters(HbStyleParameters ¶ms,
+ const HbDeviceProfile &profile = HbDeviceProfile()) const
+ {
+ Q_UNUSED(params);
+ Q_UNUSED(profile);
+ }
+
+ void widgetParameters(HbStyleParameters ¶ms, HbWidget* widget) const
+ {
+ Q_UNUSED(params);
+ Q_UNUSED(widget);
+ }
+*/
+ };
+
+#endif // HBSTYLE_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -17,80 +17,131 @@
#include <QGraphicsItem>
#include <QtTest/QtTest>
+#include "hbstyle.h"
#include "calendayutils.h"
+#include "hbdeviceprofile.h"
#include "calendaycommonheaders.h"
// Test variables
QRectF gTestWindowRect = QRectF(0, 0, 10, 20);
Qt::Orientation gTestOrientation = Qt::Horizontal;
+qreal param_value = 10;
+qreal unitInPix = 1;
class TestCalenDayUtils : public QObject
-{
+ {
Q_OBJECT
public:
- TestCalenDayUtils();
- virtual ~TestCalenDayUtils();
+ TestCalenDayUtils();
+ virtual ~TestCalenDayUtils();
private slots:
- void initTestCase();
- void cleanupTestCase();
- void init();
- void cleanup();
+ void initTestCase();
+ void cleanupTestCase();
+ void init();
+ void cleanup();
- void testConstructors();
- void testHorizontalSwipe();
- void testOrientation();
+ void testInstance();
+ void testScreenWidth();
+ void testHourElementWidth();
+ void testHourElementHeight();
+ void testContentWidth();
+
+ void testConstructors();
+ void testOrientation();
private:
- CalenDayUtils *mUtils;
-};
+ CalenDayUtils *mUtils;
+ qreal mUnit;
+ };
/*!
Constructor
*/
TestCalenDayUtils::TestCalenDayUtils() :
- mUtils(NULL)
-{
-
-}
+ mUtils(NULL)
+ {
+ HbDeviceProfile s;
+ mUnit = s.unitValue();
+ }
/*!
Destructor
*/
TestCalenDayUtils::~TestCalenDayUtils()
-{
+ {
-}
+ }
/*!
Called before testcase
*/
void TestCalenDayUtils::initTestCase()
-{
-}
+ {
+ }
/*!
Called after testcase
*/
void TestCalenDayUtils::cleanupTestCase()
-{
-
-}
+ {
+ }
/*!
Called before every function
*/
void TestCalenDayUtils::init()
-{
-}
+ {
+ mUtils = CalenDayUtils::instance();
+ }
/*!
Called after everyfunction
*/
void TestCalenDayUtils::cleanup()
-{
-}
+ {
+ //delete mUtils;
+ }
+
+void TestCalenDayUtils::testInstance()
+ {
+ CalenDayUtils* utils = CalenDayUtils::instance();
+ QVERIFY(utils);
+ }
+
+void TestCalenDayUtils::testScreenWidth()
+ {
+ qreal sw = mUtils->screenWidth();
+ QVERIFY(sw == gTestWindowRect.width());
+ }
+
+void TestCalenDayUtils::testHourElementWidth()
+ {
+ qreal hEW = mUtils->hourElementWidth();
+ qreal myWidth = mUnit * 8.04 + param_value * 2;
+
+ QCOMPARE(hEW, myWidth);
+
+ }
+
+void TestCalenDayUtils::testHourElementHeight()
+ {
+
+ qreal hEH = mUtils->hourElementHeight();
+ qreal myHeight = mUnit * 3 + param_value * 4;
+
+ QCOMPARE(hEH, myHeight);
+ }
+
+void TestCalenDayUtils::testContentWidth()
+ {
+ qreal cW = mUtils->contentWidth();
+ qreal myWidth = gTestWindowRect.width() - (mUnit * 8.04 + param_value * 2);
+
+ QCOMPARE(cW, myWidth);
+ }
+
/*!
Test function for constructors
@@ -98,47 +149,33 @@
2. Test if content widget is correcty created
*/
void TestCalenDayUtils::testConstructors()
-{
- //1)
- CalenDayUtils *testUtils = 0;
- QVERIFY(!testUtils);
-
- //2)
- testUtils = CalenDayUtils::instance();
- QVERIFY(testUtils);
-}
+ {
+ //1)
+ CalenDayUtils *testUtils = 0;
+ QVERIFY(!testUtils);
+
+ //2)
+ testUtils = CalenDayUtils::instance();
+ QVERIFY(testUtils);
+ }
+
/*!
- Test function for checking if swipe is horizontal or not
- 1)test Horizontal swipe
- 2)test no horizontal swipe
- */
-void TestCalenDayUtils::testHorizontalSwipe()
-{
- //1)
- QCOMPARE(CalenDayUtils::instance()->isHorizontalSwipe(KCalenSwipeAngle-5),
- true);
-
- //2)
- QCOMPARE(CalenDayUtils::instance()->isHorizontalSwipe(KCalenSwipeAngle+5),
- false);
-}
-
-/*!
- Test function for getting main window's orientation
- 1)test if horizontal orientation is returned
- 2)test if vertical orientation is returned
+ Test function for getting main window's orientation
+ 1)test if horizontal orientation is returned
+ 2)test if vertical orientation is returned
*/
void TestCalenDayUtils::testOrientation()
-{
- //1)
- gTestOrientation = Qt::Horizontal;
- QCOMPARE(CalenDayUtils::instance()->orientation(), Qt::Horizontal);
-
- //2)
- gTestOrientation = Qt::Vertical;
- QCOMPARE(CalenDayUtils::instance()->orientation(), Qt::Vertical);
-}
+ {
+ //1)
+ gTestOrientation = Qt::Horizontal;
+ QCOMPARE(CalenDayUtils::instance()->orientation(), Qt::Horizontal);
+
+ //2)
+ gTestOrientation = Qt::Vertical;
+ QCOMPARE(CalenDayUtils::instance()->orientation(), Qt::Vertical);
+ }
+
QTEST_MAIN(TestCalenDayUtils);
#include "unittest_calendayutils.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro Mon Aug 23 16:00:50 2010 +0100
@@ -35,8 +35,11 @@
./../../../../../inc/
# Input
-HEADERS += calendayutils.h \
- calendaycommonheaders.h
+HEADERS += hbstyle.h \
+ hbdeviceprofile.h \
+ hbinstance.h \
+ calendayutils.h \
+ calendaycommonheaders.h
SOURCES += unittest_calendayutils.cpp \
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calendaymodelmanager.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calendaymodelmanager.h Mon Aug 23 16:00:50 2010 +0100
@@ -106,7 +106,7 @@
void moveBackward()
{
}
- void moveForeward()
+ void moveForward()
{
}
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -103,27 +103,6 @@
delete testView;
}
-int main(int argc, char ** argv)
-
-{
-
-argc++;
-
-argc++;
-
-char * argvNew[3];
-
-argvNew[0]= argv[0];
+QTEST_MAIN(TestCalenDayView);
-argvNew[1]= const_cast<char*>("-o");
-
-argvNew[2]= const_cast<char*>("c:\\unittest\\TestCalenDayView.txt");//set place where //output chould be
-
-QApplication app(argc, argvNew);
-
-TestCalenDayView testFile;//file with class containing unit tests
-
-QTest::qExec(&testFile,argc,argvNew);
-
-}
#include "unittest_calendayview.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.pro Mon Aug 23 16:00:50 2010 +0100
@@ -25,10 +25,12 @@
INCLUDEPATH += . \
../../../inc/ \
+ ../../../../../inc/
DEPENDPATH += . \
../../../inc/ \
../../../src/ \
+ ../../../../../inc/
# Input
HEADERS += hbeffect.h \
@@ -49,7 +51,8 @@
calendayhourscrollarea.h \
calendayutils.h \
calendateutils.h \
- calendayview.h
+ calendayview.h \
+ calencommon.h
SOURCES += unittest_calendayview.cpp \
calendayview.cpp
--- a/calendarui/views/eabi/calenviewsu.def Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/eabi/calenviewsu.def Mon Aug 23 16:00:50 2010 +0100
@@ -122,94 +122,142 @@
_ZN16CalenPreviewPane17setNoEntriesLabelEP7HbLabel @ 121 NONAME
_ZN16CalenPreviewPane19getStaticMetaObjectEv @ 122 NONAME
_ZN16CalenPreviewPane19onTwoSecondsTimeoutEv @ 123 NONAME
- _ZN16CalenPreviewPane4DateEv @ 124 NONAME
- _ZN16CalenPreviewPane7setViewEP14CalenMonthView @ 125 NONAME
- _ZN16CalenPreviewPaneC1ER14MCalenServicesP13QGraphicsItem @ 126 NONAME
- _ZN16CalenPreviewPaneC2ER14MCalenServicesP13QGraphicsItem @ 127 NONAME
- _ZN16CalenPreviewPaneD0Ev @ 128 NONAME
- _ZN16CalenPreviewPaneD1Ev @ 129 NONAME
- _ZN16CalenPreviewPaneD2Ev @ 130 NONAME
- _ZN17CalenSettingsView11qt_metacallEN11QMetaObject4CallEiPPv @ 131 NONAME
- _ZN17CalenSettingsView11qt_metacastEPKc @ 132 NONAME
- _ZN17CalenSettingsView11refreshViewEv @ 133 NONAME
- _ZN17CalenSettingsView14initializeFormEv @ 134 NONAME
- _ZN17CalenSettingsView16staticMetaObjectE @ 135 NONAME DATA 16
- _ZN17CalenSettingsView18launchPreviousViewEv @ 136 NONAME
- _ZN17CalenSettingsView19getStaticMetaObjectEv @ 137 NONAME
- _ZN17CalenSettingsViewC1ER14MCalenServicesP13QGraphicsItem @ 138 NONAME
- _ZN17CalenSettingsViewC2ER14MCalenServicesP13QGraphicsItem @ 139 NONAME
- _ZN17CalenSettingsViewD0Ev @ 140 NONAME
- _ZN17CalenSettingsViewD1Ev @ 141 NONAME
- _ZN17CalenSettingsViewD2Ev @ 142 NONAME
- _ZN21CalenAgendaViewWidgetC1ER14MCalenServicesP14CalenDocLoader @ 143 NONAME
- _ZN21CalenAgendaViewWidgetC2ER14MCalenServicesP14CalenDocLoader @ 144 NONAME
- _ZN21CalenAgendaViewWidgetD0Ev @ 145 NONAME
- _ZN21CalenAgendaViewWidgetD1Ev @ 146 NONAME
- _ZN21CalenAgendaViewWidgetD2Ev @ 147 NONAME
- _ZN21CalenThickLinesDrawer11qt_metacallEN11QMetaObject4CallEiPPv @ 148 NONAME
- _ZN21CalenThickLinesDrawer11qt_metacastEPKc @ 149 NONAME
- _ZN21CalenThickLinesDrawer16staticMetaObjectE @ 150 NONAME DATA 16
- _ZN21CalenThickLinesDrawer19getStaticMetaObjectEv @ 151 NONAME
- _ZN21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 152 NONAME
- _ZN21CalenThickLinesDrawerC1EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 153 NONAME
- _ZN21CalenThickLinesDrawerC2EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 154 NONAME
- _ZN21CalenThickLinesDrawerD0Ev @ 155 NONAME
- _ZN21CalenThickLinesDrawerD1Ev @ 156 NONAME
- _ZN21CalenThickLinesDrawerD2Ev @ 157 NONAME
- _ZNK14CalenMonthGrid10metaObjectEv @ 158 NONAME
- _ZNK14CalenMonthView10metaObjectEv @ 159 NONAME
- _ZNK16CalenPreviewPane10metaObjectEv @ 160 NONAME
- _ZNK17CalenSettingsView10metaObjectEv @ 161 NONAME
- _ZNK21CalenThickLinesDrawer10metaObjectEv @ 162 NONAME
- _ZTI14CalenMonthGrid @ 163 NONAME
- _ZTI14CalenMonthView @ 164 NONAME
- _ZTI16CalenPreviewPane @ 165 NONAME
- _ZTI17CalenSettingsView @ 166 NONAME
- _ZTI21CalenThickLinesDrawer @ 167 NONAME
- _ZTV14CalenMonthGrid @ 168 NONAME
- _ZTV14CalenMonthView @ 169 NONAME
- _ZTV16CalenPreviewPane @ 170 NONAME
- _ZTV17CalenSettingsView @ 171 NONAME
- _ZTV21CalenThickLinesDrawer @ 172 NONAME
- _ZThn16_N12CalenDayViewD0Ev @ 173 NONAME
- _ZThn16_N12CalenDayViewD1Ev @ 174 NONAME
- _ZThn16_N14CalenMonthGridD0Ev @ 175 NONAME
- _ZThn16_N14CalenMonthGridD1Ev @ 176 NONAME
- _ZThn16_N14CalenMonthViewD0Ev @ 177 NONAME
- _ZThn16_N14CalenMonthViewD1Ev @ 178 NONAME
- _ZThn16_N15CalenAgendaViewD0Ev @ 179 NONAME
- _ZThn16_N15CalenAgendaViewD1Ev @ 180 NONAME
- _ZThn16_N16CalenPluginLabelD0Ev @ 181 NONAME
- _ZThn16_N16CalenPluginLabelD1Ev @ 182 NONAME
- _ZThn16_N16CalenPreviewPaneD0Ev @ 183 NONAME
- _ZThn16_N16CalenPreviewPaneD1Ev @ 184 NONAME
- _ZThn16_N17CalenSettingsViewD0Ev @ 185 NONAME
- _ZThn16_N17CalenSettingsViewD1Ev @ 186 NONAME
- _ZThn16_N21CalenAgendaViewWidgetD0Ev @ 187 NONAME
- _ZThn16_N21CalenAgendaViewWidgetD1Ev @ 188 NONAME
- _ZThn16_N21CalenThickLinesDrawerD0Ev @ 189 NONAME
- _ZThn16_N21CalenThickLinesDrawerD1Ev @ 190 NONAME
- _ZThn28_N15CalenAgendaView18HandleNotificationE18TCalenNotification @ 191 NONAME
- _ZThn8_N12CalenDayViewD0Ev @ 192 NONAME
- _ZThn8_N12CalenDayViewD1Ev @ 193 NONAME
- _ZThn8_N14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 194 NONAME
- _ZThn8_N14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 195 NONAME
- _ZThn8_N14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 196 NONAME
- _ZThn8_N14CalenMonthGridD0Ev @ 197 NONAME
- _ZThn8_N14CalenMonthGridD1Ev @ 198 NONAME
- _ZThn8_N14CalenMonthViewD0Ev @ 199 NONAME
- _ZThn8_N14CalenMonthViewD1Ev @ 200 NONAME
- _ZThn8_N15CalenAgendaViewD0Ev @ 201 NONAME
- _ZThn8_N15CalenAgendaViewD1Ev @ 202 NONAME
- _ZThn8_N16CalenPluginLabelD0Ev @ 203 NONAME
- _ZThn8_N16CalenPluginLabelD1Ev @ 204 NONAME
- _ZThn8_N16CalenPreviewPaneD0Ev @ 205 NONAME
- _ZThn8_N16CalenPreviewPaneD1Ev @ 206 NONAME
- _ZThn8_N17CalenSettingsViewD0Ev @ 207 NONAME
- _ZThn8_N17CalenSettingsViewD1Ev @ 208 NONAME
- _ZThn8_N21CalenAgendaViewWidgetD0Ev @ 209 NONAME
- _ZThn8_N21CalenAgendaViewWidgetD1Ev @ 210 NONAME
- _ZThn8_N21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 211 NONAME
- _ZThn8_N21CalenThickLinesDrawerD0Ev @ 212 NONAME
- _ZThn8_N21CalenThickLinesDrawerD1Ev @ 213 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
--- a/calendarui/views/inc/calenagendaview.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/inc/calenagendaview.h Mon Aug 23 16:00:50 2010 +0100
@@ -137,6 +137,11 @@
* @brief Slot which launches the day view
*/
void launchDayView();
+
+ /**
+ * @brief Slot which launches the editor
+ */
+ void createNewEvent();
private:
--- a/calendarui/views/inc/calenagendaviewwidget.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/inc/calenagendaviewwidget.h Mon Aug 23 16:00:50 2010 +0100
@@ -98,6 +98,35 @@
*/
void clearListModel();
+ /**
+ * @brief Opens the editor to create a new entry
+ */
+ 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();
+
+ /**
+ * @brief return true if location is present
+ */
+ bool isLocationData();
+
+
+
+
+
private:
/**
@@ -167,17 +196,11 @@
*/
void showHideRegionalInformation();
-
-
+
private slots:
/**
- * @brief Opens the editor to create a new entry
- */
- void createNewEvent();
-
- /**
* @brief Opens the entry at position index in the list for
* editing in the editor. Does nothing if the index is invalid
*/
@@ -354,6 +377,11 @@
* @brief Holds notes editor plugin load info.
*/
bool mNotesPluginLoaded;
+ int mIndex;
+ bool mIconCheck;
+ bool mNextEntry;
+ bool mLeftAllDayIcon;
+ bool mLocationData;
};
--- a/calendarui/views/inc/caleneventlistviewitem.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/inc/caleneventlistviewitem.h Mon Aug 23 16:00:50 2010 +0100
@@ -20,16 +20,59 @@
// System includes
#include <hblistviewitem.h>
+#include "calenagendaviewwidget.h"
class CalenEventListViewItem : public HbListViewItem
{
Q_OBJECT
+ Q_PROPERTY(bool leftAllDayIcon READ hasAllDayIcon WRITE setAllDayLeftIcon)
+ Q_PROPERTY(bool locationEntry READ locationEntryLayout WRITE setLocationEntry)
+
public:
- CalenEventListViewItem(QGraphicsItem *parent = 0);
+ /**
+ * @brief Constructor
+ * @param CalenAgendaViewWidget
+ */
+ CalenEventListViewItem(CalenAgendaViewWidget *parent = 0);
+
+ /**
+ * @brief Destructor
+ */
~CalenEventListViewItem();
+ /**
+ * @brief creates the instance of the class
+ */
HbAbstractViewItem * createItem();
+
+ /**
+ * @brief crestes the item of the list
+ */
void updateChildItems();
+
+ /**
+ * @brief check if all day icon is present
+ */
+ bool hasAllDayIcon();
+
+ /**
+ * @brief sets teh all day icon
+ */
+ void setAllDayLeftIcon(bool icon = false);
+
+ /**
+ * @brief sets location entry status
+ */
+ void setLocationEntry(bool icon);
+
+ /**
+ * @brief check if location is present
+ */
+ bool locationEntryLayout();
+private:
+ CalenAgendaViewWidget* mParent;
+ bool mAllDayIcon ;
+ bool mLocationEntry;
};
#endif // __CALEN_EVENT_LIST_VIEW_ITEM_H__
--- a/calendarui/views/inc/calenmonthgrid.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/inc/calenmonthgrid.h Mon Aug 23 16:00:50 2010 +0100
@@ -89,7 +89,6 @@
private:
QStandardItemModel *mModel;
- QList<CalenMonthData> mMonthDataArray;
scrollDirection mDirection;
bool mIsPanGesture;
bool mIsAtomicScroll;
--- a/calendarui/views/inc/calenmonthview.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/inc/calenmonthview.h Mon Aug 23 16:00:50 2010 +0100
@@ -78,7 +78,7 @@
void populatePrevMonth();
void populateNextMonth();
void onLocaleChanged(int reason);
- QList<CalenMonthData> monthDataList();
+ QList<CalenMonthData>& monthDataList();
void updateModelWithPrevMonth();
void updateModelWithFutureMonth();
void populatePreviewPane(QDateTime &dateTime);
--- a/calendarui/views/inc/calennativeview.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/inc/calennativeview.h Mon Aug 23 16:00:50 2010 +0100
@@ -84,6 +84,7 @@
MCalenServices &mServices; // not owned.
int mActivityId; // Recent Activity ID, currently it holdes wither of ECalenMonthView or ECalenAgendaView
QVariantHash mScreenShotMetadata; // Screenshot
+ bool mEntriesInDataBase;
private:
HbDateTimePicker *mDatePicker;
bool mIsCapturedScreenShotValid; // to check if the captured screenshot is valid
--- a/calendarui/views/inc/calenpluginlabel.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/inc/calenpluginlabel.h Mon Aug 23 16:00:50 2010 +0100
@@ -18,6 +18,12 @@
#ifndef CALENPLUGINLABEL_H
#define CALENPLUGINLABEL_H
+#ifdef CALENVIEWS_DLL
+#define CALENPLUGINLABEL_EXPORT Q_DECL_EXPORT
+#else
+#define CALENPLUGINLABEL_EXPORT Q_DECL_IMPORT
+#endif
+
// System includes
#include <hblabel.h>
@@ -27,8 +33,8 @@
Q_OBJECT
public:
- IMPORT_C CalenPluginLabel(MCalenServices &services, QGraphicsItem *parent = 0);
- IMPORT_C ~CalenPluginLabel();
+ CALENPLUGINLABEL_EXPORT CalenPluginLabel(MCalenServices &services, QGraphicsItem *parent = 0);
+ CALENPLUGINLABEL_EXPORT ~CalenPluginLabel();
protected:
void gestureEvent(QGestureEvent *event);
--- a/calendarui/views/inc/calenpreviewpane.h Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/inc/calenpreviewpane.h Mon Aug 23 16:00:50 2010 +0100
@@ -51,12 +51,15 @@
void startAutoScroll();
void setView(CalenMonthView* view);
void stopScrolling();
+ void effectStarted();
+ void effectFinished();
protected:
void gestureEvent(QGestureEvent *event);
private:
void GetInstanceListL();
+ void checkStartTimeOfEvent(QDateTime &dateTime);
public slots:
void onTwoSecondsTimeout();
--- a/calendarui/views/resources/caleneventlistviewitem.css Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/resources/caleneventlistviewitem.css Mon Aug 23 16:00:50 2010 +0100
@@ -1,27 +1,42 @@
-CalenEventListViewItem[layoutName="custom"]{
+CalenEventListViewItem[leftAllDayIcon="false"]:portrait{
layout: custom;
}
-CalenEventListViewItem[layoutName="custom"][modelItemType="StandardItem"][stretchItem="true"]:landscape{
- layout: custom-stretch;
+CalenEventListViewItem[leftAllDayIcon="false"]:landscape{
+ layout: custom;
+}
+
+CalenEventListViewItem[leftAllDayIcon="true"]:portrait{
+ layout: custom-subjecticon;
+}
+
+CalenEventListViewItem[leftAllDayIcon="true"]:landscape{
+ layout: custom-subjecticon;
}
-CalenEventListViewItem::icon-1[layoutName="custom"]{
+
+CalenEventListViewItem[locationEntry="true"]:portrait{
+ layout: custom-locationentry;
+}
+
+CalenEventListViewItem[locationEntry="true"]:landscape{
+ layout: custom-locationentry;
+}
+
+
+CalenEventListViewItem::icon-1{
left: -var(hb-param-margin-gene-left);
- right: var(hb-param-margin-gene-middle-horizontal);
fixed-width: var(hb-param-graphic-size-primary-small);
fixed-height: var(hb-param-graphic-size-primary-small);
}
CalenEventListViewItem::icon-2{
- top: -var(hb-param-margin-gene-top);
right: var(hb-param-margin-gene-middle-horizontal);
fixed-width: var(hb-param-graphic-size-secondary);
fixed-height: var(hb-param-graphic-size-secondary);
}
CalenEventListViewItem::icon-3{
- top: -var(hb-param-margin-gene-top);
right: var(hb-param-margin-gene-right);
fixed-width: var(hb-param-graphic-size-secondary);
fixed-height: var(hb-param-graphic-size-secondary);
@@ -29,55 +44,57 @@
CalenEventListViewItem::icon-4{
right: var(hb-param-margin-gene-right);
+ bottom: var(hb-param-margin-gene-bottom);
fixed-width: var(hb-param-graphic-size-secondary);
fixed-height: var(hb-param-graphic-size-secondary);
}
CalenEventListViewItem::text-1{
- left: -var(hb-param-margin-gene-left);
- top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-left);
font-variant: secondary;
- text-height: var(hb-param-text-height-secondary);
+ text-height: var(hb-param-text-height-secondary);
+ size-policy: maximum;
+
}
CalenEventListViewItem::text-2{
- top: -var(hb-param-margin-gene-top);
+ top: -var(hb-param-margin-gene-top);
+ right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-middle-horizontal);
font-variant: primary;
- text-height: var(hb-param-text-height-secondary);
+ text-height: var(hb-param-text-height-primary);
text-align: left;
- fixed-width: 29un;
+
}
+
+CalenEventListViewItem::text-2[locationEntry="true"]{
+ top: -var(hb-param-margin-gene-top);
+ bottom: var(hb-param-margin-gene-bottom);
+ right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-middle-horizontal);
+ font-variant: primary;
+ text-height: var(hb-param-text-height-primary);
+ text-align: left;
+
+}
+
+
CalenEventListViewItem::text-3{
top: -var(hb-param-margin-gene-middle-vertical);
+ right: var(hb-param-margin-gene-middle-horizontal);
bottom: var(hb-param-margin-gene-bottom);
font-variant: secondary;
text-height: var(hb-param-text-height-secondary);
text-align: left;
- fixed-width: 35un;
}
CalenEventListViewItem::text-4{
+ bottom: var(hb-param-margin-gene-bottom);
font-variant: secondary;
text-height: var(hb-param-text-height-secondary);
-}
-
-CalenEventListViewItem::text-2:landscape[stretchItem="false"]{
- fixed-width: 70un;
+ size-policy: maximum;
}
-CalenEventListViewItem::text-3:landscape[stretchItem="false"]{
- fixed-width: 70un;
-}
-CalenEventListViewItem::text-2:landscape[stretchItem="true"]{
- fixed-width: 35un;
- bottom: var(hb-param-margin-gene-bottom);
-}
-
-CalenEventListViewItem::text-3:landscape[stretchItem="true"]{
- fixed-width: 40un;
- top: -var(hb-param-margin-gene-top);
-}
--- a/calendarui/views/resources/caleneventlistviewitem.widgetml Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/resources/caleneventlistviewitem.widgetml Mon Aug 23 16:00:50 2010 +0100
@@ -1,53 +1,77 @@
-<hbwidget version="0.1" type="listviewitem">
+<hbwidget version="0.1" type="CalenEventListViewItem">
<layout name="custom" type="mesh">
- <meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="text-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
- <meshitem src="text-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
-
- <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="text-2" srcEdge="BOTTOM" dst="text-3" dstEdge="TOP"/>
-
- <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+ <meshitem src="text-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="text-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+
+ <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="LEFT" dst="text-1" dstEdge="RIGHT"/>
+ <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+
+ <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
+ <meshitem src="text-3" srcEdge="TOP" dst="text-2" dstEdge="BOTTOM"/>
+ <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+ <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
+
<meshitem src="text-4" srcEdge="TOP" dst="text-3" dstEdge="TOP"/>
<meshitem src="text-4" srcEdge="LEFT" dst="text-1" dstEdge="LEFT"/>
- <meshitem src="text-4" srcEdge="RIGHT" dst="text-1" dstEdge="RIGHT"/>
- <meshitem src="text-4" srcEdge="BOTTOM" dst="text-3" dstEdge="BOTTOM"/>
+ <meshitem src="text-4" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+
- <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
- <meshitem src="icon-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="icon-1" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
+ <meshitem src="icon-3" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
- <meshitem src="icon-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="icon-2" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
<meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
- <meshitem src="icon-3" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-
<meshitem src="icon-4" srcEdge="TOP" dst="text-3" dstEdge="TOP"/>
<meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+
</layout>
- <layout name="custom-stretch" type="mesh">
+ <layout name="custom-subjecticon" type="mesh">
+
<meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
- <meshitem src="icon-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="icon-1" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
+ <meshitem src="icon-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+
+ <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT"/>
+ <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+
+
+ <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
+ <meshitem src="text-3" srcEdge="TOP" dst="text-2" dstEdge="BOTTOM"/>
+ <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
+ <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
- <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="text-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
-
+ <meshitem src="icon-3" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+
+ <meshitem src="icon-2" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
<meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
- <meshitem src="icon-2" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
- <meshitem src="icon-3" srcEdge="RIGHT" dst="text-3" dstEdge="LEFT"/>
- <meshitem src="icon-3" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
-
- <meshitem src="text-3" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
- <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
+ <meshitem src="icon-4" srcEdge="TOP" dst="text-3" dstEdge="TOP"/>
+ <meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+
+ </layout>
+
+
+ <layout name="custom-locationentry" type="mesh">
+
+ <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+ <meshitem src="icon-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+
+ <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT"/>
+ <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+ <meshitem src="text-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
- <meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
- <meshitem src="icon-4" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
+ <meshitem src="icon-3" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
- </layout>
-</hbwidget>
+ <meshitem src="icon-2" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
+
+
+ </layout>
+ </hbwidget>
\ No newline at end of file
--- a/calendarui/views/resources/caleneventlistviewitem_color.css Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/resources/caleneventlistviewitem_color.css Mon Aug 23 16:00:50 2010 +0100
@@ -1,3 +1,40 @@
+CalenEventListViewItem::text-1{
+ color: var(qtc_list_item_content_normal);
+}
+
+CalenEventListViewItem::text-1[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CalenEventListViewItem::text-1[state="disabled"]{
+ color: var(qtc_list_item_disabled);
+}
+
+CalenEventListViewItem::text-2{
+ color: var(qtc_list_item_title_normal);
+}
+
+CalenEventListViewItem::text-2[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CalenEventListViewItem::text-2[state="disabled"]{
+ color: var(qtc_list_item_disabled);
+}
+
+
+CalenEventListViewItem::text-3{
+ color: var(qtc_list_item_content_normal);
+}
+
+CalenEventListViewItem::text-3[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CalenEventListViewItem::text-3[state="disabled"]{
+ color: var(qtc_list_item_disabled);
+}
+
CalenEventListViewItem::text-4{
color: var(qtc_list_item_content_normal);
}
@@ -10,8 +47,20 @@
color: var(qtc_list_item_disabled);
}
+CalenEventListViewItem::icon-2{
+ color: var(qtc_list_item_title_normal);
+}
+
+CalenEventListViewItem::icon-2[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CalenEventListViewItem::icon-2[state="disabled"]{
+ color: var(qtc_list_item_disabled);
+}
+
CalenEventListViewItem::icon-3{
- color: var(qtc_list_item_content_normal);
+ color: var(qtc_list_item_title_normal);
}
CalenEventListViewItem::icon-3[state="pressed"]{
--- a/calendarui/views/resources/calengriditemprototype.css Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/resources/calengriditemprototype.css Mon Aug 23 16:00:50 2010 +0100
@@ -1,22 +1,10 @@
-CalenGridItemPrototype:portrait {
- layout: calendarCustomGridItem;
-}
-
-CalenGridItemPrototype:landscape {
- layout: calendarCustomGridItem;
-}
-
-CalenGridItemPrototype[layoutName="calendarCustomGridItem"]:portrait{
- layout:calendarCustomGridItem;
-}
-
-CalenGridItemPrototype[layoutName="calendarCustomGridItem"]:landscape{
+CalenGridItemPrototype[layoutName="calendarCustomGridItem"] {
layout:calendarCustomGridItem;
}
CalenGridItemPrototype::eventIconItem[layoutName="calendarCustomGridItem"] {
- fixed-height: 1un;
- fixed-width: 1un;
+ fixed-height: 1.5un;
+ fixed-width: 1.5un;
}
CalenGridItemPrototype::focusIconItem[layoutName="calendarCustomGridItem"] {
--- a/calendarui/views/src/calenagendaview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calenagendaview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -33,6 +33,11 @@
#include "calencontext.h"
#include "calendateutils.h"
#include "calenconstants.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenagendaviewTraces.h"
+#endif
+
// ----------------------------------------------------------------------------
// CalenAgendaView::CalenAgendaView
@@ -47,8 +52,12 @@
mActionTaken(false),
mIsAboutToQuitEventConnected(false)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_CALENAGENDAVIEW_ENTRY );
+
// No implementation yet
grabGesture(Qt::SwipeGesture);
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_CALENAGENDAVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -58,7 +67,11 @@
//
CalenAgendaView::~CalenAgendaView()
{
+ OstTraceFunctionEntry0( DUP1_CALENAGENDAVIEW_CALENAGENDAVIEW_ENTRY );
+
// No implementation yet
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEW_CALENAGENDAVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -68,8 +81,11 @@
//
void CalenAgendaView::setupView(CalenDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_SETUPVIEW_ENTRY );
+
if (!docLoader) {
// Nothing can be done. Simply return
+ OstTraceFunctionExit0( CALENAGENDAVIEW_SETUPVIEW_EXIT );
return;
}
// Store the document loader for reference later
@@ -88,6 +104,14 @@
// Initialize all the menu and toolbar actions
setupActions();
+
+ //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
+ //so that plugin add the "Show lunar data" item as a second last option
+ // in all views
+ mServices.OfferMenu(menu());
+
// get a poitner to activity manager
HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
@@ -96,6 +120,7 @@
// only for debugging purpose.
bool ok = activityManager->removeActivity(activityName);
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEW_SETUPVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -105,8 +130,11 @@
//
void CalenAgendaView::doPopulation()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_DOPOPULATION_ENTRY );
+
// The content widget has not been constructed. Don't do anything
if (!mAgendaViewWidget) {
+ OstTraceFunctionExit0( CALENAGENDAVIEW_DOPOPULATION_EXIT );
return;
}
// Get the day for which this view is being shown from the context
@@ -157,6 +185,8 @@
// Population is complete, issue a notification
populationComplete();
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEW_DOPOPULATION_EXIT );
}
/*!
@@ -165,6 +195,8 @@
*/
void CalenAgendaView::refreshViewOnGoToDate()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_REFRESHVIEWONGOTODATE_ENTRY );
+
// Get the day for which this view is being shown from the context
mDate = mServices.Context().focusDateAndTime();
@@ -180,6 +212,8 @@
// Initialize the content widget
mAgendaViewWidget->showWidget();
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_REFRESHVIEWONGOTODATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -189,8 +223,11 @@
//
void CalenAgendaView::HandleNotification(const TCalenNotification notification)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_HANDLENOTIFICATION_ENTRY );
+
Q_UNUSED(notification)
// No implementation yet
+ OstTraceFunctionExit0( CALENAGENDAVIEW_HANDLENOTIFICATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -200,6 +237,9 @@
//
CalenDocLoader* CalenAgendaView::docLoader()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_DOCLOADER_ENTRY );
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_DOCLOADER_EXIT );
return mDocLoader;
}
@@ -208,6 +248,8 @@
*/
void CalenAgendaView::gestureEvent(QGestureEvent *event)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_GESTUREEVENT_ENTRY );
+
if(HbSwipeGesture *gesture = qobject_cast<HbSwipeGesture *>(event->gesture(Qt::SwipeGesture))) {
if (gesture->state() == Qt::GestureStarted) {
if(QSwipeGesture::Left == gesture->sceneHorizontalDirection()) {
@@ -219,6 +261,8 @@
}
}
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_GESTUREEVENT_EXIT );
}
// ----------------------------------------------------------------------------
@@ -228,6 +272,8 @@
//
void CalenAgendaView::setupActions()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_SETUPACTIONS_ENTRY );
+
// Get the actions associated with this view
HbAction *newEventAction = qobject_cast<HbAction *>
(mDocLoader->findObject(CALEN_AGENDAVIEW_MENU_NEW_EVENT));
@@ -235,8 +281,8 @@
qFatal("calenagendaview.cpp : Unable to find new event action");
}
// Connect to the signal triggered by new event action
- connect(newEventAction, SIGNAL(triggered()), mAgendaViewWidget, SLOT(createNewEvent()));
-
+ connect(newEventAction, SIGNAL(triggered()), this, SLOT(createNewEvent()));
+
mGoToTodayAction = qobject_cast<HbAction *>
(mDocLoader->findObject(CALEN_AGENDAVIEW_MENU_GO_TO_TODAY));
if (!mGoToTodayAction) {
@@ -268,6 +314,18 @@
}
// Connect to the signal triggered by settings action
connect(settingsAction, SIGNAL(triggered()), this, SLOT(launchSettingsView()));
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_SETUPACTIONS_EXIT );
+}
+
+// ----------------------------------------------------------------------------
+// CalenAgendaView::createNewEvent
+// ----------------------------------------------------------------------------
+//
+void CalenAgendaView::createNewEvent()
+{
+ captureScreenshot(true);
+ mAgendaViewWidget->createNewEvent();
}
// ----------------------------------------------------------------------------
@@ -277,11 +335,15 @@
//
void CalenAgendaView::onLocaleChanged(int reason)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_ONLOCALECHANGED_ENTRY );
+
Q_UNUSED(reason)
// Notify the content widget about the change
if(mAgendaViewWidget) {
mAgendaViewWidget->handleLocaleChange();
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_ONLOCALECHANGED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -291,10 +353,13 @@
//
void CalenAgendaView::orientationChanged(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_ORIENTATIONCHANGED_ENTRY );
+
// Notify the content widget about the change
if (mAgendaViewWidget) {
mAgendaViewWidget->orientationChanged(orientation);
}
+ OstTraceFunctionExit0( CALENAGENDAVIEW_ORIENTATIONCHANGED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -303,11 +368,15 @@
//
void CalenAgendaView::launchMonthView()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_LAUNCHMONTHVIEW_ENTRY );
+
// Issue the command to launch the month view
mServices.IssueCommandL(ECalenMonthView);
// month view launched now, disconnect to get the call backs for saveActivity
// on aboutToQuit signal
disconnectAboutToQuitEvent();
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_LAUNCHMONTHVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -316,8 +385,12 @@
//
void CalenAgendaView::launchDayView()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_LAUNCHDAYVIEW_ENTRY );
+
// Issue the command to launch the day view
mServices.IssueCommandL(ECalenDayView);
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_LAUNCHDAYVIEW_EXIT );
}
// ----------------------------------------------------------------------------
@@ -326,9 +399,13 @@
//
void CalenAgendaView::clearListModel()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_CLEARLISTMODEL_ENTRY );
+
// day view is removed from the list disconnect for aboutToQuit events
disconnectAboutToQuitEvent();
mAgendaViewWidget->clearListModel();
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_CLEARLISTMODEL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -337,11 +414,15 @@
//
void CalenAgendaView::disconnectAboutToQuitEvent()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEW_DISCONNECTABOUTTOQUITEVENT_ENTRY );
+
if (mIsAboutToQuitEventConnected)
{
disconnect(qobject_cast<HbApplication*>(qApp), SIGNAL(aboutToQuit()), this, SLOT(saveActivity()));
mIsAboutToQuitEventConnected = false;
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEW_DISCONNECTABOUTTOQUITEVENT_EXIT );
}
// End of file --Don't remove this.
--- a/calendarui/views/src/calenagendaviewwidget.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calenagendaviewwidget.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -41,10 +41,16 @@
#include "calenservices.h"
#include "calencontext.h"
#include "calendateutils.h"
+#include "calenagendautils.h"
#include "CalenUid.h"
#include "caleneventlistviewitem.h"
#include "calenpluginlabel.h"
#include "calendarprivatecrkeys.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenagendaviewwidgetTraces.h"
+#endif
+
// Constants
const QString singleSpace(" ");
@@ -58,8 +64,7 @@
const QString locationIcon("qtg_mono_location");
const QString repeatIcon("qtg_mono_repeat");
// TODO: Replace with actual image name once its available
-//const QString allDayIcon("qtg_small_allday");
-const QString allDayIcon(":/qgn_indi_cdr_meeting_layer0.svg");
+const QString allDayIcon("qtg_small_day");
const QString exceptionIcon("qtg_mono_repeat_exception");
const int singleColumn(1);
@@ -74,8 +79,12 @@
mDocLoader(docLoader),
mRegionalInfoGroupBox(NULL),
mLongTapEventFlag(false),
-mNotesPluginLoaded(false)
+mNotesPluginLoaded(false),
+mIndex(0),
+mIconCheck(false)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY );
+
// Construct the list view prototype
mListViewPrototype = new CalenEventListViewItem(this);
@@ -87,6 +96,8 @@
//Create the setting manager
mSettingsManager = new XQSettingsManager(this);
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_EXIT );
}
// ----------------------------------------------------------------------------
@@ -96,6 +107,8 @@
//
EXPORT_C CalenAgendaViewWidget::~CalenAgendaViewWidget()
{
+ OstTraceFunctionEntry0( DUP1_CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY );
+
// Unload notes editor if loaded.
if (mNotesEditorPluginLoader) {
mNotesEditorPluginLoader->unload();
@@ -103,18 +116,12 @@
mNotesEditorPluginLoader = 0;
}
- if (mListViewPrototype) {
- delete mListViewPrototype;
- mListViewPrototype = NULL;
- }
- if (mListModel) {
- // Do not delete the model since its owned by the view
- mListModel->clear();
- }
if (mSettingsManager) {
delete mSettingsManager;
mSettingsManager = NULL;
}
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_EXIT );
}
// ----------------------------------------------------------------------------
@@ -124,16 +131,20 @@
//
void CalenAgendaViewWidget::setupWidget(CalenAgendaView *view)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_SETUPWIDGET_ENTRY );
+
// Store the view for future reference
mView = view;
if (!mDocLoader) {
// Nothing much can be done. Simply return
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_SETUPWIDGET_EXIT );
return;
}
// Initialize the child widgets
initChildWidgets();
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_SETUPWIDGET_EXIT );
}
// ----------------------------------------------------------------------------
@@ -143,6 +154,8 @@
//
void CalenAgendaViewWidget::showWidget()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_SHOWWIDGET_ENTRY );
+
// Get the date for which this view has been launched
mDate = mServices.Context().focusDateAndTime();
@@ -194,6 +207,8 @@
// Now populate the list with the events
populateListWidget();
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_SHOWWIDGET_EXIT );
}
// ----------------------------------------------------------------------------
@@ -203,6 +218,8 @@
//
void CalenAgendaViewWidget::orientationChanged(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_ORIENTATIONCHANGED_ENTRY );
+
// Load the appropriate section based on the number of events for the day
if (0 == mInstanceArray.count()) {
// There are no entries for the day
@@ -238,6 +255,8 @@
}
handleListItemStretching(orientation);
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ORIENTATIONCHANGED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -247,7 +266,9 @@
//
void CalenAgendaViewWidget::handleLocaleChange()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_HANDLELOCALECHANGE_ENTRY );
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_HANDLELOCALECHANGE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -257,6 +278,8 @@
//
void CalenAgendaViewWidget::setContextFromHighlight(AgendaEntry entry)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_SETCONTEXTFROMHIGHLIGHT_ENTRY );
+
if (entry.isTimedEntry()) {
// Timed entry.
QDateTime start = entry.startTime();
@@ -275,6 +298,8 @@
TCalenInstanceId::create(entry));
}
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_SETCONTEXTFROMHIGHLIGHT_EXIT );
}
// ----------------------------------------------------------------------------
@@ -284,6 +309,8 @@
//
void CalenAgendaViewWidget::initChildWidgets()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_INITCHILDWIDGETS_ENTRY );
+
// Get the pointer to the events list
mEventsList = static_cast<HbListView*> (mDocLoader->findWidget(CALEN_AGENDAVIEW_LISTWIDGET));
if (!mEventsList) {
@@ -317,6 +344,7 @@
mRegionalPluginLayout = static_cast<QGraphicsLinearLayout*>(headingPluginWidget->layout());
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_INITCHILDWIDGETS_EXIT );
}
// ----------------------------------------------------------------------------
@@ -326,6 +354,8 @@
//
void CalenAgendaViewWidget::populateListWidget()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_ENTRY );
+
// Recycle the list items so that only needed rows
// are added or removed
if (mInstanceArray.count() == 0) {
@@ -333,6 +363,7 @@
mEventsList->reset();
// Clear the model to ensure it does not have any old items
mListModel->clear();
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_EXIT );
return;
} else if (mInstanceArray.count() > mListModel->rowCount()) {
// There are more events than the number of items
@@ -343,8 +374,12 @@
// 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
@@ -361,6 +396,8 @@
// Scroll to the index only if index is valid
mEventsList->scrollTo(mListModel->index(scrollToIndex, 0));
}
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_EXIT );
}
// ----------------------------------------------------------------------------
@@ -370,6 +407,8 @@
//
void CalenAgendaViewWidget::getInstanceList()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_GETINSTANCELIST_ENTRY );
+
// Clear the previous instance list
mInstanceArray.clear();
@@ -388,6 +427,7 @@
// Fetch the instance list from the agenda interface
mInstanceArray = mServices.agendaInterface()->createEntryIdListForDay(mDate, filter);
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_GETINSTANCELIST_EXIT );
}
// ----------------------------------------------------------------------------
@@ -397,6 +437,8 @@
//
void CalenAgendaViewWidget::setHeadingText()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_SETHEADINGTEXT_ENTRY );
+
// Format the date as per the device locale settings
HbExtendedLocale systemLocale = HbExtendedLocale::system();
@@ -409,6 +451,8 @@
mHeadingLabel->setHeading(hbTrId(
"txt_calendar_subhead_1_2").arg(dayString).arg(
systemLocale.format(mDate.date(), r_qtn_date_usual_with_zero)));
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_SETHEADINGTEXT_EXIT );
}
// ----------------------------------------------------------------------------
@@ -418,19 +462,23 @@
//
void CalenAgendaViewWidget::createListItem(int index, AgendaEntry entry)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CREATELISTITEM_ENTRY );
+
if (index < 0 || entry.isNull()) {
// Not a valid index or entry. Dont do anything
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CREATELISTITEM_EXIT );
return;
}
- // Check if the entry is a timed entry
- // TODO: Right now, only appointment/meeting type is being handled
- // Handle other timed entry types like reminder etc
- if (entry.isTimedEntry()) {
+ // Check if the entry is a timed entry and not all day event
+ // an all-day event when it is synched from OUTLOOK then entry type will be EAppt
+ if (!CalenAgendaUtils::isAlldayEvent(entry) && entry.isTimedEntry()) {
// Get the text and icon data for the entry
addTimedEventToList(index, entry);
} else {
addNonTimedEventToList(index, entry);
}
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_CREATELISTITEM_EXIT );
}
// ----------------------------------------------------------------------------
@@ -440,6 +488,8 @@
//
void CalenAgendaViewWidget::addTimedEventToList(int index, AgendaEntry entry)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_ADDTIMEDEVENTTOLIST_ENTRY );
+
// Create text and icon list to set to the model
QVariantList textData;
QVariantList iconData;
@@ -567,7 +617,7 @@
iconData << HbIcon(locationIcon);
}
else {
- iconData << HbIcon();
+ iconData << QVariant();
}
textData << entry.location();
}
@@ -581,7 +631,9 @@
}
// 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);
// Disable item stretching by removing the dynamic property
@@ -590,6 +642,8 @@
if (listViewItem) {
listViewItem->setProperty(stretchLayout, false);
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ADDTIMEDEVENTTOLIST_EXIT );
}
// ----------------------------------------------------------------------------
@@ -599,6 +653,8 @@
//
void CalenAgendaViewWidget::addNonTimedEventToList(int index, AgendaEntry entry)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_ADDNONTIMEDEVENTTOLIST_ENTRY );
+
QVariantList textData;
QVariantList iconData;
@@ -637,7 +693,7 @@
// Nothing to do as of now as anniversary events
// cannot be created
// TODO: To be handled in case of sync
- } else if (entryType == AgendaEntry::TypeEvent) {
+ } else if (CalenAgendaUtils::isAlldayEvent(entry)) {
// This is an all day event
// Append the all-day icon
iconData << HbIcon(allDayIcon);
@@ -645,12 +701,12 @@
// Check if alarm is enabled for the entry
if (entry.alarm().isNull()) {
// Insert a blank icon. Else next text item will get shifted to left
- iconData << HbIcon();
+ iconData << QVariant();
} else {
// if entry is not repeating in place of reminder icon put a blank
// icon and move reminder icon to the place of repeating icon
if (!entry.isRepeating()) {
- iconData << HbIcon();
+ iconData << QVariant();
}
iconData << HbIcon(reminderIcon);
}
@@ -658,11 +714,14 @@
// Check if the entry is recurring
if (entry.isRepeating()) {
iconData << HbIcon(repeatIcon);
+ } else if (!entry.recurrenceId().isNull()) {
+ // This is an exceptional entry
+ iconData << HbIcon(exceptionIcon);
} else {
// put the blank icon only when both reminder and repeating icons
// are not there
if (entry.alarm().isNull()) {
- iconData << HbIcon();
+ iconData << QVariant();
}
}
@@ -674,7 +733,8 @@
if (!entry.geoValue().isNull()){
iconData << HbIcon(locationIcon);
}else {
- iconData << HbIcon();
+ iconData << QVariant();
+
}
} else {
textData << QVariant();
@@ -714,12 +774,12 @@
// Check if alarm is enabled for the entry
if (entry.alarm().isNull()) {
// Insert a blank icon. Else next text item will get shifted to left
- iconData << HbIcon();
+ iconData << QVariant();
} else {
// if entry is not repeating in place of reminder icon put a blank
// icon and move reminder icon to the place of repeating icon
if (!entry.isRepeating()) {
- iconData << HbIcon();
+ iconData << QVariant();
}
iconData << HbIcon(reminderIcon);
}
@@ -731,14 +791,16 @@
// Insert the blank icon only when both reminder and repeating icons
// are not there
if (entry.alarm().isNull()) {
- iconData << HbIcon();
+ iconData << QVariant();
}
}
}
// 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
@@ -753,6 +815,8 @@
listViewItem->setProperty(stretchLayout, false);
}
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ADDNONTIMEDEVENTTOLIST_EXIT );
}
// ----------------------------------------------------------------------------
@@ -762,14 +826,24 @@
//
void CalenAgendaViewWidget::handleListItemStretching(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_ENTRY );
+
if (mInstanceArray.count() == 0) {
// Nothing much to do. Simply return
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_EXIT );
return;
}
for(int index = 0; index < mInstanceArray.count() ; index ++) {
AgendaEntry entry = mInstanceArray[index];
if (!entry.isNull()) {
AgendaEntry::Type eventType = entry.type();
+ // Need to check explicitly for Appt that got synched from OUTLOOK
+ // that can be an all-day event
+ if (AgendaEntry::TypeAppoinment == eventType) {
+ if (CalenAgendaUtils::isAlldayEvent(entry)) {
+ eventType = AgendaEntry::TypeEvent;
+ }
+ }
switch(eventType) {
// Apply the stretching to only to-do's,
// anniversary and all-day event types
@@ -803,6 +877,8 @@
}
}
}
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_EXIT );
}
// ----------------------------------------------------------------------------
@@ -812,10 +888,13 @@
//
int CalenAgendaViewWidget::getIndexToScrollTo()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_ENTRY );
+
int scrollIndex = 0;
TCalenInstanceId instanceId = mServices.Context().instanceId();
if (instanceId == TCalenInstanceId::nullInstanceId()) {
// If the instance is not set, then scroll to zero index
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_EXIT );
return scrollIndex;
}
@@ -827,6 +906,7 @@
break;
}
}
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_EXIT );
return scrollIndex;
}
@@ -837,6 +917,8 @@
//
void CalenAgendaViewWidget::showHideRegionalInformation()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_SHOWHIDEREGIONALINFORMATION_ENTRY );
+
if (mView->pluginEnabled()) {
XQSettingsKey regionalInfo(XQSettingsKey::TargetCentralRepository,
KCRUidCalendar, KCalendarShowRegionalInfo);
@@ -865,6 +947,8 @@
mRegionalInfoGroupBox = NULL;
}
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_SHOWHIDEREGIONALINFORMATION_EXIT );
}
// ----------------------------------------------------------------------------
@@ -874,9 +958,13 @@
//
void CalenAgendaViewWidget::createNewEvent()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CREATENEWEVENT_ENTRY );
+
// Issue a command to launch editor to create
// a new event
mServices.IssueCommandL(ECalenNewMeeting);
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CREATENEWEVENT_EXIT );
}
// ----------------------------------------------------------------------------
@@ -886,8 +974,11 @@
//
void CalenAgendaViewWidget::editEntry()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_EDITENTRY_ENTRY );
+
// Check if the selected index is valid
if (mSelectedIndex < 0 || mSelectedIndex > mInstanceArray.count()) {
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_EDITENTRY_EXIT );
return;
}
@@ -924,6 +1015,8 @@
// Issue a command to launch the editor to edit this entry
mServices.IssueCommandL(ECalenEditCurrentEntry);
}
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_EDITENTRY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -933,14 +1026,20 @@
//
void CalenAgendaViewWidget::viewEntry()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_VIEWENTRY_ENTRY );
+
// Get the entry details first
AgendaEntry entry = mInstanceArray[mSelectedIndex];
// Set the context
setContextFromHighlight(entry);
-
+
+ //for not setting any property again
+ mIconCheck = false;
// Launch the event viewer.
mServices.IssueCommandL(ECalenEventView);
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_VIEWENTRY_EXIT );
}
@@ -951,8 +1050,11 @@
//
void CalenAgendaViewWidget::deleteEntry()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_DELETEENTRY_ENTRY );
+
// Check if the selected index is valid
if (mSelectedIndex < 0 || mSelectedIndex > mInstanceArray.count()) {
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_DELETEENTRY_EXIT );
return;
}
@@ -962,6 +1064,8 @@
setContextFromHighlight(entry);
// Issue the command to delete the entry
mServices.IssueCommandL(ECalenDeleteCurrentEntry);
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_DELETEENTRY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -971,8 +1075,11 @@
//
void CalenAgendaViewWidget::markAsDone()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_MARKASDONE_ENTRY );
+
// Check if the selected index is valid
if (mSelectedIndex < 0 || mSelectedIndex > mInstanceArray.count()) {
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_MARKASDONE_EXIT );
return;
}
@@ -990,6 +1097,8 @@
mServices.agendaInterface()->setCompleted(entry, true, mDate);
mServices.IssueCommandL(ECalenStartActiveStep);
}
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_MARKASDONE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -1000,12 +1109,15 @@
void CalenAgendaViewWidget::itemLongPressed(HbAbstractViewItem* listViewItem,
const QPointF& coords)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_ENTRY );
+
mLongTapEventFlag = true;
// Update the selection index first
mSelectedIndex = listViewItem->modelIndex().row();
if (mSelectedIndex < 0 || mSelectedIndex > mInstanceArray.count()) {
// Invalid index
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_EXIT );
return;
}
@@ -1043,6 +1155,8 @@
SLOT(contextMenuClosed()));
contextMenu->open(this, SLOT(contextManuTriggered(HbAction *)));
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -1052,17 +1166,22 @@
//
void CalenAgendaViewWidget::itemActivated(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_ITEMACTIVATED_ENTRY );
+
// Update the selection index first
mSelectedIndex = index.row();
// Check if the selected index is valid
if (mSelectedIndex < 0 || mSelectedIndex > mInstanceArray.count()) {
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ITEMACTIVATED_EXIT );
return;
}
if( !mLongTapEventFlag ) {
// Open the event for viewing
viewEntry();
}
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_ITEMACTIVATED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -1072,6 +1191,8 @@
//
void CalenAgendaViewWidget::noteEditingCompleted(bool status)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_NOTEEDITINGCOMPLETED_ENTRY );
+
// We need to refresh the list since user
// might have marked the to-do as complete or
// edited it or deleted it. So get the instance
@@ -1079,6 +1200,8 @@
if (status) {
mServices.IssueCommandL(ECalenStartActiveStep);
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_NOTEEDITINGCOMPLETED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -1088,9 +1211,12 @@
//
void CalenAgendaViewWidget::goToToday()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_GOTOTODAY_ENTRY );
+
// First check if we are not already
// showing today's agenda
if (mDate == CalenDateUtils::today()) {
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_GOTOTODAY_EXIT );
return;
}
@@ -1098,6 +1224,8 @@
mServices.Context().setFocusDate(CalenDateUtils::today());
mView->refreshViewOnGoToDate();
+
+ OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_GOTOTODAY_EXIT );
}
// ----------------------------------------------------------------------------
@@ -1107,7 +1235,11 @@
//
void CalenAgendaViewWidget::contextMenuClosed()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CONTEXTMENUCLOSED_ENTRY );
+
mLongTapEventFlag = false;
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CONTEXTMENUCLOSED_EXIT );
}
// ----------------------------------------------------------------------------
@@ -1117,6 +1249,8 @@
//
void CalenAgendaViewWidget::contextManuTriggered(HbAction *action)
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CONTEXTMANUTRIGGERED_ENTRY );
+
if (action->text() == hbTrId("txt_common_menu_open")) {
viewEntry();
} else if (action->text() == hbTrId("txt_calendar_menu_mark_as_done")) {
@@ -1128,6 +1262,8 @@
deleteEntry();
}
}
+
+ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CONTEXTMANUTRIGGERED_EXIT );
}
// ----------------------------------------------------------------------------
// CalenAgendaViewWidget::clearListModel
@@ -1136,7 +1272,73 @@
//
void CalenAgendaViewWidget::clearListModel()
{
+ OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_ENTRY );
+
mListModel->clear();
+
+ 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;
+ mLocationData = false;
+
+ if(!entry.isTimedEntry() || CalenAgendaUtils::isAlldayEvent(entry)){
+ //all day icon is not there if its a timed entry
+ mLeftAllDayIcon = true;
+ }
+
+ if (!entry.location().isEmpty()) {
+ mLocationData = 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;
+ }
+
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::isLocationData
+// return true if location entry is present
+// ----------------------------------------------------------------------------
+//
+bool CalenAgendaViewWidget::isLocationData()
+ {
+ return mLocationData;
+ }
// End of file --Don't remove this.
--- a/calendarui/views/src/caleneventlistviewitem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/caleneventlistviewitem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -20,25 +20,111 @@
// User includes
#include "caleneventlistviewitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "caleneventlistviewitemTraces.h"
+#endif
-CalenEventListViewItem::CalenEventListViewItem(QGraphicsItem *parent) :
-HbListViewItem(parent)
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::CalenEventListViewItem
+// constructor
+// ----------------------------------------------------------------------------
+//
+CalenEventListViewItem::CalenEventListViewItem(CalenAgendaViewWidget *parent) :
+HbListViewItem(parent),mAllDayIcon(false),mLocationEntry(false),mParent(parent)
{
+ OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY );
+
+ OstTraceFunctionExit0( CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_EXIT );
}
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::~CalenEventListViewItem
+// constructor
+// ----------------------------------------------------------------------------
+//
CalenEventListViewItem::~CalenEventListViewItem()
{
+ OstTraceFunctionEntry0( DUP1_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY );
+
// No implementation yet
+ OstTraceFunctionExit0( DUP1_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_EXIT );
}
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::createItem
+// creates the instance of class
+// ----------------------------------------------------------------------------
+//
HbAbstractViewItem* CalenEventListViewItem::createItem()
{
+ OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_CREATEITEM_ENTRY );
+
+ OstTraceFunctionExit0( CALENEVENTLISTVIEWITEM_CREATEITEM_EXIT );
return new CalenEventListViewItem(*this);
}
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::updateChildItems
+// creates the child items
+// ----------------------------------------------------------------------------
+//
void CalenEventListViewItem::updateChildItems()
{
+ OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_ENTRY );
+ if(mParent->hasAllDayIcon())
+ {
+ mParent->checkEntryIcons();
+ mAllDayIcon = mParent->isAllDayIcon();
+ mLocationEntry = mParent->isLocationData();
+ }
+
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;
+ }
+
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::hasAllDayIcon
+// check if location entry is there in item
+// ----------------------------------------------------------------------------
+//
+bool CalenEventListViewItem::locationEntryLayout()
+ {
+ if(mAllDayIcon && !mLocationEntry)
+ return true;
+ else
+ return false;
+ }
+
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::setAllDayLeftIcon
+// set the location entry status
+// ----------------------------------------------------------------------------
+//
+void CalenEventListViewItem::setLocationEntry(bool icon)
+ {
+ mLocationEntry = icon;
+ }
+
// End of file
--- a/calendarui/views/src/calengriditemprototype.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calengriditemprototype.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,6 +32,11 @@
#include "calengriditemprototype.h"
#include "calencommon.h"
#include "calentodayindicatorlinedrawer.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calengriditemprototypeTraces.h"
+#endif
+
/*!
\class CalenGridItemPrototype
@@ -55,6 +60,9 @@
mFocusIndicatorItem(0),
mTodayIndicatorItem(0)
{
+ OstTraceFunctionEntry0( CALENGRIDITEMPROTOTYPE_CALENGRIDITEMPROTOTYPE_ENTRY );
+
+ OstTraceFunctionExit0( CALENGRIDITEMPROTOTYPE_CALENGRIDITEMPROTOTYPE_EXIT );
}
/*!
@@ -62,6 +70,8 @@
*/
void CalenGridItemPrototype::createPrimitives()
{
+ OstTraceFunctionEntry0( CALENGRIDITEMPROTOTYPE_CREATEPRIMITIVES_ENTRY );
+
if (!mMonthDayInfoItem) {
mMonthDayInfoItem = new HbTextItem(this);
HbStyle::setItemName(mMonthDayInfoItem,
@@ -90,6 +100,7 @@
mTodayIndicatorItem, QLatin1String("todayIndicatorItem"));
}
+ OstTraceFunctionExit0( CALENGRIDITEMPROTOTYPE_CREATEPRIMITIVES_EXIT );
}
/*!
@@ -100,6 +111,8 @@
*/
HbAbstractViewItem *CalenGridItemPrototype::createItem()
{
+ OstTraceFunctionEntry0( CALENGRIDITEMPROTOTYPE_CREATEITEM_ENTRY );
+
CalenGridItemPrototype* item = new CalenGridItemPrototype(*this);
item->createPrimitives();
@@ -109,6 +122,7 @@
frame.setFrameGraphicsName(QString(""));
item->setDefaultFrame(frame);
+ OstTraceFunctionExit0( CALENGRIDITEMPROTOTYPE_CREATEITEM_EXIT );
return item;
}
@@ -119,6 +133,8 @@
*/
void CalenGridItemPrototype::updateChildItems()
{
+ OstTraceFunctionEntry0( CALENGRIDITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY );
+
// Here update content of each item.
QVariant monthDayRole;
bool monthFocusRole;
@@ -179,6 +195,7 @@
// base class implementation
HbGridViewItem::updateChildItems();
+ OstTraceFunctionExit0( CALENGRIDITEMPROTOTYPE_UPDATECHILDITEMS_EXIT );
}
/*!
@@ -186,9 +203,12 @@
*/
void CalenGridItemPrototype::pressStateChanged(bool pressed,bool animate)
{
+ OstTraceFunctionEntry0( CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_ENTRY );
+
Q_UNUSED(pressed)
Q_UNUSED(animate)
// Just overrode it as we dont want to have any default behavior
+ OstTraceFunctionExit0( CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_EXIT );
}
/*!
@@ -196,13 +216,20 @@
*/
void CalenGridItemPrototype::pressStateChanged(bool animate)
{
+ OstTraceFunctionEntry0( DUP1_CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_ENTRY );
+
Q_UNUSED(animate)
// Just overrode it as we dont want to have any default behavior
+ OstTraceFunctionExit0( DUP1_CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_EXIT );
}
bool CalenGridItemPrototype::canSetModelIndex(const QModelIndex& index)
{
+ OstTraceFunctionEntry0( CALENGRIDITEMPROTOTYPE_CANSETMODELINDEX_ENTRY );
+
Q_UNUSED(index)
+
+ OstTraceFunctionExit0( CALENGRIDITEMPROTOTYPE_CANSETMODELINDEX_EXIT );
return true;
}
--- a/calendarui/views/src/calenmonthdata.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calenmonthdata.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -21,6 +21,11 @@
// INCLUDES
#include "calenmonthdata.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenmonthdataTraces.h"
+#endif
+
// ================= MEMBER FUNCTIONS =======================
@@ -34,8 +39,9 @@
CalenMonthData::CalenMonthData()
: mDay(QDateTime()), mHasEvents(false)
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENMONTHDATA_CALENMONTHDATA_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHDATA_CALENMONTHDATA_EXIT );
}
// ----------------------------------------------------------------------------
@@ -48,8 +54,9 @@
(QDateTime day)
: mDay(day), mHasEvents(false)
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP1_CALENMONTHDATA_CALENMONTHDATA_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENMONTHDATA_CALENMONTHDATA_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,8 +67,9 @@
//
CalenMonthData::~CalenMonthData()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( DUP2_CALENMONTHDATA_CALENMONTHDATA_ENTRY );
+
+ OstTraceFunctionExit0( DUP2_CALENMONTHDATA_CALENMONTHDATA_EXIT );
}
// ---------------------------------------------------------
@@ -72,9 +80,9 @@
//
QDateTime CalenMonthData::Day()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENMONTHDATA_DAY_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENMONTHDATA_DAY_EXIT );
return mDay;
}
@@ -86,11 +94,11 @@
//
void CalenMonthData::SetHasEvents(bool hasEvents)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENMONTHDATA_SETHASEVENTS_ENTRY );
mHasEvents = hasEvents;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENMONTHDATA_SETHASEVENTS_EXIT );
}
// -----------------------------------------------------------------------------
@@ -101,19 +109,26 @@
//
bool CalenMonthData::HasEvents()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENMONTHDATA_HASEVENTS_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENMONTHDATA_HASEVENTS_EXIT );
return mHasEvents;
}
void CalenMonthData::setActive(bool isActive)
{
+ OstTraceFunctionEntry0( CALENMONTHDATA_SETACTIVE_ENTRY );
+
mIsActive = isActive;
+
+ OstTraceFunctionExit0( CALENMONTHDATA_SETACTIVE_EXIT );
}
bool CalenMonthData::isActive()
{
+ OstTraceFunctionEntry0( CALENMONTHDATA_ISACTIVE_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHDATA_ISACTIVE_EXIT );
return mIsActive;
}
// End of File
--- a/calendarui/views/src/calenmonthgrid.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calenmonthgrid.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,7 +22,9 @@
#include <hbcolorscheme.h>
#include <hbpangesture.h>
#include <hbswipegesture.h>
+#include <hbtapgesture.h>
#include <hbdeviceprofile.h>
+#include <hbinstance.h>
// User includes
#include "calenmonthgrid.h"
@@ -32,6 +34,11 @@
#include "calendateutils.h"
#include "calencommon.h"
#include "calenconstants.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenmonthgridTraces.h"
+#endif
+
// Constants
#define SCROLL_SPEEED 3000
@@ -60,6 +67,8 @@
mIgnoreItemActivated(false),
mGridBorderColor(Qt::gray)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_CALENMONTHGRID_ENTRY );
+
setScrollDirections(Qt::Vertical);
setRowCount(KNumOfVisibleRows);
setColumnCount(KCalenDaysInWeek);
@@ -92,6 +101,8 @@
// Connect to scrolling finished signal
connect(this, SIGNAL(scrollingEnded()), this,
SLOT(scrollingFinished()));
+
+ OstTraceFunctionExit0( CALENMONTHGRID_CALENMONTHGRID_EXIT );
}
/*!
@@ -99,7 +110,11 @@
*/
CalenMonthGrid::~CalenMonthGrid()
{
+ OstTraceFunctionEntry0( DUP1_CALENMONTHGRID_CALENMONTHGRID_ENTRY );
+
// Nothing Yet
+
+ OstTraceFunctionExit0( DUP1_CALENMONTHGRID_CALENMONTHGRID_EXIT );
}
/*!
@@ -107,7 +122,11 @@
*/
void CalenMonthGrid::setView(CalenMonthView *view)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_SETVIEW_ENTRY );
+
mView = view;
+
+ OstTraceFunctionExit0( CALENMONTHGRID_SETVIEW_EXIT );
}
/*!
@@ -116,6 +135,8 @@
void CalenMonthGrid::updateMonthGridModel(QList<CalenMonthData> &monthDataArray,
int indexToBeScrolled, bool isFirstTime)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_UPDATEMONTHGRIDMODEL_ENTRY );
+
int loopStart = 0;
int loopEnd = monthDataArray.count();
if (isFirstTime) {
@@ -242,7 +263,8 @@
QModelIndex lastVisibleIndex = mModel->index(indexToBeScrolled, 0);
scrollTo(lastVisibleIndex);
}
- mMonthDataArray = monthDataArray;
+
+ OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDMODEL_EXIT );
}
/*!
@@ -252,7 +274,7 @@
void CalenMonthGrid::updateMonthGridWithInActiveMonths(
QList<CalenMonthData> &monthDataArray)
{
- mMonthDataArray = monthDataArray;
+ OstTraceFunctionEntry0( CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_ENTRY );
// Prepend the required rows
handlePrependingRows(monthDataArray);
@@ -282,6 +304,8 @@
// is tapped.
connect(this, SIGNAL(activated(const QModelIndex &)), this,
SLOT(itemActivated(const QModelIndex &)));
+
+ OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_EXIT );
}
/*!
@@ -290,8 +314,10 @@
void CalenMonthGrid::updateMonthGridWithEventIndicators(
QList<CalenMonthData> &monthDataArray)
{
- mMonthDataArray = monthDataArray;
- for(int i = 0; i < monthDataArray.count(); i++) {
+ OstTraceFunctionEntry0( CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_ENTRY );
+
+ int count(monthDataArray.count());
+ for(int i = 0; i < count; i++) {
// Check if the day has events
if (monthDataArray[i].HasEvents()) {
QModelIndex itemIndex = mModel->index(i,0);
@@ -301,6 +327,8 @@
mModel->itemFromIndex(itemIndex)->setData(list);
}
}
+
+ OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_EXIT );
}
/*!
@@ -308,6 +336,8 @@
*/
void CalenMonthGrid::downGesture()
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_DOWNGESTURE_ENTRY );
+
// Make sure that content widget is properly placed
if (mIsNonActiveDayFocused) {
mIsAtomicScroll = true;
@@ -320,6 +350,8 @@
setAttribute(Hb::InteractionDisabled);
QPointF targetPos(0.0, 0.0);
scrollContentsTo(targetPos,500);
+
+ OstTraceFunctionExit0( CALENMONTHGRID_DOWNGESTURE_EXIT );
}
/*!
@@ -327,6 +359,8 @@
*/
void CalenMonthGrid::upGesture()
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_UPGESTURE_ENTRY );
+
// Make sure that content widget is properly placed
if (mIsNonActiveDayFocused) {
mIsAtomicScroll = true;
@@ -341,6 +375,7 @@
QPointF targetPos(0.0, mStartPos.y() - size().height());
scrollContentsTo(-targetPos,500);
+ OstTraceFunctionExit0( CALENMONTHGRID_UPGESTURE_EXIT );
}
/*!
@@ -348,8 +383,12 @@
*/
void CalenMonthGrid::mousePressEvent(QGraphicsSceneMouseEvent* event)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_MOUSEPRESSEVENT_ENTRY );
+
// Pass it to parent
HbGridView::mousePressEvent(event);
+
+ OstTraceFunctionExit0( CALENMONTHGRID_MOUSEPRESSEVENT_EXIT );
}
/*!
@@ -357,6 +396,8 @@
*/
void CalenMonthGrid::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_MOUSERELEASEEVENT_ENTRY );
+
// Pass it grid view if pan gesture is not in progress else pass it to
// scrollarea. Problem here is, if we pass to gridview when panning, then
// its emitting item activated signal simply becasue of which focus item
@@ -366,6 +407,8 @@
} else {
HbScrollArea::mouseReleaseEvent(event);
}
+
+ OstTraceFunctionExit0( CALENMONTHGRID_MOUSERELEASEEVENT_EXIT );
}
/*!
@@ -373,6 +416,8 @@
*/
void CalenMonthGrid::gestureEvent(QGestureEvent *event)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_GESTUREEVENT_ENTRY );
+
if(HbPanGesture *gesture = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))) {
if (gesture->state() == Qt::GestureStarted) {
setAttribute(Hb::InteractionDisabled);
@@ -388,31 +433,44 @@
// frm orbit side is made clever enough not to scroll in other direction
// apart frm the registered scroll direction
QPointF delta = gesture->delta();
- if (abs(delta.x()) > MAX_PAN_DIRECTION_THRESHOLD) {
+ // Check the current orientation of the device and
+ // swap the vertical and horizontal distances in landscape
+ qreal horizontalDiff = 0.0;
+ qreal verticalDiff = 0.0;
+ if (hbInstance->allMainWindows().at(0)->orientation() == Qt::Vertical) {
+ horizontalDiff = delta.x();
+ verticalDiff = delta.y();
+ } else {
+ horizontalDiff = delta.y();
+ verticalDiff = delta.x();
+ }
+ if (abs(horizontalDiff) > MAX_PAN_DIRECTION_THRESHOLD) {
// Now see if y coord diff has crossed threshold
- if (delta.y() > MAX_PAN_DIRECTION_THRESHOLD) {
+ if (verticalDiff > MAX_PAN_DIRECTION_THRESHOLD) {
mIsPanGesture = true;
mIgnoreItemActivated = true;
mDirection = down;
- } else if (delta.y() < -MAX_PAN_DIRECTION_THRESHOLD){
+ } else if (verticalDiff < -MAX_PAN_DIRECTION_THRESHOLD){
mIsPanGesture = true;
mIgnoreItemActivated = true;
mDirection = up;
} else {
event->accept(Qt::PanGesture);
+ OstTraceFunctionExit0( CALENMONTHGRID_GESTUREEVENT_EXIT );
return;
}
- } else if (abs(delta.x()) < MAX_PAN_DIRECTION_THRESHOLD) {
- if (delta.y() > MIN_PAN_DIRECTION_THRESHOLD) {
+ } else if (abs(horizontalDiff) < MAX_PAN_DIRECTION_THRESHOLD) {
+ if (verticalDiff > MIN_PAN_DIRECTION_THRESHOLD) {
mIsPanGesture = true;
mIgnoreItemActivated = true;
mDirection = down;
- } else if (delta.y() < -MIN_PAN_DIRECTION_THRESHOLD){
+ } else if (verticalDiff < -MIN_PAN_DIRECTION_THRESHOLD){
mIsPanGesture = true;
mIgnoreItemActivated = true;
mDirection = up;
}else {
event->accept(Qt::PanGesture);
+ OstTraceFunctionExit0( DUP1_CALENMONTHGRID_GESTUREEVENT_EXIT );
return;
}
}
@@ -429,9 +487,20 @@
mDirection = up;
} else {
event->accept(Qt::SwipeGesture);
+ OstTraceFunctionExit0( DUP2_CALENMONTHGRID_GESTUREEVENT_EXIT );
return;
}
}
+ } else if (HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+ if(gesture->state() == Qt::GestureFinished) {
+ // Check if scrolling is in progress
+ if (mDirection != invalid) {
+ // Set the pan flag to true so that grid adjusts to nearest
+ // month after tapping
+ mIsPanGesture = true;
+ handlePanGestureFinished();
+ }
+ }
}
if (mDirection!= invalid) {
@@ -439,6 +508,8 @@
// When scrolling finished, month grid will adjust to show the proper month
HbScrollArea::gestureEvent(event);
}
+
+ OstTraceFunctionExit0( DUP3_CALENMONTHGRID_GESTUREEVENT_EXIT );
}
/*!
@@ -446,6 +517,8 @@
*/
void CalenMonthGrid::scrollingFinished()
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_SCROLLINGFINISHED_ENTRY );
+
if (mIsPanGesture) {
handlePanGestureFinished();
} else if(!mIsAtomicScroll) {
@@ -468,6 +541,8 @@
}
mIgnoreItemActivated = false;
setAttribute(Hb::InteractionDisabled, false);
+
+ OstTraceFunctionExit0( CALENMONTHGRID_SCROLLINGFINISHED_EXIT );
}
/*!
@@ -475,6 +550,8 @@
*/
void CalenMonthGrid::handlePanGestureFinished()
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEPANGESTUREFINISHED_ENTRY );
+
mIsPanGesture = false;
// Get the first item that is visible
QList<HbAbstractViewItem *> list = visibleItems();
@@ -482,7 +559,8 @@
QModelIndex modelIndex = item->modelIndex();
// Get the date which is visible at the above row
- QDateTime date = mMonthDataArray[modelIndex.row()].Day();
+ QList<CalenMonthData>& monthDataArray = mView->monthDataList();
+ QDateTime date = monthDataArray[modelIndex.row()].Day();
// Check if this date belong to current active month or
// previous month else future month
@@ -540,6 +618,8 @@
// hence, scroll up to show the next month
upGesture();
}
+
+ OstTraceFunctionExit0( CALENMONTHGRID_HANDLEPANGESTUREFINISHED_EXIT );
}
/*!
@@ -548,6 +628,8 @@
*/
void CalenMonthGrid::prependRows()
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_PREPENDROWS_ENTRY );
+
// Before we do anything, set the focus to proper date
// Set it only when non active day was focussed. When inactive day
// was focussed, we need to focus the same day
@@ -570,8 +652,7 @@
// Get the updated dates from the view
mView->updateModelWithPrevMonth();
- QList<CalenMonthData > monthDataList = mView->monthDataList();
- mMonthDataArray = monthDataList;
+ QList<CalenMonthData >& monthDataList = mView->monthDataList();
// Prepend the required rows
handlePrependingRows(monthDataList);
@@ -607,6 +688,8 @@
// Update the sart position of the content widget
mStartPos = mContentWidget->pos();
+
+ OstTraceFunctionExit0( CALENMONTHGRID_PREPENDROWS_EXIT );
}
/*!
@@ -614,6 +697,8 @@
*/
void CalenMonthGrid::handlePrependingRows(QList<CalenMonthData > &monthDataList)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEPREPENDINGROWS_ENTRY );
+
QDateTime currDate = mView->getCurrentDay();
QDateTime currDateTime = CalenDateUtils::beginningOfDay( currDate );
int rowsInPrevMonth = mView->rowsInPrevMonth();
@@ -660,6 +745,8 @@
// Set the data to model
mModel->itemFromIndex(currentIndex)->setData(itemData);
}
+
+ OstTraceFunctionExit0( CALENMONTHGRID_HANDLEPREPENDINGROWS_EXIT );
}
/*!
@@ -668,6 +755,8 @@
*/
void CalenMonthGrid::appendRows()
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_APPENDROWS_ENTRY );
+
// Before we do anything, set the focus to proper date
// Set it only when non active day was focussed. When inactive day
// was focussed, we need to focus the same day
@@ -688,8 +777,7 @@
// Get the updated dates from the view
mView->updateModelWithFutureMonth();
- QList<CalenMonthData > monthDataList = mView->monthDataList();
- mMonthDataArray = monthDataList;
+ QList<CalenMonthData >& monthDataList = mView->monthDataList();
// Get the model count before we add any rows into the mode
int rowCount = mModel->rowCount();
@@ -730,6 +818,8 @@
// Update the sart position of the content widget
mStartPos = mContentWidget->pos();
+
+ OstTraceFunctionExit0( CALENMONTHGRID_APPENDROWS_EXIT );
}
/*!
@@ -737,6 +827,8 @@
*/
void CalenMonthGrid::handleAppendingRows(QList<CalenMonthData > &monthDataList)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEAPPENDINGROWS_ENTRY );
+
QDateTime currDate = mView->getCurrentDay();
QDateTime currDateTime = CalenDateUtils::beginningOfDay( currDate );
int rowsInFutMonth = mView->rowsInFutMonth();
@@ -783,6 +875,8 @@
// Set the data to model
mModel->itemFromIndex(currentIndex)->setData(itemData);
}
+
+ OstTraceFunctionExit0( CALENMONTHGRID_HANDLEAPPENDINGROWS_EXIT );
}
/*!
@@ -790,8 +884,11 @@
*/
void CalenMonthGrid::itemActivated(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_ITEMACTIVATED_ENTRY );
+
if (mIgnoreItemActivated) {
mIgnoreItemActivated = false;
+ OstTraceFunctionExit0( CALENMONTHGRID_ITEMACTIVATED_EXIT );
return;
}
mIsNonActiveDayFocused = false;
@@ -804,6 +901,7 @@
QModelIndex itemIndex = mModel->index(mCurrentRow,0);
if(itemIndex.row() < 0 || itemIndex.row() >= mModel->rowCount() ||
itemIndex.column() < 0 || itemIndex.column() > mModel->columnCount()) {
+ OstTraceFunctionExit0( DUP1_CALENMONTHGRID_ITEMACTIVATED_EXIT );
return;
}
QVariant itemData = itemIndex.data(Qt::UserRole + 1);
@@ -822,10 +920,11 @@
// Check if inactive date is tapped
QDateTime activeMonth = mView->getActiveDay();
int month = activeMonth.date().month();
- if(month != mMonthDataArray[mCurrentRow].Day().date().month()){
+ QList<CalenMonthData >& monthDataList = mView->monthDataList();
+ if(month != monthDataList[mCurrentRow].Day().date().month()){
// Set the flag
mIsNonActiveDayFocused = true;
- mNonActiveFocusedDay = mMonthDataArray[mCurrentRow].Day();
+ mNonActiveFocusedDay = monthDataList[mCurrentRow].Day();
// Add one month to active month
activeMonth = activeMonth.addMonths(1);
@@ -844,6 +943,8 @@
}
mView->setContextForActiveDay(index.row());
}
+
+ OstTraceFunctionExit0( DUP2_CALENMONTHGRID_ITEMACTIVATED_EXIT );
}
/*!
@@ -851,6 +952,8 @@
*/
void CalenMonthGrid::setFocusToProperDay()
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_SETFOCUSTOPROPERDAY_ENTRY );
+
// Calculate the new item to be focussed
QDateTime oldFocussedDate = mView->getActiveDay();
QList<CalenMonthData> monthDataList = mView->monthDataList();
@@ -887,6 +990,8 @@
break;
}
}
+
+ OstTraceFunctionExit0( CALENMONTHGRID_SETFOCUSTOPROPERDAY_EXIT );
}
/*!
@@ -894,13 +999,16 @@
*/
void CalenMonthGrid::setActiveDates(QDate activeDate)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_SETACTIVEDATES_ENTRY );
+
// By default, text color will be set as inactive date color
// set active date color only for the dates that fall in current month
// So, in the whole data array, start from where the current month starts
// and stop the loop where it the current month ends
int start = 0;
- int end = mMonthDataArray.count();
+ QList<CalenMonthData >& monthDataList = mView->monthDataList();
+ int end = monthDataList.count();
// Calculate the start and end values
QDate firstDateInGrid = mView->firstDayOfGrid().date();
@@ -928,6 +1036,7 @@
// Now set the inactive text color to those which were active before the swipe
if (mDirection == invalid) {
// no need to do anything as other dates will be in inactive dates color
+ OstTraceFunctionExit0( CALENMONTHGRID_SETACTIVEDATES_EXIT );
return;
}
@@ -969,6 +1078,8 @@
list.replace(CalendarNamespace::CalendarMonthTextColorRole, false);
mModel->itemFromIndex(index)->setData(list);
}
+
+ OstTraceFunctionExit0( DUP1_CALENMONTHGRID_SETACTIVEDATES_EXIT );
}
/*!
@@ -976,6 +1087,9 @@
*/
int CalenMonthGrid::getCurrentIndex()
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_GETCURRENTINDEX_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHGRID_GETCURRENTINDEX_EXIT );
return mCurrentRow;
}
@@ -984,7 +1098,11 @@
*/
void CalenMonthGrid::setCurrentIdex(int index)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_SETCURRENTIDEX_ENTRY );
+
itemActivated(mModel->index(index, 0));
+
+ OstTraceFunctionExit0( CALENMONTHGRID_SETCURRENTIDEX_EXIT );
}
/*!
@@ -992,6 +1110,8 @@
*/
void CalenMonthGrid::orientationChanged(Qt::Orientation newOrientation)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_ORIENTATIONCHANGED_ENTRY );
+
Q_UNUSED(newOrientation)
// We are overriding this function to avoid the default behavior of
// hbgridview on orientation change as it swaps the row and column counts
@@ -1018,6 +1138,8 @@
mIsAtomicScroll = true;
scrollTo(indexToBeScrolled);
}
+
+ OstTraceFunctionExit0( CALENMONTHGRID_ORIENTATIONCHANGED_EXIT );
}
/*!
@@ -1027,6 +1149,8 @@
const QStyleOptionGraphicsItem* option,
QWidget* widget)
{
+ OstTraceFunctionEntry0( CALENMONTHGRID_PAINT_ENTRY );
+
Q_UNUSED(option);
Q_UNUSED(widget);
painter->setRenderHint(QPainter::NonCosmeticDefaultPen);
@@ -1043,8 +1167,9 @@
} else {
pen.setBrush(mGridBorderColor);
}
- //store the old pen first
- QPen oldPen = painter->pen();
+ // Store the old pen
+ QPen oldPen = painter->pen();
+
// Set the new pen to the painter
painter->setPen(pen);
@@ -1082,8 +1207,10 @@
// Painter draws the line for first two points in the list and then second
// line for next two points in the list like that. Hence, list should
// contain even number of points
+ // Dont draw the first horizontal line as we have thick line seperator
+ // coming between day names and the month grid
QVector<QPointF> pointList;
- for (int i = 0; i < numOfRows; i++) {
+ for (int i = 1; i < numOfRows; i++) {
pointList.append(QPointF(startPoint.x(),
startPoint.y() + (i * rowWidth)));
pointList.append(QPointF(endPoint.x(), endPoint.y() + (i * rowWidth)));
@@ -1101,8 +1228,11 @@
// Draw the lines for the points in the vector list
painter->drawLines(pointList);
+
// Set the old pen back
painter->setPen(oldPen);
+
+ OstTraceFunctionExit0( CALENMONTHGRID_PAINT_EXIT );
}
// End of File
--- a/calendarui/views/src/calenmonthview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calenmonthview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -51,6 +51,14 @@
#include "calendarprivatecrkeys.h"
#include "calenpluginlabel.h"
#include "calenconstants.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenmonthviewTraces.h"
+#endif
+
+// CONSTANTS
+#define WEEKNUMWIDTH 6.41604 // in units, need to update this value if it
+ // is changed in the docml
/*!
\class CalenMonthView
@@ -68,6 +76,8 @@
mNextRegionalInfo(0),
mIsAboutToQuitEventConnected(false)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_CALENMONTHVIEW_ENTRY );
+
mIsWeekNumbersShown = 0;
mOrientation = mServices.MainWindow().orientation();
// Read the date from the context
@@ -85,6 +95,8 @@
mIsPrevPaneGesture = false;
// Get the week day color from the theme
mWeekDaysColor = HbColorScheme::color("qtc_cal_week_day");
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_CALENMONTHVIEW_EXIT );
}
/*!
@@ -92,6 +104,9 @@
*/
CalenMonthView::~CalenMonthView()
{
+ OstTraceFunctionEntry0( DUP1_CALENMONTHVIEW_CALENMONTHVIEW_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENMONTHVIEW_CALENMONTHVIEW_EXIT );
}
/*!
@@ -100,6 +115,8 @@
*/
void CalenMonthView::setupView(CalenDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_SETUPVIEW_ENTRY );
+
mDocLoader = docLoader;
mTitleLabel
= qobject_cast<HbLabel *> (
@@ -214,6 +231,7 @@
// only for debugging purpose.
bool ok = activityManager->removeActivity(activityName);
+ OstTraceFunctionExit0( CALENMONTHVIEW_SETUPVIEW_EXIT );
}
/*!
@@ -222,6 +240,7 @@
*/
void CalenMonthView::doLazyLoading()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_DOLAZYLOADING_ENTRY );
// Add background items to all the widgets
addBackgroundFrame();
@@ -293,6 +312,14 @@
// This is required to add/remove dynamically some options
connect(menu(), SIGNAL(aboutToShow ()), this,
SLOT(addRemoveActionsInMenu()));
+ //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
+ //so that plugin add the "Show lunar data" item as a second last option
+ // in all views
+ mServices.OfferMenu(menu());
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_DOLAZYLOADING_EXIT );
}
/*!
@@ -300,6 +327,8 @@
*/
void CalenMonthView::addWeekNumbers()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_ADDWEEKNUMBERS_ENTRY );
+
if (!mFirstWeekLabel) {
// Get all the six week labels
mFirstWeekLabel
@@ -338,20 +367,26 @@
static_cast<QGraphicsLinearLayout *> (mDayNameWidget->layout());
if (KCalenDaysInWeek == dayNamesLayout->count()) {
- // Add one item with text "Wk" in the day name grid
+ // Add one empty label in the day name grid
HbLabel *label = new HbLabel(mDayNameWidget);
// Set the attributes same as that of other day names to make it
// look similar to the day names
- label->setPlainText(hbTrId("txt_calendar_grid_day_wk"));
+ label->setPlainText("");
label->setFont(mFirstDayLabel->font());
label->setFontSpec(mFirstDayLabel->fontSpec());
label->setAlignment(mFirstDayLabel->alignment());
label->setElideMode(mFirstDayLabel->elideMode());
label->setZValue(mFirstDayLabel->zValue());
- label->setPreferredHeight(mFirstDayLabel->preferredHeight());
- label->setMinimumHeight(mFirstDayLabel->minimumHeight());
- label->setMaximumHeight(mFirstDayLabel->maximumHeight());
+ // Set the proper width to this empty label so that
+ // day names are dislayed against the correct columns
+ HbDeviceProfile deviceProf;
+ qreal unitValue = deviceProf.unitValue();
+ qreal widthInPixels = WEEKNUMWIDTH * unitValue;
+ label->setPreferredWidth(widthInPixels);
+ label->setMinimumWidth(widthInPixels);
+ label->setMaximumWidth(widthInPixels);
+ label->setContentsMargins(0,0,0,0);
// Add this label into layout
dayNamesLayout->insertItem(0, label);
@@ -370,6 +405,8 @@
layout->invalidate();
layout->activate();
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_ADDWEEKNUMBERS_EXIT );
}
/*!
@@ -378,6 +415,8 @@
void CalenMonthView::removeWeekNumbers()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_REMOVEWEEKNUMBERS_ENTRY );
+
// Remove the week number grid if setting is off
QGraphicsLinearLayout *layout = static_cast<QGraphicsLinearLayout *>
(mMonthGridPlusWeekNumWidget->layout());
@@ -409,6 +448,8 @@
dayNamesLayout->activate();
}
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_REMOVEWEEKNUMBERS_EXIT );
}
/*!
@@ -416,6 +457,8 @@
*/
void CalenMonthView::addBackgroundFrame()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_ADDBACKGROUNDFRAME_ENTRY );
+
// Set the background items for all the widgets
HbFrameItem* frame = NULL;
HbFrameDrawer *drawer = NULL;
@@ -456,10 +499,14 @@
frame = new HbFrameItem(drawer, this);
if(frame)
mNextPaneLayoutWidget->setBackgroundItem(frame->graphicsItem(), -5);
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_ADDBACKGROUNDFRAME_EXIT );
}
void CalenMonthView::showHideRegionalInformation()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_SHOWHIDEREGIONALINFORMATION_ENTRY );
+
if (pluginEnabled()) {
XQSettingsKey regionalInfo(XQSettingsKey::TargetCentralRepository,
KCRUidCalendar, KCalendarShowRegionalInfo);
@@ -533,6 +580,8 @@
}
}
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_SHOWHIDEREGIONALINFORMATION_EXIT );
}
/*!
@@ -540,6 +589,7 @@
*/
void CalenMonthView::onContextChanged()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_ONCONTEXTCHANGED_ENTRY );
//Update plugin label after setting context
if (mCurrRegionalInfo && mPrevRegionalInfo && mNextPaneLayout
&& pluginEnabled()) {
@@ -548,6 +598,7 @@
mCurrRegionalInfo->setPlainText(*pluginString);
mNextRegionalInfo->setPlainText(*pluginString);
}
+ OstTraceFunctionExit0( CALENMONTHVIEW_ONCONTEXTCHANGED_EXIT );
}
/*!
@@ -556,6 +607,8 @@
void CalenMonthView::updateWeekNumGridModel()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_UPDATEWEEKNUMGRIDMODEL_ENTRY );
+
// Get the visible date
QDateTime firstVisibleDate = mFirstDayOfGrid.addDays(KCalenDaysInWeek
* mNumOfRowsInPrevMonth);
@@ -583,6 +636,8 @@
mFifthWeekLabel->setPlainText(text);
text = QString::number(mWeekNumbers.at(5));
mSixthWeekLabel->setPlainText(text);
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_UPDATEWEEKNUMGRIDMODEL_EXIT );
}
/*!
@@ -590,6 +645,8 @@
*/
void CalenMonthView::goToToday()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_GOTOTODAY_ENTRY );
+
QDateTime today = CalenDateUtils::today();
// Set the context and repopulate the view
MCalenContext &context = mServices.Context();
@@ -598,6 +655,7 @@
// First check if we are not alread
// showing today's month view
if (mDate == today) {
+ OstTraceFunctionExit0( CALENMONTHVIEW_GOTOTODAY_EXIT );
return;
} else if (mActiveMonth.date().year() == today.date().year() &&
mActiveMonth.date().month() == today.date().month()) {
@@ -611,6 +669,8 @@
} else {
refreshViewOnGoToDate();
}
+
+ OstTraceFunctionExit0( DUP1_CALENMONTHVIEW_GOTOTODAY_EXIT );
}
/*
@@ -619,14 +679,17 @@
*/
void CalenMonthView::addRemoveActionsInMenu()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_ADDREMOVEACTIONSINMENU_ENTRY );
HbAction* menuAction = mDeleteSubMenu->menuAction();
- // Check if there are no entries in the database
- if (mAgendaUtil->areNoEntriesInCalendar() && menuAction) {
- // hide the delete entries option
- menuAction->setVisible(false);
- } else if (menuAction) {
- // Show the option to delete
- menuAction->setVisible(true);
+ if (menuAction) {
+ if (!mEntriesInDataBase && mAgendaUtil->areNoEntriesInCalendar()) {
+ // hide the delete entries option
+ menuAction->setVisible(false);
+ } else {
+ mEntriesInDataBase = true;
+ // Show the option to delete
+ menuAction->setVisible(true);
+ }
}
// Check if we are population for current day, if yes then disable the
@@ -636,6 +699,7 @@
} else if (mGoToTodayAction){
mGoToTodayAction->setVisible(true);
}
+ OstTraceFunctionExit0( CALENMONTHVIEW_ADDREMOVEACTIONSINMENU_EXIT );
}
/*!
@@ -643,7 +707,8 @@
*/
void CalenMonthView::doPopulation()
{
-
+ OstTraceFunctionEntry0( CALENMONTHVIEW_DOPOPULATION_ENTRY );
+
// Get the layout and add the preview pane layout.
QGraphicsLinearLayout* viewLayout = static_cast<QGraphicsLinearLayout *>
(widget()->layout());
@@ -699,6 +764,8 @@
}
// Reset the first time load flag
mIsFirstTimeLoad = false;
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_DOPOPULATION_EXIT );
}
/*!
@@ -706,9 +773,13 @@
*/
void CalenMonthView::prepareForPopulation()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_PREPAREFORPOPULATION_ENTRY );
+
setActiveDay(dateFromContext(mServices.Context()));
setDate();
updateMonthDataArrayWithActiveDates();
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_PREPAREFORPOPULATION_EXIT );
}
/*!
@@ -716,6 +787,8 @@
*/
void CalenMonthView::refreshViewOnGoToDate()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_REFRESHVIEWONGOTODATE_ENTRY );
+
prepareForPopulation();
setDateToLabel();
// fetch list of required calendar instances
@@ -729,6 +802,8 @@
if (mIsWeekNumbersShown) {
updateWeekNumGridModel();
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_REFRESHVIEWONGOTODATE_EXIT );
}
/*!
@@ -736,6 +811,7 @@
*/
QDateTime CalenMonthView::dateFromContext(const MCalenContext &context)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_DATEFROMCONTEXT_ENTRY );
QDateTime ret;
if (AgendaEntry::TypeTodo == context.instanceId().mType) {
QDateTime today = CalenDateUtils::today();
@@ -747,6 +823,7 @@
} else {
ret = context.focusDateAndTime();
}
+ OstTraceFunctionExit0( CALENMONTHVIEW_DATEFROMCONTEXT_EXIT );
return ret;
}
@@ -755,6 +832,8 @@
*/
void CalenMonthView::setActiveDay(QDateTime day)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_SETACTIVEDAY_ENTRY );
+
mDate = day;
mActiveMonth = mDate;
@@ -814,6 +893,8 @@
mNumOfRowsInFutureMonth++;
dateTimeToCalc = dateTimeToCalc.addDays(-KCalenDaysInWeek);
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_SETACTIVEDAY_EXIT );
}
/*!
@@ -821,6 +902,8 @@
*/
void CalenMonthView::setDate()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_SETDATE_ENTRY );
+
mMonthDataArray.clear();
// Calculate the actual number of dates to be populated from previous month
// to future month
@@ -829,6 +912,8 @@
CalenMonthData element(currentDay);
mMonthDataArray.append(element);
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_SETDATE_EXIT );
}
/*!
@@ -836,6 +921,9 @@
*/
QDateTime CalenMonthView::getCurrentDay()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_GETCURRENTDAY_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_GETCURRENTDAY_EXIT );
return mCurrentDay;
}
@@ -844,14 +932,20 @@
*/
QDateTime CalenMonthView::getActiveDay()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_GETACTIVEDAY_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_GETACTIVEDAY_EXIT );
return mDate;
}
/*!
Returns the array of CalenMonthData items
*/
-QList<CalenMonthData> CalenMonthView::monthDataList()
+QList<CalenMonthData>& CalenMonthView::monthDataList()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_MONTHDATALIST_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_MONTHDATALIST_EXIT );
return mMonthDataArray;
}
@@ -860,6 +954,7 @@
*/
void CalenMonthView::createGrid()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_CREATEGRID_ENTRY );
// Update the month grid
mMonthGrid->updateMonthGridModel(mMonthDataArray, mIndexToBeScrolled,
mIsFirstTimeLoad);
@@ -884,6 +979,7 @@
// remove the weeknumbergrid from the layout
removeWeekNumbers();
}
+ OstTraceFunctionExit0( CALENMONTHVIEW_CREATEGRID_EXIT );
}
/*!
@@ -892,6 +988,8 @@
*/
void CalenMonthView::updateModelWithPrevMonth()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_UPDATEMODELWITHPREVMONTH_ENTRY );
+
// Get the new previous month
QDateTime prevMonthDateTime = mActiveMonth.addMonths(-1);
QDateTime dateTime = mFirstDayOfGrid;
@@ -960,12 +1058,16 @@
if (mIsWeekNumbersShown) {
updateWeekNumGridModel();
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_UPDATEMODELWITHPREVMONTH_EXIT );
}
/*!
Called when up gesture is performed
*/
void CalenMonthView::updateModelWithFutureMonth()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_UPDATEMODELWITHFUTUREMONTH_ENTRY );
+
// Get the new future month
QDateTime previousLastDayOfGrid = mLastDayOfGrid;
QDateTime futureMonthDateTime = mActiveMonth.addMonths(2);
@@ -1029,6 +1131,7 @@
// Update the mMonthDataArray with instances if any
populateNextMonth();
+ OstTraceFunctionExit0( CALENMONTHVIEW_UPDATEMODELWITHFUTUREMONTH_EXIT );
}
/*!
@@ -1036,6 +1139,9 @@
*/
int CalenMonthView::rowsInPrevMonth()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_ROWSINPREVMONTH_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_ROWSINPREVMONTH_EXIT );
return mNumOfRowsInPrevMonth;
}
@@ -1044,6 +1150,9 @@
*/
int CalenMonthView::rowsInFutMonth()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_ROWSINFUTMONTH_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_ROWSINFUTMONTH_EXIT );
return mNumOfRowsInFutureMonth;
}
@@ -1052,6 +1161,9 @@
*/
int CalenMonthView::getCurrGridIndex()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_GETCURRGRIDINDEX_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_GETCURRGRIDINDEX_EXIT );
return mMonthGrid->getCurrentIndex();
}
@@ -1060,8 +1172,10 @@
*/
void CalenMonthView::setCurrGridIndex(int index)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_SETCURRGRIDINDEX_ENTRY );
mIsPrevPaneGesture = true;
mMonthGrid->setCurrentIdex(index);
+ OstTraceFunctionExit0( CALENMONTHVIEW_SETCURRGRIDINDEX_EXIT );
}
/*!
@@ -1069,6 +1183,8 @@
*/
void CalenMonthView::updateMonthDataArrayWithActiveDates()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_UPDATEMONTHDATAARRAYWITHACTIVEDATES_ENTRY );
+
int activeMonth = mActiveMonth.date().month();
int monthDataCount = mMonthDataArray.count();
for (int i = 0; i < monthDataCount; i++) {
@@ -1080,6 +1196,8 @@
mMonthDataArray[i].setActive(false);
}
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_UPDATEMONTHDATAARRAYWITHACTIVEDATES_EXIT );
}
/*!
@@ -1088,6 +1206,8 @@
void CalenMonthView::getInstanceList(QList<QDate> &list,
QDateTime rangeStart, QDateTime rangeEnd)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_GETINSTANCELIST_ENTRY );
+
AgendaUtil::FilterFlags filter =
AgendaUtil::FilterFlags(AgendaUtil::IncludeAnniversaries
| AgendaUtil::IncludeAppointments
@@ -1095,6 +1215,8 @@
| AgendaUtil::IncludeReminders
| AgendaUtil::IncludeIncompletedTodos);
mAgendaUtil->markDatesWithEvents(rangeStart, rangeEnd, filter, list);
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_GETINSTANCELIST_EXIT );
}
/*!
@@ -1102,6 +1224,8 @@
*/
void CalenMonthView::populateWithInstanceView()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_POPULATEWITHINSTANCEVIEW_ENTRY );
+
const QDateTime today(CalenDateUtils::today());
const QDateTime gridStart(CalenDateUtils::beginningOfDay(mFirstDayOfGrid));
@@ -1120,8 +1244,13 @@
int offset = mFirstDayOfGrid.date().daysTo(datesWithEvents.at(i));
mMonthDataArray[offset].SetHasEvents(true);
}
-
datesWithEvents.clear();
+
+ if (datesEventsCount) {
+ mEntriesInDataBase = true;
+ }
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_POPULATEWITHINSTANCEVIEW_EXIT );
}
/*!
@@ -1130,6 +1259,8 @@
*/
void CalenMonthView::populatePrevMonth()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_POPULATEPREVMONTH_ENTRY );
+
const QDateTime gridStart(CalenDateUtils::beginningOfDay(mFirstDayOfGrid));
const QDateTime today(CalenDateUtils::today());
@@ -1149,6 +1280,12 @@
mMonthDataArray[offset].SetHasEvents(true);
}
datesWithEvents.clear();
+
+ if (datesEventsCount) {
+ mEntriesInDataBase = true;
+ }
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_POPULATEPREVMONTH_EXIT );
}
/*!
@@ -1157,6 +1294,7 @@
*/
void CalenMonthView::populateNextMonth()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_POPULATENEXTMONTH_ENTRY );
QList<AgendaEntry> list;
int actualIndex = mNumOfRowsInFutureMonth * KCalenDaysInWeek;
const QDateTime gridStart(mLastDayOfGrid.addDays(-actualIndex));
@@ -1177,6 +1315,11 @@
mMonthDataArray[offset].SetHasEvents(true);
}
datesWithEvents.clear();
+
+ if (datesEventsCount) {
+ mEntriesInDataBase = true;
+ }
+ OstTraceFunctionExit0( CALENMONTHVIEW_POPULATENEXTMONTH_EXIT );
}
/*!
@@ -1185,12 +1328,16 @@
*/
void CalenMonthView::fetchEntriesAndUpdateModel()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_FETCHENTRIESANDUPDATEMODEL_ENTRY );
+
// Get to know if entries are there from the agenda server
populateWithInstanceView();
// Update the month grid model
mMonthGrid->updateMonthGridWithEventIndicators(mMonthDataArray);
// Populate the preview panes
populatePreviewPane(mDate);
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_FETCHENTRIESANDUPDATEMODEL_EXIT );
}
/*!
@@ -1198,12 +1345,16 @@
*/
void CalenMonthView::populatePreviewPane(QDateTime &dateTime)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_POPULATEPREVIEWPANE_ENTRY );
+
mPrevPreviewPane->populateLabel(dateTime.addDays(-1));
mCurrPreviewPane->populateLabel(dateTime);
mNextPreviewPane->populateLabel(dateTime.addDays(1));
// Start the auto scroll on current preview pane
mCurrPreviewPane->startAutoScroll();
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_POPULATEPREVIEWPANE_EXIT );
}
/*!
@@ -1212,7 +1363,11 @@
*/
void CalenMonthView::completePopulation()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_COMPLETEPOPULATION_ENTRY );
+
setDateToLabel();
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_COMPLETEPOPULATION_EXIT );
}
/*!
@@ -1220,7 +1375,11 @@
*/
void CalenMonthView::handleGridItemActivated()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_HANDLEGRIDITEMACTIVATED_ENTRY );
+
mServices.IssueCommandL(ECalenDayView);
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_HANDLEGRIDITEMACTIVATED_EXIT );
}
/*!
@@ -1228,6 +1387,7 @@
*/
void CalenMonthView::setContextForActiveDay(int index)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_SETCONTEXTFORACTIVEDAY_ENTRY );
QDateTime newActiveDay = mFirstDayOfGrid.addDays(index);
// Set the context
mServices.Context().setFocusDate(newActiveDay);
@@ -1241,6 +1401,7 @@
mIsPrevPaneGesture = false;
}
+ OstTraceFunctionExit0( CALENMONTHVIEW_SETCONTEXTFORACTIVEDAY_EXIT );
}
/*!
@@ -1248,7 +1409,12 @@
*/
void CalenMonthView::createEditor()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_CREATEEDITOR_ENTRY );
+
+ captureScreenshot(true);
mServices.IssueCommandL(ECalenNewMeeting);
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_CREATEEDITOR_EXIT );
}
/*!
@@ -1256,6 +1422,8 @@
*/
void CalenMonthView::launchDayView()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_LAUNCHDAYVIEW_ENTRY );
+
mServices.IssueCommandL(ECalenDayView);
// day view launched now, disconnect to get the call backs for saveActivity
// on aboutToQuit signal
@@ -1264,6 +1432,8 @@
disconnect(qobject_cast<HbApplication*>(qApp), SIGNAL(aboutToQuit()), this, SLOT(saveActivity()));
mIsAboutToQuitEventConnected = false;
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_LAUNCHDAYVIEW_EXIT );
}
/*!
@@ -1271,11 +1441,15 @@
*/
void CalenMonthView::changeOrientation(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_CHANGEORIENTATION_ENTRY );
+
if (mOrientation != orientation) {
// change the orientation here
mOrientation = orientation;
handleChangeOrientation();
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_CHANGEORIENTATION_EXIT );
}
/*!
@@ -1284,6 +1458,8 @@
*/
void CalenMonthView::handleChangeOrientation()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_HANDLECHANGEORIENTATION_ENTRY );
+
bool loadSuccess = false;
if (mOrientation == Qt::Horizontal) {
mDocLoader->load(CALEN_MONTHVIEW_XML_FILE, CALEN_LANDSCAPE,
@@ -1307,6 +1483,8 @@
if (this == mServices.MainWindow().currentView()) {
viewLayout->addItem(mCurrPaneParent);
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_HANDLECHANGEORIENTATION_EXIT );
}
/*!
@@ -1314,13 +1492,18 @@
*/
void CalenMonthView::setDateToLabel()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_SETDATETOLABEL_ENTRY );
+
// Get the localised string for month name from system locale
- QString monthString = mLocale.monthName(mDate.date().month(), HbExtendedLocale::LongFormat);
+ QString dateString = mLocale.monthName(mDate.date().month(), HbExtendedLocale::LongFormat);
// Append a single space
- monthString.append(" ");
+ dateString.append(" ");
mLocale.setNumberOptions(QLocale::OmitGroupSeparator);
- QString yearString = mLocale.toString(mDate.date().year());
- mTitleLabel->setPlainText(hbTrId("txt_calendar_month_label_title_12").arg(monthString).arg(yearString));
+ // Append the year string also
+ dateString.append(mLocale.toString(mDate.date().year()));
+ mTitleLabel->setPlainText(dateString);
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_SETDATETOLABEL_EXIT );
}
/*!
@@ -1328,8 +1511,16 @@
*/
void CalenMonthView::handlePreviewPaneGesture(bool rightGesture)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_HANDLEPREVIEWPANEGESTURE_ENTRY );
+
QGraphicsLinearLayout* viewLayout = static_cast<QGraphicsLinearLayout *>
(widget()->layout());
+
+ // Set the effect in progress flags for next and previous panes
+ // For current pane, we would have set it in gestureEvent() function
+ mPrevPreviewPane->effectStarted();
+ mNextPreviewPane->effectStarted();
+
if(rightGesture) {
// Need to bring up the previous day preview pane
// Create the effect on mCurrPreviewPane to slide to right side
@@ -1388,6 +1579,8 @@
viewLayout->removeAt(1);
viewLayout->addItem(mNextPaneParent);
}
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_HANDLEPREVIEWPANEGESTURE_EXIT );
}
/*!
@@ -1395,6 +1588,9 @@
*/
QDateTime CalenMonthView::firstDayOfGrid()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_FIRSTDAYOFGRID_ENTRY );
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_FIRSTDAYOFGRID_EXIT );
return mFirstDayOfGrid;
}
@@ -1403,7 +1599,13 @@
*/
void CalenMonthView::onLocaleChanged(int reason)
{
- Q_UNUSED(reason);
+ OstTraceFunctionEntry0( CALENMONTHVIEW_ONLOCALECHANGED_ENTRY );
+
+ if ((reason & EChangesSystemTime)
+ || (reason & EChangesMidnightCrossover)) {
+ mCurrentDay = CalenDateUtils::today();
+ }
+ OstTraceFunctionExit0( CALENMONTHVIEW_ONLOCALECHANGED_EXIT );
}
/*!
@@ -1412,6 +1614,7 @@
void CalenMonthView::handleLeftEffectCompleted(
const HbEffect::EffectStatus &status)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_HANDLELEFTEFFECTCOMPLETED_ENTRY );
Q_UNUSED(status);
int index = getCurrGridIndex();
@@ -1434,11 +1637,17 @@
mPrevPaneParent = paneParent;
mPrevPaneLayoutWidget = paneLayoutWidget;
+ // Reset the effect in progress flag
+ mCurrPreviewPane->effectFinished();
+ mPrevPreviewPane->effectFinished();
+ mNextPreviewPane->effectFinished();
+
// Set the focus to proper date
setCurrGridIndex(index);
// Start the auto scroll on current preview pane
mCurrPreviewPane->startAutoScroll();
mNextPreviewPane->populateLabel(mDate.addDays(1));
+ OstTraceFunctionExit0( CALENMONTHVIEW_HANDLELEFTEFFECTCOMPLETED_EXIT );
}
/*!
@@ -1447,6 +1656,8 @@
void CalenMonthView::handleRightEffectCompleted(
const HbEffect::EffectStatus &status)
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_HANDLERIGHTEFFECTCOMPLETED_ENTRY );
+
Q_UNUSED(status);
int index = getCurrGridIndex();
@@ -1469,17 +1680,26 @@
mNextPaneParent = paneParent;
mNextPaneLayoutWidget = paneLayoutWidget;
+ // Reset the effect in progress flag
+ mCurrPreviewPane->effectFinished();
+ mNextPreviewPane->effectFinished();
+ mPrevPreviewPane->effectFinished();
+
// Set the focus to proper date
setCurrGridIndex(index);
// Start the auto scroll on current preview pane
mCurrPreviewPane->startAutoScroll();
mPrevPreviewPane->populateLabel(mDate.addDays(-1));
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_HANDLERIGHTEFFECTCOMPLETED_EXIT );
}
/*!
update the Day labels
*/
void CalenMonthView::updateDayLabel()
{
+ OstTraceFunctionEntry0( CALENMONTHVIEW_UPDATEDAYLABEL_ENTRY );
+
// Set the short day names to these labels
int startOfWeek = mLocale.startOfWeek();
int weekDayIndex = startOfWeek;
@@ -1513,5 +1733,7 @@
}
labels.clear();
weekDayArray.clear();
+
+ OstTraceFunctionExit0( CALENMONTHVIEW_UPDATEDAYLABEL_EXIT );
}
// End of file --Don't remove this.
--- a/calendarui/views/src/calennativeview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calennativeview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -35,6 +35,11 @@
#include "calensettingsview.h"
#include "calendateutils.h"
#include "calenconstants.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calennativeviewTraces.h"
+#endif
+
/*!
\class CalenNativeView
@@ -45,8 +50,12 @@
Default constructor.
*/
CalenNativeView::CalenNativeView(MCalenServices &services) :
- mServices(services), mIsCapturedScreenShotValid(false)
+ mServices(services),
+ mEntriesInDataBase(false),
+ mIsCapturedScreenShotValid(false)
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY );
+
setTitle(hbTrId("txt_calendar_title_calendar"));
// Create services API and register for notifications
@@ -60,6 +69,8 @@
mServices.RegisterForNotificationsL(this, notificationArray);
CleanupStack::PopAndDestroy(¬ificationArray);
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_CALENNATIVEVIEW_EXIT );
}
/*!
@@ -67,6 +78,9 @@
*/
CalenNativeView::~CalenNativeView()
{
+ OstTraceFunctionEntry0( DUP1_CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENNATIVEVIEW_CALENNATIVEVIEW_EXIT );
}
/*!
@@ -74,8 +88,12 @@
*/
void CalenNativeView::populationComplete()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_POPULATIONCOMPLETE_ENTRY );
+
// Population is complete, issue the notification
mServices.IssueNotificationL(ECalenNotifyViewPopulationComplete);
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_POPULATIONCOMPLETE_EXIT );
}
/*!
@@ -83,7 +101,11 @@
*/
void CalenNativeView::deleteBeforeDate()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_DELETEBEFOREDATE_ENTRY );
+
mServices.IssueCommandL(ECalenDeleteEntriesBeforeDate);
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_DELETEBEFOREDATE_EXIT );
}
/*!
@@ -91,7 +113,12 @@
*/
void CalenNativeView::deleteAllEntries()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_DELETEALLENTRIES_ENTRY );
+
mServices.IssueCommandL(ECalenDeleteAllEntries);
+ mEntriesInDataBase = false;
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_DELETEALLENTRIES_EXIT );
}
/*!
@@ -99,6 +126,8 @@
*/
void CalenNativeView::goToDate()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_GOTODATE_ENTRY );
+
// Create a popup with datepicker for the user to select date.
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
@@ -121,6 +150,8 @@
connect(okAction, SIGNAL(triggered()), this, SLOT(goToSelectedDate()));
popUp->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popUp));
popUp->open();
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_GOTODATE_EXIT );
}
/*
@@ -128,6 +159,8 @@
*/
void CalenNativeView::goToSelectedDate()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_GOTOSELECTEDDATE_ENTRY );
+
QDate selectedDate = mDatePicker->date();
// Check if the selected date is within the range.
@@ -142,6 +175,8 @@
context.setFocusDateAndTime(contextDate);
}
refreshViewOnGoToDate();
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_GOTOSELECTEDDATE_EXIT );
}
/*!
@@ -150,7 +185,11 @@
*/
void CalenNativeView::refreshViewOnGoToDate()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_REFRESHVIEWONGOTODATE_ENTRY );
+
mServices.IssueCommandL(ECalenStartActiveStep);
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_REFRESHVIEWONGOTODATE_EXIT );
}
/*!
@@ -158,7 +197,11 @@
*/
void CalenNativeView::launchSettingsView()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_LAUNCHSETTINGSVIEW_ENTRY );
+
mServices.IssueCommandL(ECalenShowSettings);
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_LAUNCHSETTINGSVIEW_EXIT );
}
/*!
@@ -166,8 +209,11 @@
*/
void CalenNativeView::changeOrientation(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_CHANGEORIENTATION_ENTRY );
+
Q_UNUSED(orientation);
// Nothing, derived classes will implement it
+ OstTraceFunctionExit0( CALENNATIVEVIEW_CHANGEORIENTATION_EXIT );
}
/*!
@@ -175,11 +221,17 @@
*/
void CalenNativeView::HandleNotification(const TCalenNotification notification)
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_HANDLENOTIFICATION_ENTRY );
+
switch (notification) {
case ECalenNotifySystemLocaleChanged: {
onLocaleChanged(EChangesLocale);
}
- break;
+ break;
+ case ECalenNotifySystemTimeChanged: {
+ onLocaleChanged(EChangesSystemTime);
+ }
+ break;
case ECalenNotifyContextChanged: {
onContextChanged();
}
@@ -187,6 +239,8 @@
default:
break;
}
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_HANDLENOTIFICATION_EXIT );
}
/*!
@@ -194,17 +248,25 @@
*/
TBool CalenNativeView::pluginEnabled()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_PLUGINENABLED_ENTRY );
+
QString *pluginInfo = mServices.InfobarTextL();
if (!pluginInfo) {
+ OstTraceFunctionExit0( CALENNATIVEVIEW_PLUGINENABLED_EXIT );
return false;
} else {
+ OstTraceFunctionExit0( DUP1_CALENNATIVEVIEW_PLUGINENABLED_EXIT );
return true;
}
}
QString *CalenNativeView::pluginText()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_PLUGINTEXT_ENTRY );
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_PLUGINTEXT_EXIT );
return mServices.InfobarTextL();
+
}
// ----------------------------------------------------------------------------
@@ -214,6 +276,8 @@
//
void CalenNativeView::captureScreenshot(bool captureScreenShot)
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_CAPTURESCREENSHOT_ENTRY );
+
// get a screenshot for saving to the activity manager. It's done for once
// to optimize the performance
if (captureScreenShot) {
@@ -221,6 +285,8 @@
mScreenShotMetadata.insert("screenshot", QPixmap::grabWidget(mainWindow(), mainWindow()->rect()));
}
mIsCapturedScreenShotValid = captureScreenShot; // set the validity of the screenshot captured
+
+ OstTraceFunctionExit0( CALENNATIVEVIEW_CAPTURESCREENSHOT_EXIT );
}
// ----------------------------------------------------------------------------
@@ -229,6 +295,8 @@
//
void CalenNativeView::saveActivity()
{
+ OstTraceFunctionEntry0( CALENNATIVEVIEW_SAVEACTIVITY_ENTRY );
+
// Get a pointer to activity manager
HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
@@ -251,5 +319,6 @@
if ( !ok ) {
qFatal("Add failed" ); // Panic is activity is not saved successfully
}
+ OstTraceFunctionExit0( CALENNATIVEVIEW_SAVEACTIVITY_EXIT );
}
//End Of File
--- a/calendarui/views/src/calenpluginlabel.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calenpluginlabel.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -21,6 +21,11 @@
// User includes
#include "calenservices.h"
#include "calenpluginlabel.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenpluginlabelTraces.h"
+#endif
+
/*!
\class CalenPluginLabel
@@ -30,19 +35,26 @@
/*!
constructor
*/
-Q_DECL_EXPORT CalenPluginLabel::CalenPluginLabel(MCalenServices& services,
+CalenPluginLabel::CalenPluginLabel(MCalenServices& services,
QGraphicsItem* parent) :
HbLabel(parent),mServices(services)
{
+ OstTraceFunctionEntry0( CALENPLUGINLABEL_CALENPLUGINLABEL_ENTRY );
+
setAlignment(Qt::AlignCenter);
grabGesture(Qt::TapGesture);
+
+ OstTraceFunctionExit0( CALENPLUGINLABEL_CALENPLUGINLABEL_EXIT );
}
/*!
Destructor
*/
-Q_DECL_EXPORT CalenPluginLabel::~CalenPluginLabel()
+CalenPluginLabel::~CalenPluginLabel()
{
+ OstTraceFunctionEntry0( DUP1_CALENPLUGINLABEL_CALENPLUGINLABEL_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENPLUGINLABEL_CALENPLUGINLABEL_EXIT );
}
@@ -51,6 +63,8 @@
*/
void CalenPluginLabel::gestureEvent(QGestureEvent *event)
{
+ OstTraceFunctionEntry0( CALENPLUGINLABEL_GESTUREEVENT_ENTRY );
+
if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
if (gesture->state() == Qt::GestureFinished) {
if (gesture->tapStyleHint() == HbTapGesture::Tap) {
@@ -60,6 +74,8 @@
}
}
}
+
+ OstTraceFunctionExit0( CALENPLUGINLABEL_GESTUREEVENT_EXIT );
}
--- a/calendarui/views/src/calenpreviewpane.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calenpreviewpane.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -29,6 +29,8 @@
#include <hbcolorscheme.h>
#include <hbtapgesture.h>
#include <hbpangesture.h>
+#include <hbinstance.h>
+#include <hbinstantfeedback.h>
#include <agendautil.h>
#include <agendaentry.h>
@@ -41,12 +43,17 @@
#include "calencommon.h"
#include "calenpreviewpane.h"
#include "calenmonthview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenpreviewpaneTraces.h"
+#endif
+
// Macros
#define TWO_SECONDS_TIMER 2000 // millseconds
#define SCROLLING_SPEED 10
#define MAX_PAN_DIRECTION_THRESHOLD 50
-#define MIN_PAN_DIRECTION_THRESHOLD 20
+#define MIN_PAN_DIRECTION_THRESHOLD 10
static const QString EMPTYSTRING(" ");
@@ -57,6 +64,8 @@
QGraphicsItem* parent)
: HbScrollArea(parent),mServices(services)
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_CALENPREVIEWPANE_ENTRY );
+
// Create the timer
mTwoSecTimer = new QTimer(this);
mScrollDirection = invalid;
@@ -72,6 +81,11 @@
// Connect the scrollig finished signal
connect(this, SIGNAL(scrollingEnded()), this,
SLOT(scrollingFinished()));
+
+ grabGesture(Qt::TapGesture);
+ grabGesture(Qt::PanGesture);
+
+ OstTraceFunctionExit0( CALENPREVIEWPANE_CALENPREVIEWPANE_EXIT );
}
/*!
@@ -79,6 +93,9 @@
*/
CalenPreviewPane::~CalenPreviewPane()
{
+ OstTraceFunctionEntry0( DUP1_CALENPREVIEWPANE_CALENPREVIEWPANE_ENTRY );
+
+ OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_CALENPREVIEWPANE_EXIT );
}
/*!
@@ -86,7 +103,11 @@
*/
void CalenPreviewPane::setNoEntriesLabel(HbLabel* label)
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_SETNOENTRIESLABEL_ENTRY );
+
mNoEntriesLabel = label;
+
+ OstTraceFunctionExit0( CALENPREVIEWPANE_SETNOENTRIESLABEL_EXIT );
}
/*!
@@ -94,6 +115,8 @@
*/
void CalenPreviewPane::populateLabel(QDateTime date)
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_POPULATELABEL_ENTRY );
+
mScrollDirection = up;
// Scroll contents to zero position before we display to the user
@@ -116,6 +139,7 @@
if (mIsNoEntriesAdded) {
if (!instanceCount) {
mNoEntriesLabel->setVisible(true);
+ OstTraceFunctionExit0( CALENPREVIEWPANE_POPULATELABEL_EXIT );
return;
} else {
// Remove the no entries label
@@ -157,14 +181,18 @@
}
QString summary = mInstanceArray[i].summary();
if(!summary.length()) {
- // No summary display "No subject"
- summary.append(hbTrId("txt_calendar_dblist_unnamed"));
+ // No summary display "Unnamed"
+ summary.append(hbTrId("txt_calendar_preview_unnamed"));
}
- // Chcek the entry type, based on the type display time field in
+ // Check the entry type, based on the type display time field in
// preview pane.
QString start;
- if(mInstanceArray[i].type() != AgendaEntry::TypeTodo ) {
+ if(mInstanceArray[i].type() != AgendaEntry::TypeTodo &&
+ mInstanceArray[i].type() != AgendaEntry::TypeAnniversary &&
+ !CalenAgendaUtils::isAlldayEvent(mInstanceArray[i])) {
QDateTime startTime = mInstanceArray[i].startTime();
+ // Check if event starts in past
+ checkStartTimeOfEvent(startTime);
HbExtendedLocale systemLocale =HbExtendedLocale::system();
start = systemLocale.format(startTime.time(),
r_qtn_time_usual_with_zero);
@@ -211,6 +239,8 @@
mIsNoEntriesAdded = true;
}
layout->activate();
+
+ OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_POPULATELABEL_EXIT );
}
/*!
@@ -218,6 +248,8 @@
*/
void CalenPreviewPane::GetInstanceListL()
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_GETINSTANCELISTL_ENTRY );
+
mInstanceArray.clear();
// Find Meetings, Remainders, Anniversaries and Day Notes
@@ -232,6 +264,8 @@
AgendaUtil::IncludeReminders);
mInstanceArray = mServices.agendaInterface()->
createEntryIdListForDay(dayStart, filter);
+
+ OstTraceFunctionExit0( CALENPREVIEWPANE_GETINSTANCELISTL_EXIT );
}
/*!
@@ -239,6 +273,9 @@
*/
QDateTime CalenPreviewPane::Date()
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_DATE_ENTRY );
+
+ OstTraceFunctionExit0( CALENPREVIEWPANE_DATE_EXIT );
return mDate;
}
@@ -247,8 +284,11 @@
*/
void CalenPreviewPane::startAutoScroll()
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_STARTAUTOSCROLL_ENTRY );
+
if (mIsNoEntriesAdded) {
scrollContentsTo(QPointF(0.0,0.0));
+ OstTraceFunctionExit0( CALENPREVIEWPANE_STARTAUTOSCROLL_EXIT );
return;
}
@@ -256,6 +296,8 @@
mTwoSecTimer->setSingleShot(true);
connect(mTwoSecTimer, SIGNAL(timeout()), this, SLOT(onTwoSecondsTimeout()));
mTwoSecTimer->start(TWO_SECONDS_TIMER);
+
+ OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_STARTAUTOSCROLL_EXIT );
}
/*!
@@ -264,6 +306,8 @@
*/
void CalenPreviewPane::onTwoSecondsTimeout()
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_ONTWOSECONDSTIMEOUT_ENTRY );
+
mTwoSecTimer->stop();
disconnect(mTwoSecTimer, SIGNAL(timeout()),
this, SLOT(onTwoSecondsTimeout()));
@@ -292,6 +336,8 @@
QPointF targetPos(0.0, 0.0);
scrollContentsTo(targetPos, mScrollDuration * 1000);
}
+
+ OstTraceFunctionExit0( CALENPREVIEWPANE_ONTWOSECONDSTIMEOUT_EXIT );
}
/*!
@@ -300,14 +346,19 @@
*/
void CalenPreviewPane::scrollingFinished()
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_SCROLLINGFINISHED_ENTRY );
+
// If we are here because of calling scrollContentsTo()
if (!mNumOfScrolls) {
+ OstTraceFunctionExit0( CALENPREVIEWPANE_SCROLLINGFINISHED_EXIT );
return;
}
// Now start the two seconds timer again
mTwoSecTimer->setSingleShot(true);
connect(mTwoSecTimer, SIGNAL(timeout()), this, SLOT(onTwoSecondsTimeout()));
mTwoSecTimer->start(TWO_SECONDS_TIMER);
+
+ OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_SCROLLINGFINISHED_EXIT );
}
/*!
@@ -315,55 +366,76 @@
*/
void CalenPreviewPane::gestureEvent(QGestureEvent *event)
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_GESTUREEVENT_ENTRY );
+
if(HbPanGesture *gesture = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))) {
- if (gesture->state() == Qt::GestureStarted) {
- // TODO: This work aroung till framework provides an api
+ if (gesture->state() == Qt::GestureUpdated) {
+ // Check if effect is not yet completed, ignore the current gesture if it is
+ if (mIsGestureHandled) {
+ OstTraceFunctionExit0( CALENPREVIEWPANE_GESTUREEVENT_EXIT );
+ return;
+ }
+ // TODO: This work around till framework provides an api
// to know the direciton of the pan, until then we need
// calculate the direction explicitly
// Get to know the direction of the gesture
QPointF delta = gesture->delta();
- if (abs(delta.y()) > MAX_PAN_DIRECTION_THRESHOLD) {
- // Now see if y coord diff has crossed threshold
- if (delta.x() > MAX_PAN_DIRECTION_THRESHOLD) {
+ // Check the current orientation of the device and
+ // swap the vertical and horizontal distances in landscape
+ qreal horizontalDiff = 0.0;
+ qreal verticalDiff = 0.0;
+ if (hbInstance->allMainWindows().at(0)->orientation() == Qt::Vertical) {
+ horizontalDiff = delta.x();
+ verticalDiff = delta.y();
+ } else {
+ horizontalDiff = delta.y();
+ verticalDiff = delta.x();
+ }
+ if (abs(verticalDiff) > MAX_PAN_DIRECTION_THRESHOLD) {
+ // Now see if x coord diff has crossed threshold
+ if (horizontalDiff > MAX_PAN_DIRECTION_THRESHOLD) {
mIsGestureHandled = true;
// right gesture
mView->handlePreviewPaneGesture(true);
event->accept(Qt::PanGesture);
- } else if (delta.x() < -MAX_PAN_DIRECTION_THRESHOLD){
+ } else if (horizontalDiff < -MAX_PAN_DIRECTION_THRESHOLD){
mIsGestureHandled = true;
// left gesture
mView->handlePreviewPaneGesture(false);
event->accept(Qt::PanGesture);
} else {
event->accept(Qt::PanGesture);
+ OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
return;
}
- } else if (abs(delta.y()) < MAX_PAN_DIRECTION_THRESHOLD) {
- if (delta.x() > MIN_PAN_DIRECTION_THRESHOLD) {
+ } else if (abs(verticalDiff) < MAX_PAN_DIRECTION_THRESHOLD) {
+ if (horizontalDiff > MIN_PAN_DIRECTION_THRESHOLD) {
mIsGestureHandled = true;
// right gesture
mView->handlePreviewPaneGesture(true);
event->accept(Qt::PanGesture);
- } else if (delta.x() < -MIN_PAN_DIRECTION_THRESHOLD){
+ } else if (horizontalDiff < -MIN_PAN_DIRECTION_THRESHOLD){
mIsGestureHandled = true;
// left gesture
mView->handlePreviewPaneGesture(false);
event->accept(Qt::PanGesture);
}else {
event->accept(Qt::PanGesture);
+ OstTraceFunctionExit0( DUP2_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
return;
}
}
}
- } else if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
- if (gesture->state() == Qt::GestureFinished) {
- if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+ } else if(QTapGesture *tapGesture = qobject_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {
+ if (tapGesture && tapGesture->state() == Qt::GestureFinished) {
+ HbInstantFeedback::play(HbFeedback::Basic);
// Preview pane tapped
mServices.IssueCommandL(ECalenAgendaView);
event->accept(Qt::TapGesture);
- }
}
}
+
+ OstTraceFunctionExit0( DUP2_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
}
/*!
@@ -371,7 +443,11 @@
*/
void CalenPreviewPane::setView(CalenMonthView* view)
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_SETVIEW_ENTRY );
+
mView = view;
+
+ OstTraceFunctionExit0( CALENPREVIEWPANE_SETVIEW_EXIT );
}
/*!
@@ -379,6 +455,8 @@
*/
void CalenPreviewPane::stopScrolling()
{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_STOPSCROLLING_ENTRY );
+
if (isScrolling() || mTwoSecTimer->isActive()) {
scrollContentsTo(QPointF(0.0,0.0));
@@ -386,6 +464,39 @@
HbScrollArea::panGesture(QPointF(0.0,0.0));
mTwoSecTimer->stop();
}
+
+ OstTraceFunctionExit0( CALENPREVIEWPANE_STOPSCROLLING_EXIT );
+}
+
+/*!
+ Checks if the start time of the event falls on the date for which preview
+ pane is being shown. If start time is in past, then time will be 12:00AM
+ */
+void CalenPreviewPane::checkStartTimeOfEvent(QDateTime &dateTime)
+{
+ // If event start time is in past
+ if (dateTime.date() < mDate.date()) {
+ // Set the time to 12:00AM of mDate
+ dateTime.setDate(mDate.date());
+ QTime time(0,0,0,0); // 0 means 12:00 AM
+ dateTime.setTime(time);
+ }
+}
+
+/*!
+ Sets the effect beign handled flag to true
+ */
+void CalenPreviewPane::effectStarted()
+{
+ mIsGestureHandled = true;
+}
+
+/*!
+ Resets the effect beign handled flag to true
+ */
+void CalenPreviewPane::effectFinished()
+{
+ mIsGestureHandled = false;
}
// End of file --Don't remove this.
--- a/calendarui/views/src/calensettingsview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calensettingsview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -29,6 +29,11 @@
#include "calensettingsview.h"
#include "calenservices.h"
#include "calensettings.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calensettingsviewTraces.h"
+#endif
+
CalenSettingsView::CalenSettingsView(MCalenServices& services, QGraphicsItem *parent)
:HbView(parent),
@@ -37,6 +42,8 @@
mCalenSettings(NULL),
mSoftKeyAction(NULL)
{
+ OstTraceFunctionEntry0( CALENSETTINGSVIEW_CALENSETTINGSVIEW_ENTRY );
+
mCalenSettingsForm = new HbDataForm(this);
@@ -54,30 +61,41 @@
}
}
+ OstTraceFunctionExit0( CALENSETTINGSVIEW_CALENSETTINGSVIEW_EXIT );
}
CalenSettingsView::~CalenSettingsView()
{
+ OstTraceFunctionEntry0( DUP1_CALENSETTINGSVIEW_CALENSETTINGSVIEW_ENTRY );
+
if (mCalenSettings) {
delete mCalenSettings;
}
if (mSoftKeyAction) {
delete mSoftKeyAction;
}
+
+ OstTraceFunctionExit0( DUP1_CALENSETTINGSVIEW_CALENSETTINGSVIEW_EXIT );
}
void CalenSettingsView::launchPreviousView()
{
+ OstTraceFunctionEntry0( CALENSETTINGSVIEW_LAUNCHPREVIOUSVIEW_ENTRY );
+
// Remove the view from mainwindow
disconnect(mSoftKeyAction, SIGNAL(triggered()),
this, SLOT(launchPreviousView()));
mServices.MainWindow().removeView(this);
mServices.IssueNotificationL(ECalenNotifySettingsClosed);
+
+ OstTraceFunctionExit0( CALENSETTINGSVIEW_LAUNCHPREVIOUSVIEW_EXIT );
}
void CalenSettingsView::initializeForm()
{
+ OstTraceFunctionEntry0( CALENSETTINGSVIEW_INITIALIZEFORM_ENTRY );
+
mCalenSettings->populateSettingList();
// Add view on main window and set back softkey
@@ -89,12 +107,18 @@
connect(mSoftKeyAction, SIGNAL(triggered()),
this, SLOT(launchPreviousView()));
}
+
+ OstTraceFunctionExit0( CALENSETTINGSVIEW_INITIALIZEFORM_EXIT );
}
void CalenSettingsView::refreshView()
{
+ OstTraceFunctionEntry0( CALENSETTINGSVIEW_REFRESHVIEW_ENTRY );
+
//populate the new items
mCalenSettings->populateSettingList();
+
+ OstTraceFunctionExit0( CALENSETTINGSVIEW_REFRESHVIEW_EXIT );
}
// End of file
--- a/calendarui/views/src/calenthicklinesdrawer.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calenthicklinesdrawer.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -24,6 +24,11 @@
// User includes
#include "calenthicklinesdrawer.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenthicklinesdrawerTraces.h"
+#endif
+
// CONSTANTS
#define CALENTHICKLINEWIDTH 0.15 // Units
@@ -42,9 +47,13 @@
QGraphicsItem* parent):
HbWidget(parent)
{
+ OstTraceFunctionEntry0( CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_ENTRY );
+
typeOfWidget = type;
mGridBorderColor = HbColorScheme::color("qtc_cal_grid_line");
setFlag(QGraphicsItem::ItemHasNoContents, false);
+
+ OstTraceFunctionExit0( CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_EXIT );
}
/*!
@@ -52,7 +61,9 @@
*/
CalenThickLinesDrawer::~CalenThickLinesDrawer()
{
+ OstTraceFunctionEntry0( DUP1_CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_ENTRY );
+ OstTraceFunctionExit0( DUP1_CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_EXIT );
}
/*!
@@ -62,6 +73,8 @@
const QStyleOptionGraphicsItem* option,
QWidget* widget)
{
+ OstTraceFunctionEntry0( CALENTHICKLINESDRAWER_PAINT_ENTRY );
+
Q_UNUSED(option);
Q_UNUSED(widget);
QPen pen;
@@ -74,6 +87,10 @@
qreal widthInPixels = CALENTHICKLINEWIDTH * unitValue;
pen.setWidth(widthInPixels);
pen.setBrush(mGridBorderColor);
+
+ // Store the old pen
+ QPen oldPen = painter->pen();
+
painter->setPen(pen);
QRectF controlRect = this->boundingRect();
@@ -82,6 +99,8 @@
// Calculate the seperation to be added so that line coincides with
// top border of the grid
qreal seperation = CALENDAYNAMEANDGRIDSEPERATOR * unitValue;
+ // Adjust the seperation with the thickness of the line
+ seperation = seperation - widthInPixels;
// Get the start point and end point to draw the line
QPointF startPoint(controlRect.bottomLeft().x(), controlRect.bottomLeft().y() + seperation);
QPointF endPoint(controlRect.bottomRight().x(), controlRect.bottomRight().y() + seperation);
@@ -95,6 +114,11 @@
painter->drawLine(startPoint, endPoint);
}
}
+
+ // Set the old pen back
+ painter->setPen(oldPen);
+
+ OstTraceFunctionExit0( CALENTHICKLINESDRAWER_PAINT_EXIT );
}
// End of file --Don't remove this.
--- a/calendarui/views/src/calentodayindicatorlinedrawer.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/src/calentodayindicatorlinedrawer.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -24,6 +24,11 @@
// User includes
#include "CalenTodayIndicatorLineDrawer.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calentodayindicatorlinedrawerTraces.h"
+#endif
+
/*!
\class CalenTodayIndicatorLineDrawer.
@@ -37,10 +42,14 @@
CalenTodayIndicatorLineDrawer::CalenTodayIndicatorLineDrawer(
QGraphicsItem* parent): HbWidgetBase(parent)
{
+ OstTraceFunctionEntry0( CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_ENTRY );
+
connect(
HbTheme::instance(), SIGNAL(changed()),
this, SLOT(handleThemeChange()));
setFlag(QGraphicsItem::ItemHasNoContents, false);
+
+ OstTraceFunctionExit0( CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_EXIT );
}
/*!
@@ -48,7 +57,9 @@
*/
CalenTodayIndicatorLineDrawer::~CalenTodayIndicatorLineDrawer()
{
+ OstTraceFunctionEntry0( DUP1_CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_ENTRY );
+ OstTraceFunctionExit0( DUP1_CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_EXIT );
}
/*!
@@ -58,15 +69,26 @@
QPainter* painter, const QStyleOptionGraphicsItem* option,
QWidget* widget)
{
+ OstTraceFunctionEntry0( CALENTODAYINDICATORLINEDRAWER_PAINT_ENTRY );
+
Q_UNUSED(option);
Q_UNUSED(widget);
QPen pen;
pen.setStyle(Qt::SolidLine);
pen.setBrush(HbColorScheme::color("qtc_cal_month_current_day"));
+
+ // Store the old pen
+ QPen oldPen = painter->pen();
+
painter->setPen(pen);
QRectF controlRect = this->boundingRect();
painter->fillRect(
controlRect, HbColorScheme::color("qtc_cal_month_current_day"));
+
+ // Set the old pen back
+ painter->setPen(oldPen);
+
+ OstTraceFunctionExit0( CALENTODAYINDICATORLINEDRAWER_PAINT_EXIT );
}
/*!
@@ -74,7 +96,11 @@
*/
void CalenTodayIndicatorLineDrawer::handleThemeChange()
{
+ OstTraceFunctionEntry0( CALENTODAYINDICATORLINEDRAWER_HANDLETHEMECHANGE_ENTRY );
+
update();
+
+ OstTraceFunctionExit0( CALENTODAYINDICATORLINEDRAWER_HANDLETHEMECHANGE_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calenagendaviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,46 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENAGENDAVIEWTRACES_H__
+#define __CALENAGENDAVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENAGENDAVIEW_CALENAGENDAVIEW_ENTRY 0x8a0001
+#define CALENAGENDAVIEW_CALENAGENDAVIEW_EXIT 0x8a0002
+#define DUP1_CALENAGENDAVIEW_CALENAGENDAVIEW_ENTRY 0x8a0003
+#define DUP1_CALENAGENDAVIEW_CALENAGENDAVIEW_EXIT 0x8a0004
+#define CALENAGENDAVIEW_SETUPVIEW_ENTRY 0x8a0005
+#define CALENAGENDAVIEW_SETUPVIEW_EXIT 0x8a0006
+#define DUP1_CALENAGENDAVIEW_SETUPVIEW_EXIT 0x8a0007
+#define CALENAGENDAVIEW_DOPOPULATION_ENTRY 0x8a0008
+#define CALENAGENDAVIEW_DOPOPULATION_EXIT 0x8a0009
+#define DUP1_CALENAGENDAVIEW_DOPOPULATION_EXIT 0x8a000a
+#define CALENAGENDAVIEW_REFRESHVIEWONGOTODATE_ENTRY 0x8a000b
+#define CALENAGENDAVIEW_REFRESHVIEWONGOTODATE_EXIT 0x8a000c
+#define CALENAGENDAVIEW_HANDLENOTIFICATION_ENTRY 0x8a000d
+#define CALENAGENDAVIEW_HANDLENOTIFICATION_EXIT 0x8a000e
+#define CALENAGENDAVIEW_DOCLOADER_ENTRY 0x8a000f
+#define CALENAGENDAVIEW_DOCLOADER_EXIT 0x8a0010
+#define CALENAGENDAVIEW_GESTUREEVENT_ENTRY 0x8a0011
+#define CALENAGENDAVIEW_GESTUREEVENT_EXIT 0x8a0012
+#define CALENAGENDAVIEW_SETUPACTIONS_ENTRY 0x8a0013
+#define CALENAGENDAVIEW_SETUPACTIONS_EXIT 0x8a0014
+#define CALENAGENDAVIEW_ONLOCALECHANGED_ENTRY 0x8a0015
+#define CALENAGENDAVIEW_ONLOCALECHANGED_EXIT 0x8a0016
+#define CALENAGENDAVIEW_ORIENTATIONCHANGED_ENTRY 0x8a0017
+#define CALENAGENDAVIEW_ORIENTATIONCHANGED_EXIT 0x8a0018
+#define CALENAGENDAVIEW_LAUNCHMONTHVIEW_ENTRY 0x8a0019
+#define CALENAGENDAVIEW_LAUNCHMONTHVIEW_EXIT 0x8a001a
+#define CALENAGENDAVIEW_LAUNCHDAYVIEW_ENTRY 0x8a001b
+#define CALENAGENDAVIEW_LAUNCHDAYVIEW_EXIT 0x8a001c
+#define CALENAGENDAVIEW_CLEARLISTMODEL_ENTRY 0x8a001d
+#define CALENAGENDAVIEW_CLEARLISTMODEL_EXIT 0x8a001e
+#define CALENAGENDAVIEW_DISCONNECTABOUTTOQUITEVENT_ENTRY 0x8a001f
+#define CALENAGENDAVIEW_DISCONNECTABOUTTOQUITEVENT_EXIT 0x8a0020
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calenagendaviewwidgetTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,83 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENAGENDAVIEWWIDGETTRACES_H__
+#define __CALENAGENDAVIEWWIDGETTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY 0x8a0021
+#define CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_EXIT 0x8a0022
+#define DUP1_CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY 0x8a0023
+#define DUP1_CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_EXIT 0x8a0024
+#define CALENAGENDAVIEWWIDGET_SETUPWIDGET_ENTRY 0x8a0025
+#define CALENAGENDAVIEWWIDGET_SETUPWIDGET_EXIT 0x8a0026
+#define DUP1_CALENAGENDAVIEWWIDGET_SETUPWIDGET_EXIT 0x8a0027
+#define CALENAGENDAVIEWWIDGET_SHOWWIDGET_ENTRY 0x8a0028
+#define CALENAGENDAVIEWWIDGET_SHOWWIDGET_EXIT 0x8a0029
+#define CALENAGENDAVIEWWIDGET_ORIENTATIONCHANGED_ENTRY 0x8a002a
+#define CALENAGENDAVIEWWIDGET_ORIENTATIONCHANGED_EXIT 0x8a002b
+#define CALENAGENDAVIEWWIDGET_HANDLELOCALECHANGE_ENTRY 0x8a002c
+#define CALENAGENDAVIEWWIDGET_HANDLELOCALECHANGE_EXIT 0x8a002d
+#define CALENAGENDAVIEWWIDGET_SETCONTEXTFROMHIGHLIGHT_ENTRY 0x8a002e
+#define CALENAGENDAVIEWWIDGET_SETCONTEXTFROMHIGHLIGHT_EXIT 0x8a002f
+#define CALENAGENDAVIEWWIDGET_INITCHILDWIDGETS_ENTRY 0x8a0030
+#define CALENAGENDAVIEWWIDGET_INITCHILDWIDGETS_EXIT 0x8a0031
+#define CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_ENTRY 0x8a0032
+#define CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_EXIT 0x8a0033
+#define DUP1_CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_EXIT 0x8a0034
+#define CALENAGENDAVIEWWIDGET_GETINSTANCELIST_ENTRY 0x8a0035
+#define CALENAGENDAVIEWWIDGET_GETINSTANCELIST_EXIT 0x8a0036
+#define CALENAGENDAVIEWWIDGET_SETHEADINGTEXT_ENTRY 0x8a0037
+#define CALENAGENDAVIEWWIDGET_SETHEADINGTEXT_EXIT 0x8a0038
+#define CALENAGENDAVIEWWIDGET_CREATELISTITEM_ENTRY 0x8a0039
+#define CALENAGENDAVIEWWIDGET_CREATELISTITEM_EXIT 0x8a003a
+#define DUP1_CALENAGENDAVIEWWIDGET_CREATELISTITEM_EXIT 0x8a003b
+#define CALENAGENDAVIEWWIDGET_ADDTIMEDEVENTTOLIST_ENTRY 0x8a003c
+#define CALENAGENDAVIEWWIDGET_ADDTIMEDEVENTTOLIST_EXIT 0x8a003d
+#define CALENAGENDAVIEWWIDGET_ADDNONTIMEDEVENTTOLIST_ENTRY 0x8a003e
+#define CALENAGENDAVIEWWIDGET_ADDNONTIMEDEVENTTOLIST_EXIT 0x8a003f
+#define CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_ENTRY 0x8a0040
+#define CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_EXIT 0x8a0041
+#define DUP1_CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_EXIT 0x8a0042
+#define CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_ENTRY 0x8a0043
+#define CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_EXIT 0x8a0044
+#define DUP1_CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_EXIT 0x8a0045
+#define CALENAGENDAVIEWWIDGET_SHOWHIDEREGIONALINFORMATION_ENTRY 0x8a0046
+#define CALENAGENDAVIEWWIDGET_SHOWHIDEREGIONALINFORMATION_EXIT 0x8a0047
+#define CALENAGENDAVIEWWIDGET_CREATENEWEVENT_ENTRY 0x8a0048
+#define CALENAGENDAVIEWWIDGET_CREATENEWEVENT_EXIT 0x8a0049
+#define CALENAGENDAVIEWWIDGET_EDITENTRY_ENTRY 0x8a004a
+#define CALENAGENDAVIEWWIDGET_EDITENTRY_EXIT 0x8a004b
+#define DUP1_CALENAGENDAVIEWWIDGET_EDITENTRY_EXIT 0x8a004c
+#define CALENAGENDAVIEWWIDGET_VIEWENTRY_ENTRY 0x8a004d
+#define CALENAGENDAVIEWWIDGET_VIEWENTRY_EXIT 0x8a004e
+#define CALENAGENDAVIEWWIDGET_DELETEENTRY_ENTRY 0x8a004f
+#define CALENAGENDAVIEWWIDGET_DELETEENTRY_EXIT 0x8a0050
+#define DUP1_CALENAGENDAVIEWWIDGET_DELETEENTRY_EXIT 0x8a0051
+#define CALENAGENDAVIEWWIDGET_MARKASDONE_ENTRY 0x8a0052
+#define CALENAGENDAVIEWWIDGET_MARKASDONE_EXIT 0x8a0053
+#define DUP1_CALENAGENDAVIEWWIDGET_MARKASDONE_EXIT 0x8a0054
+#define CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_ENTRY 0x8a0055
+#define CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_EXIT 0x8a0056
+#define DUP1_CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_EXIT 0x8a0057
+#define CALENAGENDAVIEWWIDGET_ITEMACTIVATED_ENTRY 0x8a0058
+#define CALENAGENDAVIEWWIDGET_ITEMACTIVATED_EXIT 0x8a0059
+#define DUP1_CALENAGENDAVIEWWIDGET_ITEMACTIVATED_EXIT 0x8a005a
+#define CALENAGENDAVIEWWIDGET_NOTEEDITINGCOMPLETED_ENTRY 0x8a005b
+#define CALENAGENDAVIEWWIDGET_NOTEEDITINGCOMPLETED_EXIT 0x8a005c
+#define CALENAGENDAVIEWWIDGET_GOTOTODAY_ENTRY 0x8a005d
+#define CALENAGENDAVIEWWIDGET_GOTOTODAY_EXIT 0x8a005e
+#define DUP1_CALENAGENDAVIEWWIDGET_GOTOTODAY_EXIT 0x8a005f
+#define CALENAGENDAVIEWWIDGET_CONTEXTMENUCLOSED_ENTRY 0x8a0060
+#define CALENAGENDAVIEWWIDGET_CONTEXTMENUCLOSED_EXIT 0x8a0061
+#define CALENAGENDAVIEWWIDGET_CONTEXTMANUTRIGGERED_ENTRY 0x8a0062
+#define CALENAGENDAVIEWWIDGET_CONTEXTMANUTRIGGERED_EXIT 0x8a0063
+#define CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_ENTRY 0x8a0064
+#define CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_EXIT 0x8a0065
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/caleneventlistviewitemTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,22 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENEVENTLISTVIEWITEMTRACES_H__
+#define __CALENEVENTLISTVIEWITEMTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY 0x8a0066
+#define CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_EXIT 0x8a0067
+#define DUP1_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY 0x8a0068
+#define DUP1_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_EXIT 0x8a0069
+#define CALENEVENTLISTVIEWITEM_CREATEITEM_ENTRY 0x8a006a
+#define CALENEVENTLISTVIEWITEM_CREATEITEM_EXIT 0x8a006b
+#define CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_ENTRY 0x8a006c
+#define CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_EXIT 0x8a006d
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calengriditemprototypeTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,28 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENGRIDITEMPROTOTYPETRACES_H__
+#define __CALENGRIDITEMPROTOTYPETRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENGRIDITEMPROTOTYPE_CALENGRIDITEMPROTOTYPE_ENTRY 0x8a006e
+#define CALENGRIDITEMPROTOTYPE_CALENGRIDITEMPROTOTYPE_EXIT 0x8a006f
+#define CALENGRIDITEMPROTOTYPE_CREATEPRIMITIVES_ENTRY 0x8a0070
+#define CALENGRIDITEMPROTOTYPE_CREATEPRIMITIVES_EXIT 0x8a0071
+#define CALENGRIDITEMPROTOTYPE_CREATEITEM_ENTRY 0x8a0072
+#define CALENGRIDITEMPROTOTYPE_CREATEITEM_EXIT 0x8a0073
+#define CALENGRIDITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY 0x8a0074
+#define CALENGRIDITEMPROTOTYPE_UPDATECHILDITEMS_EXIT 0x8a0075
+#define CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_ENTRY 0x8a0076
+#define CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_EXIT 0x8a0077
+#define DUP1_CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_ENTRY 0x8a0078
+#define DUP1_CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_EXIT 0x8a0079
+#define CALENGRIDITEMPROTOTYPE_CANSETMODELINDEX_ENTRY 0x8a007a
+#define CALENGRIDITEMPROTOTYPE_CANSETMODELINDEX_EXIT 0x8a007b
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calenmonthdataTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,30 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENMONTHDATATRACES_H__
+#define __CALENMONTHDATATRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENMONTHDATA_CALENMONTHDATA_ENTRY 0x8a007c
+#define CALENMONTHDATA_CALENMONTHDATA_EXIT 0x8a007d
+#define DUP1_CALENMONTHDATA_CALENMONTHDATA_ENTRY 0x8a007e
+#define DUP1_CALENMONTHDATA_CALENMONTHDATA_EXIT 0x8a007f
+#define DUP2_CALENMONTHDATA_CALENMONTHDATA_ENTRY 0x8a0080
+#define DUP2_CALENMONTHDATA_CALENMONTHDATA_EXIT 0x8a0081
+#define CALENMONTHDATA_DAY_ENTRY 0x8a0082
+#define CALENMONTHDATA_DAY_EXIT 0x8a0083
+#define CALENMONTHDATA_SETHASEVENTS_ENTRY 0x8a0084
+#define CALENMONTHDATA_SETHASEVENTS_EXIT 0x8a0085
+#define CALENMONTHDATA_HASEVENTS_ENTRY 0x8a0086
+#define CALENMONTHDATA_HASEVENTS_EXIT 0x8a0087
+#define CALENMONTHDATA_SETACTIVE_ENTRY 0x8a0088
+#define CALENMONTHDATA_SETACTIVE_EXIT 0x8a0089
+#define CALENMONTHDATA_ISACTIVE_ENTRY 0x8a008a
+#define CALENMONTHDATA_ISACTIVE_EXIT 0x8a008b
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calenmonthgridTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,68 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENMONTHGRIDTRACES_H__
+#define __CALENMONTHGRIDTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENMONTHGRID_CALENMONTHGRID_ENTRY 0x8a008c
+#define CALENMONTHGRID_CALENMONTHGRID_EXIT 0x8a008d
+#define DUP1_CALENMONTHGRID_CALENMONTHGRID_ENTRY 0x8a008e
+#define DUP1_CALENMONTHGRID_CALENMONTHGRID_EXIT 0x8a008f
+#define CALENMONTHGRID_SETVIEW_ENTRY 0x8a0090
+#define CALENMONTHGRID_SETVIEW_EXIT 0x8a0091
+#define CALENMONTHGRID_UPDATEMONTHGRIDMODEL_ENTRY 0x8a0092
+#define CALENMONTHGRID_UPDATEMONTHGRIDMODEL_EXIT 0x8a0093
+#define CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_ENTRY 0x8a0094
+#define CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_EXIT 0x8a0095
+#define CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_ENTRY 0x8a0096
+#define CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_EXIT 0x8a0097
+#define CALENMONTHGRID_DOWNGESTURE_ENTRY 0x8a0098
+#define CALENMONTHGRID_DOWNGESTURE_EXIT 0x8a0099
+#define CALENMONTHGRID_UPGESTURE_ENTRY 0x8a009a
+#define CALENMONTHGRID_UPGESTURE_EXIT 0x8a009b
+#define CALENMONTHGRID_MOUSEPRESSEVENT_ENTRY 0x8a009c
+#define CALENMONTHGRID_MOUSEPRESSEVENT_EXIT 0x8a009d
+#define CALENMONTHGRID_MOUSERELEASEEVENT_ENTRY 0x8a009e
+#define CALENMONTHGRID_MOUSERELEASEEVENT_EXIT 0x8a009f
+#define CALENMONTHGRID_GESTUREEVENT_ENTRY 0x8a00a0
+#define CALENMONTHGRID_GESTUREEVENT_EXIT 0x8a00a1
+#define DUP1_CALENMONTHGRID_GESTUREEVENT_EXIT 0x8a00a2
+#define DUP2_CALENMONTHGRID_GESTUREEVENT_EXIT 0x8a00a3
+#define DUP3_CALENMONTHGRID_GESTUREEVENT_EXIT 0x8a00a4
+#define CALENMONTHGRID_SCROLLINGFINISHED_ENTRY 0x8a00a5
+#define CALENMONTHGRID_SCROLLINGFINISHED_EXIT 0x8a00a6
+#define CALENMONTHGRID_HANDLEPANGESTUREFINISHED_ENTRY 0x8a00a7
+#define CALENMONTHGRID_HANDLEPANGESTUREFINISHED_EXIT 0x8a00a8
+#define CALENMONTHGRID_PREPENDROWS_ENTRY 0x8a00a9
+#define CALENMONTHGRID_PREPENDROWS_EXIT 0x8a00aa
+#define CALENMONTHGRID_HANDLEPREPENDINGROWS_ENTRY 0x8a00ab
+#define CALENMONTHGRID_HANDLEPREPENDINGROWS_EXIT 0x8a00ac
+#define CALENMONTHGRID_APPENDROWS_ENTRY 0x8a00ad
+#define CALENMONTHGRID_APPENDROWS_EXIT 0x8a00ae
+#define CALENMONTHGRID_HANDLEAPPENDINGROWS_ENTRY 0x8a00af
+#define CALENMONTHGRID_HANDLEAPPENDINGROWS_EXIT 0x8a00b0
+#define CALENMONTHGRID_ITEMACTIVATED_ENTRY 0x8a00b1
+#define CALENMONTHGRID_ITEMACTIVATED_EXIT 0x8a00b2
+#define DUP1_CALENMONTHGRID_ITEMACTIVATED_EXIT 0x8a00b3
+#define DUP2_CALENMONTHGRID_ITEMACTIVATED_EXIT 0x8a00b4
+#define CALENMONTHGRID_SETFOCUSTOPROPERDAY_ENTRY 0x8a00b5
+#define CALENMONTHGRID_SETFOCUSTOPROPERDAY_EXIT 0x8a00b6
+#define CALENMONTHGRID_SETACTIVEDATES_ENTRY 0x8a00b7
+#define CALENMONTHGRID_SETACTIVEDATES_EXIT 0x8a00b8
+#define DUP1_CALENMONTHGRID_SETACTIVEDATES_EXIT 0x8a00b9
+#define CALENMONTHGRID_GETCURRENTINDEX_ENTRY 0x8a00ba
+#define CALENMONTHGRID_GETCURRENTINDEX_EXIT 0x8a00bb
+#define CALENMONTHGRID_SETCURRENTIDEX_ENTRY 0x8a00bc
+#define CALENMONTHGRID_SETCURRENTIDEX_EXIT 0x8a00bd
+#define CALENMONTHGRID_ORIENTATIONCHANGED_ENTRY 0x8a00be
+#define CALENMONTHGRID_ORIENTATIONCHANGED_EXIT 0x8a00bf
+#define CALENMONTHGRID_PAINT_ENTRY 0x8a00c0
+#define CALENMONTHGRID_PAINT_EXIT 0x8a00c1
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calenmonthviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,113 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENMONTHVIEWTRACES_H__
+#define __CALENMONTHVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENMONTHVIEW_CALENMONTHVIEW_ENTRY 0x8a00c2
+#define CALENMONTHVIEW_CALENMONTHVIEW_EXIT 0x8a00c3
+#define DUP1_CALENMONTHVIEW_CALENMONTHVIEW_ENTRY 0x8a00c4
+#define DUP1_CALENMONTHVIEW_CALENMONTHVIEW_EXIT 0x8a00c5
+#define CALENMONTHVIEW_SETUPVIEW_ENTRY 0x8a00c6
+#define CALENMONTHVIEW_SETUPVIEW_EXIT 0x8a00c7
+#define CALENMONTHVIEW_DOLAZYLOADING_ENTRY 0x8a00c8
+#define CALENMONTHVIEW_DOLAZYLOADING_EXIT 0x8a00c9
+#define CALENMONTHVIEW_ADDWEEKNUMBERS_ENTRY 0x8a00ca
+#define CALENMONTHVIEW_ADDWEEKNUMBERS_EXIT 0x8a00cb
+#define CALENMONTHVIEW_REMOVEWEEKNUMBERS_ENTRY 0x8a00cc
+#define CALENMONTHVIEW_REMOVEWEEKNUMBERS_EXIT 0x8a00cd
+#define CALENMONTHVIEW_ADDBACKGROUNDFRAME_ENTRY 0x8a00ce
+#define CALENMONTHVIEW_ADDBACKGROUNDFRAME_EXIT 0x8a00cf
+#define CALENMONTHVIEW_SHOWHIDEREGIONALINFORMATION_ENTRY 0x8a00d0
+#define CALENMONTHVIEW_SHOWHIDEREGIONALINFORMATION_EXIT 0x8a00d1
+#define CALENMONTHVIEW_ONCONTEXTCHANGED_ENTRY 0x8a00d2
+#define CALENMONTHVIEW_ONCONTEXTCHANGED_EXIT 0x8a00d3
+#define CALENMONTHVIEW_UPDATEWEEKNUMGRIDMODEL_ENTRY 0x8a00d4
+#define CALENMONTHVIEW_UPDATEWEEKNUMGRIDMODEL_EXIT 0x8a00d5
+#define CALENMONTHVIEW_GOTOTODAY_ENTRY 0x8a00d6
+#define CALENMONTHVIEW_GOTOTODAY_EXIT 0x8a00d7
+#define DUP1_CALENMONTHVIEW_GOTOTODAY_EXIT 0x8a00d8
+#define CALENMONTHVIEW_ADDREMOVEACTIONSINMENU_ENTRY 0x8a00d9
+#define CALENMONTHVIEW_ADDREMOVEACTIONSINMENU_EXIT 0x8a00da
+#define CALENMONTHVIEW_DOPOPULATION_ENTRY 0x8a00db
+#define CALENMONTHVIEW_DOPOPULATION_EXIT 0x8a00dc
+#define CALENMONTHVIEW_PREPAREFORPOPULATION_ENTRY 0x8a00dd
+#define CALENMONTHVIEW_PREPAREFORPOPULATION_EXIT 0x8a00de
+#define CALENMONTHVIEW_REFRESHVIEWONGOTODATE_ENTRY 0x8a00df
+#define CALENMONTHVIEW_REFRESHVIEWONGOTODATE_EXIT 0x8a00e0
+#define CALENMONTHVIEW_DATEFROMCONTEXT_ENTRY 0x8a00e1
+#define CALENMONTHVIEW_DATEFROMCONTEXT_EXIT 0x8a00e2
+#define CALENMONTHVIEW_SETACTIVEDAY_ENTRY 0x8a00e3
+#define CALENMONTHVIEW_SETACTIVEDAY_EXIT 0x8a00e4
+#define CALENMONTHVIEW_SETDATE_ENTRY 0x8a00e5
+#define CALENMONTHVIEW_SETDATE_EXIT 0x8a00e6
+#define CALENMONTHVIEW_GETCURRENTDAY_ENTRY 0x8a00e7
+#define CALENMONTHVIEW_GETCURRENTDAY_EXIT 0x8a00e8
+#define CALENMONTHVIEW_GETACTIVEDAY_ENTRY 0x8a00e9
+#define CALENMONTHVIEW_GETACTIVEDAY_EXIT 0x8a00ea
+#define CALENMONTHVIEW_MONTHDATALIST_ENTRY 0x8a00eb
+#define CALENMONTHVIEW_MONTHDATALIST_EXIT 0x8a00ec
+#define CALENMONTHVIEW_CREATEGRID_ENTRY 0x8a00ed
+#define CALENMONTHVIEW_CREATEGRID_EXIT 0x8a00ee
+#define CALENMONTHVIEW_UPDATEMODELWITHPREVMONTH_ENTRY 0x8a00ef
+#define CALENMONTHVIEW_UPDATEMODELWITHPREVMONTH_EXIT 0x8a00f0
+#define CALENMONTHVIEW_UPDATEMODELWITHFUTUREMONTH_ENTRY 0x8a00f1
+#define CALENMONTHVIEW_UPDATEMODELWITHFUTUREMONTH_EXIT 0x8a00f2
+#define CALENMONTHVIEW_ROWSINPREVMONTH_ENTRY 0x8a00f3
+#define CALENMONTHVIEW_ROWSINPREVMONTH_EXIT 0x8a00f4
+#define CALENMONTHVIEW_ROWSINFUTMONTH_ENTRY 0x8a00f5
+#define CALENMONTHVIEW_ROWSINFUTMONTH_EXIT 0x8a00f6
+#define CALENMONTHVIEW_GETCURRGRIDINDEX_ENTRY 0x8a00f7
+#define CALENMONTHVIEW_GETCURRGRIDINDEX_EXIT 0x8a00f8
+#define CALENMONTHVIEW_SETCURRGRIDINDEX_ENTRY 0x8a00f9
+#define CALENMONTHVIEW_SETCURRGRIDINDEX_EXIT 0x8a00fa
+#define CALENMONTHVIEW_UPDATEMONTHDATAARRAYWITHACTIVEDATES_ENTRY 0x8a00fb
+#define CALENMONTHVIEW_UPDATEMONTHDATAARRAYWITHACTIVEDATES_EXIT 0x8a00fc
+#define CALENMONTHVIEW_GETINSTANCELIST_ENTRY 0x8a00fd
+#define CALENMONTHVIEW_GETINSTANCELIST_EXIT 0x8a00fe
+#define CALENMONTHVIEW_POPULATEWITHINSTANCEVIEW_ENTRY 0x8a00ff
+#define CALENMONTHVIEW_POPULATEWITHINSTANCEVIEW_EXIT 0x8a0100
+#define CALENMONTHVIEW_POPULATEPREVMONTH_ENTRY 0x8a0101
+#define CALENMONTHVIEW_POPULATEPREVMONTH_EXIT 0x8a0102
+#define CALENMONTHVIEW_POPULATENEXTMONTH_ENTRY 0x8a0103
+#define CALENMONTHVIEW_POPULATENEXTMONTH_EXIT 0x8a0104
+#define CALENMONTHVIEW_FETCHENTRIESANDUPDATEMODEL_ENTRY 0x8a0105
+#define CALENMONTHVIEW_FETCHENTRIESANDUPDATEMODEL_EXIT 0x8a0106
+#define CALENMONTHVIEW_POPULATEPREVIEWPANE_ENTRY 0x8a0107
+#define CALENMONTHVIEW_POPULATEPREVIEWPANE_EXIT 0x8a0108
+#define CALENMONTHVIEW_COMPLETEPOPULATION_ENTRY 0x8a0109
+#define CALENMONTHVIEW_COMPLETEPOPULATION_EXIT 0x8a010a
+#define CALENMONTHVIEW_HANDLEGRIDITEMACTIVATED_ENTRY 0x8a010b
+#define CALENMONTHVIEW_HANDLEGRIDITEMACTIVATED_EXIT 0x8a010c
+#define CALENMONTHVIEW_SETCONTEXTFORACTIVEDAY_ENTRY 0x8a010d
+#define CALENMONTHVIEW_SETCONTEXTFORACTIVEDAY_EXIT 0x8a010e
+#define CALENMONTHVIEW_CREATEEDITOR_ENTRY 0x8a010f
+#define CALENMONTHVIEW_CREATEEDITOR_EXIT 0x8a0110
+#define CALENMONTHVIEW_LAUNCHDAYVIEW_ENTRY 0x8a0111
+#define CALENMONTHVIEW_LAUNCHDAYVIEW_EXIT 0x8a0112
+#define CALENMONTHVIEW_CHANGEORIENTATION_ENTRY 0x8a0113
+#define CALENMONTHVIEW_CHANGEORIENTATION_EXIT 0x8a0114
+#define CALENMONTHVIEW_HANDLECHANGEORIENTATION_ENTRY 0x8a0115
+#define CALENMONTHVIEW_HANDLECHANGEORIENTATION_EXIT 0x8a0116
+#define CALENMONTHVIEW_SETDATETOLABEL_ENTRY 0x8a0117
+#define CALENMONTHVIEW_SETDATETOLABEL_EXIT 0x8a0118
+#define CALENMONTHVIEW_HANDLEPREVIEWPANEGESTURE_ENTRY 0x8a0119
+#define CALENMONTHVIEW_HANDLEPREVIEWPANEGESTURE_EXIT 0x8a011a
+#define CALENMONTHVIEW_FIRSTDAYOFGRID_ENTRY 0x8a011b
+#define CALENMONTHVIEW_FIRSTDAYOFGRID_EXIT 0x8a011c
+#define CALENMONTHVIEW_ONLOCALECHANGED_ENTRY 0x8a011d
+#define CALENMONTHVIEW_ONLOCALECHANGED_EXIT 0x8a011e
+#define CALENMONTHVIEW_HANDLELEFTEFFECTCOMPLETED_ENTRY 0x8a011f
+#define CALENMONTHVIEW_HANDLELEFTEFFECTCOMPLETED_EXIT 0x8a0120
+#define CALENMONTHVIEW_HANDLERIGHTEFFECTCOMPLETED_ENTRY 0x8a0121
+#define CALENMONTHVIEW_HANDLERIGHTEFFECTCOMPLETED_EXIT 0x8a0122
+#define CALENMONTHVIEW_UPDATEDAYLABEL_ENTRY 0x8a0123
+#define CALENMONTHVIEW_UPDATEDAYLABEL_EXIT 0x8a0124
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calennativeviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,45 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENNATIVEVIEWTRACES_H__
+#define __CALENNATIVEVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY 0x8a0125
+#define CALENNATIVEVIEW_CALENNATIVEVIEW_EXIT 0x8a0126
+#define DUP1_CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY 0x8a0127
+#define DUP1_CALENNATIVEVIEW_CALENNATIVEVIEW_EXIT 0x8a0128
+#define CALENNATIVEVIEW_POPULATIONCOMPLETE_ENTRY 0x8a0129
+#define CALENNATIVEVIEW_POPULATIONCOMPLETE_EXIT 0x8a012a
+#define CALENNATIVEVIEW_DELETEBEFOREDATE_ENTRY 0x8a012b
+#define CALENNATIVEVIEW_DELETEBEFOREDATE_EXIT 0x8a012c
+#define CALENNATIVEVIEW_DELETEALLENTRIES_ENTRY 0x8a012d
+#define CALENNATIVEVIEW_DELETEALLENTRIES_EXIT 0x8a012e
+#define CALENNATIVEVIEW_GOTODATE_ENTRY 0x8a012f
+#define CALENNATIVEVIEW_GOTODATE_EXIT 0x8a0130
+#define CALENNATIVEVIEW_GOTOSELECTEDDATE_ENTRY 0x8a0131
+#define CALENNATIVEVIEW_GOTOSELECTEDDATE_EXIT 0x8a0132
+#define CALENNATIVEVIEW_REFRESHVIEWONGOTODATE_ENTRY 0x8a0133
+#define CALENNATIVEVIEW_REFRESHVIEWONGOTODATE_EXIT 0x8a0134
+#define CALENNATIVEVIEW_LAUNCHSETTINGSVIEW_ENTRY 0x8a0135
+#define CALENNATIVEVIEW_LAUNCHSETTINGSVIEW_EXIT 0x8a0136
+#define CALENNATIVEVIEW_CHANGEORIENTATION_ENTRY 0x8a0137
+#define CALENNATIVEVIEW_CHANGEORIENTATION_EXIT 0x8a0138
+#define CALENNATIVEVIEW_HANDLENOTIFICATION_ENTRY 0x8a0139
+#define CALENNATIVEVIEW_HANDLENOTIFICATION_EXIT 0x8a013a
+#define CALENNATIVEVIEW_PLUGINENABLED_ENTRY 0x8a013b
+#define CALENNATIVEVIEW_PLUGINENABLED_EXIT 0x8a013c
+#define DUP1_CALENNATIVEVIEW_PLUGINENABLED_EXIT 0x8a013d
+#define CALENNATIVEVIEW_PLUGINTEXT_ENTRY 0x8a013e
+#define CALENNATIVEVIEW_PLUGINTEXT_EXIT 0x8a013f
+#define CALENNATIVEVIEW_CAPTURESCREENSHOT_ENTRY 0x8a0140
+#define CALENNATIVEVIEW_CAPTURESCREENSHOT_EXIT 0x8a0141
+#define CALENNATIVEVIEW_SAVEACTIVITY_ENTRY 0x8a0142
+#define CALENNATIVEVIEW_SAVEACTIVITY_EXIT 0x8a0143
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calenpluginlabelTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENPLUGINLABELTRACES_H__
+#define __CALENPLUGINLABELTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENPLUGINLABEL_CALENPLUGINLABEL_ENTRY 0x8a0144
+#define CALENPLUGINLABEL_CALENPLUGINLABEL_EXIT 0x8a0145
+#define DUP1_CALENPLUGINLABEL_CALENPLUGINLABEL_ENTRY 0x8a0146
+#define DUP1_CALENPLUGINLABEL_CALENPLUGINLABEL_EXIT 0x8a0147
+#define CALENPLUGINLABEL_GESTUREEVENT_ENTRY 0x8a0148
+#define CALENPLUGINLABEL_GESTUREEVENT_EXIT 0x8a0149
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calenpreviewpaneTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,43 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENPREVIEWPANETRACES_H__
+#define __CALENPREVIEWPANETRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENPREVIEWPANE_CALENPREVIEWPANE_ENTRY 0x8a014a
+#define CALENPREVIEWPANE_CALENPREVIEWPANE_EXIT 0x8a014b
+#define DUP1_CALENPREVIEWPANE_CALENPREVIEWPANE_ENTRY 0x8a014c
+#define DUP1_CALENPREVIEWPANE_CALENPREVIEWPANE_EXIT 0x8a014d
+#define CALENPREVIEWPANE_SETNOENTRIESLABEL_ENTRY 0x8a014e
+#define CALENPREVIEWPANE_SETNOENTRIESLABEL_EXIT 0x8a014f
+#define CALENPREVIEWPANE_POPULATELABEL_ENTRY 0x8a0150
+#define CALENPREVIEWPANE_POPULATELABEL_EXIT 0x8a0151
+#define DUP1_CALENPREVIEWPANE_POPULATELABEL_EXIT 0x8a0152
+#define CALENPREVIEWPANE_GETINSTANCELISTL_ENTRY 0x8a0153
+#define CALENPREVIEWPANE_GETINSTANCELISTL_EXIT 0x8a0154
+#define CALENPREVIEWPANE_DATE_ENTRY 0x8a0155
+#define CALENPREVIEWPANE_DATE_EXIT 0x8a0156
+#define CALENPREVIEWPANE_STARTAUTOSCROLL_ENTRY 0x8a0157
+#define CALENPREVIEWPANE_STARTAUTOSCROLL_EXIT 0x8a0158
+#define DUP1_CALENPREVIEWPANE_STARTAUTOSCROLL_EXIT 0x8a0159
+#define CALENPREVIEWPANE_ONTWOSECONDSTIMEOUT_ENTRY 0x8a015a
+#define CALENPREVIEWPANE_ONTWOSECONDSTIMEOUT_EXIT 0x8a015b
+#define CALENPREVIEWPANE_SCROLLINGFINISHED_ENTRY 0x8a015c
+#define CALENPREVIEWPANE_SCROLLINGFINISHED_EXIT 0x8a015d
+#define DUP1_CALENPREVIEWPANE_SCROLLINGFINISHED_EXIT 0x8a015e
+#define CALENPREVIEWPANE_GESTUREEVENT_ENTRY 0x8a015f
+#define CALENPREVIEWPANE_GESTUREEVENT_EXIT 0x8a0160
+#define DUP1_CALENPREVIEWPANE_GESTUREEVENT_EXIT 0x8a0161
+#define DUP2_CALENPREVIEWPANE_GESTUREEVENT_EXIT 0x8a0162
+#define CALENPREVIEWPANE_SETVIEW_ENTRY 0x8a0163
+#define CALENPREVIEWPANE_SETVIEW_EXIT 0x8a0164
+#define CALENPREVIEWPANE_STOPSCROLLING_ENTRY 0x8a0165
+#define CALENPREVIEWPANE_STOPSCROLLING_EXIT 0x8a0166
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calensettingsviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENSETTINGSVIEWTRACES_H__
+#define __CALENSETTINGSVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENSETTINGSVIEW_CALENSETTINGSVIEW_ENTRY 0x8a0167
+#define CALENSETTINGSVIEW_CALENSETTINGSVIEW_EXIT 0x8a0168
+#define DUP1_CALENSETTINGSVIEW_CALENSETTINGSVIEW_ENTRY 0x8a0169
+#define DUP1_CALENSETTINGSVIEW_CALENSETTINGSVIEW_EXIT 0x8a016a
+#define CALENSETTINGSVIEW_LAUNCHPREVIOUSVIEW_ENTRY 0x8a016b
+#define CALENSETTINGSVIEW_LAUNCHPREVIOUSVIEW_EXIT 0x8a016c
+#define CALENSETTINGSVIEW_INITIALIZEFORM_ENTRY 0x8a016d
+#define CALENSETTINGSVIEW_INITIALIZEFORM_EXIT 0x8a016e
+#define CALENSETTINGSVIEW_REFRESHVIEW_ENTRY 0x8a016f
+#define CALENSETTINGSVIEW_REFRESHVIEW_EXIT 0x8a0170
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calenthicklinesdrawerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENTHICKLINESDRAWERTRACES_H__
+#define __CALENTHICKLINESDRAWERTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_ENTRY 0x8a0171
+#define CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_EXIT 0x8a0172
+#define DUP1_CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_ENTRY 0x8a0173
+#define DUP1_CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_EXIT 0x8a0174
+#define CALENTHICKLINESDRAWER_PAINT_ENTRY 0x8a0175
+#define CALENTHICKLINESDRAWER_PAINT_EXIT 0x8a0176
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/calentodayindicatorlinedrawerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,22 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CALENTODAYINDICATORLINEDRAWERTRACES_H__
+#define __CALENTODAYINDICATORLINEDRAWERTRACES_H__
+
+#define KOstTraceComponentID 0x10282f26
+
+#define CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_ENTRY 0x8a0177
+#define CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_EXIT 0x8a0178
+#define DUP1_CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_ENTRY 0x8a0179
+#define DUP1_CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_EXIT 0x8a017a
+#define CALENTODAYINDICATORLINEDRAWER_PAINT_ENTRY 0x8a017b
+#define CALENTODAYINDICATORLINEDRAWER_PAINT_EXIT 0x8a017c
+#define CALENTODAYINDICATORLINEDRAWER_HANDLETHEMECHANGE_ENTRY 0x8a017d
+#define CALENTODAYINDICATORLINEDRAWER_HANDLETHEMECHANGE_EXIT 0x8a017e
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,384 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ADDNONTIMEDEVENTTOLIST_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ADDNONTIMEDEVENTTOLIST_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ADDTIMEDEVENTTOLIST_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ADDTIMEDEVENTTOLIST_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_ENTRY=0x64
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_EXIT=0x65
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CONTEXTMANUTRIGGERED_ENTRY=0x62
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CONTEXTMANUTRIGGERED_EXIT=0x63
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CONTEXTMENUCLOSED_ENTRY=0x60
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CONTEXTMENUCLOSED_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CREATELISTITEM_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CREATELISTITEM_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CREATENEWEVENT_ENTRY=0x48
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_CREATENEWEVENT_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_DELETEENTRY_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_DELETEENTRY_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_EDITENTRY_ENTRY=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_EDITENTRY_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_GETINSTANCELIST_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_GETINSTANCELIST_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_GOTOTODAY_ENTRY=0x5d
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_GOTOTODAY_EXIT=0x5e
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_ENTRY=0x40
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_HANDLELOCALECHANGE_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_HANDLELOCALECHANGE_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_INITCHILDWIDGETS_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_INITCHILDWIDGETS_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ITEMACTIVATED_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ITEMACTIVATED_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_MARKASDONE_ENTRY=0x52
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_MARKASDONE_EXIT=0x53
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_NOTEEDITINGCOMPLETED_ENTRY=0x5b
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_NOTEEDITINGCOMPLETED_EXIT=0x5c
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ORIENTATIONCHANGED_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_ORIENTATIONCHANGED_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SETCONTEXTFROMHIGHLIGHT_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SETCONTEXTFROMHIGHLIGHT_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SETHEADINGTEXT_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SETHEADINGTEXT_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SETUPWIDGET_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SETUPWIDGET_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SHOWHIDEREGIONALINFORMATION_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SHOWHIDEREGIONALINFORMATION_EXIT=0x47
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SHOWWIDGET_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_SHOWWIDGET_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_VIEWENTRY_ENTRY=0x4d
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEWWIDGET_VIEWENTRY_EXIT=0x4e
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_CALENAGENDAVIEW_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_CALENAGENDAVIEW_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_CLEARLISTMODEL_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_CLEARLISTMODEL_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_DISCONNECTABOUTTOQUITEVENT_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_DISCONNECTABOUTTOQUITEVENT_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_DOCLOADER_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_DOCLOADER_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_DOPOPULATION_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_DOPOPULATION_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_GESTUREEVENT_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_GESTUREEVENT_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_HANDLENOTIFICATION_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_HANDLENOTIFICATION_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_LAUNCHDAYVIEW_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_LAUNCHDAYVIEW_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_LAUNCHMONTHVIEW_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_LAUNCHMONTHVIEW_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_ONLOCALECHANGED_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_ONLOCALECHANGED_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_ORIENTATIONCHANGED_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_ORIENTATIONCHANGED_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_REFRESHVIEWONGOTODATE_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_REFRESHVIEWONGOTODATE_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_SETUPACTIONS_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_SETUPACTIONS_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_SETUPVIEW_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CALENAGENDAVIEW_SETUPVIEW_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_CALENEVENTLISTVIEWITEM_CREATEITEM_ENTRY=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CALENEVENTLISTVIEWITEM_CREATEITEM_EXIT=0x6b
+[TRACE]TRACE_FLOW[0x8A]_CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_ENTRY=0x6c
+[TRACE]TRACE_FLOW[0x8A]_CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_EXIT=0x6d
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_CALENGRIDITEMPROTOTYPE_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_CALENGRIDITEMPROTOTYPE_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_CANSETMODELINDEX_ENTRY=0x7a
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_CANSETMODELINDEX_EXIT=0x7b
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_CREATEITEM_ENTRY=0x72
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_CREATEITEM_EXIT=0x73
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_CREATEPRIMITIVES_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_CREATEPRIMITIVES_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_ENTRY=0x76
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_EXIT=0x77
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY=0x74
+[TRACE]TRACE_FLOW[0x8A]_CALENGRIDITEMPROTOTYPE_UPDATECHILDITEMS_EXIT=0x75
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_CALENMONTHDATA_ENTRY=0x7c
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_CALENMONTHDATA_EXIT=0x7d
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_DAY_ENTRY=0x82
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_DAY_EXIT=0x83
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_HASEVENTS_ENTRY=0x86
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_HASEVENTS_EXIT=0x87
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_ISACTIVE_ENTRY=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_ISACTIVE_EXIT=0x8b
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_SETACTIVE_ENTRY=0x88
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_SETACTIVE_EXIT=0x89
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_SETHASEVENTS_ENTRY=0x84
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHDATA_SETHASEVENTS_EXIT=0x85
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_APPENDROWS_ENTRY=0xad
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_APPENDROWS_EXIT=0xae
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_CALENMONTHGRID_ENTRY=0x8c
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_CALENMONTHGRID_EXIT=0x8d
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_DOWNGESTURE_ENTRY=0x98
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_DOWNGESTURE_EXIT=0x99
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_GESTUREEVENT_ENTRY=0xa0
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_GESTUREEVENT_EXIT=0xa1
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_GETCURRENTINDEX_ENTRY=0xba
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_GETCURRENTINDEX_EXIT=0xbb
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_HANDLEAPPENDINGROWS_ENTRY=0xaf
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_HANDLEAPPENDINGROWS_EXIT=0xb0
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_HANDLEPANGESTUREFINISHED_ENTRY=0xa7
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_HANDLEPANGESTUREFINISHED_EXIT=0xa8
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_HANDLEPREPENDINGROWS_ENTRY=0xab
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_HANDLEPREPENDINGROWS_EXIT=0xac
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_ITEMACTIVATED_ENTRY=0xb1
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_ITEMACTIVATED_EXIT=0xb2
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_MOUSEPRESSEVENT_ENTRY=0x9c
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_MOUSEPRESSEVENT_EXIT=0x9d
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_MOUSERELEASEEVENT_ENTRY=0x9e
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_MOUSERELEASEEVENT_EXIT=0x9f
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_ORIENTATIONCHANGED_ENTRY=0xbe
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_ORIENTATIONCHANGED_EXIT=0xbf
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_PAINT_ENTRY=0xc0
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_PAINT_EXIT=0xc1
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_PREPENDROWS_ENTRY=0xa9
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_PREPENDROWS_EXIT=0xaa
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SCROLLINGFINISHED_ENTRY=0xa5
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SCROLLINGFINISHED_EXIT=0xa6
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SETACTIVEDATES_ENTRY=0xb7
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SETACTIVEDATES_EXIT=0xb8
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SETCURRENTIDEX_ENTRY=0xbc
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SETCURRENTIDEX_EXIT=0xbd
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SETFOCUSTOPROPERDAY_ENTRY=0xb5
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SETFOCUSTOPROPERDAY_EXIT=0xb6
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SETVIEW_ENTRY=0x90
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_SETVIEW_EXIT=0x91
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_UPDATEMONTHGRIDMODEL_ENTRY=0x92
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_UPDATEMONTHGRIDMODEL_EXIT=0x93
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_ENTRY=0x96
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_EXIT=0x97
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_ENTRY=0x94
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_EXIT=0x95
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_UPGESTURE_ENTRY=0x9a
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHGRID_UPGESTURE_EXIT=0x9b
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ADDBACKGROUNDFRAME_ENTRY=0xce
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ADDBACKGROUNDFRAME_EXIT=0xcf
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ADDREMOVEACTIONSINMENU_ENTRY=0xd9
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ADDREMOVEACTIONSINMENU_EXIT=0xda
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ADDWEEKNUMBERS_ENTRY=0xca
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ADDWEEKNUMBERS_EXIT=0xcb
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_CALENMONTHVIEW_ENTRY=0xc2
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_CALENMONTHVIEW_EXIT=0xc3
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_CHANGEORIENTATION_ENTRY=0x113
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_CHANGEORIENTATION_EXIT=0x114
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_COMPLETEPOPULATION_ENTRY=0x109
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_COMPLETEPOPULATION_EXIT=0x10a
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_CREATEEDITOR_ENTRY=0x10f
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_CREATEEDITOR_EXIT=0x110
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_CREATEGRID_ENTRY=0xed
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_CREATEGRID_EXIT=0xee
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_DATEFROMCONTEXT_ENTRY=0xe1
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_DATEFROMCONTEXT_EXIT=0xe2
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_DOLAZYLOADING_ENTRY=0xc8
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_DOLAZYLOADING_EXIT=0xc9
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_DOPOPULATION_ENTRY=0xdb
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_DOPOPULATION_EXIT=0xdc
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_FETCHENTRIESANDUPDATEMODEL_ENTRY=0x105
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_FETCHENTRIESANDUPDATEMODEL_EXIT=0x106
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_FIRSTDAYOFGRID_ENTRY=0x11b
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_FIRSTDAYOFGRID_EXIT=0x11c
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GETACTIVEDAY_ENTRY=0xe9
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GETACTIVEDAY_EXIT=0xea
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GETCURRENTDAY_ENTRY=0xe7
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GETCURRENTDAY_EXIT=0xe8
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GETCURRGRIDINDEX_ENTRY=0xf7
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GETCURRGRIDINDEX_EXIT=0xf8
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GETINSTANCELIST_ENTRY=0xfd
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GETINSTANCELIST_EXIT=0xfe
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GOTOTODAY_ENTRY=0xd6
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_GOTOTODAY_EXIT=0xd7
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLECHANGEORIENTATION_ENTRY=0x115
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLECHANGEORIENTATION_EXIT=0x116
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLEGRIDITEMACTIVATED_ENTRY=0x10b
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLEGRIDITEMACTIVATED_EXIT=0x10c
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLELEFTEFFECTCOMPLETED_ENTRY=0x11f
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLELEFTEFFECTCOMPLETED_EXIT=0x120
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLEPREVIEWPANEGESTURE_ENTRY=0x119
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLEPREVIEWPANEGESTURE_EXIT=0x11a
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLERIGHTEFFECTCOMPLETED_ENTRY=0x121
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_HANDLERIGHTEFFECTCOMPLETED_EXIT=0x122
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_LAUNCHDAYVIEW_ENTRY=0x111
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_LAUNCHDAYVIEW_EXIT=0x112
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_MONTHDATALIST_ENTRY=0xeb
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_MONTHDATALIST_EXIT=0xec
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ONCONTEXTCHANGED_ENTRY=0xd2
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ONCONTEXTCHANGED_EXIT=0xd3
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ONLOCALECHANGED_ENTRY=0x11d
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ONLOCALECHANGED_EXIT=0x11e
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_POPULATENEXTMONTH_ENTRY=0x103
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_POPULATENEXTMONTH_EXIT=0x104
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_POPULATEPREVIEWPANE_ENTRY=0x107
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_POPULATEPREVIEWPANE_EXIT=0x108
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_POPULATEPREVMONTH_ENTRY=0x101
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_POPULATEPREVMONTH_EXIT=0x102
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_POPULATEWITHINSTANCEVIEW_ENTRY=0xff
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_POPULATEWITHINSTANCEVIEW_EXIT=0x100
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_PREPAREFORPOPULATION_ENTRY=0xdd
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_PREPAREFORPOPULATION_EXIT=0xde
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_REFRESHVIEWONGOTODATE_ENTRY=0xdf
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_REFRESHVIEWONGOTODATE_EXIT=0xe0
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_REMOVEWEEKNUMBERS_ENTRY=0xcc
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_REMOVEWEEKNUMBERS_EXIT=0xcd
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ROWSINFUTMONTH_ENTRY=0xf5
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ROWSINFUTMONTH_EXIT=0xf6
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ROWSINPREVMONTH_ENTRY=0xf3
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_ROWSINPREVMONTH_EXIT=0xf4
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETACTIVEDAY_ENTRY=0xe3
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETACTIVEDAY_EXIT=0xe4
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETCONTEXTFORACTIVEDAY_ENTRY=0x10d
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETCONTEXTFORACTIVEDAY_EXIT=0x10e
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETCURRGRIDINDEX_ENTRY=0xf9
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETCURRGRIDINDEX_EXIT=0xfa
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETDATETOLABEL_ENTRY=0x117
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETDATETOLABEL_EXIT=0x118
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETDATE_ENTRY=0xe5
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETDATE_EXIT=0xe6
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETUPVIEW_ENTRY=0xc6
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SETUPVIEW_EXIT=0xc7
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SHOWHIDEREGIONALINFORMATION_ENTRY=0xd0
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_SHOWHIDEREGIONALINFORMATION_EXIT=0xd1
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEDAYLABEL_ENTRY=0x123
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEDAYLABEL_EXIT=0x124
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEMODELWITHFUTUREMONTH_ENTRY=0xf1
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEMODELWITHFUTUREMONTH_EXIT=0xf2
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEMODELWITHPREVMONTH_ENTRY=0xef
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEMODELWITHPREVMONTH_EXIT=0xf0
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEMONTHDATAARRAYWITHACTIVEDATES_ENTRY=0xfb
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEMONTHDATAARRAYWITHACTIVEDATES_EXIT=0xfc
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEWEEKNUMGRIDMODEL_ENTRY=0xd4
+[TRACE]TRACE_FLOW[0x8A]_CALENMONTHVIEW_UPDATEWEEKNUMGRIDMODEL_EXIT=0xd5
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY=0x125
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_CALENNATIVEVIEW_EXIT=0x126
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_CAPTURESCREENSHOT_ENTRY=0x140
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_CAPTURESCREENSHOT_EXIT=0x141
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_CHANGEORIENTATION_ENTRY=0x137
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_CHANGEORIENTATION_EXIT=0x138
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_DELETEALLENTRIES_ENTRY=0x12d
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_DELETEALLENTRIES_EXIT=0x12e
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_DELETEBEFOREDATE_ENTRY=0x12b
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_DELETEBEFOREDATE_EXIT=0x12c
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_GOTODATE_ENTRY=0x12f
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_GOTODATE_EXIT=0x130
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_GOTOSELECTEDDATE_ENTRY=0x131
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_GOTOSELECTEDDATE_EXIT=0x132
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_HANDLENOTIFICATION_ENTRY=0x139
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_HANDLENOTIFICATION_EXIT=0x13a
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_LAUNCHSETTINGSVIEW_ENTRY=0x135
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_LAUNCHSETTINGSVIEW_EXIT=0x136
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_PLUGINENABLED_ENTRY=0x13b
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_PLUGINENABLED_EXIT=0x13c
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_PLUGINTEXT_ENTRY=0x13e
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_PLUGINTEXT_EXIT=0x13f
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_POPULATIONCOMPLETE_ENTRY=0x129
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_POPULATIONCOMPLETE_EXIT=0x12a
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_REFRESHVIEWONGOTODATE_ENTRY=0x133
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_REFRESHVIEWONGOTODATE_EXIT=0x134
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_SAVEACTIVITY_ENTRY=0x142
+[TRACE]TRACE_FLOW[0x8A]_CALENNATIVEVIEW_SAVEACTIVITY_EXIT=0x143
+[TRACE]TRACE_FLOW[0x8A]_CALENPLUGINLABEL_CALENPLUGINLABEL_ENTRY=0x144
+[TRACE]TRACE_FLOW[0x8A]_CALENPLUGINLABEL_CALENPLUGINLABEL_EXIT=0x145
+[TRACE]TRACE_FLOW[0x8A]_CALENPLUGINLABEL_GESTUREEVENT_ENTRY=0x148
+[TRACE]TRACE_FLOW[0x8A]_CALENPLUGINLABEL_GESTUREEVENT_EXIT=0x149
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_CALENPREVIEWPANE_ENTRY=0x14a
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_CALENPREVIEWPANE_EXIT=0x14b
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_DATE_ENTRY=0x155
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_DATE_EXIT=0x156
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_GESTUREEVENT_ENTRY=0x15f
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_GESTUREEVENT_EXIT=0x160
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_GETINSTANCELISTL_ENTRY=0x153
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_GETINSTANCELISTL_EXIT=0x154
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_ONTWOSECONDSTIMEOUT_ENTRY=0x15a
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_ONTWOSECONDSTIMEOUT_EXIT=0x15b
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_POPULATELABEL_ENTRY=0x150
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_POPULATELABEL_EXIT=0x151
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_SCROLLINGFINISHED_ENTRY=0x15c
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_SCROLLINGFINISHED_EXIT=0x15d
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_SETNOENTRIESLABEL_ENTRY=0x14e
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_SETNOENTRIESLABEL_EXIT=0x14f
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_SETVIEW_ENTRY=0x163
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_SETVIEW_EXIT=0x164
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_STARTAUTOSCROLL_ENTRY=0x157
+[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]_CALENSETTINGSVIEW_CALENSETTINGSVIEW_ENTRY=0x167
+[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_CALENSETTINGSVIEW_EXIT=0x168
+[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_INITIALIZEFORM_ENTRY=0x16d
+[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_INITIALIZEFORM_EXIT=0x16e
+[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_LAUNCHPREVIOUSVIEW_ENTRY=0x16b
+[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_LAUNCHPREVIOUSVIEW_EXIT=0x16c
+[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_REFRESHVIEW_ENTRY=0x16f
+[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_REFRESHVIEW_EXIT=0x170
+[TRACE]TRACE_FLOW[0x8A]_CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_ENTRY=0x171
+[TRACE]TRACE_FLOW[0x8A]_CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_EXIT=0x172
+[TRACE]TRACE_FLOW[0x8A]_CALENTHICKLINESDRAWER_PAINT_ENTRY=0x175
+[TRACE]TRACE_FLOW[0x8A]_CALENTHICKLINESDRAWER_PAINT_EXIT=0x176
+[TRACE]TRACE_FLOW[0x8A]_CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_ENTRY=0x177
+[TRACE]TRACE_FLOW[0x8A]_CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_EXIT=0x178
+[TRACE]TRACE_FLOW[0x8A]_CALENTODAYINDICATORLINEDRAWER_HANDLETHEMECHANGE_ENTRY=0x17d
+[TRACE]TRACE_FLOW[0x8A]_CALENTODAYINDICATORLINEDRAWER_HANDLETHEMECHANGE_EXIT=0x17e
+[TRACE]TRACE_FLOW[0x8A]_CALENTODAYINDICATORLINEDRAWER_PAINT_ENTRY=0x17b
+[TRACE]TRACE_FLOW[0x8A]_CALENTODAYINDICATORLINEDRAWER_PAINT_EXIT=0x17c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_CREATELISTITEM_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_DELETEENTRY_EXIT=0x51
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_EDITENTRY_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_GETINDEXTOSCROLLTO_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_GOTOTODAY_EXIT=0x5f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_HANDLELISTITEMSTRETCHING_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_ITEMACTIVATED_EXIT=0x5a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_MARKASDONE_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_POPULATELISTWIDGET_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEWWIDGET_SETUPWIDGET_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEW_CALENAGENDAVIEW_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEW_CALENAGENDAVIEW_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEW_DOPOPULATION_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENAGENDAVIEW_SETUPVIEW_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY=0x68
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_EXIT=0x69
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_ENTRY=0x78
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENGRIDITEMPROTOTYPE_PRESSSTATECHANGED_EXIT=0x79
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHDATA_CALENMONTHDATA_ENTRY=0x7e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHDATA_CALENMONTHDATA_EXIT=0x7f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHGRID_CALENMONTHGRID_ENTRY=0x8e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHGRID_CALENMONTHGRID_EXIT=0x8f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHGRID_GESTUREEVENT_EXIT=0xa2
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHGRID_ITEMACTIVATED_EXIT=0xb3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHGRID_SETACTIVEDATES_EXIT=0xb9
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHVIEW_CALENMONTHVIEW_ENTRY=0xc4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHVIEW_CALENMONTHVIEW_EXIT=0xc5
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENMONTHVIEW_GOTOTODAY_EXIT=0xd8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY=0x127
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENNATIVEVIEW_CALENNATIVEVIEW_EXIT=0x128
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENNATIVEVIEW_PLUGINENABLED_EXIT=0x13d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENPLUGINLABEL_CALENPLUGINLABEL_ENTRY=0x146
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENPLUGINLABEL_CALENPLUGINLABEL_EXIT=0x147
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENPREVIEWPANE_CALENPREVIEWPANE_ENTRY=0x14c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENPREVIEWPANE_CALENPREVIEWPANE_EXIT=0x14d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENPREVIEWPANE_GESTUREEVENT_EXIT=0x161
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENPREVIEWPANE_POPULATELABEL_EXIT=0x152
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENPREVIEWPANE_SCROLLINGFINISHED_EXIT=0x15e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENPREVIEWPANE_STARTAUTOSCROLL_EXIT=0x159
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENSETTINGSVIEW_CALENSETTINGSVIEW_ENTRY=0x169
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENSETTINGSVIEW_CALENSETTINGSVIEW_EXIT=0x16a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_ENTRY=0x173
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENTHICKLINESDRAWER_CALENTHICKLINESDRAWER_EXIT=0x174
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_ENTRY=0x179
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENTODAYINDICATORLINEDRAWER_CALENTODAYINDICATORLINEDRAWER_EXIT=0x17a
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENMONTHDATA_CALENMONTHDATA_ENTRY=0x80
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENMONTHDATA_CALENMONTHDATA_EXIT=0x81
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENMONTHGRID_GESTUREEVENT_EXIT=0xa3
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENMONTHGRID_ITEMACTIVATED_EXIT=0xb4
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENPREVIEWPANE_GESTUREEVENT_EXIT=0x162
+[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENMONTHGRID_GESTUREEVENT_EXIT=0xa4
--- a/calendarui/views/views.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/calendarui/views/views.pro Mon Aug 23 16:00:50 2010 +0100
@@ -26,10 +26,12 @@
INCLUDEPATH += ./inc \
../inc \
../controller/inc \
- ../cenrep
+ ../cenrep \
+ ./traces
CONFIG += hb
+HB += hbfeedback
symbian: {
LIBS += -leuser \
--- a/clock/clockmw/clockalarms/clockalarms.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clockalarms/clockalarms.pro Mon Aug 23 16:00:50 2010 +0100
@@ -18,7 +18,8 @@
TARGET = clockalarmclient
DEFINES += ALARMCLIENT_LIBRARY
-INCLUDEPATH += ../../inc
+INCLUDEPATH += ../../inc \
+ ./traces
DEPENDPATH += . \
./inc \
--- a/clock/clockmw/clockalarms/src/alarmclient.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clockalarms/src/alarmclient.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -21,6 +21,11 @@
// User includes
#include "alarmclient.h"
#include "alarmlistener.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmclientTraces.h"
+#endif
+
/*!
\class AlarmClient
@@ -33,10 +38,12 @@
:QObject(parent),
mListener(0)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_ALARMCLIENT_ENTRY );
// Connect to the alarm server.
User::LeaveIfError(mAlarmSrvSession.Connect());
// Construct the listener, but do not start it.
mListener = new AlarmListener(this, mAlarmSrvSession);
+OstTraceFunctionExit0( ALARMCLIENT_ALARMCLIENT_EXIT );
}
/*!
@@ -44,6 +51,7 @@
*/
AlarmClient::~AlarmClient()
{
+OstTraceFunctionEntry0( DUP1_ALARMCLIENT_ALARMCLIENT_ENTRY );
if (mListener) {
mListener->stop();
@@ -51,6 +59,7 @@
mListener = 0;
}
mAlarmSrvSession.Close();
+OstTraceFunctionExit0( DUP1_ALARMCLIENT_ALARMCLIENT_EXIT );
}
/*!
@@ -60,6 +69,7 @@
*/
void AlarmClient::getAlarmList(QList<AlarmInfo>& alarmList)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_GETALARMLIST_ENTRY );
// This will hold the alarm ids returned from alarm server.
RArray<TAlarmId> alarmIdArray;
AlarmInfo alarmInfo;
@@ -121,6 +131,7 @@
}
// Cleanup.
alarmIdArray.Close();
+OstTraceFunctionExit0( ALARMCLIENT_GETALARMLIST_EXIT );
}
/*!
@@ -128,6 +139,7 @@
*/
void AlarmClient::setAlarm(AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_SETALARM_ENTRY );
// Get the current home time
TTime homeTime;
homeTime.HomeTime();
@@ -204,10 +216,12 @@
alarmInfo.alarmDateTime = alarmDate;
}
+OstTraceFunctionExit0( ALARMCLIENT_SETALARM_EXIT );
}
void AlarmClient::setAlarmState(TAlarmState state, AlarmState& alarmState)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_SETALARMSTATE_ENTRY );
switch (state) {
case EAlarmStateInPreparation:
alarmState = InPreparation;
@@ -231,10 +245,12 @@
break;
}
+OstTraceFunctionExit0( ALARMCLIENT_SETALARMSTATE_EXIT );
}
void AlarmClient::setAlarmState(AlarmState state, TAlarmState& alarmState)
{
+ OstTraceFunctionEntry0( DUP1_ALARMCLIENT_SETALARMSTATE_ENTRY );
switch (state) {
case InPreparation:
alarmState = EAlarmStateInPreparation;
@@ -257,11 +273,13 @@
default:
break;
}
+OstTraceFunctionExit0( DUP1_ALARMCLIENT_SETALARMSTATE_EXIT );
}
void AlarmClient::setAlarmRepeatType(
TAlarmRepeatDefinition repeat, AlarmRepeatType& repeatType)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_SETALARMREPEATTYPE_ENTRY );
switch (repeat) {
case EAlarmRepeatDefintionRepeatOnce:
repeatType = Once;
@@ -278,11 +296,13 @@
default:
break;
}
+OstTraceFunctionExit0( ALARMCLIENT_SETALARMREPEATTYPE_EXIT );
}
void AlarmClient::setAlarmRepeatType(
AlarmRepeatType repeat, TAlarmRepeatDefinition& repeatType)
{
+ OstTraceFunctionEntry0( DUP1_ALARMCLIENT_SETALARMREPEATTYPE_ENTRY );
switch (repeat) {
case Once:
repeatType = EAlarmRepeatDefintionRepeatOnce;
@@ -299,12 +319,15 @@
default:
break;
}
+OstTraceFunctionExit0( DUP1_ALARMCLIENT_SETALARMREPEATTYPE_EXIT );
}
void AlarmClient::deleteAlarm(int alarmId)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_DELETEALARM_ENTRY );
// Request the alarmserver to delete the alarm.
mAlarmSrvSession.AlarmDelete(alarmId);
+OstTraceFunctionExit0( ALARMCLIENT_DELETEALARM_EXIT );
}
/*!
@@ -315,25 +338,30 @@
*/
int AlarmClient::deleteSnoozedAlarm(int alarmId)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_DELETESNOOZEDALARM_ENTRY );
AlarmInfo alarmInfo;
int retVal(KErrNone);
int returnVal = getAlarmInfo(alarmId, alarmInfo);
if (KErrNone != retVal) {
+ OstTraceFunctionExit0( ALARMCLIENT_DELETESNOOZEDALARM_EXIT );
return retVal;
}
returnVal = mAlarmSrvSession.AlarmDelete(alarmId);
if (KErrNone != retVal) {
+ OstTraceFunctionExit0( DUP1_ALARMCLIENT_DELETESNOOZEDALARM_EXIT );
return retVal;
}
alarmInfo.alarmState = InPreparation;
alarmInfo.nextDueTime = alarmInfo.origAlarmTime;
setAlarm(alarmInfo);
+ OstTraceFunctionExit0( DUP2_ALARMCLIENT_DELETESNOOZEDALARM_EXIT );
return retVal;
}
int AlarmClient::getAlarmInfo(int alarmId, AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_GETALARMINFO_ENTRY );
TASShdAlarm tempSharedAlarm;
// Get the requested alarm info from the alarm server.
@@ -392,31 +420,40 @@
alarmInfo.volumeStatus = AlarmVolumeOff;
}
}
+ OstTraceFunctionExit0( ALARMCLIENT_GETALARMINFO_EXIT );
return error;
}
void AlarmClient::toggleAlarmStatus(int alarmId, int alarmStatus)
{
+OstTraceFunctionEntry0( ALARMCLIENT_TOGGLEALARMSTATUS_ENTRY );
mAlarmSrvSession.SetAlarmStatus(alarmId, (TAlarmStatus)alarmStatus);
+OstTraceFunctionExit0( ALARMCLIENT_TOGGLEALARMSTATUS_EXIT );
}
void AlarmClient::startListener()
{
+ OstTraceFunctionEntry0( ALARMCLIENT_STARTLISTENER_ENTRY );
mListener->start();
+OstTraceFunctionExit0( ALARMCLIENT_STARTLISTENER_EXIT );
}
void AlarmClient::stopListener()
{
+ OstTraceFunctionEntry0( ALARMCLIENT_STOPLISTENER_ENTRY );
mListener->stop();
+OstTraceFunctionExit0( ALARMCLIENT_STOPLISTENER_EXIT );
}
void AlarmClient::notifyChange(int alarmId)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_NOTIFYCHANGE_ENTRY );
emit alarmStateChanged(alarmId);
+OstTraceFunctionExit0( ALARMCLIENT_NOTIFYCHANGE_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockmw/clockalarms/src/alarmlistener.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clockalarms/src/alarmlistener.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,25 +19,35 @@
// User includes
#include "alarmlistener.h"
#include "alarmclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmlistenerTraces.h"
+#endif
+
AlarmListener::AlarmListener(AlarmClient* client, RASCliSession& session)
:CActive(EPriorityStandard),
mClient(client),
mSession(session)
{
+ OstTraceFunctionEntry0( ALARMLISTENER_ALARMLISTENER_ENTRY );
// Nothing to do.
+OstTraceFunctionExit0( ALARMLISTENER_ALARMLISTENER_EXIT );
}
AlarmListener::~AlarmListener()
{
+ OstTraceFunctionEntry0( DUP1_ALARMLISTENER_ALARMLISTENER_ENTRY );
if (IsActive()) {
Cancel();
}
+OstTraceFunctionExit0( DUP1_ALARMLISTENER_ALARMLISTENER_EXIT );
}
void AlarmListener::start()
{
+ OstTraceFunctionEntry0( ALARMLISTENER_START_ENTRY );
// Add the AO to the scheduler.
CActiveScheduler::Add(this);
@@ -47,17 +57,21 @@
// Set the AO active.
SetActive();
+OstTraceFunctionExit0( ALARMLISTENER_START_EXIT );
}
void AlarmListener::stop()
{
+ OstTraceFunctionEntry0( ALARMLISTENER_STOP_ENTRY );
if (IsActive()) {
Cancel();
}
+OstTraceFunctionExit0( ALARMLISTENER_STOP_EXIT );
}
void AlarmListener::RunL()
{
+ OstTraceFunctionEntry0( ALARMLISTENER_RUNL_ENTRY );
if (iStatus != KRequestPending) {
// We get notification for various changes with the alarm server.
// Only the required Events are used to emit a signal.
@@ -77,13 +91,16 @@
SetActive();
}
+OstTraceFunctionExit0( ALARMLISTENER_RUNL_EXIT );
}
void AlarmListener::DoCancel()
{
+ OstTraceFunctionEntry0( ALARMLISTENER_DOCANCEL_ENTRY );
// Cancel async request.
mSession.NotifyChangeCancel();
+OstTraceFunctionExit0( ALARMLISTENER_DOCANCEL_EXIT );
}
// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clockalarms/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clockalarms/traces/alarmclientTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,46 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMCLIENTTRACES_H__
+#define __ALARMCLIENTTRACES_H__
+
+#define KOstTraceComponentID 0x2002dd0e
+
+#define ALARMCLIENT_ALARMCLIENT_ENTRY 0x8a0001
+#define ALARMCLIENT_ALARMCLIENT_EXIT 0x8a0002
+#define DUP1_ALARMCLIENT_ALARMCLIENT_ENTRY 0x8a0003
+#define DUP1_ALARMCLIENT_ALARMCLIENT_EXIT 0x8a0004
+#define ALARMCLIENT_GETALARMLIST_ENTRY 0x8a0005
+#define ALARMCLIENT_GETALARMLIST_EXIT 0x8a0006
+#define ALARMCLIENT_SETALARM_ENTRY 0x8a0007
+#define ALARMCLIENT_SETALARM_EXIT 0x8a0008
+#define ALARMCLIENT_SETALARMSTATE_ENTRY 0x8a0009
+#define ALARMCLIENT_SETALARMSTATE_EXIT 0x8a000a
+#define DUP1_ALARMCLIENT_SETALARMSTATE_ENTRY 0x8a000b
+#define DUP1_ALARMCLIENT_SETALARMSTATE_EXIT 0x8a000c
+#define ALARMCLIENT_SETALARMREPEATTYPE_ENTRY 0x8a000d
+#define ALARMCLIENT_SETALARMREPEATTYPE_EXIT 0x8a000e
+#define DUP1_ALARMCLIENT_SETALARMREPEATTYPE_ENTRY 0x8a000f
+#define DUP1_ALARMCLIENT_SETALARMREPEATTYPE_EXIT 0x8a0010
+#define ALARMCLIENT_DELETEALARM_ENTRY 0x8a0011
+#define ALARMCLIENT_DELETEALARM_EXIT 0x8a0012
+#define ALARMCLIENT_DELETESNOOZEDALARM_ENTRY 0x8a0013
+#define ALARMCLIENT_DELETESNOOZEDALARM_EXIT 0x8a0014
+#define DUP1_ALARMCLIENT_DELETESNOOZEDALARM_EXIT 0x8a0015
+#define DUP2_ALARMCLIENT_DELETESNOOZEDALARM_EXIT 0x8a0016
+#define ALARMCLIENT_GETALARMINFO_ENTRY 0x8a0017
+#define ALARMCLIENT_GETALARMINFO_EXIT 0x8a0018
+#define ALARMCLIENT_TOGGLEALARMSTATUS_ENTRY 0x8a0019
+#define ALARMCLIENT_TOGGLEALARMSTATUS_EXIT 0x8a001a
+#define ALARMCLIENT_STARTLISTENER_ENTRY 0x8a001b
+#define ALARMCLIENT_STARTLISTENER_EXIT 0x8a001c
+#define ALARMCLIENT_STOPLISTENER_ENTRY 0x8a001d
+#define ALARMCLIENT_STOPLISTENER_EXIT 0x8a001e
+#define ALARMCLIENT_NOTIFYCHANGE_ENTRY 0x8a001f
+#define ALARMCLIENT_NOTIFYCHANGE_EXIT 0x8a0020
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clockalarms/traces/alarmlistenerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMLISTENERTRACES_H__
+#define __ALARMLISTENERTRACES_H__
+
+#define KOstTraceComponentID 0x2002dd0e
+
+#define ALARMLISTENER_ALARMLISTENER_ENTRY 0x8a0021
+#define ALARMLISTENER_ALARMLISTENER_EXIT 0x8a0022
+#define DUP1_ALARMLISTENER_ALARMLISTENER_ENTRY 0x8a0023
+#define DUP1_ALARMLISTENER_ALARMLISTENER_EXIT 0x8a0024
+#define ALARMLISTENER_START_ENTRY 0x8a0025
+#define ALARMLISTENER_START_EXIT 0x8a0026
+#define ALARMLISTENER_STOP_ENTRY 0x8a0027
+#define ALARMLISTENER_STOP_EXIT 0x8a0028
+#define ALARMLISTENER_RUNL_ENTRY 0x8a0029
+#define ALARMLISTENER_RUNL_EXIT 0x8a002a
+#define ALARMLISTENER_DOCANCEL_ENTRY 0x8a002b
+#define ALARMLISTENER_DOCANCEL_EXIT 0x8a002c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clockalarms/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,46 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_ALARMCLIENT_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_ALARMCLIENT_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_DELETEALARM_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_DELETEALARM_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_DELETESNOOZEDALARM_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_DELETESNOOZEDALARM_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_GETALARMINFO_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_GETALARMINFO_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_GETALARMLIST_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_GETALARMLIST_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_NOTIFYCHANGE_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_NOTIFYCHANGE_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARMREPEATTYPE_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARMREPEATTYPE_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARMSTATE_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARMSTATE_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARM_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARM_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_STARTLISTENER_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_STARTLISTENER_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_STOPLISTENER_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_STOPLISTENER_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_TOGGLEALARMSTATUS_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_TOGGLEALARMSTATUS_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_ALARMLISTENER_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_ALARMLISTENER_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_DOCANCEL_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_DOCANCEL_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_RUNL_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_RUNL_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_START_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_START_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_STOP_ENTRY=0x27
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_STOP_EXIT=0x28
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_ALARMCLIENT_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_ALARMCLIENT_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_DELETESNOOZEDALARM_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_SETALARMREPEATTYPE_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_SETALARMREPEATTYPE_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_SETALARMSTATE_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_SETALARMSTATE_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMLISTENER_ALARMLISTENER_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMLISTENER_ALARMLISTENER_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_DUP2_ALARMCLIENT_DELETESNOOZEDALARM_EXIT=0x16
--- a/clock/clockmw/clocksettingsutility/clocksettingsutility.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clocksettingsutility/clocksettingsutility.pro Mon Aug 23 16:00:50 2010 +0100
@@ -21,7 +21,9 @@
CONFIG += hb
INCLUDEPATH += ../../inc \
- ../clocktimezone/inc
+ ../clocktimezone/inc \
+ ./traces
+
DEPENDPATH += . \
./inc \
./src
--- a/clock/clockmw/clocksettingsutility/src/settingsutility.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clocksettingsutility/src/settingsutility.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,6 +26,11 @@
#include "settingsutility.h"
#include "timezoneclient.h"
#include "clockdatatypes.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "settingsutilityTraces.h"
+#endif
+
/*!
\class SettingsUtility.
@@ -37,6 +42,7 @@
SettingsUtility::SettingsUtility(QObject *parent)
:QObject(parent)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETTINGSUTILITY_ENTRY );
mTimeSeparatorList << tr(".") << tr(":");
mClockTypeList << hbTrId("txt_clock_button_digital") << hbTrId("txt_clock_button_analog");
mTimeFormatList << hbTrId("txt_clk_setlabel_val_24_hour") << hbTrId("txt_clk_setlabel_val_12_hour");
@@ -44,6 +50,7 @@
mDateSeparatorList << tr(".") << tr(":") << tr("/") << tr("-");
mAutoUpdateValueList << tr("ON") << tr("OFF");
mSnoozeValueList << tr("5 minutes") << tr("15 minutes") << tr(" 30 minutes") << tr("1 hour");
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETTINGSUTILITY_EXIT );
}
/*!
@@ -51,7 +58,9 @@
*/
SettingsUtility::~SettingsUtility()
{
+ OstTraceFunctionEntry0( DUP1_SETTINGSUTILITY_SETTINGSUTILITY_ENTRY );
// Nothing.
+ OstTraceFunctionExit0( DUP1_SETTINGSUTILITY_SETTINGSUTILITY_EXIT );
}
/*!
@@ -59,6 +68,7 @@
*/
QString SettingsUtility::time()
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_TIME_ENTRY );
return QTime::currentTime().toString(timeFormatString());
}
@@ -67,6 +77,7 @@
*/
void SettingsUtility::setTimeFormat(const QString& format)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETTIMEFORMAT_ENTRY );
TLocale locale;
if (format == mTimeFormatList.at(0)) {
@@ -77,6 +88,7 @@
// Nothing to do.
}
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETTIMEFORMAT_EXIT );
}
/*!
@@ -84,6 +96,7 @@
*/
int SettingsUtility::timeFormat(QStringList &format)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_TIMEFORMAT_ENTRY );
TLocale locale;
int value = -1;
@@ -95,6 +108,7 @@
format = mTimeFormatList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_TIMEFORMAT_EXIT );
return value;
}
@@ -103,16 +117,18 @@
*/
void SettingsUtility::setClockType(const QString &type)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETCLOCKTYPE_ENTRY );
TLocale locale;
if (type == mClockTypeList.at(0)) {
- locale.SetClockFormat(EClockAnalog);
+ locale.SetClockFormat(EClockDigital);
} else if (type == mClockTypeList.at(1)) {
- locale.SetClockFormat(EClockDigital);
+ locale.SetClockFormat(EClockAnalog);
} else {
// Nothing to do.
}
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETCLOCKTYPE_EXIT );
}
/*!
@@ -120,19 +136,21 @@
*/
int SettingsUtility::clockType(QStringList &list)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_CLOCKTYPE_ENTRY );
TLocale locale;
int value = -1;
if (EClockAnalog == locale.ClockFormat()) {
- value = 0;
+ value = 1;
} else if (EClockDigital == locale.ClockFormat()){
- value = 1;
+ value = 0;
} else {
// Nothing to do.
}
list = mClockTypeList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_CLOCKTYPE_EXIT );
return value;
}
@@ -141,6 +159,7 @@
*/
void SettingsUtility::setTimeSeparator(const QString &separator)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETTIMESEPARATOR_ENTRY );
if (mTimeSeparatorList.contains(separator)) {
TLocale locale;
@@ -149,6 +168,7 @@
locale.Set();
}
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETTIMESEPARATOR_EXIT );
}
/*!
@@ -156,6 +176,7 @@
*/
int SettingsUtility::timeSeparator(QStringList &list)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_TIMESEPARATOR_ENTRY );
TLocale locale;
TChar separatorChar = locale.TimeSeparator(1);
int value = -1;
@@ -169,6 +190,7 @@
}
list = mTimeSeparatorList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_TIMESEPARATOR_EXIT );
return value;
}
@@ -177,6 +199,7 @@
*/
QString SettingsUtility::date()
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_DATE_ENTRY );
return QDate::currentDate().toString(dateFormatString());
}
@@ -185,6 +208,7 @@
*/
void SettingsUtility::setDateFormat(const QString &format)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETDATEFORMAT_ENTRY );
TLocale locale;
int index;
@@ -210,6 +234,7 @@
}
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETDATEFORMAT_EXIT );
}
/*!
@@ -217,6 +242,7 @@
*/
int SettingsUtility::dateFormat(QStringList &format)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_DATEFORMAT_ENTRY );
TLocale locale;
int index = -1;
@@ -237,6 +263,7 @@
format = mDateFormatList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_DATEFORMAT_EXIT );
return index;
}
@@ -245,12 +272,14 @@
*/
void SettingsUtility::setDateSeparator(const QString &separator)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETDATESEPARATOR_ENTRY );
TLocale locale;
locale.SetDateSeparator(
TChar(separator.unicode()->unicode()), 1);
locale.SetDateSeparator(
TChar(separator.unicode()->unicode()), 2);
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETDATESEPARATOR_EXIT );
}
/*!
@@ -258,6 +287,7 @@
*/
int SettingsUtility::dateSeparator(QStringList &separator)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_DATESEPARATOR_ENTRY );
TLocale locale;
TChar separatorChar = locale.DateSeparator(1);
@@ -282,6 +312,7 @@
separator = mDateSeparatorList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_DATESEPARATOR_EXIT );
return value;
}
@@ -292,7 +323,9 @@
*/
void SettingsUtility::setWorkdays(const QString &workdays)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETWORKDAYS_ENTRY );
Q_UNUSED(workdays)
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETWORKDAYS_EXIT );
}
/*!
@@ -303,6 +336,7 @@
*/
int SettingsUtility::workdays(QStringList &workdaysList)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_WORKDAYS_ENTRY );
Q_UNUSED(workdaysList)
return 0;
@@ -315,6 +349,7 @@
*/
QString SettingsUtility::timeFormatString()
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_TIMEFORMATSTRING_ENTRY );
QString format;
TLocale locale;
QStringList dummyList;
@@ -329,6 +364,7 @@
format.replace(QString(":"), separator);
+ OstTraceFunctionExit0( SETTINGSUTILITY_TIMEFORMATSTRING_EXIT );
return format;
}
@@ -339,6 +375,7 @@
*/
QString SettingsUtility::dateFormatString()
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_DATEFORMATSTRING_ENTRY );
QStringList dummyList;
QString format(mDateFormatList.at(dateFormat(dummyList)));
QString separator = mDateSeparatorList.at(dateSeparator(dummyList));
@@ -346,6 +383,7 @@
format.replace(QString(" "), separator);
format.replace(QString("mm"), QString("MM"));
+ OstTraceFunctionExit0( SETTINGSUTILITY_DATEFORMATSTRING_EXIT );
return format;
}
@@ -356,7 +394,9 @@
*/
void SettingsUtility::setSnoozeTime(int index)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETSNOOZETIME_ENTRY );
Q_UNUSED(index)
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETSNOOZETIME_EXIT );
}
/*!
@@ -367,9 +407,11 @@
*/
int SettingsUtility::snoozeTime(QStringList &snoozeValueList)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SNOOZETIME_ENTRY );
int index = -1;
snoozeValueList = mSnoozeValueList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_SNOOZETIME_EXIT );
return index;
}
@@ -380,9 +422,11 @@
*/
void SettingsUtility::setStartOfWeek(int index)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETSTARTOFWEEK_ENTRY );
TLocale locale;
TDay day = (TDay)index;
locale.SetStartOfWeek(day);
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETSTARTOFWEEK_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocksettingsutility/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocksettingsutility/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,41 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSUTILITY_SETTINGSUTILITY_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSUTILITY_SETTINGSUTILITY_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_CLOCKTYPE_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_CLOCKTYPE_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATEFORMATSTRING_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATEFORMATSTRING_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATEFORMAT_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATEFORMAT_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATESEPARATOR_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATESEPARATOR_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATE_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETCLOCKTYPE_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETCLOCKTYPE_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETDATEFORMAT_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETDATEFORMAT_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETDATESEPARATOR_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETDATESEPARATOR_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETSNOOZETIME_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETSNOOZETIME_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETSTARTOFWEEK_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETSTARTOFWEEK_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTIMEFORMAT_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTIMEFORMAT_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTIMESEPARATOR_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTIMESEPARATOR_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTINGSUTILITY_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTINGSUTILITY_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETWORKDAYS_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETWORKDAYS_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SNOOZETIME_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SNOOZETIME_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMEFORMATSTRING_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMEFORMATSTRING_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMEFORMAT_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMEFORMAT_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMESEPARATOR_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMESEPARATOR_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIME_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_WORKDAYS_ENTRY=0x1d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocksettingsutility/traces/settingsutilityTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,53 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __SETTINGSUTILITYTRACES_H__
+#define __SETTINGSUTILITYTRACES_H__
+
+#define KOstTraceComponentID 0x2002e6b3
+
+#define SETTINGSUTILITY_SETTINGSUTILITY_ENTRY 0x8a0001
+#define SETTINGSUTILITY_SETTINGSUTILITY_EXIT 0x8a0002
+#define DUP1_SETTINGSUTILITY_SETTINGSUTILITY_ENTRY 0x8a0003
+#define DUP1_SETTINGSUTILITY_SETTINGSUTILITY_EXIT 0x8a0004
+#define SETTINGSUTILITY_TIME_ENTRY 0x8a0005
+#define SETTINGSUTILITY_SETTIMEFORMAT_ENTRY 0x8a0006
+#define SETTINGSUTILITY_SETTIMEFORMAT_EXIT 0x8a0007
+#define SETTINGSUTILITY_TIMEFORMAT_ENTRY 0x8a0008
+#define SETTINGSUTILITY_TIMEFORMAT_EXIT 0x8a0009
+#define SETTINGSUTILITY_SETCLOCKTYPE_ENTRY 0x8a000a
+#define SETTINGSUTILITY_SETCLOCKTYPE_EXIT 0x8a000b
+#define SETTINGSUTILITY_CLOCKTYPE_ENTRY 0x8a000c
+#define SETTINGSUTILITY_CLOCKTYPE_EXIT 0x8a000d
+#define SETTINGSUTILITY_SETTIMESEPARATOR_ENTRY 0x8a000e
+#define SETTINGSUTILITY_SETTIMESEPARATOR_EXIT 0x8a000f
+#define SETTINGSUTILITY_TIMESEPARATOR_ENTRY 0x8a0010
+#define SETTINGSUTILITY_TIMESEPARATOR_EXIT 0x8a0011
+#define SETTINGSUTILITY_DATE_ENTRY 0x8a0012
+#define SETTINGSUTILITY_SETDATEFORMAT_ENTRY 0x8a0013
+#define SETTINGSUTILITY_SETDATEFORMAT_EXIT 0x8a0014
+#define SETTINGSUTILITY_DATEFORMAT_ENTRY 0x8a0015
+#define SETTINGSUTILITY_DATEFORMAT_EXIT 0x8a0016
+#define SETTINGSUTILITY_SETDATESEPARATOR_ENTRY 0x8a0017
+#define SETTINGSUTILITY_SETDATESEPARATOR_EXIT 0x8a0018
+#define SETTINGSUTILITY_DATESEPARATOR_ENTRY 0x8a0019
+#define SETTINGSUTILITY_DATESEPARATOR_EXIT 0x8a001a
+#define SETTINGSUTILITY_SETWORKDAYS_ENTRY 0x8a001b
+#define SETTINGSUTILITY_SETWORKDAYS_EXIT 0x8a001c
+#define SETTINGSUTILITY_WORKDAYS_ENTRY 0x8a001d
+#define SETTINGSUTILITY_TIMEFORMATSTRING_ENTRY 0x8a001e
+#define SETTINGSUTILITY_TIMEFORMATSTRING_EXIT 0x8a001f
+#define SETTINGSUTILITY_DATEFORMATSTRING_ENTRY 0x8a0020
+#define SETTINGSUTILITY_DATEFORMATSTRING_EXIT 0x8a0021
+#define SETTINGSUTILITY_SETSNOOZETIME_ENTRY 0x8a0022
+#define SETTINGSUTILITY_SETSNOOZETIME_EXIT 0x8a0023
+#define SETTINGSUTILITY_SNOOZETIME_ENTRY 0x8a0024
+#define SETTINGSUTILITY_SNOOZETIME_EXIT 0x8a0025
+#define SETTINGSUTILITY_SETSTARTOFWEEK_ENTRY 0x8a0026
+#define SETTINGSUTILITY_SETSTARTOFWEEK_EXIT 0x8a0027
+
+
+#endif
+
+// End of file
+
--- a/clock/clockmw/clocktimezone/bwins/timezoneclientu.def Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clocktimezone/bwins/timezoneclientu.def Mon Aug 23 16:00:50 2010 +0100
@@ -1,53 +1,19 @@
EXPORTS
- ?deleteInstance@TimezoneClient@@QAEXXZ @ 1 NONAME ; void TimezoneClient::deleteInstance(void)
- ?addCity@TimezoneClient@@QAE?AULocationInfo@@HAAVQString@@H@Z @ 2 NONAME ; struct LocationInfo TimezoneClient::addCity(int, class QString &, int)
- ?isNull@TimezoneClient@@QAE_NXZ @ 3 NONAME ; bool TimezoneClient::isNull(void)
- ??_ETimezoneClient@@UAE@I@Z @ 4 NONAME ; TimezoneClient::~TimezoneClient(unsigned int)
- ?getLocations@TimezoneClient@@QAEAAV?$QList@ULocationInfo@@@@XZ @ 5 NONAME ; class QList<struct LocationInfo> & TimezoneClient::getLocations(void)
- ?getDstRulesL@TimezoneClient@@AAEXAAVQDateTime@@0H@Z @ 6 NONAME ; void TimezoneClient::getDstRulesL(class QDateTime &, class QDateTime &, int)
- ?locationSelectorModel@TimezoneClient@@QAEPAVQStandardItemModel@@XZ @ 7 NONAME ; class QStandardItemModel * TimezoneClient::locationSelectorModel(void)
- ?getUtcDstOffsetL@TimezoneClient@@AAE_NAAHABVCTzId@@@Z @ 8 NONAME ; bool TimezoneClient::getUtcDstOffsetL(int &, class CTzId const &)
- ??0TimezoneClient@@AAE@XZ @ 9 NONAME ; TimezoneClient::TimezoneClient(void)
- ?intToMonth@TimezoneClient@@AAE?AW4TMonth@@H@Z @ 10 NONAME ; enum TMonth TimezoneClient::intToMonth(int)
- ?getDstZoneOffset@TimezoneClient@@AAEHH@Z @ 11 NONAME ; int TimezoneClient::getDstZoneOffset(int)
- ?environmentCallback@TimezoneClient@@SAHPAX@Z @ 12 NONAME ; int TimezoneClient::environmentCallback(void *)
- ?trUtf8@TimezoneClient@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString TimezoneClient::trUtf8(char const *, char const *, int)
- ?getStandardOffset@TimezoneClient@@QAEHH@Z @ 14 NONAME ; int TimezoneClient::getStandardOffset(int)
- ?getCurrentZoneInfoL@TimezoneClient@@QAE?AULocationInfo@@XZ @ 15 NONAME ; struct LocationInfo TimezoneClient::getCurrentZoneInfoL(void)
- ?dstOn@TimezoneClient@@QAE_NH@Z @ 16 NONAME ; bool TimezoneClient::dstOn(int)
- ?createWorldClockModel@TimezoneClient@@QAEXXZ @ 17 NONAME ; void TimezoneClient::createWorldClockModel(void)
- ?tr@TimezoneClient@@SA?AVQString@@PBD0H@Z @ 18 NONAME ; class QString TimezoneClient::tr(char const *, char const *, int)
- ?setAsCurrentLocationL@TimezoneClient@@QAEXAAULocationInfo@@@Z @ 19 NONAME ; void TimezoneClient::setAsCurrentLocationL(struct LocationInfo &)
- ?eventMonitor@TimezoneClient@@AAEXABVXQSettingsKey@@ABVQVariant@@@Z @ 20 NONAME ; void TimezoneClient::eventMonitor(class XQSettingsKey const &, class QVariant const &)
- ?getInstance@TimezoneClient@@SAPAV1@XZ @ 21 NONAME ; class TimezoneClient * TimezoneClient::getInstance(void)
- ?getCityGroupIdByName@TimezoneClient@@AAEHABVQString@@@Z @ 22 NONAME ; int TimezoneClient::getCityGroupIdByName(class QString const &)
- ?getCityOffsetByNameAndId@TimezoneClient@@AAEHABVQString@@H@Z @ 23 NONAME ; int TimezoneClient::getCityOffsetByNameAndId(class QString const &, int)
- ?getAllTimeZoneOffsets@TimezoneClient@@QAE?AV?$QList@H@@XZ @ 24 NONAME ; class QList<int> TimezoneClient::getAllTimeZoneOffsets(void)
- ?getCitiesForCountry@TimezoneClient@@AAEXHAAV?$QMap@VQString@@H@@@Z @ 25 NONAME ; void TimezoneClient::getCitiesForCountry(int, class QMap<class QString, int> &)
- ?getCountriesForUTCOffset@TimezoneClient@@QAE?AV?$QList@ULocationInfo@@@@H@Z @ 26 NONAME ; class QList<struct LocationInfo> TimezoneClient::getCountriesForUTCOffset(int)
- ??1TimezoneClient@@EAE@XZ @ 27 NONAME ; TimezoneClient::~TimezoneClient(void)
- ?timeUpdateOn@TimezoneClient@@QAE_NXZ @ 28 NONAME ; bool TimezoneClient::timeUpdateOn(void)
- ?staticMetaObject@TimezoneClient@@2UQMetaObject@@B @ 29 NONAME ; struct QMetaObject const TimezoneClient::staticMetaObject
- ?qt_metacast@TimezoneClient@@UAEPAXPBD@Z @ 30 NONAME ; void * TimezoneClient::qt_metacast(char const *)
- ?autoTimeUpdateChanged@TimezoneClient@@IAEXH@Z @ 31 NONAME ; void TimezoneClient::autoTimeUpdateChanged(int)
- ?trUtf8@TimezoneClient@@SA?AVQString@@PBD0@Z @ 32 NONAME ; class QString TimezoneClient::trUtf8(char const *, char const *)
- ?listUpdated@TimezoneClient@@IAEXXZ @ 33 NONAME ; void TimezoneClient::listUpdated(void)
- ?getSavedLocations@TimezoneClient@@QAE?AV?$QList@ULocationInfo@@@@XZ @ 34 NONAME ; class QList<struct LocationInfo> TimezoneClient::getSavedLocations(void)
- ?getLocationInfo@TimezoneClient@@AAEXHHAAULocationInfo@@@Z @ 35 NONAME ; void TimezoneClient::getLocationInfo(int, int, struct LocationInfo &)
- ?getAllTimeZoneIds@TimezoneClient@@QAE?AV?$QList@H@@XZ @ 36 NONAME ; class QList<int> TimezoneClient::getAllTimeZoneIds(void)
- ?populateCities@TimezoneClient@@AAEXXZ @ 37 NONAME ; void TimezoneClient::populateCities(void)
- ?tr@TimezoneClient@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString TimezoneClient::tr(char const *, char const *)
- ?setDateTime@TimezoneClient@@QAEXVQDateTime@@@Z @ 39 NONAME ; void TimezoneClient::setDateTime(class QDateTime)
- ?metaObject@TimezoneClient@@UBEPBUQMetaObject@@XZ @ 40 NONAME ; struct QMetaObject const * TimezoneClient::metaObject(void) const
- ?getStaticMetaObject@TimezoneClient@@SAABUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const & TimezoneClient::getStaticMetaObject(void)
- ?mTimezoneClient@TimezoneClient@@0PAV1@A @ 42 NONAME ; class TimezoneClient * TimezoneClient::mTimezoneClient
- ?cityUpdated@TimezoneClient@@IAEXXZ @ 43 NONAME ; void TimezoneClient::cityUpdated(void)
- ?setTimeUpdateOn@TimezoneClient@@QAEX_N@Z @ 44 NONAME ; void TimezoneClient::setTimeUpdateOn(bool)
- ?mReferenceCount@TimezoneClient@@0_NA @ 45 NONAME ; bool TimezoneClient::mReferenceCount
- ?getCountries@TimezoneClient@@QAEXAAV?$QMap@VQString@@H@@@Z @ 46 NONAME ; void TimezoneClient::getCountries(class QMap<class QString, int> &)
- ?checkForDstChange@TimezoneClient@@QAE_NAAUAlarmInfo@@@Z @ 47 NONAME ; bool TimezoneClient::checkForDstChange(struct AlarmInfo &)
- ?isDSTOnL@TimezoneClient@@QAE_NH@Z @ 48 NONAME ; bool TimezoneClient::isDSTOnL(int)
- ?timechanged@TimezoneClient@@IAEXXZ @ 49 NONAME ; void TimezoneClient::timechanged(void)
- ?saveLocations@TimezoneClient@@QAEXABV?$QList@ULocationInfo@@@@@Z @ 50 NONAME ; void TimezoneClient::saveLocations(class QList<struct LocationInfo> const &)
- ?qt_metacall@TimezoneClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 51 NONAME ; int TimezoneClient::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?timeUpdateOn@TimezoneClient@@QAE_NXZ @ 1 NONAME ; bool TimezoneClient::timeUpdateOn(void)
+ ?deleteInstance@TimezoneClient@@QAEXXZ @ 2 NONAME ; void TimezoneClient::deleteInstance(void)
+ ?addCity@TimezoneClient@@QAE?AULocationInfo@@HAAVQString@@H@Z @ 3 NONAME ; struct LocationInfo TimezoneClient::addCity(int, class QString &, int)
+ ?isNull@TimezoneClient@@QAE_NXZ @ 4 NONAME ; bool TimezoneClient::isNull(void)
+ ?setTimeUpdateOn@TimezoneClient@@QAEX_N@Z @ 5 NONAME ; void TimezoneClient::setTimeUpdateOn(bool)
+ ?setAsCurrentLocationL@TimezoneClient@@QAEXAAULocationInfo@@@Z @ 6 NONAME ; void TimezoneClient::setAsCurrentLocationL(struct LocationInfo &)
+ ?getLocations@TimezoneClient@@QAEAAV?$QList@ULocationInfo@@@@XZ @ 7 NONAME ; class QList<struct LocationInfo> & TimezoneClient::getLocations(void)
+ ?getInstance@TimezoneClient@@SAPAV1@XZ @ 8 NONAME ; class TimezoneClient * TimezoneClient::getInstance(void)
+ ?getSavedLocations@TimezoneClient@@QAE?AV?$QList@ULocationInfo@@@@XZ @ 9 NONAME ; class QList<struct LocationInfo> TimezoneClient::getSavedLocations(void)
+ ?getAllTimeZoneOffsets@TimezoneClient@@QAE?AV?$QList@H@@XZ @ 10 NONAME ; class QList<int> TimezoneClient::getAllTimeZoneOffsets(void)
+ ?isDSTOnL@TimezoneClient@@QAE_NH@Z @ 11 NONAME ; bool TimezoneClient::isDSTOnL(int)
+ ?checkForDstChange@TimezoneClient@@QAE_NAAUAlarmInfo@@@Z @ 12 NONAME ; bool TimezoneClient::checkForDstChange(struct AlarmInfo &)
+ ?getCountriesForUTCOffset@TimezoneClient@@QAE?AV?$QList@ULocationInfo@@@@H@Z @ 13 NONAME ; class QList<struct LocationInfo> TimezoneClient::getCountriesForUTCOffset(int)
+ ?saveLocations@TimezoneClient@@QAEXABV?$QList@ULocationInfo@@@@@Z @ 14 NONAME ; void TimezoneClient::saveLocations(class QList<struct LocationInfo> const &)
+ ?getStandardOffset@TimezoneClient@@QAEHH@Z @ 15 NONAME ; int TimezoneClient::getStandardOffset(int)
+ ?getCurrentZoneInfoL@TimezoneClient@@QAE?AULocationInfo@@XZ @ 16 NONAME ; struct LocationInfo TimezoneClient::getCurrentZoneInfoL(void)
+ ?setDateTime@TimezoneClient@@QAEXVQDateTime@@@Z @ 17 NONAME ; void TimezoneClient::setDateTime(class QDateTime)
--- a/clock/clockmw/clocktimezone/clocktimezone.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clocktimezone/clocktimezone.pro Mon Aug 23 16:00:50 2010 +0100
@@ -22,7 +22,9 @@
INCLUDEPATH += ../../inc \
../../data/timezonedata \
../../clockengines/inc \
- ../../clockengines/clockserver/client/inc
+ ../../clockengines/clockserver/client/inc \
+ ./traces
+
DEPENDPATH += . \
../../inc \
./inc \
@@ -99,8 +101,10 @@
}
SOURCES += timezoneclient.cpp \
- debug.cpp
+ debug.cpp \
+ environmentchangenotifier.cpp
HEADERS += timezoneclient.h \
- debug.h
+ debug.h \
+ environmentchangenotifier.h
# End of file --Don't remove this.
--- a/clock/clockmw/clocktimezone/eabi/timezoneclientu.def Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clocktimezone/eabi/timezoneclientu.def Mon Aug 23 16:00:50 2010 +0100
@@ -1,55 +1,19 @@
EXPORTS
- _ZN14TimezoneClient10intToMonthEi @ 1 NONAME
- _ZN14TimezoneClient11cityUpdatedEv @ 2 NONAME
- _ZN14TimezoneClient11getInstanceEv @ 3 NONAME
- _ZN14TimezoneClient11listUpdatedEv @ 4 NONAME
- _ZN14TimezoneClient11qt_metacallEN11QMetaObject4CallEiPPv @ 5 NONAME
- _ZN14TimezoneClient11qt_metacastEPKc @ 6 NONAME
- _ZN14TimezoneClient11setDateTimeE9QDateTime @ 7 NONAME
- _ZN14TimezoneClient11timechangedEv @ 8 NONAME
- _ZN14TimezoneClient12eventMonitorERK13XQSettingsKeyRK8QVariant @ 9 NONAME
- _ZN14TimezoneClient12getCountriesER4QMapI7QStringiE @ 10 NONAME
- _ZN14TimezoneClient12getDstRulesLER9QDateTimeS1_i @ 11 NONAME
- _ZN14TimezoneClient12getLocationsEv @ 12 NONAME
- _ZN14TimezoneClient12timeUpdateOnEv @ 13 NONAME
- _ZN14TimezoneClient13saveLocationsERK5QListI12LocationInfoE @ 14 NONAME
- _ZN14TimezoneClient14deleteInstanceEv @ 15 NONAME
- _ZN14TimezoneClient14populateCitiesEv @ 16 NONAME
- _ZN14TimezoneClient15getLocationInfoEiiR12LocationInfo @ 17 NONAME
- _ZN14TimezoneClient15mReferenceCountE @ 18 NONAME DATA 1
- _ZN14TimezoneClient15mTimezoneClientE @ 19 NONAME DATA 4
- _ZN14TimezoneClient15setTimeUpdateOnEb @ 20 NONAME
- _ZN14TimezoneClient16getDstZoneOffsetEi @ 21 NONAME
- _ZN14TimezoneClient16getUtcDstOffsetLERiRK5CTzId @ 22 NONAME
- _ZN14TimezoneClient16staticMetaObjectE @ 23 NONAME DATA 16
- _ZN14TimezoneClient17checkForDstChangeER9AlarmInfo @ 24 NONAME
- _ZN14TimezoneClient17getAllTimeZoneIdsEv @ 25 NONAME
- _ZN14TimezoneClient17getSavedLocationsEv @ 26 NONAME
- _ZN14TimezoneClient17getStandardOffsetEi @ 27 NONAME
- _ZN14TimezoneClient19environmentCallbackEPv @ 28 NONAME
- _ZN14TimezoneClient19getCitiesForCountryEiR4QMapI7QStringiE @ 29 NONAME
- _ZN14TimezoneClient19getCurrentZoneInfoLEv @ 30 NONAME
- _ZN14TimezoneClient19getStaticMetaObjectEv @ 31 NONAME
- _ZN14TimezoneClient20getCityGroupIdByNameERK7QString @ 32 NONAME
- _ZN14TimezoneClient21autoTimeUpdateChangedEi @ 33 NONAME
- _ZN14TimezoneClient21createWorldClockModelEv @ 34 NONAME
- _ZN14TimezoneClient21getAllTimeZoneOffsetsEv @ 35 NONAME
- _ZN14TimezoneClient21locationSelectorModelEv @ 36 NONAME
- _ZN14TimezoneClient21setAsCurrentLocationLER12LocationInfo @ 37 NONAME
- _ZN14TimezoneClient24getCityOffsetByNameAndIdERK7QStringi @ 38 NONAME
- _ZN14TimezoneClient24getCountriesForUTCOffsetEi @ 39 NONAME
- _ZN14TimezoneClient5dstOnEi @ 40 NONAME
- _ZN14TimezoneClient6isNullEv @ 41 NONAME
- _ZN14TimezoneClient7addCityEiR7QStringi @ 42 NONAME
- _ZN14TimezoneClient8isDSTOnLEi @ 43 NONAME
- _ZN14TimezoneClientC1Ev @ 44 NONAME
- _ZN14TimezoneClientC2Ev @ 45 NONAME
- _ZN14TimezoneClientD0Ev @ 46 NONAME
- _ZN14TimezoneClientD1Ev @ 47 NONAME
- _ZN14TimezoneClientD2Ev @ 48 NONAME
- _ZNK14TimezoneClient10metaObjectEv @ 49 NONAME
- _ZTI14TimezoneClient @ 50 NONAME
- _ZTV14TimezoneClient @ 51 NONAME
- _ZThn8_N14TimezoneClientD0Ev @ 52 NONAME
- _ZThn8_N14TimezoneClientD1Ev @ 53 NONAME
+ _ZN14TimezoneClient11getInstanceEv @ 1 NONAME
+ _ZN14TimezoneClient11setDateTimeE9QDateTime @ 2 NONAME
+ _ZN14TimezoneClient12getLocationsEv @ 3 NONAME
+ _ZN14TimezoneClient12timeUpdateOnEv @ 4 NONAME
+ _ZN14TimezoneClient13saveLocationsERK5QListI12LocationInfoE @ 5 NONAME
+ _ZN14TimezoneClient14deleteInstanceEv @ 6 NONAME
+ _ZN14TimezoneClient15setTimeUpdateOnEb @ 7 NONAME
+ _ZN14TimezoneClient17checkForDstChangeER9AlarmInfo @ 8 NONAME
+ _ZN14TimezoneClient17getSavedLocationsEv @ 9 NONAME
+ _ZN14TimezoneClient17getStandardOffsetEi @ 10 NONAME
+ _ZN14TimezoneClient19getCurrentZoneInfoLEv @ 11 NONAME
+ _ZN14TimezoneClient21getAllTimeZoneOffsetsEv @ 12 NONAME
+ _ZN14TimezoneClient21setAsCurrentLocationLER12LocationInfo @ 13 NONAME
+ _ZN14TimezoneClient24getCountriesForUTCOffsetEi @ 14 NONAME
+ _ZN14TimezoneClient6isNullEv @ 15 NONAME
+ _ZN14TimezoneClient7addCityEiR7QStringi @ 16 NONAME
+ _ZN14TimezoneClient8isDSTOnLEi @ 17 NONAME
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/inc/environmentchangenotifier.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,56 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef ENVIRONMENTCHANGENOTIFIER_H_
+#define ENVIRONMENTCHANGENOTIFIER_H_
+
+// System includes
+#include <e32base.h>
+
+// Forward declaration
+class CEnvironmentChangeNotifier;
+class TimezoneClient;
+
+const int KInitialEvent = (
+ EChangesLocale |
+ EChangesMidnightCrossover |
+ EChangesThreadDeath |
+ EChangesPowerStatus |
+ EChangesSystemTime |
+ EChangesFreeMemory |
+ EChangesOutOfMemory);
+
+class EnvironmentChangeNotifier : public CBase
+{
+public:
+ EnvironmentChangeNotifier(TimezoneClient *client);
+ ~EnvironmentChangeNotifier();
+
+public:
+ static int environmentCallback(TAny* obj);
+
+private:
+ void notifyEnvChange();
+
+private:
+ CEnvironmentChangeNotifier *mNotifier;
+ TimezoneClient *mTzClient;
+};
+
+#endif /* ENVIRONMENTCHANGENOTIFIER_H_ */
+
+// End of file -- Do not remove this.
--- a/clock/clockmw/clocktimezone/inc/timezoneclient.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clocktimezone/inc/timezoneclient.h Mon Aug 23 16:00:50 2010 +0100
@@ -27,7 +27,6 @@
#include <QMap>
#include <tz.h>
-#include <bacntf.h>
// User includes
#include "clockdatatypes.h"
@@ -38,72 +37,56 @@
#define TIMEZONECLIENT_EXPORT Q_DECL_IMPORT
#endif
-class CEnvironmentChangeNotifier;
+//class CEnvironmentChangeNotifier;
class QStandardItemModel;
class CTzLocalizer;
class XQSettingsManager;
class XQSettingsKey;
+class EnvironmentChangeNotifier;
-const int KInitialEvent = (
- EChangesLocale |
- EChangesMidnightCrossover |
- EChangesThreadDeath |
- EChangesPowerStatus |
- EChangesSystemTime |
- EChangesFreeMemory |
- EChangesOutOfMemory);
-
-class TIMEZONECLIENT_EXPORT TimezoneClient : public QObject, public CBase
+class TimezoneClient : public QObject
{
Q_OBJECT
public:
- /*TIMEZONECLIENT_EXPORT*/ static TimezoneClient* getInstance();
- /*TIMEZONECLIENT_EXPORT*/ void deleteInstance();
- /*TIMEZONECLIENT_EXPORT*/ bool isNull();
-
-private:
- TimezoneClient();
- ~TimezoneClient();
-
-private:
-
-private:
- static TimezoneClient *mTimezoneClient;
- static bool mReferenceCount;
-
-// TODO: still refatoring
-public:
- /*TIMEZONECLIENT_EXPORT*/ QList<LocationInfo> &getLocations();
- /*TIMEZONECLIENT_EXPORT*/ LocationInfo getCurrentZoneInfoL();
- /*TIMEZONECLIENT_EXPORT*/ void setAsCurrentLocationL(LocationInfo &location);
- /*TIMEZONECLIENT_EXPORT*/ bool isDSTOnL(int timezoneId);
- /*TIMEZONECLIENT_EXPORT*/ int getStandardOffset(int timezoneId);
- QList<LocationInfo> getSavedLocations();
- void saveLocations(const QList<LocationInfo> &locationList);
- void getCountries(QMap<QString, int>& countries);
- bool dstOn(int tzId);
- void setDateTime(QDateTime dateTime);
- void setTimeUpdateOn(bool timeUpdate = true);
- bool timeUpdateOn();
- QStandardItemModel *locationSelectorModel();
- void createWorldClockModel();
- bool checkForDstChange(AlarmInfo& alarmInfo);
- QList<int> getAllTimeZoneIds();
- QList<int> getAllTimeZoneOffsets();
- QList<LocationInfo> getCountriesForUTCOffset(int utcOffset);
- LocationInfo addCity(int timeZoneId, QString &cityName, int cityGroupId);
+ TIMEZONECLIENT_EXPORT static TimezoneClient* getInstance();
+ TIMEZONECLIENT_EXPORT void deleteInstance();
+ TIMEZONECLIENT_EXPORT bool isNull();
public:
- static int environmentCallback(TAny* obj);
+ TIMEZONECLIENT_EXPORT QList<LocationInfo> &getLocations();
+ TIMEZONECLIENT_EXPORT LocationInfo getCurrentZoneInfoL();
+ TIMEZONECLIENT_EXPORT void setAsCurrentLocationL(LocationInfo &location);
+ TIMEZONECLIENT_EXPORT bool isDSTOnL(int timezoneId);
+ TIMEZONECLIENT_EXPORT int getStandardOffset(int timezoneId);
+ TIMEZONECLIENT_EXPORT bool timeUpdateOn();
+ TIMEZONECLIENT_EXPORT void setTimeUpdateOn(bool timeUpdate = true);
+ TIMEZONECLIENT_EXPORT void setDateTime(QDateTime dateTime);
+ TIMEZONECLIENT_EXPORT QList<int> getAllTimeZoneOffsets();
+ TIMEZONECLIENT_EXPORT QList<LocationInfo> getCountriesForUTCOffset(
+ int utcOffset);
+ TIMEZONECLIENT_EXPORT LocationInfo addCity(
+ int timeZoneId, QString &cityName, int cityGroupId);
+ TIMEZONECLIENT_EXPORT bool checkForDstChange(AlarmInfo& alarmInfo);
+ TIMEZONECLIENT_EXPORT QList<LocationInfo> getSavedLocations();
+ TIMEZONECLIENT_EXPORT void saveLocations(
+ const QList<LocationInfo> &locationList);
+
+ void notifyTimeChange();
signals:
void timechanged();
void listUpdated();
void autoTimeUpdateChanged(int value);
void cityUpdated();
+
+private:
+ TimezoneClient();
+ ~TimezoneClient();
private:
+ bool dstOn(int tzId);
+ QList<int> getAllTimeZoneIds();
int getDstZoneOffset(int tzId);
TMonth intToMonth(int month);
bool getUtcDstOffsetL(int &dstOffset, const CTzId &tzId);
@@ -120,20 +103,21 @@
void populateCities();
void eventMonitor(const XQSettingsKey& key, const QVariant& value);
-public:
- CEnvironmentChangeNotifier *mNotifier;
-
private:
+ static TimezoneClient *mTimezoneClient;
+ static bool mReferenceCount;
+
+private:
+ EnvironmentChangeNotifier *mNotifier;
CTzLocalizer *mTzLocalizer;
QMap<QString, int> mAllCountries;
QList<LocationInfo> mAllLocations;
- QStandardItemModel *mWorldClockModel;
+ QPointer<QStandardItemModel> mWorldClockModel;
XQSettingsManager *mSettingsManager;
XQSettingsKey *mAutoTimeUpdateKey;
QList<int> mTimeZoneIds;
-// bool mTimeUpdateOn;
int mCountryCount;
int mAutoTimeUpdateValue;
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/src/environmentchangenotifier.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,102 @@
+/*
+* Copyright (c) 2009-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 file for the EnvironmentChangeNotifier class.
+*
+*/
+
+// System includes
+#include <bacntf.h>
+
+// User includes
+#include "environmentchangenotifier.h"
+#include "timezoneclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "environmentchangenotifierTraces.h"
+#endif
+
+
+/*!
+ \class EnvironmentChangeNotifier
+
+ This class listens to the enviroment changes and notifies the client.
+ */
+
+/*!
+ The constructor.
+ */
+EnvironmentChangeNotifier::EnvironmentChangeNotifier(TimezoneClient *client)
+{
+ OstTraceFunctionEntry0( ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY );
+ mTzClient = client;
+
+ TCallBack callback(environmentCallback, this);
+
+ mNotifier = CEnvironmentChangeNotifier::NewL(
+ CActive::EPriorityStandard, callback);
+ mNotifier->Start();
+
+ OstTraceFunctionExit0( ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT );
+}
+
+EnvironmentChangeNotifier::~EnvironmentChangeNotifier()
+{
+ OstTraceFunctionEntry0( DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY );
+ if (mNotifier) {
+ mNotifier->Cancel();
+ delete mNotifier;
+ mNotifier = 0;
+ }
+ OstTraceFunctionExit0( DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT );
+}
+
+int EnvironmentChangeNotifier::environmentCallback(TAny* obj)
+{
+ OstTraceFunctionEntry0( ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_ENTRY );
+ EnvironmentChangeNotifier* self =
+ static_cast<EnvironmentChangeNotifier *> (obj);
+
+ int changes = KInitialEvent;
+ if (self->mNotifier) {
+ changes = self->mNotifier->Change();
+ }
+
+ if (KInitialEvent <= changes) {
+ // We're not concerned about handling environment changes in that range.
+ OstTraceFunctionExit0( ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT );
+ return 0;
+ }
+
+ if (changes & (EChangesMidnightCrossover |
+ EChangesLocale |
+ EChangesSystemTime)) {
+// emit self->timechanged(); TODO: notify timezone client.
+//
+ self->notifyEnvChange();
+ } else {
+ // Nothing to do.
+ }
+ OstTraceFunctionExit0( DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT );
+ return 0;
+}
+
+void EnvironmentChangeNotifier::notifyEnvChange()
+{
+ OstTraceFunctionEntry0( ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_ENTRY );
+ mTzClient->notifyTimeChange();
+ OstTraceFunctionExit0( ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_EXIT );
+}
+
+// End of file -- Do not remove this.
--- a/clock/clockmw/clocktimezone/src/timezoneclient.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockmw/clocktimezone/src/timezoneclient.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,6 +32,12 @@
#include "clockcommon.h"
#include "clockserverclt.h"
#include "clockprivatecrkeys.h"
+#include "environmentchangenotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "timezoneclientTraces.h"
+#endif
+
const int KDaysInWeek(7);
const int KZerothRule(0);
@@ -52,11 +58,13 @@
*/
TimezoneClient* TimezoneClient::getInstance()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETINSTANCE_ENTRY );
if (!mTimezoneClient) {
mTimezoneClient = new TimezoneClient();
mReferenceCount = true;
}
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETINSTANCE_EXIT );
return mTimezoneClient;
}
@@ -65,10 +73,13 @@
*/
void TimezoneClient::deleteInstance()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_DELETEINSTANCE_ENTRY );
if (mReferenceCount) {
delete mTimezoneClient;
mTimezoneClient = 0;
+ mReferenceCount = false;
}
+ OstTraceFunctionExit0( TIMEZONECLIENT_DELETEINSTANCE_EXIT );
}
/*!
@@ -76,6 +87,8 @@
*/
bool TimezoneClient::isNull()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_ISNULL_ENTRY );
+ OstTraceFunctionExit0( TIMEZONECLIENT_ISNULL_EXIT );
return !mReferenceCount;
}
@@ -83,12 +96,9 @@
The constructor.
*/
TimezoneClient::TimezoneClient()
-{
- TCallBack callback(environmentCallback, this);
-
- mNotifier = CEnvironmentChangeNotifier::NewL(
- CActive::EPriorityStandard, callback);
- mNotifier->Start();
+{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_TIMEZONECLIENT_ENTRY );
+ mNotifier = new EnvironmentChangeNotifier(this);
mTzLocalizer = CTzLocalizer::NewL();
@@ -111,6 +121,7 @@
connect(
mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
this, SLOT(eventMonitor(XQSettingsKey, QVariant)));
+ OstTraceFunctionExit0( TIMEZONECLIENT_TIMEZONECLIENT_EXIT );
}
/*!
@@ -118,10 +129,9 @@
*/
TimezoneClient::~TimezoneClient()
{
+ OstTraceFunctionEntry0( DUP1_TIMEZONECLIENT_TIMEZONECLIENT_ENTRY );
if (mNotifier) {
- mNotifier->Cancel();
delete mNotifier;
- mNotifier = 0;
}
if (mWorldClockModel) {
mWorldClockModel->clear();
@@ -137,7 +147,7 @@
if (mAllLocations.count()) {
mAllLocations.clear();
}
-
+ OstTraceFunctionExit0( DUP1_TIMEZONECLIENT_TIMEZONECLIENT_EXIT );
}
/*!
@@ -150,6 +160,7 @@
*/
QList<LocationInfo>& TimezoneClient::getLocations()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETLOCATIONS_ENTRY );
if (mAllLocations.count()) {
mAllLocations.clear();
}
@@ -201,11 +212,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(cityArray);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETLOCATIONS_EXIT );
return mAllLocations;
}
bool TimezoneClient::getUtcDstOffsetL(int& dstOffset, const CTzId& timezoneId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETUTCDSTOFFSETL_ENTRY );
RTz tzHandle;
User::LeaveIfError(tzHandle.Connect());
CleanupClosePushL(tzHandle);
@@ -263,6 +276,7 @@
CleanupStack::PopAndDestroy(actualizedRules);
CleanupStack::PopAndDestroy(timezoneRules);
CleanupStack::PopAndDestroy(&tzHandle);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT );
return true;
} else {
dstOffset = initialTimeZoneOffset;
@@ -271,11 +285,13 @@
CleanupStack::PopAndDestroy(actualizedRules);
CleanupStack::PopAndDestroy(timezoneRules);
CleanupStack::PopAndDestroy(&tzHandle);
+ OstTraceFunctionExit0( DUP1_TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT );
return false;
}
LocationInfo TimezoneClient::getCurrentZoneInfoL()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCURRENTZONEINFOL_ENTRY );
// Current zone info.
LocationInfo currentLocation;
int timezoneId(0);
@@ -402,21 +418,17 @@
// Cleanup.
CleanupStack::PopAndDestroy( tzId );
CleanupStack::PopAndDestroy( &tzHandle );
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETCURRENTZONEINFOL_EXIT );
return currentLocation;
}
void TimezoneClient::setAsCurrentLocationL(LocationInfo &location)
{
-/* Debug::writeDebugMsg(
- "In time zone client setAsCurrentLocationL " + location.cityName +
- " " +
- location.countryName +
- " " +
- QString::number(location.zoneOffset));*/
-
+ OstTraceFunctionEntry0( TIMEZONECLIENT_SETASCURRENTLOCATIONL_ENTRY );
LocationInfo prevLocationInfo ;
prevLocationInfo = getCurrentZoneInfoL();
-
+ QTime prevLocationTime = QTime::currentTime();
+
mTzLocalizer->SetTimeZoneL( location.timezoneId );
TPtrC ptrCityName(
@@ -433,10 +445,19 @@
if(prevLocationInfo.timezoneId == location.timezoneId) {
emit cityUpdated();
}
+
+ QTime newTime = QTime::currentTime();
+ if ((prevLocationTime.hour() == newTime.hour())
+ && (prevLocationTime.minute() == newTime.minute())
+ && (prevLocationInfo.timezoneId != location.timezoneId)) {
+ emit cityUpdated();
+ }
+ OstTraceFunctionExit0( TIMEZONECLIENT_SETASCURRENTLOCATIONL_EXIT );
}
bool TimezoneClient::isDSTOnL(int timezoneId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_ISDSTONL_ENTRY );
bool returnVal( false );
CTzId* tzId = CTzId::NewL( timezoneId );
CleanupStack::PushL( tzId );
@@ -451,11 +472,13 @@
CleanupStack::PopAndDestroy( &tzHandle );
CleanupStack::PopAndDestroy( tzId );
+ OstTraceFunctionExit0( TIMEZONECLIENT_ISDSTONL_EXIT );
return returnVal;
}
int TimezoneClient::getStandardOffset(int timezoneId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETSTANDARDOFFSET_ENTRY );
RTz tzHandle;
User::LeaveIfError(tzHandle.Connect());
CleanupClosePushL(tzHandle);
@@ -466,6 +489,17 @@
tzHandle.GetOffsetsForTimeZoneIdsL(idArray, offsetArray);
int stdOffset = offsetArray[0];
+
+ if (isDSTOnL(timezoneId)) {
+ CTzId* tzId = CTzId::NewL( timezoneId );
+ CleanupStack::PushL( tzId );
+
+ // Get the offset with DST enabled.
+ getUtcDstOffsetL(stdOffset, *tzId);
+
+ CleanupStack::PopAndDestroy(tzId);
+
+ }
offsetArray.Close();
idArray.Close();
@@ -473,12 +507,14 @@
// Cleanup.
CleanupStack::PopAndDestroy(&tzHandle);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETSTANDARDOFFSET_EXIT );
return stdOffset;
}
void TimezoneClient::getDstRulesL(
QDateTime &startTime, QDateTime &endTime, int timezoneId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETDSTRULESL_ENTRY );
RTz tzHandle;
User::LeaveIfError(tzHandle.Connect());
CleanupClosePushL(tzHandle);
@@ -566,10 +602,12 @@
CleanupStack::PopAndDestroy(timezoneRules);
CleanupStack::PopAndDestroy(tzId);
CleanupStack::PopAndDestroy(&tzHandle);
+OstTraceFunctionExit0( TIMEZONECLIENT_GETDSTRULESL_EXIT );
}
QList<LocationInfo> TimezoneClient::getSavedLocations()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETSAVEDLOCATIONS_ENTRY );
QList<LocationInfo> locationList;
QString fileName(CITY_INFO_DB_PATH);
@@ -581,11 +619,13 @@
writeStream >> locationList;
cityInfoFile.close();
}
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETSAVEDLOCATIONS_EXIT );
return locationList;
}
void TimezoneClient::saveLocations(const QList<LocationInfo> &locationList)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_SAVELOCATIONS_ENTRY );
QDir cityDbDir;
cityDbDir.mkpath(CITY_INFO_DB_PATH);
@@ -595,6 +635,7 @@
QFile cityInfoFile(fileName);
if (!cityInfoFile.open(QIODevice::WriteOnly)) {
// Error opening or creating file.
+ OstTraceFunctionExit0( TIMEZONECLIENT_SAVELOCATIONS_EXIT );
return;
}
QDataStream writeStream(&cityInfoFile);
@@ -602,35 +643,12 @@
cityInfoFile.close();
emit listUpdated();
-}
-
-void TimezoneClient::getCountries(QMap<QString, int>& countries)
-{
- // Get all the city groups(countries).
- QTime t;
- t.start();
- CTzLocalizedCityGroupArray* cityGroupArray =
- mTzLocalizer->GetAllCityGroupsL(CTzLocalizer::ETzAlphaNameAscending);
- CleanupStack::PushL(cityGroupArray);
-
- t.restart();
- // Iterate through each of the city groups.
- for (int i = 0; i < cityGroupArray->Count(); i++) {
- CTzLocalizedCityGroup& cityGroup(cityGroupArray->At(i));
- TPtrC countryName(cityGroup.Name());
-
- // Get the QString of country name
- QString qCountryName = QString::fromUtf16(
- countryName.Ptr(),countryName.Length());
- countries[qCountryName] = cityGroup.Id();
- }
-
- // Cleanup.
- CleanupStack::PopAndDestroy(cityGroupArray);
+OstTraceFunctionExit0( DUP1_TIMEZONECLIENT_SAVELOCATIONS_EXIT );
}
void TimezoneClient::getCitiesForCountry(int id, QMap<QString, int>& cities)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCITIESFORCOUNTRY_ENTRY );
// Get the city group for the given id.
CTzLocalizedCityArray* cityArray = mTzLocalizer->GetCitiesInGroupL(id,
CTzLocalizer::ETzAlphaNameAscending);
@@ -658,11 +676,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(unsortedArray);
CleanupStack::PopAndDestroy(cityArray);
+OstTraceFunctionExit0( TIMEZONECLIENT_GETCITIESFORCOUNTRY_EXIT );
}
void TimezoneClient::getLocationInfo(
int groupId, int cityIndex, LocationInfo& cityInfo)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETLOCATIONINFO_ENTRY );
TRAPD(
error,
@@ -692,58 +712,40 @@
CleanupStack::PopAndDestroy(cityGroup);
)
Q_UNUSED(error)
+OstTraceFunctionExit0( TIMEZONECLIENT_GETLOCATIONINFO_EXIT );
}
QDataStream &operator<<(
QDataStream &writeStream, const LocationInfo& locationInfo)
{
+ OstTraceFunctionEntry0( _OPERATOR_ENTRY );
writeStream << locationInfo.cityName
<< locationInfo.countryName
<< locationInfo.listImageName
<< locationInfo.dstOn
<< locationInfo.timezoneId
<< locationInfo.zoneOffset;
+ OstTraceFunctionExit0( _OPERATOR_EXIT );
return writeStream;
}
QDataStream &operator>>(
QDataStream &readStream, LocationInfo &locationInfo)
{
+ OstTraceFunctionEntry0( DUP1__OPERATOR_ENTRY );
readStream >> locationInfo.cityName
>> locationInfo.countryName
>> locationInfo.listImageName
>> locationInfo.dstOn
>> locationInfo.timezoneId
>> locationInfo.zoneOffset;
+ OstTraceFunctionExit0( DUP1__OPERATOR_EXIT );
return readStream;
}
-int TimezoneClient::environmentCallback(TAny* obj)
-{
- TimezoneClient* self = static_cast<TimezoneClient *> (obj);
-
- int changes = KInitialEvent;
- if (self->mNotifier) {
- changes = self->mNotifier->Change();
- }
-
- if (KInitialEvent <= changes) {
- // We're not concerned about handling environment changes in that range.
- return 0;
- }
-
- if (changes & (EChangesMidnightCrossover |
- EChangesLocale |
- EChangesSystemTime)) {
- emit self->timechanged();
- } else {
- // Nothing to do.
- }
- return 0;
-}
-
int TimezoneClient::getDstZoneOffset(int tzId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETDSTZONEOFFSET_ENTRY );
// Connect to the timezone server.
RTz client;
User::LeaveIfError(client.Connect());
@@ -759,11 +761,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(&client);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETDSTZONEOFFSET_EXIT );
return zoneOffsets[0];
}
bool TimezoneClient::dstOn(int tzId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_DSTON_ENTRY );
// Connect to the timezone server.
RTz client;
User::LeaveIfError(client.Connect());
@@ -778,11 +782,13 @@
CleanupStack::PopAndDestroy(zoneId);
CleanupStack::PopAndDestroy(&client);
+ OstTraceFunctionExit0( TIMEZONECLIENT_DSTON_EXIT );
return returnVal;
}
int TimezoneClient::getCityGroupIdByName(const QString& name)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCITYGROUPIDBYNAME_ENTRY );
TPtrC namePtr;
namePtr.Set(name.utf16(), name.length());
@@ -796,11 +802,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(cityGroup);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETCITYGROUPIDBYNAME_EXIT );
return id;
}
int TimezoneClient::getCityOffsetByNameAndId(const QString& name, int tzId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_ENTRY );
TPtrC namePtr;
namePtr.Set(name.utf16(), name.length());
@@ -821,11 +829,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(cityArray);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_EXIT );
return id;
}
void TimezoneClient::setDateTime(QDateTime dateTime)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_SETDATETIME_ENTRY );
TMonth month = intToMonth(dateTime.date().month());
TTime current(TDateTime(
dateTime.date().year(), month, dateTime.date().day() - 1,
@@ -836,10 +846,12 @@
CleanupClosePushL(tz);
TInt ret(tz.SetHomeTime(current));
CleanupStack::PopAndDestroy(&tz);
+OstTraceFunctionExit0( TIMEZONECLIENT_SETDATETIME_EXIT );
}
void TimezoneClient::setTimeUpdateOn(bool timeUpdate)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_SETTIMEUPDATEON_ENTRY );
RClkSrvInterface clkSrvInterface;
User::LeaveIfError(clkSrvInterface.Connect());
if (timeUpdate) {
@@ -849,28 +861,24 @@
clkSrvInterface.DeActivateAllProtocols();
}
clkSrvInterface.Close();
+OstTraceFunctionExit0( TIMEZONECLIENT_SETTIMEUPDATEON_EXIT );
}
bool TimezoneClient::timeUpdateOn()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_TIMEUPDATEON_ENTRY );
TBool autoTimeUpdateOn;
RClkSrvInterface clkSrvInterface;
User::LeaveIfError(clkSrvInterface.Connect());
clkSrvInterface.IsAutoTimeUpdateOn(autoTimeUpdateOn);
clkSrvInterface.Close();
+ OstTraceFunctionExit0( TIMEZONECLIENT_TIMEUPDATEON_EXIT );
return autoTimeUpdateOn;
}
-QStandardItemModel *TimezoneClient::locationSelectorModel()
-{
- if (!mWorldClockModel) {
- createWorldClockModel();
- }
- return mWorldClockModel;
-}
-
TMonth TimezoneClient::intToMonth(int month)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_INTTOMONTH_ENTRY );
switch (month) {
case 1:
return EJanuary;
@@ -903,23 +911,9 @@
return (TMonth) -1;
}
-void TimezoneClient::createWorldClockModel()
-{
- // Construct the model if its not yet done
- if (!mWorldClockModel) {
- // Create the model
- mWorldClockModel = new QStandardItemModel(this);
-
- getCountries(mAllCountries);
- mCountryCount = mAllCountries.count();
-
- // Construct the model in asynchronously
- QTimer::singleShot(2000, this, SLOT(populateCities()));
- }
-}
-
void TimezoneClient::populateCities()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_POPULATECITIES_ENTRY );
// First iterate over all the counties
QMapIterator<QString, int> countryIter(mAllCountries);
while (countryIter.hasNext()) {
@@ -944,6 +938,7 @@
country->appendRow(city);
}
}
+OstTraceFunctionExit0( TIMEZONECLIENT_POPULATECITIES_EXIT );
}
/*!
@@ -954,6 +949,7 @@
*/
bool TimezoneClient::checkForDstChange(AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_CHECKFORDSTCHANGE_ENTRY );
// User to be notified whether DST rollover happens in a day or
// has happen within a day if he tries to change the time.
bool returnValue( EFalse );
@@ -1081,6 +1077,7 @@
CleanupStack::PopAndDestroy( currentTZId );
CleanupStack::PopAndDestroy( &tzHandle );
+ OstTraceFunctionExit0( TIMEZONECLIENT_CHECKFORDSTCHANGE_EXIT );
return returnValue;
}
@@ -1091,7 +1088,9 @@
*/
QList<int> TimezoneClient::getAllTimeZoneIds()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETALLTIMEZONEIDS_ENTRY );
if (mTimeZoneIds.count()) {
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT );
return mTimeZoneIds;
} else {
// This list will contain the info of the cities fetched from tz server.
@@ -1115,6 +1114,7 @@
}
CleanupStack::PopAndDestroy(cityArray);
+ OstTraceFunctionExit0( DUP1_TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT );
return mTimeZoneIds;
}
}
@@ -1126,6 +1126,7 @@
*/
QList<int> TimezoneClient::getAllTimeZoneOffsets()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_ENTRY );
QList<int> timeZoneOffsetList;
QList<int> timeZoneIdList;
if (mTimeZoneIds.count()) {
@@ -1161,6 +1162,7 @@
CleanupStack::PopAndDestroy( &tzHandle );
// Sort the offset list
qSort(timeZoneOffsetList.begin(),timeZoneOffsetList.end());
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_EXIT );
return timeZoneOffsetList;
}
@@ -1172,6 +1174,7 @@
*/
QList<LocationInfo> TimezoneClient::getCountriesForUTCOffset(int utcOffset)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_ENTRY );
// This list will contain the info of the countries.
QList<LocationInfo> countryList;
QList<int> cityGroupIdList;
@@ -1206,6 +1209,7 @@
}
cityGroupIdList.clear();
CleanupStack::PopAndDestroy(cityList);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_EXIT );
return countryList;
}
@@ -1220,6 +1224,7 @@
LocationInfo TimezoneClient::addCity(
int timeZoneId,QString &cityName,int cityGroupId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_ADDCITY_ENTRY );
TPtrC namePtr;
namePtr.Set(cityName.utf16(), cityName.length());
@@ -1237,6 +1242,7 @@
CleanupStack::PopAndDestroy(newCity);
+ OstTraceFunctionExit0( TIMEZONECLIENT_ADDCITY_EXIT );
return info;
}
@@ -1248,6 +1254,7 @@
*/
void TimezoneClient::eventMonitor(const XQSettingsKey& key, const QVariant& value)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_EVENTMONITOR_ENTRY );
if (key.uid() == KCRUidNitz && key.key() == KActiveProtocol) {
if (mSettingsManager->error() == XQSettingsManager::NoError) {
@@ -1263,5 +1270,13 @@
}
}
}
+OstTraceFunctionExit0( TIMEZONECLIENT_EVENTMONITOR_EXIT );
+}
+
+void TimezoneClient::notifyTimeChange()
+{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_NOTIFYTIMECHANGE_ENTRY );
+ emit timechanged();
+OstTraceFunctionExit0( TIMEZONECLIENT_NOTIFYTIMECHANGE_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/traces/environmentchangenotifierTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,23 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ENVIRONMENTCHANGENOTIFIERTRACES_H__
+#define __ENVIRONMENTCHANGENOTIFIERTRACES_H__
+
+#define KOstTraceComponentID 0x2002dd0f
+
+#define ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY 0x8a0001
+#define ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT 0x8a0002
+#define DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY 0x8a0003
+#define DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT 0x8a0004
+#define ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_ENTRY 0x8a0005
+#define ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT 0x8a0006
+#define DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT 0x8a0007
+#define ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_ENTRY 0x8a0008
+#define ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_EXIT 0x8a0009
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,81 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_SAVELOCATIONS_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_TIMEZONECLIENT_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_TIMEZONECLIENT_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_DUP1__OPERATOR_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_DUP1__OPERATOR_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ADDCITY_ENTRY=0x4a
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ADDCITY_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_CHECKFORDSTCHANGE_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_CHECKFORDSTCHANGE_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_DELETEINSTANCE_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_DELETEINSTANCE_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_DSTON_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_DSTON_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_EVENTMONITOR_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_EVENTMONITOR_EXIT=0x4d
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETALLTIMEZONEIDS_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_EXIT=0x47
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITIESFORCOUNTRY_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITIESFORCOUNTRY_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITYGROUPIDBYNAME_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITYGROUPIDBYNAME_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_ENTRY=0x48
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCURRENTZONEINFOL_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCURRENTZONEINFOL_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETDSTRULESL_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETDSTRULESL_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETDSTZONEOFFSET_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETDSTZONEOFFSET_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETINSTANCE_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETINSTANCE_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETLOCATIONINFO_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETLOCATIONINFO_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETLOCATIONS_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETLOCATIONS_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETSAVEDLOCATIONS_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETSAVEDLOCATIONS_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETSTANDARDOFFSET_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETSTANDARDOFFSET_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETUTCDSTOFFSETL_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_INTTOMONTH_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ISDSTONL_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ISDSTONL_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ISNULL_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ISNULL_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_NOTIFYTIMECHANGE_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_NOTIFYTIMECHANGE_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_POPULATECITIES_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_POPULATECITIES_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SAVELOCATIONS_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SAVELOCATIONS_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETASCURRENTLOCATIONL_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETASCURRENTLOCATIONL_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETDATETIME_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETDATETIME_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETTIMEUPDATEON_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETTIMEUPDATEON_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_TIMEUPDATEON_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_TIMEUPDATEON_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_TIMEZONECLIENT_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_TIMEZONECLIENT_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]__OPERATOR_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]__OPERATOR_EXIT=0x2d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/traces/timezoneclientTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,178 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __TIMEZONECLIENTTRACES_H__
+#define __TIMEZONECLIENTTRACES_H__
+
+#define KOstTraceComponentID 0x2002dd0f
+
+#define TIMEZONECLIENT_GETINSTANCE_ENTRY 0x8a000a
+#define TIMEZONECLIENT_GETINSTANCE_EXIT 0x8a000b
+#define TIMEZONECLIENT_DELETEINSTANCE_ENTRY 0x8a000c
+#define TIMEZONECLIENT_DELETEINSTANCE_EXIT 0x8a000d
+#define TIMEZONECLIENT_ISNULL_ENTRY 0x8a000e
+#define TIMEZONECLIENT_ISNULL_EXIT 0x8a000f
+#define TIMEZONECLIENT_TIMEZONECLIENT_ENTRY 0x8a0010
+#define TIMEZONECLIENT_TIMEZONECLIENT_EXIT 0x8a0011
+#define DUP1_TIMEZONECLIENT_TIMEZONECLIENT_ENTRY 0x8a0012
+#define DUP1_TIMEZONECLIENT_TIMEZONECLIENT_EXIT 0x8a0013
+#define TIMEZONECLIENT_GETLOCATIONS_ENTRY 0x8a0014
+#define TIMEZONECLIENT_GETLOCATIONS_EXIT 0x8a0015
+#define TIMEZONECLIENT_GETUTCDSTOFFSETL_ENTRY 0x8a0016
+#define TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT 0x8a0017
+#define DUP1_TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT 0x8a0018
+#define TIMEZONECLIENT_GETCURRENTZONEINFOL_ENTRY 0x8a0019
+#define TIMEZONECLIENT_GETCURRENTZONEINFOL_EXIT 0x8a001a
+#define TIMEZONECLIENT_SETASCURRENTLOCATIONL_ENTRY 0x8a001b
+#define TIMEZONECLIENT_SETASCURRENTLOCATIONL_EXIT 0x8a001c
+#define TIMEZONECLIENT_ISDSTONL_ENTRY 0x8a001d
+#define TIMEZONECLIENT_ISDSTONL_EXIT 0x8a001e
+#define TIMEZONECLIENT_GETSTANDARDOFFSET_ENTRY 0x8a001f
+#define TIMEZONECLIENT_GETSTANDARDOFFSET_EXIT 0x8a0020
+#define TIMEZONECLIENT_GETDSTRULESL_ENTRY 0x8a0021
+#define TIMEZONECLIENT_GETDSTRULESL_EXIT 0x8a0022
+#define TIMEZONECLIENT_GETSAVEDLOCATIONS_ENTRY 0x8a0023
+#define TIMEZONECLIENT_GETSAVEDLOCATIONS_EXIT 0x8a0024
+#define TIMEZONECLIENT_SAVELOCATIONS_ENTRY 0x8a0025
+#define TIMEZONECLIENT_SAVELOCATIONS_EXIT 0x8a0026
+#define DUP1_TIMEZONECLIENT_SAVELOCATIONS_EXIT 0x8a0027
+#define TIMEZONECLIENT_GETCITIESFORCOUNTRY_ENTRY 0x8a0028
+#define TIMEZONECLIENT_GETCITIESFORCOUNTRY_EXIT 0x8a0029
+#define TIMEZONECLIENT_GETLOCATIONINFO_ENTRY 0x8a002a
+#define TIMEZONECLIENT_GETLOCATIONINFO_EXIT 0x8a002b
+#define _OPERATOR_ENTRY 0x8a002c
+#define _OPERATOR_EXIT 0x8a002d
+#define DUP1__OPERATOR_ENTRY 0x8a002e
+#define DUP1__OPERATOR_EXIT 0x8a002f
+#define TIMEZONECLIENT_GETDSTZONEOFFSET_ENTRY 0x8a0030
+#define TIMEZONECLIENT_GETDSTZONEOFFSET_EXIT 0x8a0031
+#define TIMEZONECLIENT_DSTON_ENTRY 0x8a0032
+#define TIMEZONECLIENT_DSTON_EXIT 0x8a0033
+#define TIMEZONECLIENT_GETCITYGROUPIDBYNAME_ENTRY 0x8a0034
+#define TIMEZONECLIENT_GETCITYGROUPIDBYNAME_EXIT 0x8a0035
+#define TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_ENTRY 0x8a0036
+#define TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_EXIT 0x8a0037
+#define TIMEZONECLIENT_SETDATETIME_ENTRY 0x8a0038
+#define TIMEZONECLIENT_SETDATETIME_EXIT 0x8a0039
+#define TIMEZONECLIENT_SETTIMEUPDATEON_ENTRY 0x8a003a
+#define TIMEZONECLIENT_SETTIMEUPDATEON_EXIT 0x8a003b
+#define TIMEZONECLIENT_TIMEUPDATEON_ENTRY 0x8a003c
+#define TIMEZONECLIENT_TIMEUPDATEON_EXIT 0x8a003d
+#define TIMEZONECLIENT_INTTOMONTH_ENTRY 0x8a003e
+#define TIMEZONECLIENT_POPULATECITIES_ENTRY 0x8a003f
+#define TIMEZONECLIENT_POPULATECITIES_EXIT 0x8a0040
+#define TIMEZONECLIENT_CHECKFORDSTCHANGE_ENTRY 0x8a0041
+#define TIMEZONECLIENT_CHECKFORDSTCHANGE_EXIT 0x8a0042
+#define TIMEZONECLIENT_GETALLTIMEZONEIDS_ENTRY 0x8a0043
+#define TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT 0x8a0044
+#define DUP1_TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT 0x8a0045
+#define TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_ENTRY 0x8a0046
+#define TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_EXIT 0x8a0047
+#define TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_ENTRY 0x8a0048
+#define TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_EXIT 0x8a0049
+#define TIMEZONECLIENT_ADDCITY_ENTRY 0x8a004a
+#define TIMEZONECLIENT_ADDCITY_EXIT 0x8a004b
+#define TIMEZONECLIENT_EVENTMONITOR_ENTRY 0x8a004c
+#define TIMEZONECLIENT_EVENTMONITOR_EXIT 0x8a004d
+#define TIMEZONECLIENT_NOTIFYTIMECHANGE_ENTRY 0x8a004e
+#define TIMEZONECLIENT_NOTIFYTIMECHANGE_EXIT 0x8a004f
+
+
+#ifndef __OSTTRACEGEN2_TUINT32_TUINT_TUINT__
+#define __OSTTRACEGEN2_TUINT32_TUINT_TUINT__
+
+inline TBool OstTraceGen2( TUint32 aTraceID, TUint aParam1, TUint aParam2 )
+ {
+ TBool retval = BTraceFiltered8( EXTRACT_GROUP_ID(aTraceID), EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
+ if ( retval )
+ {
+ TUint8 data[ 8 ];
+ TUint8* ptr = data;
+ *( ( TUint* )ptr ) = aParam1;
+ ptr += sizeof ( TUint );
+ *( ( TUint* )ptr ) = aParam2;
+ ptr += sizeof ( TUint );
+ ptr -= 8;
+ retval = OstSendNBytes( EXTRACT_GROUP_ID(aTraceID), EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
+ }
+ return retval;
+ }
+
+#endif // __OSTTRACEGEN2_TUINT32_TUINT_TUINT__
+
+
+#ifndef __OSTTRACEGEN2_TUINT32_TUINT32_TUINT32__
+#define __OSTTRACEGEN2_TUINT32_TUINT32_TUINT32__
+
+inline TBool OstTraceGen2( TUint32 aTraceID, TUint32 aParam1, TUint32 aParam2 )
+ {
+ TBool retval = BTraceFiltered8( EXTRACT_GROUP_ID(aTraceID), EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
+ if ( retval )
+ {
+ TUint8 data[ 8 ];
+ TUint8* ptr = data;
+ *( ( TUint* )ptr ) = aParam1;
+ ptr += sizeof ( TUint );
+ *( ( TUint* )ptr ) = aParam2;
+ ptr += sizeof ( TUint );
+ ptr -= 8;
+ retval = OstSendNBytes( EXTRACT_GROUP_ID(aTraceID), EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
+ }
+ return retval;
+ }
+
+#endif // __OSTTRACEGEN2_TUINT32_TUINT32_TUINT32__
+
+
+
+#ifndef __OSTTRACEGEN2_TUINT32_TUINT_TINT__
+#define __OSTTRACEGEN2_TUINT32_TUINT_TINT__
+
+inline TBool OstTraceGen2( TUint32 aTraceID, TUint aParam1, TInt aParam2 )
+ {
+ TBool retval = BTraceFiltered8( EXTRACT_GROUP_ID(aTraceID), EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
+ if ( retval )
+ {
+ TUint8 data[ 8 ];
+ TUint8* ptr = data;
+ *( ( TUint* )ptr ) = aParam1;
+ ptr += sizeof ( TUint );
+ *( ( TInt* )ptr ) = aParam2;
+ ptr += sizeof ( TInt );
+ ptr -= 8;
+ retval = OstSendNBytes( EXTRACT_GROUP_ID(aTraceID), EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
+ }
+ return retval;
+ }
+
+#endif // __OSTTRACEGEN2_TUINT32_TUINT_TINT__
+
+
+#ifndef __OSTTRACEGEN2_TUINT32_TUINT32_TINT32__
+#define __OSTTRACEGEN2_TUINT32_TUINT32_TINT32__
+
+inline TBool OstTraceGen2( TUint32 aTraceID, TUint32 aParam1, TInt32 aParam2 )
+ {
+ TBool retval = BTraceFiltered8( EXTRACT_GROUP_ID(aTraceID), EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
+ if ( retval )
+ {
+ TUint8 data[ 8 ];
+ TUint8* ptr = data;
+ *( ( TUint* )ptr ) = aParam1;
+ ptr += sizeof ( TUint );
+ *( ( TInt* )ptr ) = aParam2;
+ ptr += sizeof ( TInt );
+ ptr -= 8;
+ retval = OstSendNBytes( EXTRACT_GROUP_ID(aTraceID), EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
+ }
+ return retval;
+ }
+
+#endif // __OSTTRACEGEN2_TUINT32_TUINT32_TINT32__
+
+
+
+#endif
+
+// End of file
+
--- a/clock/clockui/clockalarmeditor/clockalarmeditor.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockalarmeditor/clockalarmeditor.pro Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,8 @@
../../clockmw/clockalarms/inc \
../../clockmw/clocksettingsutility/inc \
../../clockmw/clocktimezone/inc \
- ../../inc
+ ../../inc \
+ ./traces
DEPENDPATH += \
./inc \
--- a/clock/clockui/clockalarmeditor/data/xml/clockalarmeditor.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockalarmeditor/data/xml/clockalarmeditor.docml Mon Aug 23 16:00:50 2010 +0100
@@ -3,9 +3,6 @@
<object name="deleteAction" type="HbAction">
<string locid="txt_clock_opt_delete" name="text" value="Delete"/>
</object>
- <object name="discardChanges" type="HbAction">
- <string locid="txt_clock_opt_discard_changes" name="text" value="Discard changes"/>
- </object>
<widget name="alarmEditorView" type="HbView">
<widget name="alarmEditorViewWidget" role="HbView:widget" type="HbWidget">
<widget name="subtitleGroupBox" type="HbGroupBox">
@@ -22,9 +19,8 @@
</widget>
<widget name="viewMenu" role="HbView:menu" type="HbMenu">
<ref object="deleteAction" role="HbMenu:addAction"/>
- <ref object="discardChanges" role="HbMenu:addAction"/>
</widget>
- <string locid="txt_common_common_clock" name="title" value="Clock"/>
+ <string locid="txt_clock_title_clock3" name="title" value="Clock"/>
</widget>
<metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/clock/clockui/clockalarmeditor/inc/clockalarmeditor.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockalarmeditor/inc/clockalarmeditor.h Mon Aug 23 16:00:50 2010 +0100
@@ -37,6 +37,7 @@
class HbDateTimePicker;
class HbDialog;
class HbTranslator;
+class HbAbstractVkbHost;
class XQSettingsManager;
class XQSettingsKey;
class AlarmClient;
@@ -58,16 +59,19 @@
public:
CLOCKALARMEDITOR_EXPORT void showAlarmEditor();
-public slots:
+private slots:
void handleDoneAction();
void handleDeleteAction();
- void handleDiscardAction();
void handleTimeChange(const QString &text);
void handleOccurenceChanged(int index);
void handleOkAction();
void launchTimePicker();
void handleAlarmSoundChanged(int checkedState);
void selectedAction(HbAction *action);
+ void handleDayChanged(int index);
+ void handleDescriptionChanged(const QString &text);
+ void handleKeypadOpen();
+ void handleKeypadClosed();
signals:
void alarmSet();
@@ -94,7 +98,9 @@
int mAlarmId;
int mStartOfWeek;
bool mAlarmDayItemInserted;
+ bool mIsQuickAlarm;
QString mTimeFormat;
+ QTime mOldAlarmTime;
HbDataForm *mAlarmEditorForm;
HbDataFormModel *mAlarmEditorModel;
@@ -104,14 +110,14 @@
HbDataFormModelItem *mAlarmSoundItem;
HbDataFormModelItem *mAlarmDescription;
- HbView *mAlarmEditorView;
- HbAction *mDiscardAction;
+ QPointer<HbView> mAlarmEditorView;
HbAction *mDeleteAction;
HbAction *mDoneAction;
HbAction *mOkAction;
HbAction *mCancelAction;
QPointer<HbDialog> mTimePickerDialog;
+ QPointer<HbAbstractVkbHost> mVirtualKeyboard;
XQSettingsManager *mSettingsManager;
XQSettingsKey *mPreviosAlarmTime;
--- a/clock/clockui/clockalarmeditor/src/clockalarmcustomitem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockalarmeditor/src/clockalarmcustomitem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -24,6 +24,11 @@
// User includes.
#include "clockalarmcustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockalarmcustomitemTraces.h"
+#endif
+
/*!
\class ClockAlarmCustomItem
@@ -40,7 +45,9 @@
ClockAlarmCustomItem::ClockAlarmCustomItem(QGraphicsItem *parent)
:HbDataFormViewItem(parent)
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT );
}
/*!
@@ -48,7 +55,9 @@
*/
ClockAlarmCustomItem::~ClockAlarmCustomItem()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT );
}
/*!
@@ -58,6 +67,7 @@
*/
HbAbstractViewItem* ClockAlarmCustomItem::createItem()
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_CREATEITEM_ENTRY );
return new ClockAlarmCustomItem(*this);
}
@@ -67,13 +77,16 @@
*/
bool ClockAlarmCustomItem::canSetModelIndex(const QModelIndex &index) const
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
index.data(HbDataFormModelItem::ItemTypeRole).toInt());
if(itemType == (HbDataFormModelItem::CustomItemBase)) {
+ OstTraceFunctionExit0( CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT );
return true;
} else {
+ OstTraceFunctionExit0( DUP1_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT );
return false;
}
@@ -81,6 +94,7 @@
void ClockAlarmCustomItem::restore()
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_RESTORE_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -91,8 +105,11 @@
static_cast<HbAbstractViewItem*>(this)->itemView()->model());
HbDataFormModelItem* modlItem = model->itemFromIndex(modelIndex());
mCustomButton->setProperty("text", modlItem->contentWidgetData("text"));
+ mCustomButton->setProperty(
+ "objectName", modlItem->contentWidgetData("objectName"));
}
+ OstTraceFunctionExit0( CLOCKALARMCUSTOMITEM_RESTORE_EXIT );
}
/*!
@@ -102,7 +119,9 @@
*/
HbWidget* ClockAlarmCustomItem::createCustomWidget()
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY );
mCustomButton = new HbPushButton(this);
+ OstTraceFunctionExit0( CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mCustomButton;
}
--- a/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -33,9 +33,11 @@
#include <HbGroupBox>
#include <HbDocumentLoader>
#include <HbTranslator>
+#include <HbAbstractVkbHost>
+#include <HbLineEdit>
#include <xqsettingsmanager.h>
#include <xqsettingskey.h>
-
+#include <QLocale>
// User includes
#include "clockprivatecrkeys.h"
@@ -44,6 +46,11 @@
#include "settingsutility.h"
#include "timezoneclient.h"
#include "clockalarmcustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockalarmeditorTraces.h"
+#endif
+
// Constants
const int KOneHourInMinute(60);
@@ -75,6 +82,7 @@
mAlarmId(alarmId),
mStartOfWeek(0),
mAlarmDayItemInserted(false),
+ mIsQuickAlarm(true),
mAlarmEditorForm(0),
mAlarmEditorModel(0),
mAlarmTimeItem(0),
@@ -84,6 +92,7 @@
mAlarmDescription(0),
mAlarmClient(alarmClient)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY );
// Load the translation file and install the alarmeditor specific translator
mTranslator = new HbTranslator("clockalarmeditor");
mTranslator->loadCommon();
@@ -146,16 +155,11 @@
// Get the menu items for the alarm editor.
mDeleteAction = qobject_cast<HbAction *> (
loader->findObject("deleteAction"));
- mDiscardAction = qobject_cast<HbAction *>(
- loader->findObject("discardChanges"));
// Connect the signals for the menu item.
connect(
mDeleteAction, SIGNAL(triggered()),
this, SLOT(handleDeleteAction()));
- connect(
- mDiscardAction, SIGNAL(triggered()),
- this, SLOT(handleDiscardAction()));
// Add the done soft key action.
mDoneAction = new HbAction(Hb::DoneNaviAction);
@@ -163,7 +167,19 @@
mDoneAction, SIGNAL(triggered()),
this, SLOT(handleDoneAction()));
mAlarmEditorView->setNavigationAction(mDoneAction);
+
+ if (mAlarmEditorView) {
+ mVirtualKeyboard = new HbAbstractVkbHost(mAlarmEditorView);
+ }
+ connect(
+ mVirtualKeyboard, SIGNAL(keypadOpened()),
+ this, SLOT(handleKeypadOpen()));
+ connect(
+ mVirtualKeyboard, SIGNAL(keypadClosed()),
+ this, SLOT(handleKeypadClosed()));
+
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT );
}
/*!
@@ -171,12 +187,14 @@
*/
ClockAlarmEditor::~ClockAlarmEditor()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY );
// Remove the translator
if (mTranslator) {
delete mTranslator;
mTranslator = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT );
}
/*!
@@ -184,10 +202,12 @@
*/
void ClockAlarmEditor::showAlarmEditor()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SHOWALARMEDITOR_ENTRY );
// Store the current view and set alarm editor as current view.
HbMainWindow *window = hbInstance->allMainWindows().first();
window->addView(mAlarmEditorView);
window->setCurrentView(mAlarmEditorView);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SHOWALARMEDITOR_EXIT );
}
/*!
@@ -195,6 +215,7 @@
*/
void ClockAlarmEditor::handleDoneAction()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEDONEACTION_ENTRY );
int alarmDayIndex = -1;
if (mAlarmDayItemInserted) {
alarmDayIndex = mAlarmDayItem->contentWidgetData("currentIndex").toInt();
@@ -215,6 +236,7 @@
emit alarmSet();
closeAlarmEditor();
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEDONEACTION_EXIT );
}
/*!
@@ -222,39 +244,9 @@
*/
void ClockAlarmEditor::handleDeleteAction()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEDELETEACTION_ENTRY );
closeAlarmEditor();
-}
-
-/*!
- Handles discard changes action on the editor.
- */
-void ClockAlarmEditor::handleDiscardAction()
-{
- // Reset alarm time.
- mAlarmTimeItem->setContentWidgetData(
- "text",mAlarmInfo.nextDueTime.toString(mTimeFormat));
- // Reset repeat info.
- mAlarmOccurenceItem->setContentWidgetData("currentIndex", mAlarmInfo.repeatType);
-
- // Reset alarm day item.
- if (mAlarmDayItemInserted) {
- int currentIndex = mAlarmInfo.alarmDateTime.dayOfWeek() - 1;
- currentIndex -= mStartOfWeek;
- if(0 > currentIndex){
- currentIndex += KDaysInWeek;
- }
- mAlarmDayItem->setContentWidgetData(
- "currentIndex",currentIndex);
- }
-
- // Reset for alarm sound.
- if (AlarmVolumeOn == mAlarmInfo.volumeStatus) {
- mAlarmSoundItem->setContentWidgetData("checkState", Qt::Checked);
- } else {
- mAlarmSoundItem->setContentWidgetData("checkState", Qt::Unchecked);
- }
-
- mAlarmDescription->setContentWidgetData("text", mAlarmInfo.alarmDesc);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEDELETEACTION_EXIT );
}
/*!
@@ -262,6 +254,7 @@
*/
void ClockAlarmEditor::handleTimeChange(const QString &text)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLETIMECHANGE_ENTRY );
// If it is a new alarm.
if (!mAlarmId) {
// Decide the day to focus.
@@ -271,11 +264,13 @@
text,
mTimeFormat);
if (!alarmTime.isValid()) {
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT );
return;
}
QTime homeTime = QTime::currentTime();
if (-1 == alarmDayIndex) {
+ OstTraceFunctionExit0( DUP1_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT );
return;
}
if (homeTime > alarmTime) {
@@ -290,11 +285,19 @@
if(0 > alarmDayIndex){
alarmDayIndex += KDaysInWeek;
}
+ mAlarmEditorForm->removeConnection(
+ mAlarmDayItem, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(handleDayChanged(int)));
+ mIsQuickAlarm = true;
mAlarmDayItem->setContentWidgetData(
"currentIndex",
alarmDayIndex);
+ mAlarmEditorForm->addConnection(
+ mAlarmDayItem, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(handleDayChanged(int)));
}
}
+ OstTraceFunctionExit0( DUP2_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT );
}
/*!
@@ -302,7 +305,10 @@
*/
void ClockAlarmEditor:: handleOccurenceChanged(int index)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_ENTRY );
Q_UNUSED(index)
+
+ mIsQuickAlarm = false;
int repeatIndex =
mAlarmOccurenceItem->contentWidgetData("currentIndex").toInt();
@@ -315,6 +321,7 @@
mTimeFormat);
QTime homeTime = QTime::currentTime();
if (-1 == alarmDayIndex) {
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT );
return;
}
if (homeTime > alarmTime) {
@@ -327,8 +334,10 @@
// Show the alarm days field to select the day.
mAlarmDayItem = new HbDataFormModelItem(
HbDataFormModelItem::ComboBoxItem,
- QString(hbTrId("txt_clock_formlabel_day")),
- mAlarmEditorModel->invisibleRootItem());
+ QString(hbTrId("txt_clk_setlabel_day")));
+ mAlarmEditorForm->addConnection(
+ mAlarmDayItem, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(handleDayChanged(int)));
// Add the alarm days beginning from the start of week.
QStringList alarmDays;
@@ -357,6 +366,7 @@
mAlarmDayItemInserted = false;
}
}
+ OstTraceFunctionExit0( DUP1_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT );
}
/*!
@@ -364,6 +374,7 @@
*/
void ClockAlarmEditor::handleOkAction()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEOKACTION_ENTRY );
// Get the time from the time picker.
QTime newAlarmTime = static_cast<HbDateTimePicker *> (
mTimePickerDialog->contentWidget())->time();
@@ -371,9 +382,12 @@
// Update the selected time value.
mAlarmTimeItem->setContentWidgetData("text",newAlarmTime.toString(mTimeFormat));
- if (mAlarmInfo.nextDueTime != newAlarmTime ) {
+ if (mOldAlarmTime != newAlarmTime && mIsQuickAlarm) {
handleTimeChange(newAlarmTime.toString(mTimeFormat));
}
+
+ mOldAlarmTime = newAlarmTime;
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEOKACTION_EXIT );
}
/*!
@@ -381,6 +395,7 @@
*/
void ClockAlarmEditor::launchTimePicker()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_LAUNCHTIMEPICKER_ENTRY );
if (mTimePickerDialog) {
delete mTimePickerDialog;
}
@@ -425,6 +440,7 @@
mTimePickerDialog->addAction(mCancelAction);
mTimePickerDialog->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_LAUNCHTIMEPICKER_EXIT );
}
/*!
@@ -432,12 +448,15 @@
*/
void ClockAlarmEditor::handleAlarmSoundChanged(int checkedState)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_ENTRY );
Q_UNUSED(checkedState)
- if (AlarmVolumeOff == mAlarmInfo.volumeStatus) {
+ mIsQuickAlarm = false;
+/* if (AlarmVolumeOff == mAlarmInfo.volumeStatus) {
mAlarmInfo.volumeStatus = AlarmVolumeOn;
} else {
mAlarmInfo.volumeStatus = AlarmVolumeOff;
- }
+ }*/
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_EXIT );
}
/*!
@@ -445,9 +464,70 @@
*/
void ClockAlarmEditor::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SELECTEDACTION_ENTRY );
if (action == mOkAction) {
handleOkAction();
}
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SELECTEDACTION_EXIT );
+}
+
+/*!
+ Slot to handle the change in day item.
+ */
+void ClockAlarmEditor::handleDayChanged(int index)
+{
+ Q_UNUSED(index)
+ mIsQuickAlarm = false;
+}
+
+/*!
+ Slot to handle the change in description.
+ */
+void ClockAlarmEditor::handleDescriptionChanged(const QString &text)
+{
+ Q_UNUSED(text)
+ mIsQuickAlarm = false;
+}
+
+/*!
+ Slot to handle the open event of vkb.
+ */
+void ClockAlarmEditor::handleKeypadOpen()
+{
+ QModelIndex descriptionItemIndex =
+ mAlarmEditorModel->indexFromItem(mAlarmDescription);
+ HbDataFormViewItem *viewItem = static_cast<HbDataFormViewItem *> (
+ mAlarmEditorForm->itemByIndex(descriptionItemIndex));
+ if (viewItem) {
+ HbLineEdit *editor = static_cast<HbLineEdit *>(
+ viewItem->dataItemContentWidget());
+ int temp = editor->text().length();
+ bool flag = editor->hasSelectedText();
+ if (!flag) {
+ editor->setSelection(0, temp);
+ }
+ }
+}
+
+/*!
+ Slot to handle the close event of vkb.
+ */
+void ClockAlarmEditor::handleKeypadClosed()
+{
+ QModelIndex descriptionItemIndex =
+ mAlarmEditorModel->indexFromItem(mAlarmDescription);
+ HbDataFormViewItem *viewItem = static_cast<HbDataFormViewItem *> (
+ mAlarmEditorForm->itemByIndex(descriptionItemIndex));
+ if (viewItem) {
+ HbLineEdit *editor = static_cast<HbLineEdit *>(
+ viewItem->dataItemContentWidget());
+
+ editor->setSelection(0, 0);
+ if (editor->text().isEmpty()) {
+ editor->setText(hbTrId("txt_clk_formlabel_val_alarm"));
+ }
+
+ }
}
/*!
@@ -455,6 +535,7 @@
*/
void ClockAlarmEditor::initModel()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_INITMODEL_ENTRY );
// Remove the model.
if (mAlarmEditorForm->model()) {
delete mAlarmEditorForm->model();
@@ -467,6 +548,7 @@
populateModelItems();
// Set the model.
mAlarmEditorForm->setModel(mAlarmEditorModel);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_INITMODEL_EXIT );
}
/*!
@@ -474,14 +556,16 @@
*/
void ClockAlarmEditor::populateModelItems()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_POPULATEMODELITEMS_ENTRY );
// Time.
- // Creats a data form model item to set time.
+ // Creates a data form model item to set time.
mAlarmTimeItem = mAlarmEditorModel->appendDataFormItem(
HbDataFormModelItem::CustomItemBase,
QString(hbTrId("txt_clk_setlabel_time")),
mAlarmEditorModel->invisibleRootItem());
mAlarmTimeItem->setContentWidgetData(
"text", mAlarmInfo.nextDueTime.toString(mTimeFormat));
+ mAlarmTimeItem->setContentWidgetData("objectName", "alarmTime");
mAlarmEditorForm->addConnection(
mAlarmTimeItem, SIGNAL(pressed()),
this, SLOT(launchTimePicker()));
@@ -497,6 +581,8 @@
<< hbTrId("txt_clk_setlabel_val_repeat_weekly")
<< hbTrId("txt_clk_setlabel_val_repeat_on_workdays");
mAlarmOccurenceItem->setContentWidgetData("items", repeatTypes);
+ mAlarmOccurenceItem->setContentWidgetData(
+ "objectName", "alarmOccurence");
mAlarmEditorForm->addConnection(
mAlarmOccurenceItem, SIGNAL(currentIndexChanged(int)),
this, SLOT(handleOccurenceChanged(int)));
@@ -515,6 +601,9 @@
HbDataFormModelItem::ComboBoxItem,
QString(hbTrId("txt_clk_setlabel_day")),
mAlarmEditorModel->invisibleRootItem());
+ mAlarmEditorForm->addConnection(
+ mAlarmDayItem, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(handleDayChanged(int)));
// Add the alarm days beginning from the start of week.
QStringList alarmDays;
@@ -528,7 +617,7 @@
mAlarmDayItem->setContentWidgetData("items", alarmDays);
mAlarmDayItem->setContentWidgetData(
"currentIndex",currentIndex);
-
+ mAlarmDayItem->setContentWidgetData("objectName", "alarmDay");
mAlarmDayItemInserted = true;
}/* else { TODO: check and remove this else block.
HbDataFormModelItem *dayItem = formItem(2);
@@ -551,7 +640,7 @@
if (AlarmVolumeOn == mAlarmInfo.volumeStatus) {
mAlarmSoundItem->setContentWidgetData("checkState",Qt::Checked);
}
-
+ mAlarmSoundItem->setContentWidgetData("objectName", "alarmSound");
mAlarmEditorForm->addConnection(
mAlarmSoundItem, SIGNAL(stateChanged(int)),
this,SLOT(handleAlarmSoundChanged(int)));
@@ -562,7 +651,12 @@
QString(hbTrId("txt_clk_formlabel_description")),
mAlarmEditorModel->invisibleRootItem());
mAlarmDescription->setContentWidgetData("text", mAlarmInfo.alarmDesc);
+ mAlarmDescription->setContentWidgetData("objectName", "alaramDescription");
+ mAlarmEditorForm->addConnection(
+ mAlarmDescription, SIGNAL(textChanged (const QString &)),
+ this, SLOT(handleDescriptionChanged(const QString &)));
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_POPULATEMODELITEMS_EXIT );
}
/*!
@@ -572,6 +666,7 @@
*/
void ClockAlarmEditor::initAlarmInfo()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_INITALARMINFO_ENTRY );
// Fill default values for alarmInfo.
mAlarmInfo.nextDueTime = getPreviousAlarmTime();
mAlarmInfo.alarmDesc =
@@ -599,6 +694,11 @@
mAlarmClient.getAlarmInfo(mAlarmId, mAlarmInfo);
mAlarmClient.deleteAlarm(mAlarmId);
}
+
+ // Set the value for previous alarm time.
+ mOldAlarmTime = mAlarmInfo.nextDueTime;
+
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_INITALARMINFO_EXIT );
}
/*!
@@ -607,6 +707,7 @@
void ClockAlarmEditor::setAlarm(
QString timeInfo, QString descInfo, int repeatType, int alarmDayIndex)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SETALARM_ENTRY );
QTime alarmTime;
AlarmInfo alarmInfo;
@@ -630,7 +731,12 @@
}
// Fill the alarm volume status
- alarmInfo.volumeStatus = mAlarmInfo.volumeStatus;
+ int state = mAlarmSoundItem->contentWidgetData("checkState").toInt();
+ if (Qt::Checked == state) {
+ alarmInfo.volumeStatus = AlarmVolumeOn;
+ } else {
+ alarmInfo.volumeStatus = AlarmVolumeOff;
+ }
// Request the listener to set the alarm.
mAlarmClient.setAlarm(alarmInfo);
@@ -652,6 +758,7 @@
// Save previous alarm time.
setPreviosAlarmTime(alarmTime);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SETALARM_EXIT );
}
/*!
@@ -662,6 +769,7 @@
*/
QTime ClockAlarmEditor::getPreviousAlarmTime()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_ENTRY );
QTime previousTime(9,0,0);
// Read the initial values from the cenrep.
@@ -674,9 +782,11 @@
previousTime.setHMS(
alarmTimeMinutes / 60, alarmTimeMinutes % 60, 0);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT );
return previousTime;
}
+ OstTraceFunctionExit0( DUP1_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT );
return previousTime;
}
@@ -685,18 +795,22 @@
*/
void ClockAlarmEditor::setPreviosAlarmTime(QTime time)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SETPREVIOSALARMTIME_ENTRY );
int alarmTimeMinutes = (time.hour() * 60) + (time.minute());
// Write the value to cenrep.
mSettingsManager->writeItemValue(*mPreviosAlarmTime, alarmTimeMinutes);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SETPREVIOSALARMTIME_EXIT );
}
void ClockAlarmEditor::closeAlarmEditor()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_CLOSEALARMEDITOR_ENTRY );
// Remove the alarm editor.
HbMainWindow *window = hbInstance->allMainWindows().first();
window->removeView(mAlarmEditorView);
deleteLater();
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_CLOSEALARMEDITOR_EXIT );
}
/*!
@@ -706,6 +820,7 @@
*/
void ClockAlarmEditor::displayDSTRollOverNote(AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_ENTRY );
QString alarmTime = alarmInfo.nextDueTime.toString(mTimeFormat);
QString dstRollOverText =
@@ -713,6 +828,7 @@
QString displayText = dstRollOverText.arg(alarmTime);
// show the note
launchDialog(displayText);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_EXIT );
}
/*!
@@ -722,6 +838,7 @@
*/
void ClockAlarmEditor::displayRemainingTimeNote(AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_ENTRY );
QDateTime currentDateTime= QDateTime::currentDateTime();
QTime alarmTime = alarmInfo.origAlarmTime;
@@ -859,6 +976,7 @@
if (showDisplayText) {
launchDialog(displayText);
}
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_EXIT );
}
/*!
@@ -869,24 +987,27 @@
*/
void ClockAlarmEditor::getDayText(int alarmDay,QString& dayText)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_GETDAYTEXT_ENTRY );
+ QLocale qLocale;
switch(alarmDay) {
- case 1:dayText.append(hbTrId("txt_clk_setlabel_val_monday"));
+ case 1:dayText.append(qLocale.dayName(1));
break;
- case 2:dayText.append(hbTrId("txt_clk_setlabel_val_tuesday"));
- break;
- case 3:dayText.append(hbTrId("txt_clk_setlabel_val_wednesday"));
+ case 2:dayText.append(qLocale.dayName(2));
break;
- case 4:dayText.append(hbTrId("txt_clk_setlabel_val_thursday"));
+ case 3:dayText.append(qLocale.dayName(3));
break;
- case 5:dayText.append(hbTrId("txt_clk_setlabel_val_friday"));
+ case 4:dayText.append(qLocale.dayName(4));
break;
- case 6:dayText.append(hbTrId("txt_clk_setlabel_val_saturday"));
+ case 5:dayText.append(qLocale.dayName(5));
break;
- case 7:dayText.append(hbTrId("txt_clk_setlabel_val_sunday"));
+ case 6:dayText.append(qLocale.dayName(6));
+ break;
+ case 7:dayText.append(qLocale.dayName(7));
break;
default:
break;
}
+OstTraceFunctionExit0( CLOCKALARMEDITOR_GETDAYTEXT_EXIT );
}
/*!
gets remaining seconds to the alarm time from current date time
@@ -895,6 +1016,7 @@
*/
int ClockAlarmEditor::getRemainingSeconds(QDateTime& alarmDateTime)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_GETREMAININGSECONDS_ENTRY );
QDateTime currentDateTime = QDateTime::currentDateTime();
int currentDateTimeSec =
@@ -915,6 +1037,7 @@
}
int remainingSeconds = alarmDateTimeSec - currentDateTimeSec;
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_GETREMAININGSECONDS_EXIT );
return remainingSeconds;
}
@@ -923,6 +1046,7 @@
*/
void ClockAlarmEditor::launchDialog(QString title, QString text)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_LAUNCHDIALOG_ENTRY );
HbNotificationDialog *notificationDialog = new HbNotificationDialog();
notificationDialog->setTitle(title);
@@ -932,6 +1056,7 @@
notificationDialog->setTimeout(HbPopup::ConfirmationNoteTimeout);
notificationDialog->show();
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_LAUNCHDIALOG_EXIT );
}
/*!
@@ -940,6 +1065,7 @@
void ClockAlarmEditor::sortAlarmDaysList(QStringList& alarmDaysList)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SORTALARMDAYSLIST_ENTRY );
for(int index=(mStartOfWeek + 1),j=KDaysInWeek;j!=0 ;index++,j--){
if(index > KDaysInWeek){
index = index - KDaysInWeek;
@@ -948,5 +1074,6 @@
getDayText(index, alarmDayText );
alarmDaysList.append(alarmDayText);
}
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SORTALARMDAYSLIST_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockalarmeditor/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockalarmeditor/traces/clockalarmcustomitemTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKALARMCUSTOMITEMTRACES_H__
+#define __CLOCKALARMCUSTOMITEMTRACES_H__
+
+#define KOstTraceComponentID 0x2001cc10
+
+#define CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY 0x8a0001
+#define CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT 0x8a0002
+#define DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY 0x8a0003
+#define DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT 0x8a0004
+#define CLOCKALARMCUSTOMITEM_CREATEITEM_ENTRY 0x8a0005
+#define CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_ENTRY 0x8a0006
+#define CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a0007
+#define DUP1_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a0008
+#define CLOCKALARMCUSTOMITEM_RESTORE_ENTRY 0x8a0009
+#define CLOCKALARMCUSTOMITEM_RESTORE_EXIT 0x8a000a
+#define CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY 0x8a000b
+#define CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a000c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockalarmeditor/traces/clockalarmeditorTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,68 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKALARMEDITORTRACES_H__
+#define __CLOCKALARMEDITORTRACES_H__
+
+#define KOstTraceComponentID 0x2001cc10
+
+#define CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY 0x8a000d
+#define CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT 0x8a000e
+#define DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY 0x8a000f
+#define DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT 0x8a0010
+#define CLOCKALARMEDITOR_SHOWALARMEDITOR_ENTRY 0x8a0011
+#define CLOCKALARMEDITOR_SHOWALARMEDITOR_EXIT 0x8a0012
+#define CLOCKALARMEDITOR_HANDLEDONEACTION_ENTRY 0x8a0013
+#define CLOCKALARMEDITOR_HANDLEDONEACTION_EXIT 0x8a0014
+#define CLOCKALARMEDITOR_HANDLEDELETEACTION_ENTRY 0x8a0015
+#define CLOCKALARMEDITOR_HANDLEDELETEACTION_EXIT 0x8a0016
+#define CLOCKALARMEDITOR_HANDLEDISCARDACTION_ENTRY 0x8a0017
+#define CLOCKALARMEDITOR_HANDLEDISCARDACTION_EXIT 0x8a0018
+#define CLOCKALARMEDITOR_HANDLETIMECHANGE_ENTRY 0x8a0019
+#define CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT 0x8a001a
+#define DUP1_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT 0x8a001b
+#define DUP2_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT 0x8a001c
+#define CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_ENTRY 0x8a001d
+#define CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT 0x8a001e
+#define DUP1_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT 0x8a001f
+#define CLOCKALARMEDITOR_HANDLEOKACTION_ENTRY 0x8a0020
+#define CLOCKALARMEDITOR_HANDLEOKACTION_EXIT 0x8a0021
+#define CLOCKALARMEDITOR_LAUNCHTIMEPICKER_ENTRY 0x8a0022
+#define CLOCKALARMEDITOR_LAUNCHTIMEPICKER_EXIT 0x8a0023
+#define CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_ENTRY 0x8a0024
+#define CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_EXIT 0x8a0025
+#define CLOCKALARMEDITOR_SELECTEDACTION_ENTRY 0x8a0026
+#define CLOCKALARMEDITOR_SELECTEDACTION_EXIT 0x8a0027
+#define CLOCKALARMEDITOR_INITMODEL_ENTRY 0x8a0028
+#define CLOCKALARMEDITOR_INITMODEL_EXIT 0x8a0029
+#define CLOCKALARMEDITOR_POPULATEMODELITEMS_ENTRY 0x8a002a
+#define CLOCKALARMEDITOR_POPULATEMODELITEMS_EXIT 0x8a002b
+#define CLOCKALARMEDITOR_INITALARMINFO_ENTRY 0x8a002c
+#define CLOCKALARMEDITOR_INITALARMINFO_EXIT 0x8a002d
+#define CLOCKALARMEDITOR_SETALARM_ENTRY 0x8a002e
+#define CLOCKALARMEDITOR_SETALARM_EXIT 0x8a002f
+#define CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_ENTRY 0x8a0030
+#define CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT 0x8a0031
+#define DUP1_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT 0x8a0032
+#define CLOCKALARMEDITOR_SETPREVIOSALARMTIME_ENTRY 0x8a0033
+#define CLOCKALARMEDITOR_SETPREVIOSALARMTIME_EXIT 0x8a0034
+#define CLOCKALARMEDITOR_CLOSEALARMEDITOR_ENTRY 0x8a0035
+#define CLOCKALARMEDITOR_CLOSEALARMEDITOR_EXIT 0x8a0036
+#define CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_ENTRY 0x8a0037
+#define CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_EXIT 0x8a0038
+#define CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_ENTRY 0x8a0039
+#define CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_EXIT 0x8a003a
+#define CLOCKALARMEDITOR_GETDAYTEXT_ENTRY 0x8a003b
+#define CLOCKALARMEDITOR_GETDAYTEXT_EXIT 0x8a003c
+#define CLOCKALARMEDITOR_GETREMAININGSECONDS_ENTRY 0x8a003d
+#define CLOCKALARMEDITOR_GETREMAININGSECONDS_EXIT 0x8a003e
+#define CLOCKALARMEDITOR_LAUNCHDIALOG_ENTRY 0x8a003f
+#define CLOCKALARMEDITOR_LAUNCHDIALOG_EXIT 0x8a0040
+#define CLOCKALARMEDITOR_SORTALARMDAYSLIST_ENTRY 0x8a0041
+#define CLOCKALARMEDITOR_SORTALARMDAYSLIST_EXIT 0x8a0042
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockalarmeditor/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,68 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CREATEITEM_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_RESTORE_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_RESTORE_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_CLOSEALARMEDITOR_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_CLOSEALARMEDITOR_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETDAYTEXT_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETDAYTEXT_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETREMAININGSECONDS_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETREMAININGSECONDS_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDELETEACTION_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDELETEACTION_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDISCARDACTION_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDISCARDACTION_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDONEACTION_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDONEACTION_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEOKACTION_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEOKACTION_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLETIMECHANGE_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_INITALARMINFO_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_INITALARMINFO_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_INITMODEL_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_INITMODEL_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_LAUNCHDIALOG_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_LAUNCHDIALOG_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_LAUNCHTIMEPICKER_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_LAUNCHTIMEPICKER_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_POPULATEMODELITEMS_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_POPULATEMODELITEMS_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SELECTEDACTION_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SELECTEDACTION_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SETALARM_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SETALARM_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SETPREVIOSALARMTIME_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SETPREVIOSALARMTIME_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SHOWALARMEDITOR_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SHOWALARMEDITOR_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SORTALARMDAYSLIST_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SORTALARMDAYSLIST_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT=0x1c
--- a/clock/clockui/clockappcontroller/clockappcontroller.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockappcontroller/clockappcontroller.pro Mon Aug 23 16:00:50 2010 +0100
@@ -31,6 +31,7 @@
../../clockmw/clocktimezone/inc \
../../clockmw/clocksettingsutility/inc \
../../clockmw/clockalarms/inc \
+ ./traces
symbian: {
TARGET.CAPABILITY = ALL -TCB
--- a/clock/clockui/clockappcontroller/inc/clockappcontroller.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockappcontroller/inc/clockappcontroller.h Mon Aug 23 16:00:50 2010 +0100
@@ -30,10 +30,18 @@
class ClockAppController : public QObject
{
+ Q_OBJECT
+
public:
CLOCKAPPCONTROLLER_EXPORT explicit ClockAppController(QObject *parent = 0);
CLOCKAPPCONTROLLER_EXPORT virtual ~ClockAppController();
+signals:
+ void appReady();
+
+private slots:
+ void handleAppReady();
+
private:
ClockViewManager *mViewManager;
ClockAppControllerIfImpl *mIfImpl;
--- a/clock/clockui/clockappcontroller/src/clockappcontroller.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockappcontroller/src/clockappcontroller.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,6 +19,11 @@
#include "clockappcontroller.h"
#include "clockappcontrollerifimpl.h"
#include "clockviewmanager.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockappcontrollerTraces.h"
+#endif
+
/*!
\class ClockAppController
@@ -35,6 +40,7 @@
mViewManager(0),
mIfImpl(0)
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY );
// Construct the interface implementation.
mIfImpl = new ClockAppControllerIfImpl(this, this);
@@ -43,6 +49,8 @@
Q_ASSERT_X(
mViewManager, "clockappcontroller.cpp",
"ClockViewManager is 0");
+ connect(mViewManager, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT );
}
/*!
@@ -50,6 +58,7 @@
*/
ClockAppController::~ClockAppController()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY );
if (mViewManager) {
delete mViewManager;
mViewManager = 0;
@@ -58,6 +67,18 @@
delete mIfImpl;
mIfImpl = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT );
+}
+
+/*!
+ Emits the appReday signal.
+ */
+void ClockAppController::handleAppReady()
+{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLER_HANDLEAPPREADY_ENTRY );
+ emit appReady();
+ disconnect(mViewManager, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLER_HANDLEAPPREADY_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockappcontroller/src/clockappcontrollerifimpl.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockappcontroller/src/clockappcontrollerifimpl.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,11 @@
#include "timezoneclient.h"
#include "settingsutility.h"
#include "alarmclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockappcontrollerifimplTraces.h"
+#endif
+
/*!
\class ClockAppControllerIfImpl
@@ -43,12 +48,14 @@
:QObject(parent),
mAppController(controller)
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY );
// Construct the timezone client.
mTimeZoneClient = TimezoneClient::getInstance();
// Construct the settings utility object.
mSettingsUtility = new SettingsUtility(this);
// Construct the alarm client object.
mAlarmClient = new AlarmClient(this);
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT );
}
/*!
@@ -56,6 +63,7 @@
*/
ClockAppControllerIfImpl::~ClockAppControllerIfImpl()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY );
if (!mTimeZoneClient->isNull()) {
mTimeZoneClient->deleteInstance();
}
@@ -67,6 +75,7 @@
delete mAlarmClient;
mAlarmClient = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT );
}
@@ -79,6 +88,8 @@
*/
TimezoneClient* ClockAppControllerIfImpl::timezoneClient()
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_ENTRY );
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_EXIT );
return mTimeZoneClient;
}
@@ -91,6 +102,8 @@
*/
SettingsUtility* ClockAppControllerIfImpl::settingsUtility()
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_ENTRY );
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_EXIT );
return mSettingsUtility;
}
@@ -103,6 +116,8 @@
*/
AlarmClient* ClockAppControllerIfImpl::alarmClient()
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_ENTRY );
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_EXIT );
return mAlarmClient;
}
@@ -115,7 +130,9 @@
*/
void ClockAppControllerIfImpl::switchToView(ClockViews viewId)
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY );
mAppController->mViewManager->showView(viewId);
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockappcontroller/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockappcontroller/traces/clockappcontrollerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKAPPCONTROLLERTRACES_H__
+#define __CLOCKAPPCONTROLLERTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce3
+
+#define CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY 0x8a0001
+#define CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT 0x8a0002
+#define DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY 0x8a0003
+#define DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT 0x8a0004
+#define CLOCKAPPCONTROLLER_HANDLEAPPREADY_ENTRY 0x8a0005
+#define CLOCKAPPCONTROLLER_HANDLEAPPREADY_EXIT 0x8a0006
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockappcontroller/traces/clockappcontrollerifimplTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKAPPCONTROLLERIFIMPLTRACES_H__
+#define __CLOCKAPPCONTROLLERIFIMPLTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce3
+
+#define CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY 0x8a0007
+#define CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT 0x8a0008
+#define DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY 0x8a0009
+#define DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT 0x8a000a
+#define CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_ENTRY 0x8a000b
+#define CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_EXIT 0x8a000c
+#define CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_ENTRY 0x8a000d
+#define CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_EXIT 0x8a000e
+#define CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_ENTRY 0x8a000f
+#define CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_EXIT 0x8a0010
+#define CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY 0x8a0011
+#define CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT 0x8a0012
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockappcontroller/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLER_HANDLEAPPREADY_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLER_HANDLEAPPREADY_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT=0x4
--- a/clock/clockui/clockapplication/clockapplication.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockapplication/clockapplication.pro Mon Aug 23 16:00:50 2010 +0100
@@ -20,11 +20,13 @@
INCLUDEPATH += \
. \
- ../clockappcontroller/inc
+ ../clockappcontroller/inc \
+ ./traces
DEPENDPATH += \
. \
- ./src
+ ./src \
+ ./inc
symbian: {
TARGET.CAPABILITY = ALL -TCB
@@ -38,7 +40,12 @@
SKINICON = qtg_large_clock
}
-SOURCES += main.cpp
+SOURCES += \
+ main.cpp \
+ clockapplication.cpp
+
+HEADERS += \
+ clockapplication.h
TRANSLATIONS += clock.ts
dtplugin.sources = /epoc32/data/c/resource/qt/plugins/controlpanel/datetimesettingsplugin.qtplugin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/inc/clockapplication.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,51 @@
+/*
+* 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: Header file for class ClockApplication.
+*
+*/
+#ifndef CLOCKAPPLICATION_H
+#define CLOCKAPPLICATION_H
+
+// System includes
+#include <QPointer>
+#include <HbApplication>
+
+// Forward Declaratios
+class ClockAppController;
+
+class ClockApplication : public HbApplication
+{
+ Q_OBJECT
+
+public:
+ ClockApplication(int &argc, char *argv[]);
+ virtual ~ClockApplication();
+
+signals:
+ void applicationReady();
+
+public:
+ void createController();
+ bool execution();
+
+private slots:
+ void handleAppReady();
+
+private:
+ QPointer<ClockAppController> mController;
+};
+
+#endif // CLOCKAPPLICATION_H
+
+// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/src/clockapplication.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,90 @@
+/*
+* 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 ClockApplication.
+*
+*/
+
+
+// User includes
+#include "clockapplication.h"
+#include "clockappcontroller.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockapplicationTraces.h"
+#endif
+
+
+/*!
+ \class ClockApplication
+
+ This class creates the ClockAppController object.
+ */
+/*!
+ Constructor.
+ */
+ClockApplication::ClockApplication(int &argc, char *argv[]):
+ HbApplication(argc, argv)
+{
+OstTraceFunctionEntry0( CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY );
+OstTraceFunctionExit0( CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT );
+}
+
+/*!
+ Destructor.
+ */
+ClockApplication::~ClockApplication()
+{
+ OstTraceFunctionEntry0( DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY );
+ if (mController) {
+ delete mController;
+ mController = 0;
+ }
+OstTraceFunctionExit0( DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT );
+}
+
+/*!
+ creates the ClockAppController object.
+*/
+void ClockApplication::createController()
+{
+ OstTraceFunctionEntry0( CLOCKAPPLICATION_CREATECONTROLLER_ENTRY );
+ mController = new ClockAppController;
+ connect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+OstTraceFunctionExit0( CLOCKAPPLICATION_CREATECONTROLLER_EXIT );
+}
+
+/*!
+ Start the event loop for the application.
+*/
+bool ClockApplication::execution()
+{
+ OstTraceFunctionEntry0( CLOCKAPPLICATION_EXECUTION_ENTRY );
+ int ret = 0;
+ ret = exec();
+ OstTraceFunctionExit0( CLOCKAPPLICATION_EXECUTION_EXIT );
+ return ret;
+}
+
+/*!
+ Emits the applicationReady signal.
+ */
+void ClockApplication::handleAppReady()
+{
+ OstTraceFunctionEntry0( CLOCKAPPLICATION_HANDLEAPPREADY_ENTRY );
+ emit applicationReady();
+ disconnect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+OstTraceFunctionExit0( CLOCKAPPLICATION_HANDLEAPPREADY_EXIT );
+}
+
+// End of file --Don't remove this.
--- a/clock/clockui/clockapplication/src/main.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockapplication/src/main.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -17,13 +17,16 @@
// System includes
#include <QtGui>
-#include <QScopedPointer>
#include <HbTranslator>
-#include <HbApplication>
#include <HbMainWindow>
// User includes
-#include "clockappcontroller.h"
+#include "clockapplication.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "mainTraces.h"
+#endif
+
/*!
The main entry point of the clock application.
@@ -32,9 +35,11 @@
*/
int main(int argc, char *argv[])
{
- // Initialization
- HbApplication app(argc, argv);
-
+ OstTraceFunctionEntry0( _MAIN_ENTRY );
+ // Create and initialize an ClockApplication instance
+ QScopedPointer<ClockApplication> application(
+ new ClockApplication(argc, argv));
+
// Main window widget.
// Includes decorator such as signal strength and battery life indicator.
HbMainWindow window;
@@ -47,14 +52,13 @@
translator.loadCommon();
// Construct the application controller.
- QScopedPointer<ClockAppController> controller(new ClockAppController);
- Q_UNUSED(controller)
+ application->createController();
// Show widget
window.show();
- // Enter event loop
- return app.exec();
+ // Start the event loop for the application
+ return application->execution();
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/traces/clockapplicationTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKAPPLICATIONTRACES_H__
+#define __CLOCKAPPLICATIONTRACES_H__
+
+#define KOstTraceComponentID 0x10005903
+
+#define CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY 0x8a0001
+#define CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT 0x8a0002
+#define DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY 0x8a0003
+#define DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT 0x8a0004
+#define CLOCKAPPLICATION_CREATECONTROLLER_ENTRY 0x8a0005
+#define CLOCKAPPLICATION_CREATECONTROLLER_EXIT 0x8a0006
+#define CLOCKAPPLICATION_EXECUTION_ENTRY 0x8a0007
+#define CLOCKAPPLICATION_EXECUTION_EXIT 0x8a0008
+#define CLOCKAPPLICATION_HANDLEAPPREADY_ENTRY 0x8a0009
+#define CLOCKAPPLICATION_HANDLEAPPREADY_EXIT 0x8a000a
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,13 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_CREATECONTROLLER_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_CREATECONTROLLER_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_EXECUTION_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_EXECUTION_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_HANDLEAPPREADY_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_HANDLEAPPREADY_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]__MAIN_ENTRY=0xb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/traces/mainTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,15 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __MAINTRACES_H__
+#define __MAINTRACES_H__
+
+#define KOstTraceComponentID 0x10005903
+
+#define _MAIN_ENTRY 0x8a000b
+
+
+#endif
+
+// End of file
+
--- a/clock/clockui/clockcityselectionlist/clockcityselectionlist.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockcityselectionlist/clockcityselectionlist.pro Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,8 @@
INCLUDEPATH += \
./inc \
../../inc \
- ../../clockmw/clocktimezone/inc
+ ../../clockmw/clocktimezone/inc \
+ ./traces
DEPENDPATH += \
./inc \
--- a/clock/clockui/clockcityselectionlist/data/clockcityselectionlist.qrc Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockcityselectionlist/data/clockcityselectionlist.qrc Mon Aug 23 16:00:50 2010 +0100
@@ -1,5 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/xml">
<file alias="clockcityselectionlist.docml">xml/clockcityselectionlist.docml</file>
+ <file alias="clockaddcitydialog.docml">xml/clockaddcitydialog.docml</file>
</qresource>
</RCC>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/data/xml/clockaddcitydialog.docml Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+ <object name="okAction" type="HbAction">
+ <string name="text" value="Ok"/>
+ </object>
+ <object name="cancelAction" type="HbAction">
+ <string name="text" value="Cancel"/>
+ </object>
+ <widget name="dialog" type="HbDialog">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) - 2 * var(hb-param-margin-gene-screen) )"/>
+ <widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
+ <enums name="alignment" value="AlignLeft|AlignLeading"/>
+ <string locid="txt_clk_opt_add_own_city" name="plainText" value="Add own city"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <widget name="countryLabel" type="HbLabel">
+ <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="46.38806un"/>
+ <string name="plainText" value="Country:"/>
+ </widget>
+ <widget name="timezoneCombobox" type="HbComboBox">
+ <sizehint type="PREFERRED" width="46.38806un"/>
+ </widget>
+ <widget name="cityNameLineEdit" type="HbLineEdit">
+ <string name="text" value=""/>
+ </widget>
+ <widget name="cityNameLabel" type="HbLabel">
+ <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="46.38806un"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MINIMUM"/>
+ <string name="plainText" value="City name:"/>
+ </widget>
+ <widget name="counrtyCombobox" type="HbComboBox">
+ </widget>
+ <widget name="timezoneLabel" type="HbLabel">
+ <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="46.38806un"/>
+ <string name="plainText" value="Timezone:"/>
+ </widget>
+ <layout type="anchor">
+ <anchoritem dst="cityNameLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="cityNameLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="cityNameLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="cityNameLabel" srcEdge="BOTTOM"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="timezoneLabel" dstEdge="TOP" spacing="2un" src="cityNameLineEdit" srcEdge="BOTTOM"/>
+ <anchoritem dst="timezoneLabel" dstEdge="RIGHT" spacing="-1.34328un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="LEFT" spacing="2un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="TOP" spacing="0.75un" src="timezoneLabel" srcEdge="BOTTOM"/>
+ <anchoritem dst="countryLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="timezoneCombobox" srcEdge="BOTTOM"/>
+ <anchoritem dst="countryLabel" dstEdge="RIGHT" spacing="-1.34328un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="countryLabel" srcEdge="BOTTOM"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <ref object="okAction" role="HbWidget:addAction"/>
+ <ref object="cancelAction" role="HbWidget:addAction"/>
+ </widget>
+ <section name="portrait">
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="cityNameLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="cityNameLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="cityNameLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="cityNameLabel" srcEdge="BOTTOM"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="countryLabel" srcEdge="BOTTOM"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="timezoneLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="timezoneLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="cityNameLineEdit" srcEdge="BOTTOM"/>
+ <anchoritem dst="timezoneLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="timezoneLabel" srcEdge="BOTTOM"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="countryLabel" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="countryLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="timezoneCombobox" srcEdge="BOTTOM"/>
+ <anchoritem dst="countryLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ </layout>
+ </widget>
+ <widget name="dialog" type="HbDialog">
+ <sizehint type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - 2 * var(hb-param-margin-gene-screen) )"/>
+ </widget>
+ <widget name="cityNameLineEdit" type="HbLineEdit">
+ <string name="text"/>
+ </widget>
+ <widget name="cityNameLabel" type="HbLabel">
+ <string locid="txt_clock_formlabel_city_name" name="plainText" value="City name:"/>
+ </widget>
+ <widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
+ <enums name="alignment" value="AlignLeft|AlignLeading"/>
+ <string locid="txt_clk_opt_add_own_city" name="plainText" value="Add own city"/>
+ </widget>
+ </section>
+ <section name="landscape">
+ <widget name="timezoneCombobox" type="HbComboBox">
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - 2 * var(hb-param-margin-gene-popup) )"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="cityNameLineEdit" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-middle-horizontal) )" src="cityNameLabel" srcEdge="RIGHT"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="cityNameLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="cityNameLabel" dstEdge="CENTERV" spacing="0un" src="cityNameLineEdit" srcEdge="CENTERV"/>
+ <anchoritem dst="timezoneLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="timezoneLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-middle-horizontal) )" src="timezoneCombobox" srcEdge="LEFT"/>
+ <anchoritem dst="timezoneLabel" dstEdge="CENTERV" spacing="0un" src="timezoneCombobox" srcEdge="CENTERV"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="cityNameLineEdit" srcEdge="BOTTOM"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-middle-horizontal) )" src="countryLabel" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="timezoneCombobox" srcEdge="BOTTOM"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="countryLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="countryLabel" dstEdge="CENTERV" spacing="0un" src="counrtyCombobox" srcEdge="CENTERV"/>
+ </layout>
+ </widget>
+ <widget name="dialog" type="HbDialog">
+ <sizehint type="PREFERRED" width="expr(var(hb-param-screen-long-edge) - 2 * var(hb-param-margin-gene-screen) )"/>
+ </widget>
+ <widget name="cityNameLineEdit" type="HbLineEdit">
+ <sizehint type="FIXED" width="expr(var(hb-param-screen-short-edge) - 2 * var(hb-param-margin-gene-popup) )"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ </widget>
+ <widget name="cityNameLabel" type="HbLabel">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="expr((var(hb-param-screen-long-edge) - (2 * var(hb-param-margin-gene-popup) + var(hb-param-margin-gene-middle-horizontal) )) / 2)"/>
+ </widget>
+ <widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
+ <enums name="alignment" value="AlignLeft|AlignLeading"/>
+ </widget>
+ <widget name="timezoneLabel" type="HbLabel">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="expr((var(hb-param-screen-long-edge) - (2 * var(hb-param-margin-gene-popup) + var(hb-param-margin-gene-middle-horizontal) )) / 2)"/>
+ </widget>
+ <widget name="countryLabel" type="HbLabel">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="expr((var(hb-param-screen-long-edge) - (2 * var(hb-param-margin-gene-popup) + var(hb-param-margin-gene-middle-horizontal) )) / 2)"/>
+ </widget>
+ <widget name="counrtyCombobox" type="HbComboBox">
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - 2 * var(hb-param-margin-gene-popup) )"/>
+ </widget>
+ </section>
+ <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ <uistate name="portrait" sections="#common portrait"/>
+ <uistate name="landscape" sections="#common landscape"/>
+ </metadata>
+</hbdocument>
--- a/clock/clockui/clockcityselectionlist/data/xml/clockcityselectionlist.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockcityselectionlist/data/xml/clockcityselectionlist.docml Mon Aug 23 16:00:50 2010 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<hbdocument version="0.9">
<object name="addOwnCityAction" type="HbAction">
- <string name="text" value="Add own city"/>
+ <string locid="txt_clk_opt_add_own_city" name="text" value="Add own city"/>
</object>
<widget name="clockCitySelectionView" type="HbView">
<widget name="clockCitySelectionWidget" role="HbView:widget" type="HbWidget">
@@ -35,7 +35,7 @@
<widget name="viewMenu" role="HbView:menu" type="HbMenu">
<ref object="addOwnCityAction" role="HbMenu:addAction"/>
</widget>
- <string locid="txt_common_common_clock" name="title" value="Clock"/>
+ <string locid="txt_clock_title_clock" name="title" value="Clock"/>
</widget>
<metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/clock/clockui/clockcityselectionlist/inc/clockcityselectionlist_p.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockcityselectionlist/inc/clockcityselectionlist_p.h Mon Aug 23 16:00:50 2010 +0100
@@ -36,6 +36,7 @@
class HbLineEdit;
class HbDialog;
class HbComboBox;
+class HbShrinkingVkbHost;
class ClockCitySelectionList;
class ClockCityListProxyModel;
class TimezoneClient;
@@ -60,6 +61,8 @@
void handleOkAction();
void handleTimeZoneSelection(int index);
void selectedAction(HbAction *action);
+ void loadSection(Qt::Orientation orientation);
+ void cancelSearch();
private:
void showCityList();
@@ -67,10 +70,13 @@
void addCityNameField();
void addTimeZoneField();
void addCountryListField();
+ void focusLineEdit();
+
private:
QPointer<QStandardItemModel> mListModel;
HbDocumentLoader *mLoader;
+ HbDocumentLoader *mAddCityDocloader;
QPointer<HbView> mView;
QPointer<HbListView> mListView;
HbAction *mBackAction;
@@ -80,6 +86,8 @@
QPointer<HbLineEdit> mCityNameEdit;
QPointer<HbComboBox> mTimeZoneComboBox;
QPointer<HbComboBox> mCountryComboBox;
+
+ QPointer<HbShrinkingVkbHost> mVirtualKeyboard;
HbAction *mOkAction;
HbAction *mCancelAction;
--- a/clock/clockui/clockcityselectionlist/src/clockcitylistproxymodel.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockcityselectionlist/src/clockcitylistproxymodel.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -20,6 +20,11 @@
// User includes
#include "clockcitylistproxymodel.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockcitylistproxymodelTraces.h"
+#endif
+
/*!
\class ClockCityListProxyModel
@@ -38,7 +43,9 @@
ClockCityListProxyModel::ClockCityListProxyModel(QObject *parent)
:QSortFilterProxyModel(parent)
{
+ OstTraceFunctionEntry0( CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_EXIT );
}
/*!
@@ -52,11 +59,13 @@
bool ClockCityListProxyModel::filterAcceptsRow(
int sourceRow, const QModelIndex &sourceParent) const
{
+ OstTraceFunctionEntry0( CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_ENTRY );
// Get the model index of the source model.
QModelIndex modelIndex = sourceModel()->index(
sourceRow, filterKeyColumn(), sourceParent);
if (!modelIndex.isValid()) {
+ OstTraceFunctionExit0( CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT );
return false;
}
@@ -71,6 +80,7 @@
if (Qt::UserRole + 100 == role) {
QString string = modelData.value<QString>();
if (string.contains(filterExp)) {
+ OstTraceFunctionExit0( DUP1_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT );
return true;
}
}
--- a/clock/clockui/clockcityselectionlist/src/clockcityselectionlist.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockcityselectionlist/src/clockcityselectionlist.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -25,6 +25,11 @@
#include "clockcityselectionlist_p.h"
#include "clockdatatypes.h"
#include "timezoneclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockcityselectionlistTraces.h"
+#endif
+
/*!
\class ClockCitySelectionList
@@ -53,9 +58,11 @@
:QObject(parent),
d_ptr(new ClockCitySelectionListPrivate(client, this))
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY );
// Load the translation file and install the editor specific translator
mTranslator = new HbTranslator("clockcityselectionlist");
mTranslator->loadCommon();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT );
}
/*!
@@ -67,18 +74,22 @@
:QObject(parent),
d_ptr(new ClockCitySelectionListPrivate(0, this))
{
+ OstTraceFunctionEntry0( DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY );
// Load the translation file and install the editor specific translator
mTranslator = new HbTranslator("clockcityselectionlist");
mTranslator->loadCommon();
+ OstTraceFunctionExit0( DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT );
}
ClockCitySelectionList::~ClockCitySelectionList()
{
+ OstTraceFunctionEntry0( DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY );
// Remove the translator
if (mTranslator) {
delete mTranslator;
mTranslator = 0;
}
+ OstTraceFunctionExit0( DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT );
}
/*!
@@ -87,7 +98,9 @@
*/
void ClockCitySelectionList::showCityList()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLIST_SHOWCITYLIST_ENTRY );
d_ptr->showCityList();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLIST_SHOWCITYLIST_EXIT );
}
/*!
@@ -96,7 +109,9 @@
*/
void ClockCitySelectionList::closeCityList()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLIST_CLOSECITYLIST_ENTRY );
d_ptr->closeCityList();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLIST_CLOSECITYLIST_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -1,4 +1,4 @@
-/*
+ /*
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
@@ -19,6 +19,8 @@
// System includes
#include <QStandardItemModel>
#include <QModelIndex>
+#include <QGraphicsScene>
+#include <QTimer>
#include <HbDocumentLoader>
#include <HbView>
#include <HbListView>
@@ -34,6 +36,7 @@
#include <HbComboBox>
#include <HbExtendedLocale>
#include <HbAbstractItemView>
+#include <HbShrinkingVkbHost>
// User includes
#include "clockcityselectionlist_p.h"
@@ -43,6 +46,11 @@
#include "timezoneclient.h"
#include "clockdatatypes.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockcityselectionlist_pTraces.h"
+#endif
+
/*!
\class ClockCitySelectionListPrivate
@@ -62,6 +70,7 @@
mLoader(0),
mOwnsClient(false)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY );
// First get the q-pointer.
q_ptr = static_cast<ClockCitySelectionList *> (parent);
@@ -70,6 +79,7 @@
mClient = TimezoneClient::getInstance();
mOwnsClient = true;
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT );
}
/*!
@@ -77,6 +87,7 @@
*/
ClockCitySelectionListPrivate::~ClockCitySelectionListPrivate()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY );
if (mOwnsClient) {
mClient->deleteInstance();
}
@@ -94,7 +105,11 @@
if(mCountryList.count()) {
mCountryList.clear();
}
+ if (mVirtualKeyboard) {
+ delete mVirtualKeyboard;
+ }
+ OstTraceFunctionExit0( DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT );
}
/*!
@@ -102,6 +117,7 @@
*/
void ClockCitySelectionListPrivate::populateListModel()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_ENTRY );
// First get the data from the timezone client.
QList<LocationInfo> &infoList = mClient->getLocations();
@@ -139,6 +155,7 @@
// Cleanup.
infoList.clear();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_EXIT );
}
/*!
@@ -149,6 +166,7 @@
void ClockCitySelectionListPrivate::handleItemActivated(
const QModelIndex &index)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_ENTRY );
LocationInfo selectedInfo;
selectedInfo.timezoneId = index.data(Qt::UserRole + 101).value<int>();
selectedInfo.cityGroupId = index.data(Qt::UserRole + 102).value<int>();
@@ -163,6 +181,7 @@
// Close the list.
closeCityList();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_EXIT );
}
/*!
@@ -170,6 +189,7 @@
*/
void ClockCitySelectionListPrivate::handleBackAction()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_ENTRY );
LocationInfo info;
info.timezoneId = -1;
@@ -187,6 +207,7 @@
// Close the list.
closeCityList();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_EXIT );
}
/*!
@@ -194,6 +215,7 @@
*/
void ClockCitySelectionListPrivate::closeCityList()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_ENTRY );
// We are done, lets remove the view off the main window.
HbMainWindow *window = hbInstance->allMainWindows().at(0);
window->removeView(mView);
@@ -207,6 +229,7 @@
if (mListModel) {
delete mListModel;
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_EXIT );
}
/*!
@@ -217,6 +240,7 @@
void ClockCitySelectionListPrivate::updateSearchCriteria(
const QString &criteria)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_ENTRY );
int originalMask = mListView->enabledAnimations();
mListView->setEnabledAnimations(HbAbstractItemView::TouchDown);
@@ -230,6 +254,7 @@
mProxyModel->setFilterRegExp(searchExp);
mProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_EXIT );
}
/*!
@@ -237,55 +262,48 @@
*/
void ClockCitySelectionListPrivate::handleAddOwnCityAction()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_ENTRY );
if (mAddOwnCityDialog) {
delete mAddOwnCityDialog;
}
+
+ HbMainWindow *window = hbInstance->allMainWindows().first();
- // Create the dialog.
- mAddOwnCityDialog = new HbDialog;
+ connect(
+ window, SIGNAL(orientationChanged(Qt::Orientation)),
+ this, SLOT(loadSection(Qt::Orientation)));
+
+ mAddCityDocloader = new HbDocumentLoader();
+ bool success = false;
+ mAddCityDocloader->load(":/xml/clockaddcitydialog.docml", &success);
+ if (!success) {
+ qFatal("Unable to load the document.");
+ }
+
+ // Get the dialog.
+ mAddOwnCityDialog = static_cast<HbDialog *> (mAddCityDocloader->findWidget("dialog"));
+ if (!mAddOwnCityDialog) {
+ qFatal("Unable to get the selection view.");
+ }
mAddOwnCityDialog->setTimeout(HbDialog::NoTimeout);
mAddOwnCityDialog->setDismissPolicy(HbDialog::NoDismiss);
mAddOwnCityDialog->setAttribute(Qt::WA_DeleteOnClose, true);
-
- // Set the heading text
- HbLabel *titlelabel = new HbLabel(hbTrId("txt_clk_opt_add_own_city"));
- mAddOwnCityDialog->setHeadingWidget(titlelabel);
-
- QGraphicsGridLayout *layout = new QGraphicsGridLayout();
-
- // Set city name label and line edit
- HbLabel *cityNameLabel = new HbLabel(hbTrId("txt_clock_formlabel_city_name"));
- layout->addItem(cityNameLabel,0,0);
-
- addCityNameField();
- layout->addItem(mCityNameEdit, 0, 1);
-
- // Set time zone label and combobox
- HbLabel *timeZoneLabel = new HbLabel(hbTrId("txt_clock_formlabel_timezone"));
- layout->addItem(timeZoneLabel, 1,0);
-
- addTimeZoneField();
- layout->addItem(mTimeZoneComboBox, 1,1);
-
- // Set the country label and combobox
- HbLabel *countryLabel = new HbLabel(hbTrId("txt_clock_formlabel_country"));
- layout->addItem(countryLabel, 2,0);
-
+
+ // Find the elements from the docml.
+ mCityNameEdit = static_cast<HbLineEdit *> (mAddCityDocloader->findWidget("cityNameLineEdit"));
+
+ mTimeZoneComboBox = static_cast<HbComboBox *> (mAddCityDocloader->findWidget("timezoneCombobox"));
+ if (mTimeZoneComboBox) {
+ addTimeZoneField();
+ }
+
+ mCountryComboBox = static_cast<HbComboBox *> (mAddCityDocloader->findWidget("counrtyCombobox"));
addCountryListField();
- layout->addItem(mCountryComboBox, 2,1);
-
- QGraphicsWidget *widget = new QGraphicsWidget();
- widget->setLayout(layout);
-
- // Add actions to the dialog
- mOkAction = new HbAction(hbTrId("txt_common_button_ok"));
- mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"));
-
- mAddOwnCityDialog->addAction(mOkAction);
- mAddOwnCityDialog->addAction(mCancelAction);
-
- mAddOwnCityDialog->setContentWidget(widget);
+
+ mOkAction = static_cast<HbAction *> (mAddCityDocloader->findObject("okAction"));
+
mAddOwnCityDialog->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_EXIT );
}
/*!
@@ -293,6 +311,7 @@
*/
void ClockCitySelectionListPrivate::handleOkAction()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_ENTRY );
QString cityName = mCityNameEdit->text();
// Add the city if city name is not empty
@@ -320,6 +339,7 @@
populateListModel();
}
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_EXIT );
}
/*!
@@ -328,6 +348,7 @@
*/
void ClockCitySelectionListPrivate::handleTimeZoneSelection(int index)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_ENTRY );
// Get the selected time zone offset.
int selectedTimeZoneOffset = mTimeZoneOffsetList.at(index);
@@ -345,6 +366,7 @@
qSort(countries);
mCountryComboBox->setItems(countries);
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_EXIT );
}
/*!
@@ -352,15 +374,92 @@
*/
void ClockCitySelectionListPrivate::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_ENTRY );
if (action==mOkAction) {
handleOkAction();
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_EXIT );
}
+
+/*!
+ Slot to handle the orientation change.
+ */
+void ClockCitySelectionListPrivate::loadSection(Qt::Orientation orientation)
+{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_ENTRY );
+ bool loadSuccess;
+ if (mAddOwnCityDialog) {
+ if (Qt::Horizontal == orientation) {
+ mAddCityDocloader->load(":/xml/clockaddcitydialog.docml",
+ "landscape", &loadSuccess);
+ } else if (Qt::Vertical == orientation) {
+ mAddCityDocloader->load(":/xml/clockaddcitydialog.docml",
+ "portrait", &loadSuccess);
+ }
+ }
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_EXIT );
+}
+
+/*!
+ Slot to handle close action of search panel.
+ This slot cancels the search and dismisses the vkb.
+ */
+void ClockCitySelectionListPrivate::cancelSearch()
+{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_ENTRY );
+ // Clear the search criteria.
+ mSearchBox->setCriteria(QString(""));
+
+ // Hide the virtual keyborad.
+ QInputContext *ic = qApp->inputContext();
+ if (ic) {
+ QEvent *event = new QEvent(QEvent::CloseSoftwareInputPanel);
+ ic->filterEvent(event);
+ delete event;
+ }
+
+ // Set focus to the first city in the list.
+ mListView->scrollTo(mProxyModel->index(0, 0));
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_EXIT );
+}
+
+/*!
+ Focuses the line edit when the city selection list is opened.
+ */
+void ClockCitySelectionListPrivate::focusLineEdit()
+{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_ENTRY );
+ if (mSearchBox) {
+ // mView->scene()->setFocusItem(mSearchBox);
+ HbLineEdit *searchBoxEditor = 0;
+ searchBoxEditor = static_cast<HbLineEdit*>(
+ mSearchBox->primitive("lineedit"));
+
+ if (searchBoxEditor) {
+ searchBoxEditor->setInputMethodHints(Qt::ImhNoPredictiveText);
+/* HbMainWindow *window = hbInstance->allMainWindows().at(0);
+ window->scene()->setFocusItem(searchBoxEditor);*/
+
+ // searchBoxEditor->setCursorPosition(0);
+ searchBoxEditor->setFocus();
+ }
+
+ QInputContext *ic = qApp->inputContext();
+ if (ic) {
+ QEvent *event = new QEvent(QEvent::RequestSoftwareInputPanel);
+ ic->filterEvent(event);
+ delete event;
+ }
+ }
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_EXIT );
+}
+
/*!
Displays the city selection list.
*/
void ClockCitySelectionListPrivate::showCityList()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_ENTRY );
// Construct the document loader.
bool success = false;
mLoader = new HbDocumentLoader;
@@ -374,7 +473,9 @@
if (!mView) {
qFatal("Unable to get the selection view.");
}
-
+ // Set the shrinking vkb host to prevent pushing of the list.
+ mVirtualKeyboard = new HbShrinkingVkbHost(mView);
+
// Get the list view.
mListView = static_cast<HbListView *> (mLoader->findWidget(CITYLISTVIEW));
if (!mListView) {
@@ -392,7 +493,9 @@
connect(
mSearchBox, SIGNAL(criteriaChanged(QString)),
this, SLOT(updateSearchCriteria(QString)));
-
+ connect(mSearchBox, SIGNAL(exitClicked()),
+ this, SLOT(cancelSearch()));
+
// Construct the source model.
if (!mListModel) {
mListModel = new QStandardItemModel(0, 1, this);
@@ -433,7 +536,11 @@
window->addView(mView);
window->setCurrentView(mView);
+
+ // Focus the search box.
+ focusLineEdit();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_EXIT );
}
/*!
@@ -441,6 +548,7 @@
*/
QStringList ClockCitySelectionListPrivate::getOffsetTexts()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_ENTRY );
int offsetCount(mTimeZoneOffsetList.count());
// Get all the time zone offsets
@@ -473,6 +581,7 @@
offsetTextList.append(offsetText);
offsetText.clear();
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_EXIT );
return offsetTextList;
}
@@ -481,8 +590,10 @@
*/
void ClockCitySelectionListPrivate::addCityNameField()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_ENTRY );
mCityNameEdit = new HbLineEdit();
mCityNameEdit->setFocus(Qt::MouseFocusReason);
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_EXIT );
}
/*!
@@ -490,7 +601,8 @@
*/
void ClockCitySelectionListPrivate::addTimeZoneField()
{
- mTimeZoneComboBox = new HbComboBox();
+OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_ENTRY );
+// mTimeZoneComboBox = new HbComboBox();
QStringList texts = getOffsetTexts();
mTimeZoneComboBox->addItems(texts);
@@ -504,6 +616,7 @@
connect(
mTimeZoneComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(handleTimeZoneSelection(int)));
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_EXIT );
}
/*!
@@ -511,10 +624,10 @@
*/
void ClockCitySelectionListPrivate::addCountryListField()
{
- mCountryComboBox = new HbComboBox();
-
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_ENTRY );
// Populate the country list based on the current TZ offset selected.
handleTimeZoneSelection(mCurrentTZOffsetIndex);
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/clockcitylistproxymodelTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,19 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKCITYLISTPROXYMODELTRACES_H__
+#define __CLOCKCITYLISTPROXYMODELTRACES_H__
+
+#define KOstTraceComponentID 0xabcde123
+
+#define CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_ENTRY 0x8a0001
+#define CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_EXIT 0x8a0002
+#define CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_ENTRY 0x8a0003
+#define CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0004
+#define DUP1_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0005
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/clockcityselectionlistTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKCITYSELECTIONLISTTRACES_H__
+#define __CLOCKCITYSELECTIONLISTTRACES_H__
+
+#define KOstTraceComponentID 0xabcde123
+
+#define CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY 0x8a0006
+#define CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT 0x8a0007
+#define DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY 0x8a0008
+#define DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT 0x8a0009
+#define DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY 0x8a000a
+#define DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT 0x8a000b
+#define CLOCKCITYSELECTIONLIST_SHOWCITYLIST_ENTRY 0x8a000c
+#define CLOCKCITYSELECTIONLIST_SHOWCITYLIST_EXIT 0x8a000d
+#define CLOCKCITYSELECTIONLIST_CLOSECITYLIST_ENTRY 0x8a000e
+#define CLOCKCITYSELECTIONLIST_CLOSECITYLIST_EXIT 0x8a000f
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/clockcityselectionlist_pTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,52 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKCITYSELECTIONLIST_PTRACES_H__
+#define __CLOCKCITYSELECTIONLIST_PTRACES_H__
+
+#define KOstTraceComponentID 0xabcde123
+
+#define CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY 0x8a0010
+#define CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT 0x8a0011
+#define DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY 0x8a0012
+#define DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT 0x8a0013
+#define CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_ENTRY 0x8a0014
+#define CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_EXIT 0x8a0015
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_ENTRY 0x8a0016
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_EXIT 0x8a0017
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_ENTRY 0x8a0018
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_EXIT 0x8a0019
+#define CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_ENTRY 0x8a001a
+#define CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_EXIT 0x8a001b
+#define CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_ENTRY 0x8a001c
+#define CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_EXIT 0x8a001d
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_ENTRY 0x8a001e
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_EXIT 0x8a001f
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_ENTRY 0x8a0020
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_EXIT 0x8a0021
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_ENTRY 0x8a0022
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_EXIT 0x8a0023
+#define CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_ENTRY 0x8a0024
+#define CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_EXIT 0x8a0025
+#define CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_ENTRY 0x8a0026
+#define CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_EXIT 0x8a0027
+#define CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_ENTRY 0x8a0028
+#define CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_EXIT 0x8a0029
+#define CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_ENTRY 0x8a002a
+#define CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_EXIT 0x8a002b
+#define CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_ENTRY 0x8a002c
+#define CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_EXIT 0x8a002d
+#define CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_ENTRY 0x8a002e
+#define CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_EXIT 0x8a002f
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_ENTRY 0x8a0030
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_EXIT 0x8a0031
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_ENTRY 0x8a0032
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_EXIT 0x8a0033
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_ENTRY 0x8a0034
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_EXIT 0x8a0035
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,55 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_CLOSECITYLIST_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_CLOSECITYLIST_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_SHOWCITYLIST_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_SHOWCITYLIST_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT=0x5
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT=0xb
--- a/clock/clockui/clockplugins/clocksettingsviewplugin/clocksettingsviewplugin.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/clocksettingsviewplugin.pro Mon Aug 23 16:00:50 2010 +0100
@@ -26,7 +26,8 @@
INCLUDEPATH += . \
../../../inc \
../../clocksettingsview/inc \
- ../../../clockmw/clocksettingsutility/inc
+ ../../../clockmw/clocksettingsutility/inc \
+ ./traces
LIBS += \
-lclocksettingsview
--- a/clock/clockui/clockplugins/clocksettingsviewplugin/src/clocksettingsviewplugin.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/src/clocksettingsviewplugin.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -21,6 +21,11 @@
// User includes
#include "clockregionalsettingsview.h"
#include "clocksettingsviewplugin.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clocksettingsviewpluginTraces.h"
+#endif
+
/*!
\class ClockSettingsViewPlugin
@@ -34,6 +39,8 @@
*/
ClockSettingsViewPlugin::ClockSettingsViewPlugin()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY );
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT );
}
/*!
@@ -41,6 +48,8 @@
*/
ClockSettingsViewPlugin::~ClockSettingsViewPlugin()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY );
+ OstTraceFunctionExit0( DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT );
}
/*!
@@ -48,9 +57,11 @@
*/
void ClockSettingsViewPlugin::launchRegionalSettingsView()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_ENTRY );
//The view is removed from main window and deleted once you select back on view
ClockRegionalSettingsView *view = new ClockRegionalSettingsView();
view->showView();
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_EXIT );
}
Q_EXPORT_PLUGIN2(clocksettingsviewplugin, ClockSettingsViewPlugin)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/traces/clocksettingsviewpluginTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKSETTINGSVIEWPLUGINTRACES_H__
+#define __CLOCKSETTINGSVIEWPLUGINTRACES_H__
+
+#define KOstTraceComponentID 0x2003157c
+
+#define CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY 0x8a0001
+#define CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT 0x8a0002
+#define DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY 0x8a0003
+#define DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT 0x8a0004
+#define CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_ENTRY 0x8a0005
+#define CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_EXIT 0x8a0006
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,8 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT=0x4
--- a/clock/clockui/clockplugins/datetimesettingsplugin/datetimesettingsplugin.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/datetimesettingsplugin.pro Mon Aug 23 16:00:50 2010 +0100
@@ -26,7 +26,8 @@
INCLUDEPATH += . \
../../../inc \
../../../clockmw/clocktimezone/inc \
- ../../clocksettingsview/inc
+ ../../clocksettingsview/inc \
+ ./traces
LIBS += \
-lcpframework \
--- a/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,12 +23,19 @@
// User includes
#include "datetimesettingsplugin.h"
#include "datetimesettingsview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "datetimesettingspluginTraces.h"
+#endif
+
/*!
Constructor.
*/
DateTimeSettingsPlugin::DateTimeSettingsPlugin()
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY );
+ OstTraceFunctionExit0( DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT );
}
/*!
@@ -36,6 +43,8 @@
*/
DateTimeSettingsPlugin::~DateTimeSettingsPlugin()
{
+ OstTraceFunctionEntry0( DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY );
+ OstTraceFunctionExit0( DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT );
}
/*!
@@ -43,7 +52,9 @@
*/
int DateTimeSettingsPlugin::uid() const
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSPLUGIN_UID_ENTRY );
// UID of the plugin.
+ OstTraceFunctionExit0( DATETIMESETTINGSPLUGIN_UID_EXIT );
return 0x102818E9;
}
@@ -54,6 +65,7 @@
createSettingFormItemData(
CpItemDataHelper &itemDataHelper) const
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_ENTRY );
HbIcon icon ;
HbExtendedLocale locale = HbExtendedLocale::system();
QString timeInfo = locale.format(
@@ -70,6 +82,7 @@
itemDataHelper,hbTrId("txt_cp_main_view_list_time_date"),
displayString,icon);
entryItemList.append(entryItem);
+ OstTraceFunctionExit0( DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_EXIT );
return entryItemList;
}
--- a/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,6 +26,11 @@
#include "datetimesettingsview.h"
#include "clocksettingsview.h"
#include "timezoneclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "datetimesettingsviewTraces.h"
+#endif
+
/*!
\class DateTimeSettingsView
@@ -49,6 +54,7 @@
CpSettingFormEntryItemData(
itemDataHelper, text, description, icon, parent)
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY );
// Construct the timezone client.
mTimezoneClient = TimezoneClient::getInstance();
connect(
@@ -62,6 +68,7 @@
connect(
mTickTimer, SIGNAL(timeout()),
this, SLOT(updateDisplayTime()));
+ OstTraceFunctionExit0( DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT );
}
/*!
@@ -69,6 +76,7 @@
*/
DateTimeSettingsView::~DateTimeSettingsView()
{
+ OstTraceFunctionEntry0( DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY );
if (mTickTimer) {
mTickTimer->stop();
delete mTickTimer;
@@ -78,6 +86,7 @@
if (!mTimezoneClient->isNull()) {
mTimezoneClient->deleteInstance();
}
+ OstTraceFunctionExit0( DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT );
}
/*!
@@ -85,8 +94,10 @@
*/
void DateTimeSettingsView::onLaunchView()
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSVIEW_ONLAUNCHVIEW_ENTRY );
ClockSettingsView *settingsView = new ClockSettingsView(this);
settingsView->loadSettingsView();
+ OstTraceFunctionExit0( DATETIMESETTINGSVIEW_ONLAUNCHVIEW_EXIT );
}
/*!
@@ -94,6 +105,7 @@
*/
void DateTimeSettingsView::updateDisplayTime()
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
QString timeInfo = locale.format(
QTime::currentTime(), r_qtn_time_usual_with_zero);
@@ -106,6 +118,7 @@
setDescription(displayString);
// Start the Timer for 1 minute.
mTickTimer->start(60000);
+ OstTraceFunctionExit0( DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_EXIT );
}
/*!
@@ -113,6 +126,8 @@
*/
CpBaseSettingView *DateTimeSettingsView::createSettingView() const
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSVIEW_CREATESETTINGVIEW_ENTRY );
+ OstTraceFunctionExit0( DATETIMESETTINGSVIEW_CREATESETTINGVIEW_EXIT );
return 0;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/traces/datetimesettingspluginTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,22 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __DATETIMESETTINGSPLUGINTRACES_H__
+#define __DATETIMESETTINGSPLUGINTRACES_H__
+
+#define KOstTraceComponentID 0x102818e9
+
+#define DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY 0x8a0001
+#define DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT 0x8a0002
+#define DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY 0x8a0003
+#define DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT 0x8a0004
+#define DATETIMESETTINGSPLUGIN_UID_ENTRY 0x8a0005
+#define DATETIMESETTINGSPLUGIN_UID_EXIT 0x8a0006
+#define DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_ENTRY 0x8a0007
+#define DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_EXIT 0x8a0008
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/traces/datetimesettingsviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __DATETIMESETTINGSVIEWTRACES_H__
+#define __DATETIMESETTINGSVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x102818e9
+
+#define DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY 0x8a0009
+#define DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT 0x8a000a
+#define DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY 0x8a000b
+#define DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT 0x8a000c
+#define DATETIMESETTINGSVIEW_ONLAUNCHVIEW_ENTRY 0x8a000d
+#define DATETIMESETTINGSVIEW_ONLAUNCHVIEW_EXIT 0x8a000e
+#define DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_ENTRY 0x8a000f
+#define DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_EXIT 0x8a0010
+#define DATETIMESETTINGSVIEW_CREATESETTINGVIEW_ENTRY 0x8a0011
+#define DATETIMESETTINGSVIEW_CREATESETTINGVIEW_EXIT 0x8a0012
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_UID_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_UID_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_CREATESETTINGVIEW_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_CREATESETTINGVIEW_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_ONLAUNCHVIEW_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_ONLAUNCHVIEW_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT=0xc
--- a/clock/clockui/clocksettingsview/clocksettingsview.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/clocksettingsview.pro Mon Aug 23 16:00:50 2010 +0100
@@ -26,7 +26,8 @@
../../clockmw/clocksettingsutility/inc \
../../clockmw/clocktimezone/inc \
../clockcityselectionlist/inc \
- ../../inc
+ ../../inc \
+ ./traces
DEPENDPATH += \
--- a/clock/clockui/clocksettingsview/data/xml/clockregionalsettingsview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/data/xml/clockregionalsettingsview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -22,7 +22,7 @@
<anchoritem dst="dataForm" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
- <string locid="txt_common_common_clock" name="title" value="Clock"/>
+ <string locid="txt_clock_title_clock2" name="title" value="Clock"/>
</widget>
<metadata activeUIState="Common ui state" display="QHD portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,7 @@
</layout>
</widget>
<widget name="viewMenu" role="HbView:menu" type="HbMenu"/>
- <string locid="txt_common_common_clock" name="title" value="Clock"/>
+ <string locid="txt_clock_title_clock2" name="title" value="Clock"/>
</widget>
<section name="landscape">
<widget name="clockSettingsViewWidget" role="HbView:widget" type="HbWidget">
--- a/clock/clockui/clocksettingsview/inc/clocksettingsview.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/inc/clocksettingsview.h Mon Aug 23 16:00:50 2010 +0100
@@ -83,6 +83,7 @@
HbDataFormModelItem *mTimeDataFormItem;
HbDataFormModelItem *mDateDataFormItem;
HbDataFormModelItem *mPlaceDataFormItem;
+ HbDataFormModelItem *mRegionalDataFormItem;
HbDataFormModelItem *mClockTypeItem;
HbDataFormModelItem *mAlarmSnoozeItem;
ClockSettingsDocLoader *mDocLoader;
--- a/clock/clockui/clocksettingsview/inc/settingscustomitem.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/inc/settingscustomitem.h Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,6 @@
#include <QPointer>
#include <HbDataFormViewItem>
#include <HbDialog>
-#include <HbPushButton>
// User includes
#include "clockdatatypes.h"
@@ -32,6 +31,8 @@
class SettingsUtility;
class ClockCitySelectionList;
class TimezoneClient;
+class HbPushButton;
+class HbListWidget;
class SettingsCustomItem : public HbDataFormViewItem
{
@@ -68,6 +69,8 @@
QPointer<HbPushButton> mTimeWidget;
QPointer<HbPushButton> mDateWidget;
QPointer<HbPushButton> mPlaceWidget;
+ QPointer<HbPushButton> mRegSettingsWidget;
+ QPointer<HbListWidget> mWorkdaysWidget;
HbAction *mOkAction;
HbAction *mCancelAction;
--- a/clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -31,6 +31,7 @@
#include <HbComboBox>
#include <HbListWidgetItem>
#include <HbTranslator>
+#include <QLocale>
// User includes
#include "clockregionalsettingsview.h"
@@ -38,6 +39,11 @@
#include "clocksettingsdefines.h"
#include "settingsdatatypes.h"
#include "settingscustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockregionalsettingsviewTraces.h"
+#endif
+
/*!
\class ClockRegionalSettingsView
@@ -53,6 +59,7 @@
mView(0),
mLoader(0)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY );
// Construct the document loader.
mLoader = new ClockSettingsDocLoader;
@@ -65,6 +72,7 @@
// Create the custom prototype.
mCustomPrototype = new SettingsCustomItem();
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT );
}
/*!
@@ -72,6 +80,7 @@
*/
ClockRegionalSettingsView::~ClockRegionalSettingsView()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY );
if (mLoader) {
delete mLoader;
mLoader = 0;
@@ -89,6 +98,7 @@
delete mTranslator;
mTranslator = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT );
}
/*!
@@ -96,6 +106,7 @@
*/
void ClockRegionalSettingsView::showView()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_ENTRY );
bool success;
// Load the application xml.
@@ -141,6 +152,7 @@
connect(
backAction, SIGNAL(triggered()),
this, SLOT(handleBackAction()));
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_EXIT );
}
/*!
@@ -148,10 +160,11 @@
*/
void ClockRegionalSettingsView::handleBackAction()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
HbExtendedLocale::WeekDay startOfWeekIndex =
HbExtendedLocale::system().startOfWeek();
- // TODO: Save workdays settings.
+ // Save workdays settings.
QItemSelectionModel *model = 0;
model = mWorkdaysItem->selectionModel();
QModelIndexList selectedModelIndex = model->selectedIndexes();
@@ -185,6 +198,7 @@
// Cleanup.
window->removeView(mView);
deleteLater();
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_EXIT );
}
/*!
@@ -195,7 +209,9 @@
*/
void ClockRegionalSettingsView::handleItemDisplayed(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_ENTRY );
if (!index.isValid()) {
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT );
return;
}
@@ -227,6 +243,7 @@
default:
break;
}
+ OstTraceFunctionExit0( DUP1_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT );
}
/*!
@@ -235,9 +252,10 @@
*/
void ClockRegionalSettingsView::handleTimeFormatChange()
{
-// mSettingsUtility->setTimeFormat(mTimeFormatItem->text());
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_ENTRY );
mSettingsUtility->setTimeFormat(
mTimeFormatItem->contentWidgetData("text").toString());
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_EXIT );
}
/*!
@@ -246,16 +264,19 @@
*/
void ClockRegionalSettingsView::handleTimeSeparatorChange()
{
-// mSettingsUtility->setTimeSeparator(mTimeSeparatorItem->text());
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_ENTRY );
mSettingsUtility->setTimeSeparator(
mTimeSeparatorItem->contentWidgetData("text").toString());
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_EXIT );
}
/*!
*/
void ClockRegionalSettingsView::handleDateFormatChange(QString text)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_ENTRY );
mSettingsUtility->setDateFormat(text);
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_EXIT );
}
/*!
@@ -264,7 +285,9 @@
*/
void ClockRegionalSettingsView::handleDateSeparatorChange(QString text)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_ENTRY );
mSettingsUtility->setDateSeparator(text);
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_EXIT );
}
/*!
@@ -273,6 +296,7 @@
void ClockRegionalSettingsView::handleDataChanged(
const QModelIndex& topLeft, const QModelIndex& bottomRight)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_ENTRY );
Q_UNUSED(bottomRight)
@@ -293,6 +317,7 @@
default:
break;
}
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_EXIT );
}
/*!
@@ -300,6 +325,7 @@
*/
void ClockRegionalSettingsView::createModel()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_ENTRY );
if (mForm->model()) {
delete mForm->model();
mForm->setModel(0);
@@ -317,6 +343,7 @@
SIGNAL(dataChanged(const QModelIndex, const QModelIndex)),
this,
SLOT(handleDataChanged(const QModelIndex, const QModelIndex)));
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_EXIT );
}
/*!
@@ -324,6 +351,7 @@
*/
void ClockRegionalSettingsView::populateFormModel()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_ENTRY );
if (!mFormModel) {
createModel();
}
@@ -343,6 +371,7 @@
mTimeFormatItem->setContentWidgetData("text", mTimeFormatStringList[1]);
mTimeFormatItem->setContentWidgetData("additionalText", mTimeFormatStringList[0]);
}
+ mTimeFormatItem->setContentWidgetData("objectName", "timeFormat");
mForm->addConnection(
mTimeFormatItem, SIGNAL(clicked()),
this, SLOT(handleTimeFormatChange()));
@@ -361,6 +390,7 @@
mTimeSeparatorItem->setContentWidgetData(
"additionalText", mTimeSeparatorStringList[0]);
}
+ mTimeSeparatorItem->setContentWidgetData("objectName", "timeSeparator");
mForm->addConnection(
mTimeSeparatorItem, SIGNAL(clicked()),
this, SLOT(handleTimeSeparatorChange()));
@@ -373,6 +403,7 @@
mDateFormatItem->setContentWidgetData("items", mDateFormatStringList);
mDateFormatItem->setContentWidgetData("currentIndex",index);
+ mDateFormatItem->setContentWidgetData("objectName", "dateFormat");
mForm->addConnection(
mDateFormatItem, SIGNAL(currentIndexChanged(QString)),
this, SLOT(handleDateFormatChange(QString)));
@@ -385,6 +416,7 @@
mDateSeparatorItem->setContentWidgetData("items", mDateSeparatorStringList);
mDateSeparatorItem->setContentWidgetData("currentIndex",index);
+ mDateSeparatorItem->setContentWidgetData("objectName", "dateSeparator");
mForm->addConnection(
mDateSeparatorItem, SIGNAL(currentIndexChanged(QString)),
this, SLOT(handleDateSeparatorChange(QString)));
@@ -393,14 +425,15 @@
HbDataFormModelItem *item = 0;
// Create the weekday list based on start of week.
QStringList weekdaysList;
+ QLocale qLocale;
weekdaysList
- << hbTrId("txt_clk_setlabel_val_monday")
- << hbTrId("txt_clk_setlabel_val_tuesday")
- << hbTrId("txt_clk_setlabel_val_wednesday")
- << hbTrId("txt_clk_setlabel_val_thursday")
- << hbTrId("txt_clk_setlabel_val_friday")
- << hbTrId("txt_clk_setlabel_val_saturday")
- << hbTrId("txt_clk_setlabel_val_sunday");
+ << qLocale.dayName(1)
+ << qLocale.dayName(2)
+ << qLocale.dayName(3)
+ << qLocale.dayName(4)
+ << qLocale.dayName(5)
+ << qLocale.dayName(6)
+ << qLocale.dayName(7);
HbDataFormModelItem::DataItemType workdaysItemType =
static_cast<HbDataFormModelItem::DataItemType>
@@ -408,6 +441,7 @@
item = new HbDataFormModelItem(workdaysItemType,
hbTrId("txt_clock_setlabel_workdays"));
mFormModel->appendDataFormItem(item);
+ item->setContentWidgetData("objectName", "workdays");
// Start of week item.
item = 0;
@@ -416,6 +450,8 @@
HbExtendedLocale::WeekDay startOfWeek = locale.startOfWeek();
item->setContentWidgetData("items", weekdaysList);
item->setContentWidgetData("currentIndex", startOfWeek);
+ item->setContentWidgetData("objectName", "startOfWeek");
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_EXIT );
}
/*!
@@ -424,16 +460,18 @@
QStringList ClockRegionalSettingsView::weekdayList()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_ENTRY );
QStringList weekDays;
QStringList daysList;
+ QLocale qLocale;
daysList
- << hbTrId("txt_clk_setlabel_val_monday")
- << hbTrId("txt_clk_setlabel_val_tuesday")
- << hbTrId("txt_clk_setlabel_val_wednesday")
- << hbTrId("txt_clk_setlabel_val_thursday")
- << hbTrId("txt_clk_setlabel_val_friday")
- << hbTrId("txt_clk_setlabel_val_saturday")
- << hbTrId("txt_clk_setlabel_val_sunday");
+ << qLocale.dayName(1)
+ << qLocale.dayName(2)
+ << qLocale.dayName(3)
+ << qLocale.dayName(4)
+ << qLocale.dayName(5)
+ << qLocale.dayName(6)
+ << qLocale.dayName(7);
HbExtendedLocale::WeekDay startOfWeekIndex =
HbExtendedLocale::system().startOfWeek();
@@ -447,6 +485,7 @@
}
}
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_EXIT );
return weekDays;
}
@@ -457,21 +496,26 @@
void ClockRegionalSettingsView::updateWeekStartOn()
{
-if (mStartOfWeekItem != 0)
- {
- HbExtendedLocale locale;
- HbExtendedLocale::WeekDay weekdDayStart = locale.startOfWeek();
- int currentDay = mStartOfWeekItem->currentIndex();
- if(currentDay == weekdDayStart )
- {
- return;
- }
- else
- {
- mStartOfWeekItem->setCurrentIndex(weekdDayStart);
- updateWeekDays();
- }
- }
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY );
+ if (mStartOfWeekItem != 0)
+ {
+ HbExtendedLocale locale;
+ HbExtendedLocale::WeekDay weekdDayStart = locale.startOfWeek();
+ int currentDay = mStartOfWeekItem->currentIndex();
+ if(currentDay == weekdDayStart )
+ {
+ OstTraceFunctionExit0(
+ CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT );
+ return;
+ }
+ else
+ {
+ mStartOfWeekItem->setCurrentIndex(weekdDayStart);
+ updateWeekDays();
+ }
+ }
+ OstTraceFunctionExit0(
+ DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT );
}
/*!
@@ -479,31 +523,33 @@
*/
void ClockRegionalSettingsView::updateWeekDays()
{
-QStringList weekdays = weekdayList();
-QString workdays = mCustomPrototype->workdaysSetting();
-QItemSelectionModel *model = 0;
-model = mWorkdaysItem->selectionModel();
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY );
+ QStringList weekdays = weekdayList();
+ QString workdays = mCustomPrototype->workdaysSetting();
+ QItemSelectionModel *model = 0;
+ model = mWorkdaysItem->selectionModel();
-for (int i = 0, index = workdays.size() - 1;
- i < mWorkdaysItem->count(); ++i, index--)
- {
- QString str = weekdays[i];
- mWorkdaysItem->item(i)->setText(str);
+ for (int i = 0, index = workdays.size() - 1;
+ i < mWorkdaysItem->count(); ++i, index--)
+ {
+ QString str = weekdays[i];
+ mWorkdaysItem->item(i)->setText(str);
- QChar ch = workdays.at(index);
- if ( ch == QChar('0'))
- {
- // Not a workday.
- model->select(
- model->model()->index(i,0),
- QItemSelectionModel::Deselect);
- }
- else
- {
- // Workday.
- model->select(
- model->model()->index(i,0),
- QItemSelectionModel::Select);}
- }
+ QChar ch = workdays.at(index);
+ if ( ch == QChar('0'))
+ {
+ // Not a workday.
+ model->select(
+ model->model()->index(i,0),
+ QItemSelectionModel::Deselect);
+ }
+ else
+ {
+ // Workday.
+ model->select(
+ model->model()->index(i,0),
+ QItemSelectionModel::Select);}
+ }
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clocksettingsview/src/clocksettingsdocloader.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/src/clocksettingsdocloader.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -20,6 +20,11 @@
#include "clocksettingsdocloader.h"
#include "clocksettingsdefines.h"
#include "clocksettingsview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clocksettingsdocloaderTraces.h"
+#endif
+
/*!
\class ClockSettingsDocLoader
@@ -35,6 +40,7 @@
*/
QObject *ClockSettingsDocLoader::createObject(const QString &type, const QString &name)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSDOCLOADER_CREATEOBJECT_ENTRY );
return HbDocumentLoader::createObject(type, name);
}
--- a/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -38,6 +38,11 @@
#include "timezoneclient.h"
#include "settingsdatatypes.h"
#include "settingscustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clocksettingsviewTraces.h"
+#endif
+
/*!
\class ClockSettingsView
@@ -54,6 +59,7 @@
ClockSettingsView::ClockSettingsView(QObject *parent)
:QObject(parent)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY );
// Load the translation file and install the editor specific translator
mTranslator = new HbTranslator("clocksettingsview");
@@ -102,6 +108,7 @@
connect(
mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
this, SLOT(eventMonitor(XQSettingsKey, QVariant)));
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT );
}
/*!
@@ -109,6 +116,7 @@
*/
ClockSettingsView::~ClockSettingsView()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
}
@@ -127,6 +135,7 @@
}
+ OstTraceFunctionExit0( DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT );
}
/*!
@@ -134,6 +143,7 @@
*/
void ClockSettingsView::loadSettingsView()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_ENTRY );
bool loadSuccess;
// Construct the document loader instance
@@ -172,6 +182,7 @@
// Setup the view.
setupView();
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_EXIT );
}
/*!
@@ -179,9 +190,11 @@
*/
void ClockSettingsView::handleBackAction()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLEBACKACTION_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
window->removeView(mSettingsView);
deleteLater();
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLEBACKACTION_EXIT );
}
/*!
@@ -189,6 +202,7 @@
*/
void ClockSettingsView::updatePlaceItem()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATEPLACEITEM_ENTRY );
// Get the current zone info.
LocationInfo currentZoneInfo = mTimezoneClient->getCurrentZoneInfoL();
@@ -200,6 +214,7 @@
+ tr(", ") + currentZoneInfo.countryName;
mPlaceDataFormItem->setContentWidgetData("text", placeInfo);
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_UPDATEPLACEITEM_EXIT );
}
/*!
@@ -207,7 +222,9 @@
*/
void ClockSettingsView::updateDateItem()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATEDATEITEM_ENTRY );
mDateDataFormItem->setContentWidgetData("text", mSettingsUtility->date());
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_UPDATEDATEITEM_EXIT );
}
/*!
@@ -215,6 +232,7 @@
*/
void ClockSettingsView::updateTimeItem()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATETIMEITEM_ENTRY );
if (!mTickTimer->isActive()) {
mTickTimer->stop();
}
@@ -222,6 +240,7 @@
// Start the timer again.
mTickTimer->start(60000 - 1000 * QTime::currentTime().second());
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_UPDATETIMEITEM_EXIT );
}
/*!
@@ -229,6 +248,7 @@
*/
void ClockSettingsView::handleOrientationChanged(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_ENTRY );
bool success;
// If horizontal, load the landscape section.
if (Qt::Horizontal == orientation) {
@@ -242,10 +262,12 @@
CLOCK_SETTINGS_VIEW_PORTRAIT_SECTION,
&success);
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_EXIT );
}
void ClockSettingsView::handleNetworkTimeStateChange(int state)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_ENTRY );
bool cenrepValue = mTimezoneClient->timeUpdateOn();
if ((Qt::Checked == state && !cenrepValue)
|| (Qt::Unchecked == state && cenrepValue)) {
@@ -258,6 +280,7 @@
mTimezoneClient->setTimeUpdateOn(false);
}
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_EXIT );
}
/*!
@@ -268,6 +291,7 @@
*/
void ClockSettingsView::setupView()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_SETUPVIEW_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
window->addView(mSettingsView);
window->setCurrentView(mSettingsView);
@@ -294,6 +318,7 @@
updatePlaceItem();
mTickTimer->start(60000 - 1000 * QTime::currentTime().second());
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_SETUPVIEW_EXIT );
}
/*!
@@ -301,6 +326,7 @@
*/
void ClockSettingsView::createModel()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_CREATEMODEL_ENTRY );
// Remove the model.
if (mSettingsForm->model()) {
delete mSettingsForm->model();
@@ -312,6 +338,7 @@
// Add the items to the view.
populateModel();
mSettingsForm->setModel(mSettingsModel);
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_CREATEMODEL_EXIT );
}
/*!
@@ -319,6 +346,7 @@
*/
void ClockSettingsView::populateModel()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_POPULATEMODEL_ENTRY );
if (!mSettingsModel) {
createModel();
}
@@ -335,6 +363,7 @@
"checkState", state);
mNetworkTimeItem->setContentWidgetData(
"text", QString(hbTrId("txt_clk_setlabel_use_network_date_time")));
+ mNetworkTimeItem->setContentWidgetData("objectName", "networkTime");
mSettingsForm->addConnection(
mNetworkTimeItem, SIGNAL(stateChanged(int)),
this, SLOT(handleNetworkTimeStateChange(int)));
@@ -347,6 +376,7 @@
mTimeDataFormItem = mSettingsModel->appendDataFormItem(
timeItemType, QString(hbTrId("txt_clock_setlabel_time")));
mTimeDataFormItem->setContentWidgetData("text", mSettingsUtility->time());
+ mTimeDataFormItem->setContentWidgetData("objectName", "timeItem");
// Add the date item.
// Custom data type for adding a time button to the data form.
@@ -356,6 +386,7 @@
mDateDataFormItem = mSettingsModel->appendDataFormItem(
dateItemType, QString(hbTrId("txt_clock_setlabel_date")));
mDateDataFormItem->setContentWidgetData("text", mSettingsUtility->date());
+ mDateDataFormItem->setContentWidgetData("objectName", "dateItem");
// Add the place item.
HbDataFormModelItem::DataItemType placeItemType =
@@ -372,6 +403,7 @@
}
placeItemText.append(currentZoneInfo.countryName);
mPlaceDataFormItem->setContentWidgetData("text", placeItemText);
+ mPlaceDataFormItem->setContentWidgetData("objectName", "placeItem");
if (networkTime) {
mTimeDataFormItem->setEnabled(false);
@@ -387,7 +419,12 @@
HbDataFormModelItem::DataItemType regionalSettingsItem =
static_cast<HbDataFormModelItem::DataItemType>
(HbDataFormModelItem::CustomItemBase + RegionalSettingsItem);
- mSettingsModel->appendDataFormItem(regionalSettingsItem);
+ mRegionalDataFormItem = mSettingsModel->appendDataFormItem(
+ regionalSettingsItem);
+ mRegionalDataFormItem->setContentWidgetData(
+ "text", hbTrId("txt_clock_button_regional_date_time_settings"));
+ mRegionalDataFormItem->setContentWidgetData(
+ "objectName", "regionalSettings");
// Add the clock type item.
HbDataFormModelItem::DataItemType clockTypeSettingsItem =
@@ -405,6 +442,7 @@
mClockTypeItem->setContentWidgetData("text", clockTypeList[1]);
mClockTypeItem->setContentWidgetData("additionalText", clockTypeList[0]);
}
+ mClockTypeItem->setContentWidgetData("objectName", "clockType");
mSettingsForm->addConnection(
mClockTypeItem, SIGNAL(clicked()),
this, SLOT(handleClockTypeChanged()));
@@ -414,10 +452,10 @@
HbDataFormModelItem::ComboBoxItem,
hbTrId("txt_clock_setlabel_alarm_snooze_time"));
QStringList alramSnoozeTimes;
- alramSnoozeTimes << hbTrId("txt_clock_set_ln_mins", 5)
- << hbTrId("txt_clock_set_ln_mins", 10)
- << hbTrId("txt_clock_set_ln_mins", 15)
- << hbTrId("txt_clock_set_ln_mins", 30);
+ alramSnoozeTimes << hbTrId("txt_clock_setlabel_ln_mins", 5)
+ << hbTrId("txt_clock_setlabel_ln_mins", 10)
+ << hbTrId("txt_clock_setlabel_ln_mins", 15)
+ << hbTrId("txt_clock_setlabel_ln_mins", 30);
// Build the hash map for the reminder.
mAlarmSnoozeTimeHash[0] = 5;
@@ -436,10 +474,12 @@
index = mAlarmSnoozeTimeHash.key(15);
}
mAlarmSnoozeItem->setContentWidgetData("currentIndex", index);
+ mAlarmSnoozeItem->setContentWidgetData("objectName", "alarmSnooze");
mSettingsForm->addConnection(
mAlarmSnoozeItem, SIGNAL(currentIndexChanged(int)),
this, SLOT(handleAlarmSnoozeTimeChanged(int)));
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_POPULATEMODEL_EXIT );
}
/*!
@@ -449,6 +489,7 @@
*/
void ClockSettingsView::handleAutoTimeUpdateChange(int value)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_ENTRY );
int state = (mNetworkTimeItem->contentWidgetData("checkState")).toInt();
if (value) {
@@ -483,6 +524,7 @@
}
}
updatePlaceItem();
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_EXIT );
}
/*!
@@ -492,10 +534,12 @@
*/
void ClockSettingsView::handleAlarmSnoozeTimeChanged(int index)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_ENTRY );
if (mAlarmSnoozeTimeHash.value(index)) {
mSettingsManager->writeItemValue(
*mAlarmSnoozeTimeKey, mAlarmSnoozeTimeHash.value(index));
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_EXIT );
}
/*!
@@ -503,8 +547,10 @@
*/
void ClockSettingsView::handleClockTypeChanged()
{
- mSettingsUtility->setClockType(
- mClockTypeItem->contentWidgetData("text").toString());
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_ENTRY );
+ mSettingsUtility->setClockType(
+ mClockTypeItem->contentWidgetData("text").toString());
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_EXIT );
}
/*!
@@ -516,6 +562,7 @@
void ClockSettingsView::eventMonitor(
const XQSettingsKey& key, const QVariant& value)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY );
if (key.uid() == KCRUidClockApp && key.key() == KClockAppSnoozeTime) {
if (mSettingsManager->error() == XQSettingsManager::NoError) {
@@ -529,6 +576,7 @@
}
}
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -36,6 +36,11 @@
#include "clockcityselectionlist.h"
#include "timezoneclient.h"
#include "clockregionalsettingsview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "settingscustomitemTraces.h"
+#endif
+
/*!
\class SettingsCustomItem
@@ -52,10 +57,12 @@
SettingsCustomItem::SettingsCustomItem(QGraphicsItem *parent)
:HbDataFormViewItem(parent)
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY );
// Construct the settignsutility.
mSettingsUtility = new SettingsUtility();
// Construct the timezone client.
mTimezoneClient = TimezoneClient::getInstance();
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT );
}
/*!
@@ -63,7 +70,9 @@
*/
SettingsCustomItem::~SettingsCustomItem()
{
- // Nothing yet.
+ OstTraceFunctionEntry0( DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY );
+ // Nothing yet.
+ OstTraceFunctionExit0( DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT );
}
/*!
@@ -72,6 +81,7 @@
*/
HbAbstractViewItem* SettingsCustomItem::createItem()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_CREATEITEM_ENTRY );
return new SettingsCustomItem(*this);
}
@@ -81,14 +91,17 @@
*/
bool SettingsCustomItem::canSetModelIndex(const QModelIndex &index) const
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_CANSETMODELINDEX_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
index.data(HbDataFormModelItem::ItemTypeRole).toInt());
if(itemType >= HbDataFormModelItem::CustomItemBase &&
itemType <= (HbDataFormModelItem::CustomItemBase + 50)) {
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT );
return true;
} else {
+ OstTraceFunctionExit0( DUP1_SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT );
return false;
}
@@ -96,6 +109,7 @@
void SettingsCustomItem::restore()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_RESTORE_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -107,27 +121,54 @@
switch (itemType) {
case (TimeItemOffset + HbDataFormModelItem::CustomItemBase):
- mTimeWidget->setProperty("text", modlItem->contentWidgetData("text"));
- break;
-
+ {
+ mTimeWidget->setProperty(
+ "text", modlItem->contentWidgetData("text"));
+ mTimeWidget->setProperty(
+ "objectName", modlItem->contentWidgetData("objectName"));
+ break;
+ }
case (DateItemOffset + HbDataFormModelItem::CustomItemBase):
- mDateWidget->setProperty("text", modlItem->contentWidgetData("text"));
- break;
-
+ {
+ mDateWidget->setProperty(
+ "text", modlItem->contentWidgetData("text"));
+ mDateWidget->setProperty(
+ "objectName", modlItem->contentWidgetData("objectName"));
+ break;
+ }
case (PlaceItemOffset + HbDataFormModelItem::CustomItemBase):
- mPlaceWidget->setProperty("text", modlItem->contentWidgetData("text"));
- break;
+ {
+ mPlaceWidget->setProperty(
+ "text", modlItem->contentWidgetData("text"));
+ mPlaceWidget->setProperty(
+ "objectName", modlItem->contentWidgetData("objectName"));
+ break;
+ }
+ case (RegionalItemOffset + HbDataFormModelItem::CustomItemBase):
+ {
+ mRegSettingsWidget->setProperty(
+ "text", modlItem->contentWidgetData("text"));
+ mRegSettingsWidget->setProperty(
+ "objectName", modlItem->contentWidgetData("objectName"));
+ break;
+ }
case (50 + HbDataFormModelItem::CustomItemBase):
-
- break;
+ {
+ mWorkdaysWidget->setProperty(
+ "objectName", modlItem->contentWidgetData("objectName"));
+ break;
+ }
default:
break;
}
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_RESTORE_EXIT );
}
void SettingsCustomItem::setWeekdaysList(QStringList list)
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_ENTRY );
mWeekdaysList = list;
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_EXIT );
}
/*!
@@ -136,6 +177,7 @@
*/
HbWidget* SettingsCustomItem::createCustomWidget()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(modelIndex()
.data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -147,6 +189,7 @@
connect(
mTimeWidget, SIGNAL(clicked()),
this, SLOT(launchTimePicker()));
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mTimeWidget;
}
@@ -156,6 +199,7 @@
connect(
mDateWidget, SIGNAL(clicked()),
this, SLOT(launchDatePicker()));
+ OstTraceFunctionExit0( DUP1_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mDateWidget;
}
@@ -165,28 +209,31 @@
connect(
mPlaceWidget, SIGNAL(clicked()),
this, SLOT(launchCitySelectionList()));
+ OstTraceFunctionExit0( DUP2_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mPlaceWidget;
}
case (RegionalItemOffset + HbDataFormModelItem::CustomItemBase):
{
- HbPushButton *regSettingsItem = new HbPushButton(this);
- regSettingsItem->setText(
- QString(hbTrId("txt_clock_button_regional_date_time_settings")));
+ mRegSettingsWidget = new HbPushButton(this);
connect(
- regSettingsItem, SIGNAL(clicked()),
+ mRegSettingsWidget, SIGNAL(clicked()),
this, SLOT(launchRegSettingsView()));
- return regSettingsItem;
+ OstTraceFunctionExit0( DUP3_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
+ return mRegSettingsWidget;
}
case (50 + HbDataFormModelItem::CustomItemBase):
{
- HbListWidget *workdaysItem = new HbListWidget();
- workdaysItem->setSelectionMode(HbAbstractItemView::MultiSelection);
+ mWorkdaysWidget = new HbListWidget(this);
+ mWorkdaysWidget->setSelectionMode(HbAbstractItemView::MultiSelection);
+ mWorkdaysWidget->setScrollDirections(0);
+ mWorkdaysWidget->ungrabGesture(Qt::PanGesture);
+
QItemSelectionModel *model = 0;
- model = workdaysItem->selectionModel();
+ model = mWorkdaysWidget->selectionModel();
for (int index = 0; index < mWeekdaysList.count(); ++index) {
- workdaysItem->addItem(mWeekdaysList.at(index));
+ mWorkdaysWidget->addItem(mWeekdaysList.at(index));
}
QString workdaysString = workdaysSetting();
@@ -205,7 +252,8 @@
}
}
- return workdaysItem;
+ OstTraceFunctionExit0( DUP4_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
+ return mWorkdaysWidget;
}
default:
@@ -218,6 +266,7 @@
*/
void SettingsCustomItem::launchTimePicker()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY );
if (mTimePickerDialog) {
delete mTimePickerDialog;
}
@@ -254,6 +303,7 @@
mTimePickerDialog->addAction(mCancelAction);
mTimePickerDialog->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_EXIT );
}
/*!
@@ -261,6 +311,7 @@
*/
void SettingsCustomItem::handleOkAction()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_HANDLEOKACTION_ENTRY );
if (mTimePickerDialog) {
// Get the time from the time picker.
QTime newTime = static_cast<HbDateTimePicker *> (
@@ -292,6 +343,7 @@
QDateTime(newDate, QTime::currentTime()));
}
}
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_HANDLEOKACTION_EXIT );
}
/*!
@@ -299,6 +351,7 @@
*/
void SettingsCustomItem::launchDatePicker()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_ENTRY );
if (mDatePickerDialog) {
delete mDatePickerDialog;
}
@@ -332,6 +385,7 @@
mDatePickerDialog->addAction(mCancelAction);
mDatePickerDialog->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_EXIT );
}
/*!
@@ -339,12 +393,14 @@
*/
void SettingsCustomItem::launchCitySelectionList()
{
- mCitySelectionList = new ClockCitySelectionList(this);
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_ENTRY );
+ mCitySelectionList = new ClockCitySelectionList(mTimezoneClient, this);
connect(
mCitySelectionList, SIGNAL(citySelected(LocationInfo)),
this, SLOT(updatePlaceItem(LocationInfo)));
mCitySelectionList->showCityList();
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_EXIT );
}
/*!
@@ -354,9 +410,11 @@
*/
void SettingsCustomItem::updatePlaceItem(LocationInfo info)
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_UPDATEPLACEITEM_ENTRY );
if (-1 != info.timezoneId) {
mTimezoneClient->setAsCurrentLocationL(info);
}
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_UPDATEPLACEITEM_EXIT );
}
/*!
@@ -364,12 +422,14 @@
*/
void SettingsCustomItem::launchRegSettingsView()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_ENTRY );
ClockRegionalSettingsView *view =
new ClockRegionalSettingsView();
connect(mTimezoneClient, SIGNAL(timechanged()),
view, SLOT(updateWeekStartOn()));
view->showView();
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_EXIT );
}
/*!
@@ -377,9 +437,11 @@
*/
void SettingsCustomItem::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_SELECTEDACTION_ENTRY );
if (action==mOkAction) {
handleOkAction();
}
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_SELECTEDACTION_EXIT );
}
/*!
@@ -387,6 +449,7 @@
*/
QString SettingsCustomItem::workdaysSetting()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_WORKDAYSSETTING_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
// 0(Sun)0(sat)1(Fri)1(Thu)1(Wed)1(Tue)1(Mon)
QString workdaysString = locale.workDays();
@@ -405,6 +468,7 @@
}
// workdays.append('\0');
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_WORKDAYSSETTING_EXIT );
return workdays;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/clockregionalsettingsviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,46 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKREGIONALSETTINGSVIEWTRACES_H__
+#define __CLOCKREGIONALSETTINGSVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x10005906
+
+#define CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY 0x8a0001
+#define CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT 0x8a0002
+#define DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY 0x8a0003
+#define DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT 0x8a0004
+#define CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_ENTRY 0x8a0005
+#define CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_EXIT 0x8a0006
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_ENTRY 0x8a0007
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_EXIT 0x8a0008
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_ENTRY 0x8a0009
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT 0x8a000a
+#define DUP1_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT 0x8a000b
+#define CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_ENTRY 0x8a000c
+#define CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_EXIT 0x8a000d
+#define CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_ENTRY 0x8a000e
+#define CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_EXIT 0x8a000f
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_ENTRY 0x8a0010
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_EXIT 0x8a0011
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_ENTRY 0x8a0012
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_EXIT 0x8a0013
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_ENTRY 0x8a0014
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_EXIT 0x8a0015
+#define CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_ENTRY 0x8a0016
+#define CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_EXIT 0x8a0017
+#define CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_ENTRY 0x8a0018
+#define CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_EXIT 0x8a0019
+#define CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_ENTRY 0x8a001a
+#define CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_EXIT 0x8a001b
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY 0x8a001c
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT 0x8a001d
+#define DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT 0x8a001e
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY 0x8a001f
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT 0x8a0020
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/clocksettingsdocloaderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,15 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKSETTINGSDOCLOADERTRACES_H__
+#define __CLOCKSETTINGSDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x10005906
+
+#define CLOCKSETTINGSDOCLOADER_CREATEOBJECT_ENTRY 0x8a0021
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/clocksettingsviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,46 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKSETTINGSVIEWTRACES_H__
+#define __CLOCKSETTINGSVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x10005906
+
+#define CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY 0x8a0022
+#define CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT 0x8a0023
+#define DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY 0x8a0024
+#define DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT 0x8a0025
+#define CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_ENTRY 0x8a0026
+#define CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_EXIT 0x8a0027
+#define CLOCKSETTINGSVIEW_HANDLEBACKACTION_ENTRY 0x8a0028
+#define CLOCKSETTINGSVIEW_HANDLEBACKACTION_EXIT 0x8a0029
+#define CLOCKSETTINGSVIEW_UPDATEPLACEITEM_ENTRY 0x8a002a
+#define CLOCKSETTINGSVIEW_UPDATEPLACEITEM_EXIT 0x8a002b
+#define CLOCKSETTINGSVIEW_UPDATEDATEITEM_ENTRY 0x8a002c
+#define CLOCKSETTINGSVIEW_UPDATEDATEITEM_EXIT 0x8a002d
+#define CLOCKSETTINGSVIEW_UPDATETIMEITEM_ENTRY 0x8a002e
+#define CLOCKSETTINGSVIEW_UPDATETIMEITEM_EXIT 0x8a002f
+#define CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_ENTRY 0x8a0030
+#define CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_EXIT 0x8a0031
+#define CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_ENTRY 0x8a0032
+#define CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_EXIT 0x8a0033
+#define CLOCKSETTINGSVIEW_SETUPVIEW_ENTRY 0x8a0034
+#define CLOCKSETTINGSVIEW_SETUPVIEW_EXIT 0x8a0035
+#define CLOCKSETTINGSVIEW_CREATEMODEL_ENTRY 0x8a0036
+#define CLOCKSETTINGSVIEW_CREATEMODEL_EXIT 0x8a0037
+#define CLOCKSETTINGSVIEW_POPULATEMODEL_ENTRY 0x8a0038
+#define CLOCKSETTINGSVIEW_POPULATEMODEL_EXIT 0x8a0039
+#define CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_ENTRY 0x8a003a
+#define CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_EXIT 0x8a003b
+#define CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_ENTRY 0x8a003c
+#define CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_EXIT 0x8a003d
+#define CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_ENTRY 0x8a003e
+#define CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_EXIT 0x8a003f
+#define CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY 0x8a0040
+#define CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT 0x8a0041
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,101 @@
+#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
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_ENTRY=0x18
+[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_UPDATEWEEKDAYS_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSDOCLOADER_CREATEOBJECT_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CREATEMODEL_ENTRY=0x36
+[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_HANDLEALARMSNOOZETIMECHANGED_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEBACKACTION_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEBACKACTION_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_POPULATEMODEL_ENTRY=0x38
+[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_UPDATEDATEITEM_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEDATEITEM_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEPLACEITEM_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEPLACEITEM_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATETIMEITEM_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATETIMEITEM_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY=0x44
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_DUP2_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x51
+[TRACE]TRACE_FLOW[0x8A]_DUP3_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_DUP4_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x53
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CANSETMODELINDEX_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CREATEITEM_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_HANDLEOKACTION_ENTRY=0x56
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_HANDLEOKACTION_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_ENTRY=0x5a
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_ENTRY=0x5e
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_EXIT=0x5f
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY=0x54
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_EXIT=0x55
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_RESTORE_ENTRY=0x4a
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_RESTORE_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SELECTEDACTION_ENTRY=0x60
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SELECTEDACTION_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY=0x42
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT=0x43
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_EXIT=0x4d
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_UPDATEPLACEITEM_ENTRY=0x5c
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_UPDATEPLACEITEM_EXIT=0x5d
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_WORKDAYSSETTING_ENTRY=0x62
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_WORKDAYSSETTING_EXIT=0x63
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/settingscustomitemTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,48 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __SETTINGSCUSTOMITEMTRACES_H__
+#define __SETTINGSCUSTOMITEMTRACES_H__
+
+#define KOstTraceComponentID 0x10005906
+
+#define SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY 0x8a0042
+#define SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT 0x8a0043
+#define DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY 0x8a0044
+#define DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT 0x8a0045
+#define SETTINGSCUSTOMITEM_CREATEITEM_ENTRY 0x8a0046
+#define SETTINGSCUSTOMITEM_CANSETMODELINDEX_ENTRY 0x8a0047
+#define SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a0048
+#define DUP1_SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a0049
+#define SETTINGSCUSTOMITEM_RESTORE_ENTRY 0x8a004a
+#define SETTINGSCUSTOMITEM_RESTORE_EXIT 0x8a004b
+#define SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_ENTRY 0x8a004c
+#define SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_EXIT 0x8a004d
+#define SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY 0x8a004e
+#define SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a004f
+#define DUP1_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a0050
+#define DUP2_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a0051
+#define DUP3_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a0052
+#define DUP4_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a0053
+#define SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY 0x8a0054
+#define SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_EXIT 0x8a0055
+#define SETTINGSCUSTOMITEM_HANDLEOKACTION_ENTRY 0x8a0056
+#define SETTINGSCUSTOMITEM_HANDLEOKACTION_EXIT 0x8a0057
+#define SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_ENTRY 0x8a0058
+#define SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_EXIT 0x8a0059
+#define SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_ENTRY 0x8a005a
+#define SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_EXIT 0x8a005b
+#define SETTINGSCUSTOMITEM_UPDATEPLACEITEM_ENTRY 0x8a005c
+#define SETTINGSCUSTOMITEM_UPDATEPLACEITEM_EXIT 0x8a005d
+#define SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_ENTRY 0x8a005e
+#define SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_EXIT 0x8a005f
+#define SETTINGSCUSTOMITEM_SELECTEDACTION_ENTRY 0x8a0060
+#define SETTINGSCUSTOMITEM_SELECTEDACTION_EXIT 0x8a0061
+#define SETTINGSCUSTOMITEM_WORKDAYSSETTING_ENTRY 0x8a0062
+#define SETTINGSCUSTOMITEM_WORKDAYSSETTING_EXIT 0x8a0063
+
+
+#endif
+
+// End of file
+
--- a/clock/clockui/clockviewmanager/clockviewmanager.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviewmanager/clockviewmanager.pro Mon Aug 23 16:00:50 2010 +0100
@@ -30,7 +30,8 @@
../clockviews/inc \
../clockappcontroller/inc \
../clockwidget/clockwidgetimpl/inc \
- ../../inc
+ ../../inc \
+ ./traces
symbian: {
TARGET.CAPABILITY = ALL -TCB
--- a/clock/clockui/clockviewmanager/inc/clockviewmanager.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviewmanager/inc/clockviewmanager.h Mon Aug 23 16:00:50 2010 +0100
@@ -43,6 +43,9 @@
public:
CLOCKVIEWMANAGER_EXPORT void showView(ClockViews view);
+signals:
+ void appReady();
+
private:
void loadMainView();
void loadWorldClockView();
--- a/clock/clockui/clockviewmanager/src/clockdocloader.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviewmanager/src/clockdocloader.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,11 @@
#include "clockwidget.h"
#include "clockworldview.h"
#include "clockhomecityitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockdocloaderTraces.h"
+#endif
+
/*!
\class ClockDocLoader
@@ -37,21 +42,26 @@
*/
QObject *ClockDocLoader::createObject(const QString &type, const QString &name)
{
+ OstTraceFunctionEntry0( CLOCKDOCLOADER_CREATEOBJECT_ENTRY );
if (CLOCK_MAIN_VIEW == name) {
QObject *object = new ClockMainView();
object->setObjectName(name);
+ OstTraceFunctionExit0( CLOCKDOCLOADER_CREATEOBJECT_EXIT );
return object;
} else if (CLOCK_WIDGET == name) {
QObject *object = new ClockWidget();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP1_CLOCKDOCLOADER_CREATEOBJECT_EXIT );
return object;
} else if (CLOCK_WORLD_VIEW == name) {
QObject *object = new ClockWorldView();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP2_CLOCKDOCLOADER_CREATEOBJECT_EXIT );
return object;
} else if (CLOCK_WORLD_HOMECITY == name) {
QObject *object = new ClockHomeCityItem();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP3_CLOCKDOCLOADER_CREATEOBJECT_EXIT );
return object;
}
--- a/clock/clockui/clockviewmanager/src/clockviewmanager.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviewmanager/src/clockviewmanager.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,8 +19,9 @@
// System includes
#include <HbMainWindow>
#include <HbInstance>
-#include <hbapplication> // hbapplication
-#include <hbactivitymanager> // hbactivitymanager
+#include <HbApplication>
+#include <HbActivityManager>
+#include <HbToolBar>
// User includes
#include "clockviewmanager.h"
@@ -29,6 +30,11 @@
#include "clockcommon.h"
#include "clockdatatypes.h"
#include "clockworldview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockviewmanagerTraces.h"
+#endif
+
/*!
\class ClockViewManager
@@ -48,6 +54,7 @@
mAppControllerIf(controllerIf),
mWorldClockView(0)
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY );
// Activity Reason from Activity Manager
int activityReason = qobject_cast<HbApplication*>(qApp)->activateReason();
@@ -86,6 +93,7 @@
this, SLOT(loadOtherViews()));
}
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT );
}
/*!
@@ -93,7 +101,9 @@
*/
ClockViewManager::~ClockViewManager()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY );
// No implementation yet.
+OstTraceFunctionExit0( DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT );
}
/*!
@@ -103,6 +113,7 @@
*/
void ClockViewManager::showView(ClockViews view)
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_SHOWVIEW_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
switch (view) {
@@ -130,6 +141,7 @@
default:
break;
}
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_SHOWVIEW_EXIT );
}
/*!
@@ -137,6 +149,7 @@
*/
void ClockViewManager::loadMainView()
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADMAINVIEW_ENTRY );
bool loadSuccess;
// Construct the document loader instance
@@ -148,12 +161,16 @@
// Find the main view.
mMainView = static_cast<ClockMainView *> (
docLoader->findWidget(CLOCK_MAIN_VIEW));
+
+ // Disable animation effect on toolbar.
+ HbEffect::disable(mMainView->toolBar()->graphicsItem());
// Setup the view.
mMainView->setupView(mAppControllerIf, docLoader);
// Set the main view to the window
hbInstance->allMainWindows().first()->addView(mMainView);
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADMAINVIEW_EXIT );
}
/*!
@@ -161,6 +178,7 @@
*/
void ClockViewManager::loadWorldClockView()
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_ENTRY );
// Construct the document loader instance
ClockDocLoader *docLoader = new ClockDocLoader();
@@ -172,8 +190,12 @@
// Get the world list view.
mWorldClockView = static_cast<ClockWorldView *> (
docLoader->findWidget(CLOCK_WORLD_VIEW));
+
+ // Disable animation effect on toolbar.
+ HbEffect::disable(mWorldClockView->toolBar()->graphicsItem());
mWorldClockView->setupView(mAppControllerIf, docLoader);
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_EXIT );
}
/*!
@@ -181,6 +203,7 @@
*/
void ClockViewManager::loadOtherViews()
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADOTHERVIEWS_ENTRY );
mMainView->setupAfterViewReady();
// Load world clock view
@@ -191,6 +214,13 @@
disconnect(
window, SIGNAL(viewReady()),
this, SLOT(loadOtherViews()));
+
+ // 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
+ // NotesApplication object needs to emit applicationReady Signal.
+ emit appReady();
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADOTHERVIEWS_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviewmanager/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviewmanager/traces/clockdocloaderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,19 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKDOCLOADERTRACES_H__
+#define __CLOCKDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce5
+
+#define CLOCKDOCLOADER_CREATEOBJECT_ENTRY 0x8a0001
+#define CLOCKDOCLOADER_CREATEOBJECT_EXIT 0x8a0002
+#define DUP1_CLOCKDOCLOADER_CREATEOBJECT_EXIT 0x8a0003
+#define DUP2_CLOCKDOCLOADER_CREATEOBJECT_EXIT 0x8a0004
+#define DUP3_CLOCKDOCLOADER_CREATEOBJECT_EXIT 0x8a0005
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviewmanager/traces/clockviewmanagerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKVIEWMANAGERTRACES_H__
+#define __CLOCKVIEWMANAGERTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce5
+
+#define CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY 0x8a0006
+#define CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT 0x8a0007
+#define DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY 0x8a0008
+#define DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT 0x8a0009
+#define CLOCKVIEWMANAGER_SHOWVIEW_ENTRY 0x8a000a
+#define CLOCKVIEWMANAGER_SHOWVIEW_EXIT 0x8a000b
+#define CLOCKVIEWMANAGER_LOADMAINVIEW_ENTRY 0x8a000c
+#define CLOCKVIEWMANAGER_LOADMAINVIEW_EXIT 0x8a000d
+#define CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_ENTRY 0x8a000e
+#define CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_EXIT 0x8a000f
+#define CLOCKVIEWMANAGER_LOADOTHERVIEWS_ENTRY 0x8a0010
+#define CLOCKVIEWMANAGER_LOADOTHERVIEWS_EXIT 0x8a0011
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviewmanager/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,19 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKDOCLOADER_CREATEOBJECT_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKDOCLOADER_CREATEOBJECT_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADMAINVIEW_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADMAINVIEW_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADOTHERVIEWS_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADOTHERVIEWS_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_SHOWVIEW_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_SHOWVIEW_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKDOCLOADER_CREATEOBJECT_EXIT=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CLOCKDOCLOADER_CREATEOBJECT_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP3_CLOCKDOCLOADER_CREATEOBJECT_EXIT=0x5
--- a/clock/clockui/clockviews/clockviews.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/clockviews.pro Mon Aug 23 16:00:50 2010 +0100
@@ -32,7 +32,8 @@
../clockalarmeditor/inc \
../clockwidget/clockwidgetimpl/inc \
../clockcityselectionlist/inc \
- ../inc
+ ../inc \
+ ./traces
DEPENDPATH += \
./inc \
--- a/clock/clockui/clockviews/data/style/clockhomecityitem.css Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/data/style/clockhomecityitem.css Mon Aug 23 16:00:50 2010 +0100
@@ -7,8 +7,6 @@
ClockHomeCityItem::dayNightIcon{
top: -var(hb-param-margin-gene-top);
left: -var(hb-param-margin-gene-left);
- right: var(hb-param-margin-gene-middle-horizontal);
- bottom: var(hb-param-margin-gene-bottom);
fixed-height: var(hb-param-graphic-size-primary-large);
fixed-width: var(hb-param-graphic-size-primary-large);
@@ -16,32 +14,37 @@
ClockHomeCityItem::dateText{
top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-middle-horizontal);
+
text-height: var(hb-param-text-height-tiny);
font-variant: secondary;
text-align: left;
}
-ClockHomeCityItem::cityText{
- top: -var(hb-param-margin-gene-middle-vertical);
- right: var(hb-param-margin-gene-middle-horizontal);
- text-height: var(hb-param-text-height-primary);
- font-variant: primary;
- text-align: left;
-}
-
ClockHomeCityItem::dstIcon{
- top: -var(hb-param-margin-gene-top);
+ left: -var(hb-param-margin-gene-middle-horizontal);
right: var(hb-param-margin-gene-right);
fixed-height: var(hb-param-graphic-size-secondary);
fixed-width: var(hb-param-graphic-size-secondary);
}
+ClockHomeCityItem::cityText{
+ top: -var(hb-param-margin-gene-middle-vertical);
+ bottom: var(hb-param-margin-gene-bottom);
+
+ text-height: var(hb-param-text-height-primary);
+ font-variant: primary;
+ text-align: left;
+ size-policy: expanding;
+}
+
ClockHomeCityItem::timeText{
+ left = -var(hb-param-margin-gene-middle-horizontal);
right: var(hb-param-margin-gene-right);
+
text-height: var(hb-param-text-height-tiny);
font-variant: secondary;
text-align: right;
- fixed-width: 16un;
-}
+ size-policy: minimum-expanding;
+}
\ No newline at end of file
--- a/clock/clockui/clockviews/data/style/clockhomecityitem.widgetml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/data/style/clockhomecityitem.widgetml Mon Aug 23 16:00:50 2010 +0100
@@ -2,40 +2,42 @@
<layout name="homecity-portrait" type="mesh">
<meshitem src="dayNightIcon" srcEdge="TOP" dst="" dstEdge="TOP" />
<meshitem src="dayNightIcon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="dayNightIcon" srcEdge="RIGHT" dst="dateText" dstEdge="LEFT" />
-
+
<meshitem src="dateText" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="dateText" srcEdge="LEFT" dst="dayNightIcon" dstEdge="RIGHT" />
<meshitem src="dateText" srcEdge="RIGHT" dst="dstIcon" dstEdge="LEFT" />
-
+
+ <meshitem src="dstIcon" srcEdge="TOP" dst="dateText" dstEdge="TOP" />
+ <meshitem src="dstIcon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+ <meshitem src="cityText" srcEdge="TOP" dst="dateText" dstEdge="BOTTOM" />
<meshitem src="cityText" srcEdge="LEFT" dst="dateText" dstEdge="LEFT" />
- <meshitem src="cityText" srcEdge="BOTTOM" dst="dayNightIcon" dstEdge="BOTTOM" />
+ <meshitem src="cityText" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
<meshitem src="cityText" srcEdge="RIGHT" dst="timeText" dstEdge="LEFT" />
-
- <meshitem src="dstIcon" srcEdge="CENTERV" dst="dateText" dstEdge="CENTERV" />
- <meshitem src="dstIcon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
+
<meshitem src="timeText" srcEdge="TOP" dst="cityText" dstEdge="TOP" />
<meshitem src="timeText" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
</layout>
<layout name="homecity-landscape" type="mesh">
<meshitem src="dayNightIcon" srcEdge="TOP" dst="" dstEdge="TOP" />
<meshitem src="dayNightIcon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="dayNightIcon" srcEdge="RIGHT" dst="dateText" dstEdge="LEFT" />
- <meshitem src="dateText" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="dateText" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="dateText" srcEdge="LEFT" dst="dayNightIcon" dstEdge="RIGHT" />
<meshitem src="dateText" srcEdge="RIGHT" dst="timeText" dstEdge="LEFT" />
-
+
+ <meshitem src="timeText" srcEdge="TOP" dst="dateText" dstEdge="TOP" />
+ <meshitem src="timeText" srcEdge="RIGHT" dst="dstIcon" dstEdge="LEFT" spacing="0.0un"/>
+
+ <meshitem src="dstIcon" srcEdge="TOP" dst="dateText" dstEdge="TOP" />
+ <meshitem src="dstIcon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+ <meshitem src="cityText" srcEdge="TOP" dst="dateText" dstEdge="BOTTOM" />
<meshitem src="cityText" srcEdge="LEFT" dst="dateText" dstEdge="LEFT" />
- <meshitem src="cityText" srcEdge="BOTTOM" dst="dayNightIcon" dstEdge="BOTTOM" />
- <meshitem src="cityText" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
- <meshitem src="dstIcon" srcEdge="CENTERV" dst="timeText" dstEdge="CENTERV" />
- <meshitem src="dstIcon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
- <meshitem src="timeText" srcEdge="CENTERV" dst="dateText" dstEdge="CENTERV" />
- <meshitem src="timeText" srcEdge="TOP" dst="dateText" dstEdge="TOP" />
- <meshitem src="timeText" srcEdge="RIGHT" dst="dstIcon" dstEdge="LEFT" />
+ <meshitem src="cityText" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+ <meshitem src="cityText" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
</layout>
</hbwidget>
--- a/clock/clockui/clockviews/data/style/clockhomecityitem_color.css Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/data/style/clockhomecityitem_color.css Mon Aug 23 16:00:50 2010 +0100
@@ -1,47 +1,15 @@
ClockHomeCityItem::dateText{
- color: var(qtc_list_item_content_normal);
-}
-
-ClockHomeCityItem::dateText[state="pressed"]{
- color: var(qtc_list_item_pressed);
-}
-
-ClockHomeCityItem::dateText[state="disabled"]{
- color: var(qtc_list_item_disabled);
+ color: var(qtc_groupbox_normal);
}
ClockHomeCityItem::cityText{
- color: var(qtc_list_item_title_normal);
-}
-
-ClockHomeCityItem::cityText[state="pressed"]{
- color: var(qtc_list_item_pressed);
-}
-
-ClockHomeCityItem::cityText[state="disabled"]{
- color: var(qtc_list_item_disabled);
+ color: var(qtc_groupbox_normal);
}
ClockHomeCityItem::dstIcon{
- color: var(qtc_list_item_title_normal);
-}
-
-ClockHomeCityItem::dstIcon[state="pressed"]{
- color: var(qtc_list_item_pressed);
-}
-
-ClockHomeCityItem::dstIcon[state="disabled"]{
- color: var(qtc_list_item_disabled);
+ color: var(qtc_groupbox_normal);
}
ClockHomeCityItem::timeText{
- color: var(qtc_list_item_content_normal);
-}
-
-ClockHomeCityItem::timeText[state="pressed"]{
- color: var(qtc_list_item_pressed);
-}
-
-ClockHomeCityItem::timeText[state="disabled"]{
- color: var(qtc_list_item_disabled);
+ color: var(qtc_groupbox_normal);
}
\ No newline at end of file
--- a/clock/clockui/clockviews/data/style/hblistviewitem.css Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/data/style/hblistviewitem.css Mon Aug 23 16:00:50 2010 +0100
@@ -1,69 +1,69 @@
-HbListViewItem:portrait{
+HbListViewItem[layoutName="citylist"]:portrait{
layout: citylist-portrait;
}
-HbListViewItem:landscape{
+HbListViewItem[layoutName="citylist"]:landscape{
layout: citylist-landscape;
}
-HbListViewItem[layoutName="citylist-portrait"]::icon-1{
+HbListViewItem[layoutName="citylist"]::icon-1{
top: -var(hb-param-margin-gene-top);
left: -var(hb-param-margin-gene-left);
- right: var(hb-param-margin-gene-middle-horizontal);
- bottom: var(hb-param-margin-gene-bottom);
fixed-height: var(hb-param-graphic-size-primary-large);
fixed-width: var(hb-param-graphic-size-primary-large);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-1{
+HbListViewItem[layoutName="citylist"]::text-1{
top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-middle-horizontal);
+
text-height: var(hb-param-text-height-tiny);
font-variant: secondary;
text-align: left;
}
-HbListViewItem[layoutName="citylist-portrait"]::text-2{
- top: -var(hb-param-margin-gene-middle-vertical);
- right: var(hb-param-margin-gene-middle-horizontal);
- text-height: var(hb-param-text-height-primary);
- font-variant: primary;
- text-align: left;
-}
-
-HbListViewItem[layoutName="citylist-portrait"]::text-3{
- top: -var(hb-param-margin-gene-middle-vertical);
- right: var(hb-param-margin-gene-right);
- bottom: var(hb-param-margin-gene-bottom);
-
- text-height: var(hb-param-text-height-tiny);
- font-variant: secondary;
- text-align: left;
-}
-
-HbListViewItem[layoutName="citylist-landscape"]::text-3{
- right: var(hb-param-margin-gene-right);
-
- text-height: var(hb-param-text-height-tiny);
- font-variant: secondary;
- text-align: right;
- fixed-width: 24un;
-}
-
-HbListViewItem[layoutName="citylist-portrait"]::icon-2{
+HbListViewItem[layoutName="citylist"]::icon-2{
top: -var(hb-param-margin-gene-top);
+ left: -var(hb-param-margin-gene-middle-horizontal);
right: var(hb-param-margin-gene-right);
fixed-height: var(hb-param-graphic-size-secondary);
fixed-width: var(hb-param-graphic-size-secondary);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-4{
+HbListViewItem[layoutName="citylist"]::text-2{
+ top: -var(hb-param-margin-gene-middle-vertical);
+ bottom: var(hb-param-margin-gene-middle-vertical);
+
+ text-height: var(hb-param-text-height-primary);
+ font-variant: primary;
+ text-align: left;
+}
+
+HbListViewItem[layoutName="citylist"]::text-3{
+ bottom: var(hb-param-margin-gene-bottom);
+ text-height: var(hb-param-text-height-tiny);
+ font-variant: secondary;
+}
+
+HbListViewItem[layoutName="citylist"]::text-3:portrait {
+ text-align: left;
+ size-policy: preferred;
+}
+
+HbListViewItem[layoutName="citylist"]::text-3:landscape {
+ text-align: right;
+ size-policy: maximum;
+}
+
+HbListViewItem[layoutName="citylist"]::text-4{
+ left = -var(hb-param-margin-gene-middle-horizontal);
right: var(hb-param-margin-gene-right);
+
text-height: var(hb-param-text-height-tiny);
font-variant: secondary;
text-align: right;
- fixed-width: 16un;
-}
+ size-policy: maximum;
+}
\ No newline at end of file
--- a/clock/clockui/clockviews/data/style/hblistviewitem.widgetml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/data/style/hblistviewitem.widgetml Mon Aug 23 16:00:50 2010 +0100
@@ -4,48 +4,49 @@
<meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP" />
<meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="icon-1" srcEdge="RIGHT" dst="text-1" dstEdge="LEFT" />
-
+
<meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="text-1" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT" />
<meshitem src="text-1" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" />
-
+
+ <meshitem src="icon-2" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="icon-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+ <meshitem src="text-2" srcEdge="TOP" dst="text-1" dstEdge="BOTTOM" />
<meshitem src="text-2" srcEdge="LEFT" dst="text-1" dstEdge="LEFT" />
- <meshitem src="text-2" srcEdge="BOTTOM" dst="icon-1" dstEdge="BOTTOM" />
- <meshitem src="text-2" srcEdge="RIGHT" dst="text-4" dstEdge="LEFT" />
-
- <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT" />
- <meshitem src="text-3" srcEdge="TOP" dst="text-2" dstEdge="BOTTOM" />
-
- <meshitem src="icon-2" srcEdge="CENTERV" dst="text-1" dstEdge="CENTERV" />
- <meshitem src="icon-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
+
+ <meshitem src="text-3" srcEdge="LEFT" dst="text-1" dstEdge="LEFT" />
+ <meshitem src="text-3" srcEdge="RIGHT" dst="text-2" dstEdge="RIGHT" />
+ <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+
<meshitem src="text-4" srcEdge="TOP" dst="text-2" dstEdge="TOP" />
+ <meshitem src="text-4" srcEdge="LEFT" dst="text-2" dstEdge="RIGHT" />
<meshitem src="text-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
</layout>
-
+
<layout name="citylist-landscape" type="mesh">
<meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP" />
<meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="icon-1" srcEdge="RIGHT" dst="text-1" dstEdge="LEFT" />
<meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="text-1" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT" />
<meshitem src="text-1" srcEdge="RIGHT" dst="text-4" dstEdge="LEFT" />
+
+ <meshitem src="text-4" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-top)" />
+ <meshitem src="text-4" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" />
+
+ <meshitem src="icon-2" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="icon-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="text-2" srcEdge="TOP" dst="text-1" dstEdge="BOTTOM" />
<meshitem src="text-2" srcEdge="LEFT" dst="text-1" dstEdge="LEFT" />
- <meshitem src="text-2" srcEdge="BOTTOM" dst="icon-1" dstEdge="BOTTOM" />
+ <meshitem src="text-2" srcEdge="BOTTOM" dst="text-3" dstEdge="BOTTOM" />
<meshitem src="text-2" srcEdge="RIGHT" dst="text-3" dstEdge="LEFT" />
- <meshitem src="text-3" srcEdge="BOTTOM" dst="text-2" dstEdge="BOTTOM" />
- <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
- <meshitem src="icon-2" srcEdge="CENTERV" dst="text-4" dstEdge="CENTERV" />
- <meshitem src="icon-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
- <meshitem src="text-4" srcEdge="CENTERV" dst="text-1" dstEdge="CENTERV" />
- <meshitem src="text-4" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" />
+ <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+ <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
</layout>
--- a/clock/clockui/clockviews/data/style/hblistviewitem_color.css Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/data/style/hblistviewitem_color.css Mon Aug 23 16:00:50 2010 +0100
@@ -1,35 +1,35 @@
-HbListViewItem[layoutName="citylist-portrait"]::text-4{
+HbListViewItem[layoutName="citylist"]::text-4{
color: var(qtc_list_item_content_normal);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-4[state="pressed"]{
+HbListViewItem[layoutName="citylist"]::text-4[state="pressed"]{
color: var(qtc_list_item_pressed);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-4[state="disabled"]{
+HbListViewItem[layoutName="citylist"]::text-4[state="disabled"]{
color: var(qtc_list_item_disabled);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-2{
+HbListViewItem[layoutName="citylist"]::text-2{
color: var(qtc_list_item_title_normal);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-2[state="pressed"]{
+HbListViewItem[layoutName="citylist"]::text-2[state="pressed"]{
color: var(qtc_list_item_pressed);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-2[state="disabled"]{
+HbListViewItem[layoutName="citylist"]::text-2[state="disabled"]{
color: var(qtc_list_item_disabled);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-1{
+HbListViewItem[layoutName="citylist"]::text-1{
color: var(qtc_list_item_content_normal);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-1[state="pressed"]{
+HbListViewItem[layoutName="citylist"]::text-1[state="pressed"]{
color: var(qtc_list_item_pressed);
}
-HbListViewItem[layoutName="citylist-portrait"]::text-1[state="disabled"]{
+HbListViewItem[layoutName="citylist"]::text-1[state="disabled"]{
color: var(qtc_list_item_disabled);
}
\ No newline at end of file
--- a/clock/clockui/clockviews/data/xml/clockmainview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/data/xml/clockmainview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -26,12 +26,14 @@
<sizehint height="var(hb-param-text-height-primary)" type="MINIMUM" width="37.7un"/>
<sizehint height="var(hb-param-text-height-primary)" type="MAXIMUM" width="49.7un"/>
<string locid="txt_clk_main_view_list_no_alarms_set" name="plainText" value="No alarm set"/>
+ <fontspec name="fontSpec" role="Undefined" textheight="expr(var(hb-param-text-height-primary) )"/>
</widget>
<widget name="dateLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<real name="z" value="19"/>
<sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED" width="expr(var(hb-param-screen-width)-53.73un-4un)"/>
<string name="plainText" value="Mon 18.05.2009"/>
+ <fontspec name="fontSpec" role="Undefined" textheight="expr(var(hb-param-text-height-tiny) )"/>
</widget>
<widget name="alarmListView" type="HbListView">
<widget name="prototype" role="HbAbstractView:prototype" type="HbListViewItem">
@@ -39,7 +41,7 @@
</widget>
<real name="z" value="21"/>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
- <sizehint height="47.7612un" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) )"/>
+ <sizehint height="15.52239un" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) )"/>
</widget>
<widget name="horizontalDivider" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -52,13 +54,32 @@
<icon iconName="qtg_graf_input_h_swipe" name="icon"/>
<real name="z" value="2"/>
</widget>
- <widget name="placeLabel" type="HbLabel">
- <enums name="alignment" value="AlignAbsolute|AlignRight|AlignTrailing"/>
+ <widget name="placeLabel" type="HbWidget">
+ <widget name="placetext" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizepolicy horizontalPolicy="Maximum" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED"/>
+ <sizehint height="var(hb-param-text-height-tiny)" type="MINIMUM"/>
+ <string name="plainText" value="India +5:30 GMT"/>
+ </widget>
+ <widget name="dstIcon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon iconName=" " name="icon"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-graphic-size-secondary)" type="FIXED" width="var(hb-param-graphic-size-secondary)"/>
+ </widget>
<enums name="layoutDirection" value="LeftToRight"/>
<real name="z" value="2"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="expr(var(hb-param-text-height-tiny) )" type="PREFERRED" width="18.58295un"/>
- <string name="plainText" value="united kingdom 0:00 GMT"/>
+ <sizepolicy horizontalPolicy="Maximum" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="expr(var(hb-param-text-height-tiny) )" type="PREFERRED" width="21.49254un"/>
+ <fontspec name="fontSpec" role="Undefined" textheight="expr(var(hb-param-text-height-tiny) )"/>
+ <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-middle-horizontal)" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <stretchitem stretchfactor="1"/>
+ <linearitem itemname="placetext"/>
+ <linearitem itemname="dstIcon"/>
+ <stretchitem stretchfactor="1"/>
+ </layout>
</widget>
<layout type="anchor">
<anchoritem dst="clockWidget" dstEdge="TOP" spacing="2un" src="" srcEdge="TOP"/>
@@ -67,14 +88,14 @@
<anchoritem dst="noAlarmLabel" dstEdge="BOTTOM" spacing="-35.26739un" src="" srcEdge="BOTTOM"/>
<anchoritem dst="dateLabel" dstEdge="LEFT" spacing="2un" src="" srcEdge="LEFT"/>
<anchoritem dst="dateLabel" dstEdge="TOP" spacing="29.73761un" src="" srcEdge="TOP"/>
- <anchoritem dst="alarmListView" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmListView" dstEdge="BOTTOM" spacing="-18un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmListView" dstEdge="LEFT" spacing="-0.44776un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmListView" dstEdge="BOTTOM" spacing="-18.51493un" src="" srcEdge="BOTTOM"/>
<anchoritem dst="horizontalDivider" dstEdge="LEFT" spacing="6.1194un" src="" srcEdge="LEFT"/>
<anchoritem dst="horizontalDivider" dstEdge="BOTTOM" spacing="-9.70896un" src="" srcEdge="BOTTOM"/>
<anchoritem dst="verticalDivider" dstEdge="RIGHT" spacing="-8.80597un" src="" srcEdge="RIGHT"/>
<anchoritem dst="verticalDivider" dstEdge="BOTTOM" spacing="-2.84328un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="placeLabel" dstEdge="TOP" spacing="35.07463un" src="" srcEdge="TOP"/>
- <anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="-16.04392un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="placeLabel" dstEdge="TOP" spacing="28.20896un" src="" srcEdge="TOP"/>
+ <anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="-6.71642un" src="" srcEdge="RIGHT"/>
</layout>
</widget>
<widget name="viewToolbar" role="HbView:toolBar" type="HbToolBar">
@@ -85,7 +106,7 @@
<widget name="viewMenu" role="HbView:menu" type="HbMenu">
<ref object="settingsAction" role="HbWidget:addAction"/>
</widget>
- <string locid="txt_common_common_clock" name="title" value="Clock"/>
+ <string locid="txt_clock_main_view_title_clock" name="title" value="Clock"/>
</widget>
<section name="portrait">
<widget name="alarmListView" type="HbListView">
@@ -94,13 +115,29 @@
<widget name="dateLabel" type="HbLabel">
<sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
</widget>
+ <widget name="clockWidget" plugin="clockwidgetplugin" type="ClockWidget">
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="31.9un" type="FIXED" width="31.9un"/>
+ </widget>
+ <widget name="placeLabel" type="HbWidget">
+ <sizehint height="expr(var(hb-param-text-height-tiny) )" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - 4un )"/>
+ </widget>
+ <widget name="verticalDivider" type="HbLabel">
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="horizontalDivider" type="HbLabel">
+ <icon iconName="qtg_graf_divider_h_thin" name="icon"/>
+ <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
+ <sizepolicy horizontalPolicy="Minimum" horizontalStretch="1" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="0.5un" type="PREFERRED" width="21.49254un"/>
+ </widget>
<widget name="clockMainViewWidget" role="HbView:widget" type="HbWidget">
<layout type="anchor">
<anchoritem dst="clockWidget" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="" srcEdge="TOP"/>
<anchoritem dst="clockWidget" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
<anchoritem dst="dateLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="" srcEdge="LEFT"/>
<anchoritem dst="dateLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="clockWidget" srcEdge="BOTTOM"/>
- <anchoritem dst="dateLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="dateLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right) )" src="" srcEdge="RIGHT"/>
<anchoritem dst="noAlarmLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="" srcEdge="LEFT"/>
<anchoritem dst="noAlarmLabel" dstEdge="CENTERV" spacing="0un" src="alarmListView" srcEdge="CENTERV"/>
<anchoritem dst="alarmListView" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
@@ -114,32 +151,31 @@
<anchoritem dst="horizontalDivider" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
<anchoritem dst="placeLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="" srcEdge="LEFT"/>
<anchoritem dst="placeLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="dateLabel" srcEdge="BOTTOM"/>
- <anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right) )" src="" srcEdge="RIGHT"/>
</layout>
</widget>
- <widget name="placeLabel" type="HbLabel">
- <sizehint height="expr(var(hb-param-text-height-tiny) )" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - 4un )"/>
- <enums name="alignment" value="AlignAbsolute|AlignVCenter|AlignHCenter"/>
- </widget>
- <widget name="clockWidget" plugin="clockwidgetplugin" type="ClockWidget">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="31.9un" type="FIXED" width="31.9un"/>
- </widget>
- <widget name="horizontalDivider" type="HbLabel">
- <icon iconName="qtg_graf_divider_h_thin" name="icon"/>
- <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
- <sizepolicy horizontalPolicy="Minimum" horizontalStretch="1" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="0.5un" type="PREFERRED" width="21.49254un"/>
- </widget>
- <widget name="verticalDivider" type="HbLabel">
- <bool name="visible" value="TRUE"/>
- </widget>
</section>
<section name="landscape">
<widget name="alarmListView" type="HbListView">
<sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<sizehint type="MAXIMUM" width="53.73un"/>
</widget>
+ <widget name="clockWidget" plugin="clockwidgetplugin" type="ClockWidget">
+ <sizehint height="expr(var(hb-param-screen-short-edge) - var(hb-param-widget-chrome-height) - var(hb-param-widget-toolbar-height) - 12.75un )" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - var(hb-param-widget-chrome-height) - var(hb-param-widget-toolbar-height) - 12.75un )"/>
+ </widget>
+ <widget name="placeLabel" type="HbWidget">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ </widget>
+ <widget name="verticalDivider" type="HbLabel">
+ <icon iconName="qtg_graf_divider_v_thin" name="icon"/>
+ <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint type="PREFERRED" width="0.1un"/>
+ </widget>
+ <widget name="horizontalDivider" type="HbLabel">
+ <sizehint height="0.5un" type="PREFERRED" width="21.49254un"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
<widget name="clockMainViewWidget" role="HbView:widget" type="HbWidget">
<layout type="anchor">
<anchoritem dst="alarmListView" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
@@ -151,7 +187,7 @@
<anchoritem dst="clockWidget" dstEdge="CENTERH" spacing="0un" src="dateLabel" srcEdge="CENTERH"/>
<anchoritem dst="dateLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="" srcEdge="LEFT"/>
<anchoritem dst="dateLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-bottom) )" src="clockWidget" srcEdge="BOTTOM"/>
- <anchoritem dst="dateLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="verticalDivider" srcEdge="LEFT"/>
+ <anchoritem dst="dateLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right) )" src="verticalDivider" srcEdge="LEFT"/>
<anchoritem dst="verticalDivider" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
<anchoritem dst="verticalDivider" dstEdge="RIGHT" spacing="0un" src="alarmListView" srcEdge="LEFT"/>
<anchoritem dst="verticalDivider" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
@@ -159,27 +195,10 @@
<anchoritem dst="horizontalDivider" dstEdge="BOTTOM" spacing="-7.17164un" src="" srcEdge="BOTTOM"/>
<anchoritem dst="placeLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="" srcEdge="LEFT"/>
<anchoritem dst="placeLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="dateLabel" srcEdge="BOTTOM"/>
- <anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="alarmListView" srcEdge="LEFT"/>
- <anchoritem dst="placeLabel" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-bottom) )" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right) )" src="alarmListView" srcEdge="LEFT"/>
+ <anchoritem dst="placeLabel" dstEdge="BOTTOM" spacing="-expr(var(hb-param-margin-gene-bottom) )" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
- <widget name="placeLabel" type="HbLabel">
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <enums name="alignment" value="AlignAbsolute|AlignVCenter|AlignHCenter"/>
- </widget>
- <widget name="clockWidget" plugin="clockwidgetplugin" type="ClockWidget">
- <sizehint height="expr(var(hb-param-screen-short-edge) - var(hb-param-widget-chrome-height) - var(hb-param-widget-toolbar-height) - 12.75un )" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - var(hb-param-widget-chrome-height) - var(hb-param-widget-toolbar-height) - 12.75un )"/>
- </widget>
- <widget name="horizontalDivider" type="HbLabel">
- <sizehint height="0.5un" type="PREFERRED" width="21.49254un"/>
- <bool name="visible" value="TRUE"/>
- </widget>
- <widget name="verticalDivider" type="HbLabel">
- <icon iconName="qtg_graf_divider_v_thin" name="icon"/>
- <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint type="PREFERRED" width="0.1un"/>
- </widget>
</section>
<metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/clock/clockui/clockviews/data/xml/clockworldview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/data/xml/clockworldview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -44,7 +44,7 @@
<ref object="addCityAction" role="HbToolBar:addAction"/>
</widget>
<widget name="viewMenu" role="HbView:menu" type="HbMenu"/>
- <string locid="txt_common_common_clock" name="title" value="Clock"/>
+ <string locid="txt_clock_main_view_title_clock" name="title" value="Clock"/>
</widget>
<section name="portrait-homecity">
<widget name="worldClockViewWidget" role="HbView:widget" type="HbWidget">
--- a/clock/clockui/clockviews/inc/clockmainview.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/inc/clockmainview.h Mon Aug 23 16:00:50 2010 +0100
@@ -81,6 +81,7 @@
private:
QTimer *mTickTimer;
+ QColor mLabelColorGroup;
HbAction *mRefreshMainView;
HbAction *mDisplayWorldClockView;
@@ -90,6 +91,7 @@
HbLabel *mDayLabel;
HbLabel *mPlaceLabel;
+ HbLabel *mDstIcon;
HbLabel *mHorizontalDivider;
HbLabel *mVerticalDivider;
ClockWidget *mClockWidget;
--- a/clock/clockui/clockviews/src/clockalarmlistitemprototype.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/src/clockalarmlistitemprototype.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,11 +23,17 @@
#include "clockalarmlistitemprototype.h"
#include "clockdatatypes.h"
#include "clockmainview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockalarmlistitemprototypeTraces.h"
+#endif
+
/*!
\class ClockAlarmListItemPrototype
- TODO: Write description here.
+ This is the prototype class for the items in the list view. This class is
+ responsible for creating any cutom item types.
*/
/*!
@@ -38,7 +44,9 @@
ClockAlarmListItemPrototype::ClockAlarmListItemPrototype(QGraphicsItem *parent)
:HbListViewItem(parent)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT );
}
/*!
@@ -46,7 +54,9 @@
*/
ClockAlarmListItemPrototype::~ClockAlarmListItemPrototype()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT );
}
/*!
@@ -56,6 +66,7 @@
*/
void ClockAlarmListItemPrototype::updateChildItems()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY );
// First allow the base class to update.
HbListViewItem::updateChildItems();
@@ -74,6 +85,7 @@
malarmIconItem->setIcon(alarmIconPath);
}
}
+ OstTraceFunctionExit0( CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_EXIT );
}
/*!
@@ -83,6 +95,7 @@
*/
ClockAlarmListItemPrototype *ClockAlarmListItemPrototype::createItem()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTITEMPROTOTYPE_CREATEITEM_ENTRY );
return new ClockAlarmListItemPrototype(*this);
}
@@ -91,9 +104,11 @@
*/
void ClockAlarmListItemPrototype::handleAlarmStatusChanged()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_ENTRY );
int row = modelIndex().row();
emit static_cast<ClockAlarmListItemPrototype*>(
prototype())->alarmStatusHasChanged(row);
+ OstTraceFunctionExit0( CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockviews/src/clockalarmlistmodel.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/src/clockalarmlistmodel.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -30,6 +30,11 @@
#include "clockalarmlistitemprototype.h"
#include "clockappcontrollerif.h"
#include "settingsutility.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockalarmlistmodelTraces.h"
+#endif
+
// Constants
const int KOneHourInMinute(60);
@@ -54,6 +59,7 @@
mSourceModel(0),
mAppControllerIf(controllerIf)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY );
// Construct the source model.
mSourceModel = new QStandardItemModel(0, 1, this);
@@ -71,6 +77,7 @@
connect(
mTickTimer, SIGNAL(timeout()),
this, SLOT(updateRemainingTime()));
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT );
}
/*!
@@ -78,10 +85,12 @@
*/
ClockAlarmListModel::~ClockAlarmListModel()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY );
if (mSourceModel) {
delete mSourceModel;
mSourceModel = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT );
}
/*!
@@ -89,8 +98,10 @@
*/
void ClockAlarmListModel::populateModel()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_POPULATEMODEL_ENTRY );
// Populate the model in a different thread.
QTimer::singleShot(1, this, SLOT(populateSourceModel()));
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_POPULATEMODEL_EXIT );
}
/*!
Returns the source model to be used with clock main view.
@@ -100,6 +111,8 @@
*/
QAbstractItemModel *ClockAlarmListModel::sourceModel()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_SOURCEMODEL_ENTRY );
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_SOURCEMODEL_EXIT );
return mSourceModel;
}
@@ -108,6 +121,7 @@
*/
void ClockAlarmListModel::populateSourceModel()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_ENTRY );
// Clear the model if it has any data already.
mSourceModel->clear();
mSourceModel->setColumnCount(1);
@@ -138,6 +152,7 @@
// Start the Timer for 1 minute.
mTickTimer->start(60000 - 1000 * QTime::currentTime().second());
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_EXIT );
}
/*!
@@ -147,6 +162,7 @@
*/
QString ClockAlarmListModel::calculateRemainingTime(AlarmInfo alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_ENTRY );
QDateTime currentDateTime = QDateTime::currentDateTime();
QDateTime alarmTime = QDateTime(
alarmInfo.alarmDateTime, alarmInfo.nextDueTime);
@@ -199,6 +215,7 @@
formatTimeNote = hbTrId("txt_clock_main_view_setlabel_in_1days");
timeNote = formatTimeNote.arg(QString::number(dayleft));
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_EXIT );
return timeNote;
}
@@ -210,6 +227,7 @@
*/
int ClockAlarmListModel::getRemainingSeconds(QDateTime &alarmDateTime)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_GETREMAININGSECONDS_ENTRY );
int remainingSeconds;
QDateTime currentDateTime = QDateTime::currentDateTime();
@@ -232,6 +250,7 @@
}
remainingSeconds = alarmTimeInSec - currentTimeInSec;
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_GETREMAININGSECONDS_EXIT );
return remainingSeconds;
}
@@ -244,6 +263,7 @@
*/
void ClockAlarmListModel::updateSourceModel(int alarmId)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_ENTRY );
Q_UNUSED(alarmId)
int alarmInfoCount;
int modelCount;
@@ -331,6 +351,7 @@
mTickTimer->stop();
}
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_EXIT );
}
/*!
@@ -340,6 +361,7 @@
*/
void ClockAlarmListModel::updateRemainingTime()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_ENTRY );
// Get the list of pending clock alarms from server.
AlarmInfo alarmInfo;
for (int row = 0; row < mSourceModel->rowCount(); row++) {
@@ -365,6 +387,7 @@
}
// Start the Timer for 1 minute.
mTickTimer->start(60000);
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_EXIT );
}
/*!
@@ -377,6 +400,7 @@
QStringList ClockAlarmListModel::getDisplayStringListforAlarmItem(
AlarmInfo alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_ENTRY );
QStringList displayStringList;
QString timeString;
if (Snoozed == alarmInfo.alarmState) {
@@ -400,8 +424,8 @@
QString remainingTime = calculateRemainingTime(alarmInfo);
displayStringList.append(remainingTime);
} else {
- // TODO: localization
- displayStringList.append(QString("In-active"));
+ displayStringList.append(
+ hbTrId("txt_clock_main_view_setlabel_inactive"));
}
QString alarmDescription = alarmInfo.alarmDesc;
@@ -428,6 +452,7 @@
}
}
displayStringList.append(repeatTypeString);
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_EXIT );
return displayStringList;
}
@@ -438,6 +463,7 @@
*/
void ClockAlarmListModel::appendAlarmToModel(AlarmInfo alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_ENTRY );
// Append only pending alarms to the model.
if (Notified != alarmInfo.alarmState) {
QStandardItem *item = new QStandardItem();
@@ -481,6 +507,7 @@
mSourceModel->appendRow(item);
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_EXIT );
}
/*!
@@ -493,6 +520,7 @@
void ClockAlarmListModel::updateAlarmDetails(
QModelIndex modelIndex, AlarmInfo alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_ENTRY );
if (Notified != alarmInfo.alarmState) {
QStringList displayStringList =
getDisplayStringListforAlarmItem(alarmInfo);
@@ -534,6 +562,7 @@
alarmData.append(alarmInfo.alarmStatus);
mSourceModel->setData(modelIndex, alarmData, AlarmDetails);
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_EXIT );
}
/*!
@@ -543,6 +572,7 @@
*/
int ClockAlarmListModel::getActiveAlarmCount()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_ENTRY );
int activeAlarmCount = 0;
for (int index = 0; index < mSourceModel->rowCount(); index++) {
// Get the data for the alarm.
@@ -552,6 +582,7 @@
activeAlarmCount++;
}
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_EXIT );
return activeAlarmCount;
}
// End of file --Don't remove this.
--- a/clock/clockui/clockviews/src/clockhomecityitem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/src/clockhomecityitem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,6 +26,11 @@
// User Includes.
#include "clockhomecityitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockhomecityitemTraces.h"
+#endif
+
/*!
\class ClockHomeCityItem
@@ -41,6 +46,7 @@
ClockHomeCityItem::ClockHomeCityItem(QGraphicsItem *parent) :
HbWidget(parent)
{
+ OstTraceFunctionEntry0( CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY );
// Path for widgetml and css files.
HbStyleLoader::registerFilePath(":/style/clockhomecityitem.css");
HbStyleLoader::registerFilePath(":/style/clockhomecityitem.widgetml");
@@ -49,9 +55,10 @@
// Set the frame to the homecity widget.
HbFrameItem *frame = new HbFrameItem(this);
frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
- frame->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox");
+ frame->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox_normal");
setBackgroundItem(frame->graphicsItem(), -2);
+ OstTraceFunctionExit0( CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT );
}
/*!
@@ -59,9 +66,11 @@
*/
ClockHomeCityItem::~ClockHomeCityItem()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY );
HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem.css");
HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem.widgetml");
HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem_color.css");
+ OstTraceFunctionExit0( DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT );
}
/*!
@@ -72,6 +81,7 @@
*/
void ClockHomeCityItem::setHomeCityItemData(const QVariantMap &itemData)
{
+ OstTraceFunctionEntry0( CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_ENTRY );
if (!itemData.isEmpty()) {
QMapIterator<QString, QVariant> iter(itemData);
while (iter.hasNext()) {
@@ -121,6 +131,7 @@
}
repolish();
}
+ OstTraceFunctionExit0( CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockviews/src/clockmainview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/src/clockmainview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,8 +26,9 @@
#include <HbListView>
#include <HbNotificationDialog>
#include <HbStyleLoader>
-#include <hbapplication> // hbapplication
-#include <hbactivitymanager> // activity manager
+#include <HbColorScheme>
+#include <HbApplication> // hbapplication
+#include <HbActivityManager> // activity manager
// User includes
#include "clockmainview.h"
@@ -42,6 +43,11 @@
#include "clockalarmlistitemprototype.h"
#include "clockalarmlistmodel.h"
#include "clockwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockmainviewTraces.h"
+#endif
+
/*!
\class ClockMainView
@@ -61,7 +67,9 @@
mIsLongTop(false),
mIsScreenShotCapruted(false)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT );
}
/*!
@@ -69,6 +77,7 @@
*/
ClockMainView::~ClockMainView()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
mDocLoader = 0;
@@ -84,6 +93,7 @@
HbStyleLoader::unregisterFilePath(
":/style/clockalarmlistitemprototype_color.css");
+ OstTraceFunctionExit0( DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT );
}
/*!
@@ -96,12 +106,16 @@
void ClockMainView::setupView(
ClockAppControllerIf &controllerIf, ClockDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
mTimezoneClient = controllerIf.timezoneClient();
mSettingsUtility = controllerIf.settingsUtility();
mAlarmClient = controllerIf.alarmClient();
+
+ // Fetch the color group of the labels from the theme.
+ mLabelColorGroup = HbColorScheme::color("qtc_view_normal");
// Create the model.
mAlarmListModel = new ClockAlarmListModel(*mAppControllerIf, this);
@@ -137,6 +151,7 @@
// Get the "No alarm set" label.
mNoAlarmLabel = qobject_cast<HbLabel *> (
mDocLoader->findWidget(CLOCK_NOALARMLABEL));
+ mNoAlarmLabel->setTextColor(mLabelColorGroup);
// Get the alarm's list.
mAlarmList = qobject_cast<HbListView *> (
@@ -185,7 +200,10 @@
}
mDayLabel = static_cast<HbLabel *> (mDocLoader->findObject("dateLabel"));
- mPlaceLabel = static_cast<HbLabel *> (mDocLoader->findObject("placeLabel"));
+ mDayLabel->setTextColor(mLabelColorGroup);
+ mPlaceLabel = static_cast<HbLabel *> (mDocLoader->findObject("placetext"));
+ mPlaceLabel->setTextColor(mLabelColorGroup);
+ mDstIcon = static_cast<HbLabel *> (mDocLoader->findObject("dstIcon"));
mClockWidget = static_cast<ClockWidget*> (
mDocLoader->findObject(CLOCK_WIDGET));
@@ -212,6 +230,7 @@
// connect for the aboutToQuit events on application Exit as to call saveActivity
connect(qobject_cast<HbApplication*>(qApp), SIGNAL(aboutToQuit()), this, SLOT(saveActivity()));
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SETUPVIEW_EXIT );
}
/*!
@@ -220,6 +239,7 @@
*/
void ClockMainView::setupAfterViewReady()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SETUPAFTERVIEWREADY_ENTRY );
// Get the toolbar/menu actions.
mRefreshMainView = static_cast<HbAction *> (
mDocLoader->findObject("alarmsAction"));
@@ -260,6 +280,7 @@
mTimezoneClient, SIGNAL(cityUpdated()),
this, SLOT(updatePlaceLabel()));
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SETUPAFTERVIEWREADY_EXIT );
}
/*!
@@ -270,6 +291,7 @@
*/
void ClockMainView::handleAlarmStatusChanged(int row)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_ENTRY );
AlarmInfo alarmInfo;
// Get the data for the alarm.
@@ -311,6 +333,7 @@
mSelectedItem = -1;
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_EXIT );
}
/*!
@@ -319,8 +342,10 @@
*/
void ClockMainView::refreshMainView()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_REFRESHMAINVIEW_ENTRY );
mRefreshMainView->setChecked(true);
+ OstTraceFunctionExit0( CLOCKMAINVIEW_REFRESHMAINVIEW_EXIT );
}
/*!
@@ -329,9 +354,11 @@
*/
void ClockMainView::displayWorldClockView()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_ENTRY );
mAppControllerIf->switchToView(WorldClock);
// no need to capture the screenshot here as it's done in ClockViewManager::showView
+ OstTraceFunctionExit0( CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_EXIT );
}
/*!
@@ -340,11 +367,13 @@
*/
void ClockMainView::addNewAlarm()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_ADDNEWALARM_ENTRY );
ClockAlarmEditor *alarmEditor = new ClockAlarmEditor(*mAlarmClient);
alarmEditor->showAlarmEditor();
// capture screenshot for future use, if application
// is exited/Quit from alarmEditor
captureScreenShot(true);
+ OstTraceFunctionExit0( CLOCKMAINVIEW_ADDNEWALARM_EXIT );
}
/*!
@@ -353,12 +382,14 @@
*/
void ClockMainView::openSettings()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_OPENSETTINGS_ENTRY );
// Create the settings view.
ClockSettingsView *settingsView = new ClockSettingsView(this);
settingsView->loadSettingsView();
// capture screenshot for future use, if application
// is exited/Quit from alarmEditor
captureScreenShot(true);
+ OstTraceFunctionExit0( CLOCKMAINVIEW_OPENSETTINGS_EXIT );
}
/*!
@@ -368,6 +399,7 @@
*/
void ClockMainView::handleActivated(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLEACTIVATED_ENTRY );
if(!mIsLongTop) {// Get the data for the alarm.
int row = index.row();
QList<QVariant> alarmData =
@@ -383,6 +415,7 @@
// is exited/Quit from alarmEditor
captureScreenShot(true);
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLEACTIVATED_EXIT );
}
/*!
@@ -395,6 +428,7 @@
void ClockMainView::handleLongPress(
HbAbstractViewItem *item, const QPointF &coords)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLELONGPRESS_ENTRY );
mIsLongTop = true;
AlarmInfo alarmInfo;
@@ -424,6 +458,7 @@
itemContextMenu->setPreferredPos(coords);
itemContextMenu->setAttribute(Qt::WA_DeleteOnClose, true );
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLELONGPRESS_EXIT );
}
/*!
@@ -432,6 +467,7 @@
*/
void ClockMainView::deleteAlarm()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_DELETEALARM_ENTRY );
if (-1 < mSelectedItem) {
// Get the data for the alarm.
QList<QVariant> alarmData = mAlarmListModel->sourceModel()->
@@ -440,6 +476,7 @@
mAlarmClient->deleteAlarm(alarmId);
mSelectedItem = -1;
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_DELETEALARM_EXIT );
}
/*!
@@ -447,6 +484,7 @@
*/
void ClockMainView::removeSnoozedAlarm()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_REMOVESNOOZEDALARM_ENTRY );
if (-1 < mSelectedItem) {
// Get the data for the alarm.
QList<QVariant> alarmData = mAlarmListModel->sourceModel()->
@@ -455,16 +493,19 @@
mAlarmClient->deleteSnoozedAlarm(alarmId);
mSelectedItem = -1;
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_REMOVESNOOZEDALARM_EXIT );
}
void ClockMainView::updateView()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_UPDATEVIEW_ENTRY );
// Update the place label.
updatePlaceLabel(mTimezoneClient->timeUpdateOn());
// Update date label.
updateDateLabel();
// Update clock widget.
updateClockWidget();
+ OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATEVIEW_EXIT );
}
/*!
@@ -474,6 +515,7 @@
*/
void ClockMainView::updatePlaceLabel(int autoTimeUpdate)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_UPDATEPLACELABEL_ENTRY );
if (-1 == autoTimeUpdate) {
autoTimeUpdate = mTimezoneClient->timeUpdateOn();
}
@@ -520,15 +562,19 @@
gmtOffset += tr(" ");
// Append GMT sting.
- gmtOffset += hbTrId("txt_common_common_gmt");
+ gmtOffset += hbTrId("txt_clock_main_view_setlabel_gmt");
// Append space.
gmtOffset += tr(" ");
// Append DST info.
+ HbIcon *dstIcon = new HbIcon("");
if (currentZoneInfo.dstOn) {
- gmtOffset += hbTrId("txt_common_setlabel_dst");
+ dstIcon->setIconName("qtg_mono_day_light_saving_time");
+ dstIcon->setColor(mLabelColorGroup);
+
}
+ mDstIcon->setIcon(*dstIcon);
// Update the labels with the correct info.
mPlaceLabel->clear();
@@ -540,6 +586,7 @@
currentZoneInfo.cityName + tr(", ")
+ currentZoneInfo.countryName + tr(" ") + gmtOffset);
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATEPLACELABEL_EXIT );
}
/*!
@@ -547,6 +594,7 @@
*/
void ClockMainView::handleAlarmListDisplay()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_ENTRY );
// alarmEditor closed reset the captured screenshot, current view is main view now
captureScreenShot(false);
// Get the list of pending clock alarms from server.
@@ -570,6 +618,7 @@
}
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_EXIT );
}
/*!
@@ -580,6 +629,7 @@
void ClockMainView::checkOrientationAndLoadSection(
Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_ENTRY );
bool success;
// If horizontal, load the landscape section.
if (Qt::Horizontal == orientation) {
@@ -606,6 +656,7 @@
hideAlarmList(false);
}
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_EXIT );
}
/*!
@@ -613,9 +664,11 @@
*/
void ClockMainView::selectedMenuAction(HbAction *action)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SELECTEDMENUACTION_ENTRY );
if (action == mDeleteAction) {
deleteAlarm();
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SELECTEDMENUACTION_EXIT );
}
/*!
@@ -623,13 +676,16 @@
*/
void ClockMainView::handleMenuClosed()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLEMENUCLOSED_ENTRY );
mIsLongTop = false;
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLEMENUCLOSED_EXIT );
}
/*!
Sets the model to the alarm list.
*/
void ClockMainView::setmodel()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SETMODEL_ENTRY );
// Set the model.
if (mAlarmList) {
mAlarmList->setModel(mAlarmListModel->sourceModel());
@@ -642,6 +698,7 @@
mAlarmList->setLayoutName("layout-alarmlist");
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SETMODEL_EXIT );
}
/*!
@@ -651,6 +708,7 @@
*/
void ClockMainView::hideAlarmList(bool hide)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HIDEALARMLIST_ENTRY );
if (hide) {
mNoAlarmLabel->show();
mAlarmList->hide();
@@ -660,6 +718,7 @@
mNoAlarmLabel->hide();
mHideAlarmList = false;
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HIDEALARMLIST_EXIT );
}
/*!
@@ -667,6 +726,7 @@
*/
void ClockMainView::updateDateLabel()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_UPDATEDATELABEL_ENTRY );
// Get the current datetime.
QDateTime dateTime = QDateTime::currentDateTime();
// Get the day name.
@@ -680,6 +740,7 @@
dayDateString += currentDate;
mDayLabel->setPlainText(dayDateString);
+ OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATEDATELABEL_EXIT );
}
/*!
@@ -695,6 +756,7 @@
*/
void ClockMainView::updateClockWidget()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_UPDATECLOCKWIDGET_ENTRY );
QStringList clockType;
int index = mSettingsUtility->clockType(clockType);
int zeroIndex(0);
@@ -713,6 +775,7 @@
}
mClockWidget->updateTime();
+ OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATECLOCKWIDGET_EXIT );
}
/*!
@@ -721,12 +784,14 @@
*/
void ClockMainView::captureScreenShot(bool captureScreenShot)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_CAPTURESCREENSHOT_ENTRY );
// check if screen shot needs to be captured
if (captureScreenShot) {
mScreenShot.clear();
mScreenShot.insert("screenshot", QPixmap::grabWidget(mainWindow(), mainWindow()->rect()));
}
mIsScreenShotCapruted = captureScreenShot; // set mIsScreenShotCapruted set validity of screenshot
+ OstTraceFunctionExit0( CLOCKMAINVIEW_CAPTURESCREENSHOT_EXIT );
}
/*!
@@ -734,6 +799,7 @@
*/
void ClockMainView::saveActivity()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SAVEACTIVITY_ENTRY );
// Get a pointer to activity Manager
HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
// check if a valid screenshot is already captured
@@ -752,5 +818,6 @@
if ( !ok ) {
qFatal("Add failed" );
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SAVEACTIVITY_EXIT );
}
// End of file --Don't remove.
--- a/clock/clockui/clockviews/src/clockworldview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockviews/src/clockworldview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -36,6 +36,11 @@
#include "timezoneclient.h"
#include "clockcityselectionlist.h"
#include "clockhomecityitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockworldviewTraces.h"
+#endif
+
/*!
\class ClockWorldView
@@ -52,6 +57,7 @@
:HbView(parent),
mSelectedItem(-1)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY );
// Timer for updating list data upon time change/update.
mRefreshTimer = new QTimer();
connect(
@@ -60,6 +66,7 @@
// Create the model.
mCityListModel = new QStandardItemModel();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT );
}
/*!
@@ -67,6 +74,7 @@
*/
ClockWorldView::~ClockWorldView()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
mDocLoader = 0;
@@ -78,6 +86,7 @@
HbStyleLoader::unregisterFilePath(":/style/hblistviewitem.css");
HbStyleLoader::unregisterFilePath(":/style/hblistviewitem.widgetml");
HbStyleLoader::unregisterFilePath(":/style/hblistviewitem_color.css");
+ OstTraceFunctionExit0( DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT );
}
/*!
@@ -91,6 +100,7 @@
ClockAppControllerIf &controllerIf,
ClockDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
@@ -131,7 +141,7 @@
HbStyleLoader::registerFilePath(":/style/hblistviewitem.css");
HbStyleLoader::registerFilePath(":/style/hblistviewitem.widgetml");
HbStyleLoader::registerFilePath(":/style/hblistviewitem_color.css");
- mCityListView->setLayoutName("citylist-portrait");
+ mCityListView->setLayoutName("citylist");
mCityListView->setModel(mCityListModel);
// Get the toolbar/menu actions.
@@ -189,6 +199,7 @@
mAddCityAction->setEnabled(false);
mAddCityMenuAction->setVisible(false);
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_SETUPVIEW_EXIT );
}
/*!
@@ -196,6 +207,7 @@
*/
void ClockWorldView::refreshCityList()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_REFRESHCITYLIST_ENTRY );
updateCurrentLocationInfo(mTimezoneClient->timeUpdateOn());
int cityInfoCount = mCityInfoList.count();
@@ -214,6 +226,7 @@
// Start the timer again for one minute.
QTimer::singleShot(60 * 1000, this, SLOT(refreshCityList()));
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_REFRESHCITYLIST_EXIT );
}
/*!
@@ -221,6 +234,7 @@
*/
void ClockWorldView::updateCurrentLocationInfo(int networkTime)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
Qt::Orientation currentOrienation = window->orientation();
loadSection(currentOrienation);
@@ -233,7 +247,7 @@
QString value;
QDateTime dateTime = QDateTime::currentDateTime();
- // Show the date. If date is current date then show 'today'.
+ // Show the date.
QString dateInfo = dateTime.toString(
mSettingsUtility->dateFormatString());
itemList.insert(value.setNum(ClockHomeCityItem::Date), dateInfo);
@@ -260,12 +274,15 @@
ClockHomeCityItem::DayNightIndicator), dayNightIconPath);
// Show dst icon when needed.
+ QString dstIconPath = " ";
if (homeCity.dstOn) {
- QString dstIconPath = "qtg_mono_day_light_saving_time";
- itemList.insert(value.setNum(ClockHomeCityItem::Dst), dstIconPath);
+ dstIconPath = "qtg_mono_day_light_saving_time";
}
+ itemList.insert(value.setNum(ClockHomeCityItem::Dst), dstIconPath);
+
mHomeCityWidget->setHomeCityItemData(itemList);
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_EXIT );
}
/*!
@@ -278,6 +295,7 @@
void ClockWorldView::handleItemLongPressed(
HbAbstractViewItem *item, const QPointF &coords)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_ENTRY );
// Get the ndex of the selected item.
mSelectedItem = item->modelIndex().row();
@@ -294,6 +312,7 @@
itemContextMenu->open(this, SLOT(selectedMenuAction(HbAction*)));
itemContextMenu->setPreferredPos(coords);
itemContextMenu->setAttribute( Qt::WA_DeleteOnClose,true);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_EXIT );
}
/*!
@@ -302,6 +321,7 @@
*/
void ClockWorldView::handleAddLocation()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEADDLOCATION_ENTRY );
// Construct the city selection list and show the same.
mCitySelectionList = new ClockCitySelectionList(mTimezoneClient, this);
connect(
@@ -310,6 +330,7 @@
// Show the city list.
mCitySelectionList->showCityList();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEADDLOCATION_EXIT );
}
/*!
@@ -318,6 +339,7 @@
*/
void ClockWorldView::handleDeleteAction()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEDELETEACTION_ENTRY );
if (-1 != mSelectedItem) {
QStandardItem *item = mCityListModel->takeItem(mSelectedItem);
mCityListModel->removeRow(mSelectedItem);
@@ -338,6 +360,7 @@
mAddCityMenuAction->setVisible(true);
}
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEDELETEACTION_EXIT );
}
/*!
@@ -345,6 +368,7 @@
*/
void ClockWorldView::handleSetAsCurrentLocationAction()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_ENTRY );
// Get the info of the selected item.
LocationInfo newHomeCity = mCityInfoList[mSelectedItem];
@@ -380,6 +404,7 @@
// Update the data file.
mTimezoneClient->saveLocations(mCityInfoList);
mSelectedItem = -1;
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_EXIT );
}
/*!
@@ -390,6 +415,7 @@
*/
void ClockWorldView::handleCitySelected(LocationInfo info)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLECITYSELECTED_ENTRY );
// Info is invalid if the timezoneId is set to -1. We don't do anything in
// that case.
if (-1 != info.timezoneId) {
@@ -437,6 +463,7 @@
}
// Cleanup.
mCitySelectionList->deleteLater();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLECITYSELECTED_EXIT );
}
/*!
@@ -444,7 +471,9 @@
*/
void ClockWorldView::showAlarmsView()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_SHOWALARMSVIEW_ENTRY );
mAppControllerIf->switchToView(MainView);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_SHOWALARMSVIEW_EXIT );
}
/*!
@@ -453,7 +482,9 @@
*/
void ClockWorldView::refreshWorldView()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_REFRESHWORLDVIEW_ENTRY );
mDisplayWorldClockView->setChecked(true);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_REFRESHWORLDVIEW_EXIT );
}
/*!
@@ -461,6 +492,7 @@
*/
void ClockWorldView::loadSection(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_LOADSECTION_ENTRY );
bool networkTime = mTimezoneClient->timeUpdateOn();
bool loadSuccess;
if (Qt::Horizontal == orientation) {
@@ -496,6 +528,7 @@
}
}
mCityListView->update();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_LOADSECTION_EXIT );
}
/*!
@@ -504,9 +537,11 @@
*/
void ClockWorldView::updateAllLocationInfo()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_ENTRY );
updateCurrentLocationInfo(mTimezoneClient->timeUpdateOn());
updateCityList();
refreshCityList();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_EXIT );
}
/*!
@@ -514,11 +549,13 @@
*/
void ClockWorldView::selectedMenuAction(HbAction *action)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_SELECTEDMENUACTION_ENTRY );
if (action == mSetCurrentLocationAction) {
handleSetAsCurrentLocationAction();
} else if (action == mRemoveCityAction) {
handleDeleteAction();
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_SELECTEDMENUACTION_EXIT );
}
/*!
@@ -528,6 +565,7 @@
*/
QModelIndex ClockWorldView::addCityToList(const LocationInfo& locationInfo)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_ADDCITYTOLIST_ENTRY );
// Here we construct a model item and add it to the list model.
QStandardItem *modelItem = new QStandardItem();
@@ -541,6 +579,7 @@
index, getCityListDecorationString(locationInfo),
Qt::DecorationRole);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_ADDCITYTOLIST_EXIT );
return index;
}
@@ -553,10 +592,13 @@
*/
bool ClockWorldView::isDay(QDateTime dateTime)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_ISDAY_ENTRY );
// It is day between 6:00 AM and 6:00 PM. Otherwise night.
if (17 < dateTime.time().hour() || 6 > dateTime.time().hour()) {
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_ISDAY_EXIT );
return false;
}
+ OstTraceFunctionExit0( DUP1_CLOCKWORLDVIEW_ISDAY_EXIT );
return true;
}
@@ -568,6 +610,7 @@
QVariantList ClockWorldView::getCityListDisplayString(
const LocationInfo& locationInfo)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_ENTRY );
QVariantList displayString;
QDateTime dateTime = QDateTime::currentDateTime();
dateTime = dateTime.toUTC();
@@ -618,7 +661,7 @@
}
else if ( hours ){
if(hours == 1 ) {
- displayFormat = hbTrId("txt_clock_dblist_val_1_hr");
+ displayFormat = hbTrId("txt_clock_dblist_daily_val_ln_hr");
offsetString = displayFormat.arg(hours);
offsetDifference += offsetString;
}
@@ -629,7 +672,7 @@
}
}
else if (minutes){
- displayFormat = hbTrId("txt_clock_dblist_val_1_mins");
+ displayFormat = hbTrId("txt_clock_dblist_daily_val_ln_mins");
offsetString = displayFormat.arg(minutes);
offsetDifference += offsetString;
} else {
@@ -643,6 +686,7 @@
QString timeInfo = dateTime.toString(mSettingsUtility->timeFormatString());
displayString.append(timeInfo);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_EXIT );
return displayString;
}
@@ -654,13 +698,13 @@
QVariantList ClockWorldView::getCityListDecorationString(
const LocationInfo& locationInfo)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_ENTRY );
QVariantList decorationString;
QDateTime dateTime = QDateTime::currentDateTime();
dateTime = dateTime.toUTC();
dateTime = dateTime.addSecs(locationInfo.zoneOffset * 60);
// Display day/night indicators.
- // TODO: change the icon name for night when available.
QString dayNightIconPath = "";
if (isDay(dateTime)) {
dayNightIconPath = "qtg_large_clock";
@@ -670,10 +714,13 @@
decorationString.append(HbIcon(dayNightIconPath));
// Show dst icon when needed.
+ QString dstIconPath = "";
if (locationInfo.dstOn) {
- QString dstIconPath = "qtg_mono_day_light_saving_time";
- decorationString.append(HbIcon(dstIconPath));
+ dstIconPath = "qtg_mono_day_light_saving_time";
}
+ decorationString.append(HbIcon(dstIconPath));
+
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_EXIT );
return decorationString;
}
@@ -683,12 +730,15 @@
*/
void ClockWorldView::updateCityList()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATECITYLIST_ENTRY );
int cityInfoCount = mCityInfoList.count();
if (cityInfoCount) {
bool deletion = false;
+ bool valueUpdated = false;
int index;
LocationInfo currentCity = mTimezoneClient->getCurrentZoneInfoL();
+ // Remove the new home city if it is already added to the list.
for (index = 0; index < cityInfoCount; index++) {
if (currentCity.timezoneId == mCityInfoList.at(index).timezoneId
&& (currentCity.cityName ==
@@ -720,7 +770,23 @@
}
}
+
+ for (int index = 0; index < cityInfoCount; ++index) {
+ int tzid = mCityInfoList[index].timezoneId;
+ bool dst = mTimezoneClient->isDSTOnL(tzid);
+ if (dst != mCityInfoList[index].dstOn) {
+ mCityInfoList[index].dstOn = dst;
+ valueUpdated = true;
+ }
+
+ }
+
+ if (valueUpdated) {
+ // Update the data file.
+ mTimezoneClient->saveLocations(mCityInfoList);
+ }
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATECITYLIST_EXIT );
}
// End of file-- Don't delete.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockalarmlistitemprototypeTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,23 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKALARMLISTITEMPROTOTYPETRACES_H__
+#define __CLOCKALARMLISTITEMPROTOTYPETRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY 0x8a0001
+#define CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT 0x8a0002
+#define DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY 0x8a0003
+#define DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT 0x8a0004
+#define CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY 0x8a0005
+#define CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_EXIT 0x8a0006
+#define CLOCKALARMLISTITEMPROTOTYPE_CREATEITEM_ENTRY 0x8a0007
+#define CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_ENTRY 0x8a0008
+#define CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_EXIT 0x8a0009
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockalarmlistmodelTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,40 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKALARMLISTMODELTRACES_H__
+#define __CLOCKALARMLISTMODELTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY 0x8a000a
+#define CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT 0x8a000b
+#define DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY 0x8a000c
+#define DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT 0x8a000d
+#define CLOCKALARMLISTMODEL_POPULATEMODEL_ENTRY 0x8a000e
+#define CLOCKALARMLISTMODEL_POPULATEMODEL_EXIT 0x8a000f
+#define CLOCKALARMLISTMODEL_SOURCEMODEL_ENTRY 0x8a0010
+#define CLOCKALARMLISTMODEL_SOURCEMODEL_EXIT 0x8a0011
+#define CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_ENTRY 0x8a0012
+#define CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_EXIT 0x8a0013
+#define CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_ENTRY 0x8a0014
+#define CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_EXIT 0x8a0015
+#define CLOCKALARMLISTMODEL_GETREMAININGSECONDS_ENTRY 0x8a0016
+#define CLOCKALARMLISTMODEL_GETREMAININGSECONDS_EXIT 0x8a0017
+#define CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_ENTRY 0x8a0018
+#define CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_EXIT 0x8a0019
+#define CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_ENTRY 0x8a001a
+#define CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_EXIT 0x8a001b
+#define CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_ENTRY 0x8a001c
+#define CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_EXIT 0x8a001d
+#define CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_ENTRY 0x8a001e
+#define CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_EXIT 0x8a001f
+#define CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_ENTRY 0x8a0020
+#define CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_EXIT 0x8a0021
+#define CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_ENTRY 0x8a0022
+#define CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_EXIT 0x8a0023
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockhomecityitemTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKHOMECITYITEMTRACES_H__
+#define __CLOCKHOMECITYITEMTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY 0x8a0024
+#define CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT 0x8a0025
+#define DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY 0x8a0026
+#define DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT 0x8a0027
+#define CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_ENTRY 0x8a0028
+#define CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_EXIT 0x8a0029
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockmainviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,64 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKMAINVIEWTRACES_H__
+#define __CLOCKMAINVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY 0x8a002a
+#define CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT 0x8a002b
+#define DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY 0x8a002c
+#define DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT 0x8a002d
+#define CLOCKMAINVIEW_SETUPVIEW_ENTRY 0x8a002e
+#define CLOCKMAINVIEW_SETUPVIEW_EXIT 0x8a002f
+#define CLOCKMAINVIEW_SETUPAFTERVIEWREADY_ENTRY 0x8a0030
+#define CLOCKMAINVIEW_SETUPAFTERVIEWREADY_EXIT 0x8a0031
+#define CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_ENTRY 0x8a0032
+#define CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_EXIT 0x8a0033
+#define CLOCKMAINVIEW_REFRESHMAINVIEW_ENTRY 0x8a0034
+#define CLOCKMAINVIEW_REFRESHMAINVIEW_EXIT 0x8a0035
+#define CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_ENTRY 0x8a0036
+#define CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_EXIT 0x8a0037
+#define CLOCKMAINVIEW_ADDNEWALARM_ENTRY 0x8a0038
+#define CLOCKMAINVIEW_ADDNEWALARM_EXIT 0x8a0039
+#define CLOCKMAINVIEW_OPENSETTINGS_ENTRY 0x8a003a
+#define CLOCKMAINVIEW_OPENSETTINGS_EXIT 0x8a003b
+#define CLOCKMAINVIEW_HANDLEACTIVATED_ENTRY 0x8a003c
+#define CLOCKMAINVIEW_HANDLEACTIVATED_EXIT 0x8a003d
+#define CLOCKMAINVIEW_HANDLELONGPRESS_ENTRY 0x8a003e
+#define CLOCKMAINVIEW_HANDLELONGPRESS_EXIT 0x8a003f
+#define CLOCKMAINVIEW_DELETEALARM_ENTRY 0x8a0040
+#define CLOCKMAINVIEW_DELETEALARM_EXIT 0x8a0041
+#define CLOCKMAINVIEW_REMOVESNOOZEDALARM_ENTRY 0x8a0042
+#define CLOCKMAINVIEW_REMOVESNOOZEDALARM_EXIT 0x8a0043
+#define CLOCKMAINVIEW_UPDATEVIEW_ENTRY 0x8a0044
+#define CLOCKMAINVIEW_UPDATEVIEW_EXIT 0x8a0045
+#define CLOCKMAINVIEW_UPDATEPLACELABEL_ENTRY 0x8a0046
+#define CLOCKMAINVIEW_UPDATEPLACELABEL_EXIT 0x8a0047
+#define CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_ENTRY 0x8a0048
+#define CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_EXIT 0x8a0049
+#define CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_ENTRY 0x8a004a
+#define CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_EXIT 0x8a004b
+#define CLOCKMAINVIEW_SELECTEDMENUACTION_ENTRY 0x8a004c
+#define CLOCKMAINVIEW_SELECTEDMENUACTION_EXIT 0x8a004d
+#define CLOCKMAINVIEW_HANDLEMENUCLOSED_ENTRY 0x8a004e
+#define CLOCKMAINVIEW_HANDLEMENUCLOSED_EXIT 0x8a004f
+#define CLOCKMAINVIEW_SETMODEL_ENTRY 0x8a0050
+#define CLOCKMAINVIEW_SETMODEL_EXIT 0x8a0051
+#define CLOCKMAINVIEW_HIDEALARMLIST_ENTRY 0x8a0052
+#define CLOCKMAINVIEW_HIDEALARMLIST_EXIT 0x8a0053
+#define CLOCKMAINVIEW_UPDATEDATELABEL_ENTRY 0x8a0054
+#define CLOCKMAINVIEW_UPDATEDATELABEL_EXIT 0x8a0055
+#define CLOCKMAINVIEW_UPDATECLOCKWIDGET_ENTRY 0x8a0056
+#define CLOCKMAINVIEW_UPDATECLOCKWIDGET_EXIT 0x8a0057
+#define CLOCKMAINVIEW_CAPTURESCREENSHOT_ENTRY 0x8a0058
+#define CLOCKMAINVIEW_CAPTURESCREENSHOT_EXIT 0x8a0059
+#define CLOCKMAINVIEW_SAVEACTIVITY_ENTRY 0x8a005a
+#define CLOCKMAINVIEW_SAVEACTIVITY_EXIT 0x8a005b
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockworldviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,55 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKWORLDVIEWTRACES_H__
+#define __CLOCKWORLDVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY 0x8a005c
+#define CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT 0x8a005d
+#define DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY 0x8a005e
+#define DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT 0x8a005f
+#define CLOCKWORLDVIEW_SETUPVIEW_ENTRY 0x8a0060
+#define CLOCKWORLDVIEW_SETUPVIEW_EXIT 0x8a0061
+#define CLOCKWORLDVIEW_REFRESHCITYLIST_ENTRY 0x8a0062
+#define CLOCKWORLDVIEW_REFRESHCITYLIST_EXIT 0x8a0063
+#define CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_ENTRY 0x8a0064
+#define CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_EXIT 0x8a0065
+#define CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_ENTRY 0x8a0066
+#define CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_EXIT 0x8a0067
+#define CLOCKWORLDVIEW_HANDLEADDLOCATION_ENTRY 0x8a0068
+#define CLOCKWORLDVIEW_HANDLEADDLOCATION_EXIT 0x8a0069
+#define CLOCKWORLDVIEW_HANDLEDELETEACTION_ENTRY 0x8a006a
+#define CLOCKWORLDVIEW_HANDLEDELETEACTION_EXIT 0x8a006b
+#define CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_ENTRY 0x8a006c
+#define CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_EXIT 0x8a006d
+#define CLOCKWORLDVIEW_HANDLECITYSELECTED_ENTRY 0x8a006e
+#define CLOCKWORLDVIEW_HANDLECITYSELECTED_EXIT 0x8a006f
+#define CLOCKWORLDVIEW_SHOWALARMSVIEW_ENTRY 0x8a0070
+#define CLOCKWORLDVIEW_SHOWALARMSVIEW_EXIT 0x8a0071
+#define CLOCKWORLDVIEW_REFRESHWORLDVIEW_ENTRY 0x8a0072
+#define CLOCKWORLDVIEW_REFRESHWORLDVIEW_EXIT 0x8a0073
+#define CLOCKWORLDVIEW_LOADSECTION_ENTRY 0x8a0074
+#define CLOCKWORLDVIEW_LOADSECTION_EXIT 0x8a0075
+#define CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_ENTRY 0x8a0076
+#define CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_EXIT 0x8a0077
+#define CLOCKWORLDVIEW_SELECTEDMENUACTION_ENTRY 0x8a0078
+#define CLOCKWORLDVIEW_SELECTEDMENUACTION_EXIT 0x8a0079
+#define CLOCKWORLDVIEW_ADDCITYTOLIST_ENTRY 0x8a007a
+#define CLOCKWORLDVIEW_ADDCITYTOLIST_EXIT 0x8a007b
+#define CLOCKWORLDVIEW_ISDAY_ENTRY 0x8a007c
+#define CLOCKWORLDVIEW_ISDAY_EXIT 0x8a007d
+#define DUP1_CLOCKWORLDVIEW_ISDAY_EXIT 0x8a007e
+#define CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_ENTRY 0x8a007f
+#define CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_EXIT 0x8a0080
+#define CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_ENTRY 0x8a0081
+#define CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_EXIT 0x8a0082
+#define CLOCKWORLDVIEW_UPDATECITYLIST_ENTRY 0x8a0083
+#define CLOCKWORLDVIEW_UPDATECITYLIST_EXIT 0x8a0084
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,134 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_CREATEITEM_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETREMAININGSECONDS_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETREMAININGSECONDS_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_POPULATEMODEL_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_POPULATEMODEL_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_SOURCEMODEL_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_SOURCEMODEL_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_ADDNEWALARM_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_ADDNEWALARM_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CAPTURESCREENSHOT_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CAPTURESCREENSHOT_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_ENTRY=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_DELETEALARM_ENTRY=0x40
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_DELETEALARM_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEACTIVATED_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEACTIVATED_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_ENTRY=0x48
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLELONGPRESS_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLELONGPRESS_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEMENUCLOSED_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEMENUCLOSED_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HIDEALARMLIST_ENTRY=0x52
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HIDEALARMLIST_EXIT=0x53
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_OPENSETTINGS_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_OPENSETTINGS_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REFRESHMAINVIEW_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REFRESHMAINVIEW_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REMOVESNOOZEDALARM_ENTRY=0x42
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REMOVESNOOZEDALARM_EXIT=0x43
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SAVEACTIVITY_ENTRY=0x5a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SAVEACTIVITY_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SELECTEDMENUACTION_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SELECTEDMENUACTION_EXIT=0x4d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETMODEL_ENTRY=0x50
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETMODEL_EXIT=0x51
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETUPAFTERVIEWREADY_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETUPAFTERVIEWREADY_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETUPVIEW_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETUPVIEW_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATECLOCKWIDGET_ENTRY=0x56
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATECLOCKWIDGET_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEDATELABEL_ENTRY=0x54
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEDATELABEL_EXIT=0x55
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEPLACELABEL_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEPLACELABEL_EXIT=0x47
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEVIEW_ENTRY=0x44
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEVIEW_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_ADDCITYTOLIST_ENTRY=0x7a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_ADDCITYTOLIST_EXIT=0x7b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY=0x5c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT=0x5d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_ENTRY=0x81
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_EXIT=0x82
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_ENTRY=0x7f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_EXIT=0x80
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEADDLOCATION_ENTRY=0x68
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEADDLOCATION_EXIT=0x69
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLECITYSELECTED_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLECITYSELECTED_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEDELETEACTION_ENTRY=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEDELETEACTION_EXIT=0x6b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_ENTRY=0x6c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_EXIT=0x6d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_ISDAY_ENTRY=0x7c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_ISDAY_EXIT=0x7d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_LOADSECTION_ENTRY=0x74
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_LOADSECTION_EXIT=0x75
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_REFRESHCITYLIST_ENTRY=0x62
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_REFRESHCITYLIST_EXIT=0x63
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_REFRESHWORLDVIEW_ENTRY=0x72
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_REFRESHWORLDVIEW_EXIT=0x73
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SELECTEDMENUACTION_ENTRY=0x78
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SELECTEDMENUACTION_EXIT=0x79
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SETUPVIEW_ENTRY=0x60
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SETUPVIEW_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SHOWALARMSVIEW_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SHOWALARMSVIEW_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_ENTRY=0x76
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_EXIT=0x77
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATECITYLIST_ENTRY=0x83
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATECITYLIST_EXIT=0x84
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_ENTRY=0x64
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_EXIT=0x65
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY=0x5e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT=0x5f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWORLDVIEW_ISDAY_EXIT=0x7e
--- a/clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.pro Mon Aug 23 16:00:50 2010 +0100
@@ -33,10 +33,13 @@
}
}
-DEPENDPATH += ./inc \
- ./src
+DEPENDPATH += \
+ ./inc \
+ ./src
-INCLUDEPATH += ./inc
+INCLUDEPATH += \
+ ./inc \
+ ./traces
SOURCES += \
clockwidget.cpp \
--- a/clock/clockui/clockwidget/clockwidgetimpl/inc/analogclockwidget.h Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockwidget/clockwidgetimpl/inc/analogclockwidget.h Mon Aug 23 16:00:50 2010 +0100
@@ -28,28 +28,28 @@
class AnalogClockWidget : public HbWidget
{
- Q_OBJECT
+ Q_OBJECT
public:
- AnalogClockWidget(QGraphicsItem *parent = 0);
- virtual ~AnalogClockWidget();
+ AnalogClockWidget(QGraphicsItem *parent = 0);
+ virtual ~AnalogClockWidget();
public slots:
- void tick();
+ void tick();
-protected:
- void resizeEvent(QGraphicsSceneResizeEvent *event);
- void polish(HbStyleParameters& params);
-
-private:
- void updatePrimitives();
+public:
+ void setGeometry(const QRectF &rect);
private:
- QPointer<QTimer> mTimer;
- QPointer<HbIconItem> mClockBackground;
- QPointer<HbIconItem> mClockHourHand;
- QPointer<HbIconItem> mClockMinuteHand;
- QPointer<HbIconItem> mClockSecondHand;
+ void constructPrimitives();
+ void updatePrimitives();
+
+private:
+ QPointer<QTimer> mTimer;
+ QPointer<HbIconItem> mClockBackground;
+ QPointer<HbIconItem> mClockHourHand;
+ QPointer<HbIconItem> mClockMinuteHand;
+ QPointer<HbIconItem> mClockSecondHand;
};
#endif
--- a/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css Mon Aug 23 16:00:50 2010 +0100
@@ -9,7 +9,7 @@
AnalogClockWidget::clock_minute_hand {
size-policy:expanding expanding;
- zvalue: 1;
+ zvalue: 2;
}
AnalogClockWidget::clock_hour_hand {
@@ -19,5 +19,5 @@
AnalogClockWidget::clock_second_hand {
size-policy:expanding expanding;
- zvalue: 3;
+ zvalue: 1;
}
--- a/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.widgetml Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.widgetml Mon Aug 23 16:00:50 2010 +0100
@@ -5,20 +5,20 @@
<meshitem src="clock_background" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="0.0un" />
<meshitem src="clock_background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="0.0un" />
- <meshitem src="clock_hour_hand" srcEdge="TOP" dst="clock_background" dstEdge="TOP" spacing="0.0un" />
- <meshitem src="clock_hour_hand" srcEdge="BOTTOM" dst="clock_background" dstEdge="BOTTOM" spacing="0.0un" />
- <meshitem src="clock_hour_hand" srcEdge="LEFT" dst="clock_background" dstEdge="LEFT" spacing="0.0un" />
- <meshitem src="clock_hour_hand" srcEdge="RIGHT" dst="clock_background" dstEdge="RIGHT" spacing="0.0un" />
+ <meshitem src="clock_hour_hand" srcEdge="TOP" dst="" dstEdge="TOP" spacing="0.0un" />
+ <meshitem src="clock_hour_hand" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="0.0un" />
+ <meshitem src="clock_hour_hand" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="0.0un" />
+ <meshitem src="clock_hour_hand" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="0.0un" />
- <meshitem src="clock_minute_hand" srcEdge="TOP" dst="clock_background" dstEdge="TOP" spacing="0.0un" />
- <meshitem src="clock_minute_hand" srcEdge="BOTTOM" dst="clock_background" dstEdge="BOTTOM" spacing="0.0un" />
- <meshitem src="clock_minute_hand" srcEdge="LEFT" dst="clock_background" dstEdge="LEFT" spacing="0.0un" />
- <meshitem src="clock_minute_hand" srcEdge="RIGHT" dst="clock_background" dstEdge="RIGHT" spacing="0.0un" />
+ <meshitem src="clock_minute_hand" srcEdge="TOP" dst="" dstEdge="TOP" spacing="0.0un" />
+ <meshitem src="clock_minute_hand" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="0.0un" />
+ <meshitem src="clock_minute_hand" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="0.0un" />
+ <meshitem src="clock_minute_hand" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="0.0un" />
- <meshitem src="clock_second_hand" srcEdge="TOP" dst="clock_background" dstEdge="TOP" spacing="0.0un" />
- <meshitem src="clock_second_hand" srcEdge="BOTTOM" dst="clock_background" dstEdge="BOTTOM" spacing="0.0un" />
- <meshitem src="clock_second_hand" srcEdge="LEFT" dst="clock_background" dstEdge="LEFT" spacing="0.0un" />
- <meshitem src="clock_second_hand" srcEdge="RIGHT" dst="clock_background" dstEdge="RIGHT" spacing="0.0un" />
+ <meshitem src="clock_second_hand" srcEdge="TOP" dst="" dstEdge="TOP" spacing="0.0un" />
+ <meshitem src="clock_second_hand" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="0.0un" />
+ <meshitem src="clock_second_hand" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="0.0un" />
+ <meshitem src="clock_second_hand" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="0.0un" />
</layout>
</hbwidget>
--- a/clock/clockui/clockwidget/clockwidgetimpl/resource/digitalclockwidget_color.css Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/digitalclockwidget_color.css Mon Aug 23 16:00:50 2010 +0100
@@ -1,9 +1,9 @@
DigitalClockWidget::clockLabel{
- color: var(qtc_list_item_content_normal);
+ color: var(qtc_view_normal);
}
DigitalClockWidget::amPmLabel{
- color: var(qtc_list_item_content_normal);
+ color: var(qtc_view_normal);
}
\ No newline at end of file
--- a/clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,11 @@
// User includes
#include "analogclockwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "analogclockwidgetTraces.h"
+#endif
+
// Constants
const int clockUpdateInterval (1000); // msec
@@ -32,104 +37,165 @@
This class implements the analogclock widget which gets displayed
in the clockmainview when the clocktype is set to analog type.
-*/
+ */
/*!
Constructor.
\param parent The parent of type QGraphicsItem.
*/
-AnalogClockWidget::AnalogClockWidget(QGraphicsItem *parent)
- : HbWidget(parent)
+AnalogClockWidget::AnalogClockWidget(QGraphicsItem *parent) :
+ HbWidget(parent)
{
- bool result = HbStyleLoader::registerFilePath(":/resource/analogclockwidget.widgetml");
- result = HbStyleLoader::registerFilePath(":/resource/analogclockwidget.css");
-
- updatePrimitives();
- mTimer = new QTimer(this);
- connect(mTimer, SIGNAL(timeout()), SLOT(tick()));
- mTimer->start(clockUpdateInterval);
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY );
+ bool result = HbStyleLoader::registerFilePath(
+ ":/resource/analogclockwidget.widgetml");
+ result = HbStyleLoader::registerFilePath(
+ ":/resource/analogclockwidget.css");
+
+ constructPrimitives();
+ mTimer = new QTimer(this);
+ connect(mTimer, SIGNAL(timeout()), SLOT(tick()));
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT );
}
/*!
Destructor.
*/
AnalogClockWidget::~AnalogClockWidget()
-{
- mTimer->stop();
- HbStyleLoader::unregisterFilePath(":/resource");
+{
+ OstTraceFunctionEntry0( DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY );
+ mTimer->stop();
+ HbStyleLoader::unregisterFilePath(":/resource/analogclockwidget.widgetml");
+ HbStyleLoader::unregisterFilePath(":/resource/analogclockwidget.css");
+OstTraceFunctionExit0( DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT );
}
/*!
- Handles resize event from HbWidget
+ Constructs the widget primitive items.
*/
-void AnalogClockWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
+void AnalogClockWidget::constructPrimitives()
{
- QGraphicsWidget::resizeEvent(event);
- updatePrimitives();
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_ENTRY );
+ if (!mClockBackground) {
+ mClockBackground = new HbIconItem(
+ QLatin1String("qtg_graf_clock_day_bg"), this);
+ HbStyle::setItemName(
+ mClockBackground, QLatin1String("clock_background"));
+ }
+
+ if (!mClockHourHand) {
+ mClockHourHand = new HbIconItem(
+ QLatin1String("qtg_graf_clock_day_hour"), this);
+ HbStyle::setItemName(
+ mClockHourHand, QLatin1String("clock_hour_hand"));
+ }
+
+ if (!mClockMinuteHand) {
+ mClockMinuteHand = new HbIconItem(
+ QLatin1String("qtg_graf_clock_day_min"), this);
+ HbStyle::setItemName(
+ mClockMinuteHand, QLatin1String("clock_minute_hand"));
+ }
+
+ if (!mClockSecondHand) {
+ mClockSecondHand = new HbIconItem(
+ QLatin1String("qtg_graf_clock_day_sec"), this);
+ HbStyle::setItemName(
+ mClockSecondHand, QLatin1String("clock_second_hand"));
+ }
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_EXIT );
}
/*!
- @copydoc HbWidget::updatePrimitives()
+ Called on the derived classes to notify in cases when
+ the style primitives need to be updated.
*/
void AnalogClockWidget::updatePrimitives()
{
- if (!mClockBackground) {
- mClockBackground = new HbIconItem(QLatin1String("qtg_graf_clock_day_bg"), this);
- HbStyle::setItemName(mClockBackground, QLatin1String("clock_background"));
- }
-
- // Calculate angles for clock hands.
- QTime time = QTime::currentTime();
- qreal s = 6 * time.second();
- qreal m = 6 * (time.minute() + s/360);
- qreal h = 30 * ((time.hour() % 12) + m/360);
-
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY );
+ if (!mClockBackground) {
+ mClockBackground = new HbIconItem(
+ QLatin1String("qtg_graf_clock_day_bg"), this);
+ HbStyle::setItemName(
+ mClockBackground, QLatin1String("clock_background"));
+ }
+
if (!mClockHourHand) {
- mClockHourHand = new HbIconItem(QLatin1String("qtg_graf_clock_day_hour"), this);
- HbStyle::setItemName(mClockHourHand, QLatin1String("clock_hour_hand"));
- }
-
- int x = mClockHourHand->geometry().width()/2;
- int y = mClockHourHand->geometry().height()/2;
- mClockHourHand->setTransform(QTransform().translate(x, y).rotate(h).translate(-x, -y));
+ mClockHourHand = new HbIconItem(
+ QLatin1String("qtg_graf_clock_day_hour"), this);
+ HbStyle::setItemName(
+ mClockHourHand, QLatin1String("clock_hour_hand"));
+ }
+
+ if (!mClockMinuteHand) {
+ mClockMinuteHand = new HbIconItem(
+ QLatin1String("qtg_graf_clock_day_min"), this);
+ HbStyle::setItemName(
+ mClockMinuteHand, QLatin1String("clock_minute_hand"));
+ }
+
+ if (!mClockSecondHand) {
+ mClockSecondHand = new HbIconItem(
+ QLatin1String("qtg_graf_clock_day_sec"), this);
+ HbStyle::setItemName(
+ mClockSecondHand, QLatin1String("clock_second_hand"));
+ }
+
+ QRectF hourHandGeometry = mClockHourHand->geometry();
+ QRectF minHandGeometry = mClockMinuteHand->geometry();
+ QRectF secHandGeometry = mClockSecondHand->geometry();
+
+ if ((hourHandGeometry.width() && hourHandGeometry.height()) &&
+ (minHandGeometry.width() && minHandGeometry.height()) &&
+ (secHandGeometry.width() && secHandGeometry.height())) {
+ // Calculate angles for clock hands.
+ QTime curTime = QTime::currentTime();
+ qreal seconds = 6 * curTime.second();
+ qreal minutes = 6 * (curTime.minute() + seconds / 360);
+ qreal hours = 30 * ((curTime.hour() % 12) + minutes / 360);
- if (!mClockMinuteHand) {
- mClockMinuteHand = new HbIconItem(QLatin1String("qtg_graf_clock_day_min"), this);
- HbStyle::setItemName(mClockMinuteHand, QLatin1String("clock_minute_hand"));
- }
+ int x = hourHandGeometry.width()/2;
+ int y = hourHandGeometry.height()/2;
+ mClockHourHand->setTransform(
+ QTransform().translate(x, y).rotate(hours).translate(-x, -y));
+
+ x = minHandGeometry.width()/2;
+ y = minHandGeometry.height()/2;
+ mClockMinuteHand->setTransform(
+ QTransform().translate(x, y).rotate(minutes).translate(-x, -y));
- x = mClockMinuteHand->geometry().width()/2;
- y = mClockMinuteHand->geometry().height()/2;
- mClockMinuteHand->setTransform(QTransform().translate(x, y).rotate(m).translate(-x, -y));
-
-
- if (!mClockSecondHand) {
- mClockSecondHand = new HbIconItem(QLatin1String("qtg_graf_clock_day_sec"), this);
- HbStyle::setItemName(mClockSecondHand, QLatin1String("clock_second_hand"));
- }
-
- x = mClockSecondHand->geometry().width()/2;
- y = mClockSecondHand->geometry().height()/2;
- mClockSecondHand->setTransform(QTransform().translate(x, y).rotate(s).translate(-x, -y));
-
+ x = secHandGeometry.width()/2;
+ y = secHandGeometry.height()/2;
+ mClockSecondHand->setTransform(
+ QTransform().translate(x, y).rotate(seconds).translate(-x, -y));
+ }
+
+ if (!mTimer->isActive()) {
+ mTimer->start(clockUpdateInterval);
+ }
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_EXIT );
}
/*!
- Updates clock visualization according to current time
+ Updates clock visualization according to current time.
*/
void AnalogClockWidget::tick()
{
- updatePrimitives();
- update();
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_TICK_ENTRY );
+ updatePrimitives();
+ update();
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_TICK_EXIT );
}
/*!
- Handles polish event
+ Sets the item's geometry to rect.
*/
-void AnalogClockWidget::polish( HbStyleParameters& params )
-{
- HbWidget::polish(params);
- updatePrimitives();
-}
+void AnalogClockWidget::setGeometry(const QRectF &rect)
+{
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_SETGEOMETRY_ENTRY );
+ HbWidget::setGeometry(rect);
+ updatePrimitives();
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_SETGEOMETRY_EXIT );
+}
// End of file --Don't remove this.
--- a/clock/clockui/clockwidget/clockwidgetimpl/src/clockwidget.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockwidget/clockwidgetimpl/src/clockwidget.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,11 @@
#include "clockwidget.h"
#include "analogclockwidget.h"
#include "digitalclockwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockwidgetTraces.h"
+#endif
+
/*!
\class ClockWidget
@@ -36,7 +41,9 @@
: HbWidget(parent, flags),
mClockType(ClockTypeDigital)
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_CLOCKWIDGET_ENTRY );
loadClockWidget();
+OstTraceFunctionExit0( CLOCKWIDGET_CLOCKWIDGET_EXIT );
}
/*!
@@ -44,7 +51,9 @@
*/
ClockWidget::~ClockWidget()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKWIDGET_CLOCKWIDGET_ENTRY );
+OstTraceFunctionExit0( DUP1_CLOCKWIDGET_CLOCKWIDGET_EXIT );
}
/*!
@@ -52,6 +61,8 @@
*/
ClockWidget::ClockType ClockWidget::clockType() const
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_CLOCKTYPE_ENTRY );
+ OstTraceFunctionExit0( CLOCKWIDGET_CLOCKTYPE_EXIT );
return mClockType;
}
@@ -60,6 +71,7 @@
*/
void ClockWidget::setClockType(const ClockType &type)
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_SETCLOCKTYPE_ENTRY );
if (type == ClockTypeAnalog) {
if(type != mClockType){
mClockType = ClockTypeAnalog;
@@ -71,6 +83,7 @@
updateClockWidget();
}
}
+OstTraceFunctionExit0( CLOCKWIDGET_SETCLOCKTYPE_EXIT );
}
/*!
@@ -78,11 +91,13 @@
*/
void ClockWidget::updateTime()
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_UPDATETIME_ENTRY );
if (mClockType == ClockTypeAnalog) {
mAnalogClock->tick();
} else {
mDigitalClock->updatePrimitives();
}
+OstTraceFunctionExit0( CLOCKWIDGET_UPDATETIME_EXIT );
}
/*!
@@ -90,6 +105,7 @@
*/
void ClockWidget::loadClockWidget()
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_LOADCLOCKWIDGET_ENTRY );
mLayout = new QGraphicsLinearLayout(Qt::Vertical);
mLayout->setContentsMargins(0,0,0,0);
@@ -102,6 +118,7 @@
mLayout->addItem(mDigitalClock);
}
setLayout(mLayout);
+OstTraceFunctionExit0( CLOCKWIDGET_LOADCLOCKWIDGET_EXIT );
}
/*!
@@ -109,6 +126,7 @@
*/
void ClockWidget::updateClockWidget()
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_UPDATECLOCKWIDGET_ENTRY );
if (mClockType == ClockTypeAnalog) {
mLayout->removeItem(mDigitalClock);
delete mDigitalClock;
@@ -125,15 +143,19 @@
}
mLayout->addItem(mDigitalClock);
}
+OstTraceFunctionExit0( CLOCKWIDGET_UPDATECLOCKWIDGET_EXIT );
}
ClockWidget::TimeFormat ClockWidget::timeFormat() const
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_TIMEFORMAT_ENTRY );
+ OstTraceFunctionExit0( CLOCKWIDGET_TIMEFORMAT_EXIT );
return mTimeFormat;
}
void ClockWidget::setTimeFormat(const TimeFormat &timeFormat)
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_SETTIMEFORMAT_ENTRY );
if(mDigitalClock){
mTimeFormat = timeFormat;
if (timeFormat == ClockWidget::TimeFormat12Hrs) {
@@ -142,5 +164,6 @@
mDigitalClock->setAmPm(false);
}
}
+OstTraceFunctionExit0( CLOCKWIDGET_SETTIMEFORMAT_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockwidget/clockwidgetimpl/src/digitalclockwidget.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/clockui/clockwidget/clockwidgetimpl/src/digitalclockwidget.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -27,6 +27,11 @@
// User includes
#include "digitalclockwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "digitalclockwidgetTraces.h"
+#endif
+
// Constants
const int clockUpdateInterval (60000); // msec
@@ -47,6 +52,7 @@
: HbWidget(parent),
mUseAmPm(useAmPm)
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY );
bool result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget.widgetml");
result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget.css");
result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget_color.css");
@@ -60,6 +66,7 @@
int initialIntervalTime = (clockUpdateInterval - ( time.msec() + (time.second() * 1000)));
mTimer->start(initialIntervalTime);
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT );
}
/*!
@@ -67,11 +74,13 @@
*/
DigitalClockWidget::~DigitalClockWidget()
{
+ OstTraceFunctionEntry0( DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY );
mTimer->stop();
HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget.widgetml");
HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget.css");
HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget_color.css");
+OstTraceFunctionExit0( DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT );
}
/*!
@@ -79,9 +88,11 @@
*/
void DigitalClockWidget::tick()
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_TICK_ENTRY );
mTimer->setInterval(clockUpdateInterval);
updatePrimitives();
update();
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_TICK_EXIT );
}
/*!
@@ -89,6 +100,7 @@
*/
void DigitalClockWidget::setAmPm(bool useAmPm)
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_SETAMPM_ENTRY );
bool old = mUseAmPm;
mUseAmPm = useAmPm;
@@ -103,6 +115,7 @@
}
}
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_SETAMPM_EXIT );
}
/*!
@@ -110,7 +123,9 @@
*/
void DigitalClockWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_RESIZEEVENT_ENTRY );
HbWidget::resizeEvent(event);
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_RESIZEEVENT_EXIT );
}
/*!
@@ -118,6 +133,7 @@
*/
void DigitalClockWidget::createPrimitives()
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_CREATEPRIMITIVES_ENTRY );
mClockLabel = new HbTextItem(this);
mClockLabel->setTextWrapping( Hb::TextNoWrap );
HbStyle::setItemName(mClockLabel, QLatin1String("clockLabel"));
@@ -125,6 +141,7 @@
mAmPmLabel = new HbTextItem(this);
mClockLabel->setTextWrapping( Hb::TextNoWrap );
HbStyle::setItemName(mAmPmLabel, QLatin1String("amPmLabel"));
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_CREATEPRIMITIVES_EXIT );
}
/*!
@@ -133,6 +150,7 @@
*/
void DigitalClockWidget::updatePrimitives()
{
+OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY );
QTime time = QTime::currentTime();
QString timeString;
@@ -154,4 +172,5 @@
mClockLabel->setText(timeString);
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_EXIT );
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/analogclockwidgetTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ANALOGCLOCKWIDGETTRACES_H__
+#define __ANALOGCLOCKWIDGETTRACES_H__
+
+#define KOstTraceComponentID 0x2002e715
+
+#define ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY 0x8a0001
+#define ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT 0x8a0002
+#define DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY 0x8a0003
+#define DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT 0x8a0004
+#define ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_ENTRY 0x8a0005
+#define ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_EXIT 0x8a0006
+#define ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY 0x8a0007
+#define ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_EXIT 0x8a0008
+#define ANALOGCLOCKWIDGET_TICK_ENTRY 0x8a0009
+#define ANALOGCLOCKWIDGET_TICK_EXIT 0x8a000a
+#define ANALOGCLOCKWIDGET_SETGEOMETRY_ENTRY 0x8a000b
+#define ANALOGCLOCKWIDGET_SETGEOMETRY_EXIT 0x8a000c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/clockwidgetTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,32 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKWIDGETTRACES_H__
+#define __CLOCKWIDGETTRACES_H__
+
+#define KOstTraceComponentID 0x2002e715
+
+#define CLOCKWIDGET_CLOCKWIDGET_ENTRY 0x8a000d
+#define CLOCKWIDGET_CLOCKWIDGET_EXIT 0x8a000e
+#define DUP1_CLOCKWIDGET_CLOCKWIDGET_ENTRY 0x8a000f
+#define DUP1_CLOCKWIDGET_CLOCKWIDGET_EXIT 0x8a0010
+#define CLOCKWIDGET_CLOCKTYPE_ENTRY 0x8a0011
+#define CLOCKWIDGET_CLOCKTYPE_EXIT 0x8a0012
+#define CLOCKWIDGET_SETCLOCKTYPE_ENTRY 0x8a0013
+#define CLOCKWIDGET_SETCLOCKTYPE_EXIT 0x8a0014
+#define CLOCKWIDGET_UPDATETIME_ENTRY 0x8a0015
+#define CLOCKWIDGET_UPDATETIME_EXIT 0x8a0016
+#define CLOCKWIDGET_LOADCLOCKWIDGET_ENTRY 0x8a0017
+#define CLOCKWIDGET_LOADCLOCKWIDGET_EXIT 0x8a0018
+#define CLOCKWIDGET_UPDATECLOCKWIDGET_ENTRY 0x8a0019
+#define CLOCKWIDGET_UPDATECLOCKWIDGET_EXIT 0x8a001a
+#define CLOCKWIDGET_TIMEFORMAT_ENTRY 0x8a001b
+#define CLOCKWIDGET_TIMEFORMAT_EXIT 0x8a001c
+#define CLOCKWIDGET_SETTIMEFORMAT_ENTRY 0x8a001d
+#define CLOCKWIDGET_SETTIMEFORMAT_EXIT 0x8a001e
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/digitalclockwidgetTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,28 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __DIGITALCLOCKWIDGETTRACES_H__
+#define __DIGITALCLOCKWIDGETTRACES_H__
+
+#define KOstTraceComponentID 0x2002e715
+
+#define DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY 0x8a001f
+#define DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT 0x8a0020
+#define DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY 0x8a0021
+#define DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT 0x8a0022
+#define DIGITALCLOCKWIDGET_TICK_ENTRY 0x8a0023
+#define DIGITALCLOCKWIDGET_TICK_EXIT 0x8a0024
+#define DIGITALCLOCKWIDGET_SETAMPM_ENTRY 0x8a0025
+#define DIGITALCLOCKWIDGET_SETAMPM_EXIT 0x8a0026
+#define DIGITALCLOCKWIDGET_RESIZEEVENT_ENTRY 0x8a0027
+#define DIGITALCLOCKWIDGET_RESIZEEVENT_EXIT 0x8a0028
+#define DIGITALCLOCKWIDGET_CREATEPRIMITIVES_ENTRY 0x8a0029
+#define DIGITALCLOCKWIDGET_CREATEPRIMITIVES_EXIT 0x8a002a
+#define DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY 0x8a002b
+#define DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_EXIT 0x8a002c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,46 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_SETGEOMETRY_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_SETGEOMETRY_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_TICK_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_TICK_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_CLOCKTYPE_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_CLOCKTYPE_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_CLOCKWIDGET_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_CLOCKWIDGET_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_LOADCLOCKWIDGET_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_LOADCLOCKWIDGET_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_SETCLOCKTYPE_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_SETCLOCKTYPE_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_SETTIMEFORMAT_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_SETTIMEFORMAT_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_TIMEFORMAT_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_TIMEFORMAT_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_UPDATECLOCKWIDGET_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_UPDATECLOCKWIDGET_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_UPDATETIME_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_UPDATETIME_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_CREATEPRIMITIVES_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_CREATEPRIMITIVES_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_RESIZEEVENT_ENTRY=0x27
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_RESIZEEVENT_EXIT=0x28
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_SETAMPM_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_SETAMPM_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_TICK_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_TICK_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWIDGET_CLOCKWIDGET_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWIDGET_CLOCKWIDGET_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT=0x22
--- a/clock/rom/clockresources.iby Mon Jul 19 15:12:16 2010 +0100
+++ b/clock/rom/clockresources.iby Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,9 @@
S60_APP_RESOURCE(clock)
data=DATAZ_/QT_TRANSLATIONS_DIR/clock.qm QT_TRANSLATIONS_DIR/clock.qm
+data=DATAZ_/QT_TRANSLATIONS_DIR/clockalarmeditor.qm QT_TRANSLATIONS_DIR/clockalarmeditor.qm
+data=DATAZ_/QT_TRANSLATIONS_DIR/clockcityselectionlist.qm QT_TRANSLATIONS_DIR/clockcityselectionlist.qm
+data=DATAZ_/QT_TRANSLATIONS_DIR/clocksettingsview.qm QT_TRANSLATIONS_DIR/clocksettingsview.qm
#endif // __CLOCKRESOURCES_IBY__
--- a/notes/data/xml/notesfavoriteview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/data/xml/notesfavoriteview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -26,7 +26,8 @@
</widget>
<widget name="emptyListLabel" type="HbLabel">
<real name="z" value="1"/>
- <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/> <enums name="textWrapping" value="TextWordWrap"/>
+ <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<sizehint height="expr(var(hb-param-text-height-primary) )" type="PREFERRED"/>
@@ -39,8 +40,8 @@
<anchoritem dst="favoritesListView" dstEdge="TOP" spacing="0un" src="subtitleGroupBox" srcEdge="BOTTOM"/>
<anchoritem dst="favoritesListView" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
<anchoritem dst="favoritesListView" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="emptyListLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="favoritesListView" srcEdge="LEFT"/>
- <anchoritem dst="emptyListLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="favoritesListView" srcEdge="RIGHT"/>
+ <anchoritem dst="emptyListLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left))" src="favoritesListView" srcEdge="LEFT"/>
+ <anchoritem dst="emptyListLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right))" src="favoritesListView" srcEdge="RIGHT"/>
<anchoritem dst="emptyListLabel" dstEdge="CENTERV" spacing="0un" src="favoritesListView" srcEdge="CENTERV"/>
</layout>
</widget>
--- a/notes/data/xml/notesmainview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/data/xml/notesmainview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -26,7 +26,8 @@
</widget>
<widget name="emptyListLabel" type="HbLabel">
<real name="z" value="1"/>
- <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/> <enums name="textWrapping" value="TextWordWrap"/>
+ <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
<sizehint height="expr(var(hb-param-text-height-primary) )" type="PREFERRED"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
</widget>
@@ -38,8 +39,8 @@
<anchoritem dst="listView" dstEdge="TOP" spacing="0un" src="viewHeading" srcEdge="BOTTOM"/>
<anchoritem dst="listView" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
<anchoritem dst="listView" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="emptyListLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="listView" srcEdge="LEFT"/>
- <anchoritem dst="emptyListLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="listView" srcEdge="RIGHT"/>
+ <anchoritem dst="emptyListLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left))" src="listView" srcEdge="LEFT"/>
+ <anchoritem dst="emptyListLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right))" src="listView" srcEdge="RIGHT"/>
<anchoritem dst="emptyListLabel" dstEdge="CENTERV" spacing="0un" src="listView" srcEdge="CENTERV"/>
</layout>
</widget>
--- a/notes/data/xml/notesnoteview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/data/xml/notesnoteview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -26,7 +26,8 @@
</widget>
<widget name="emptyListLabel" type="HbLabel">
<real name="z" value="1"/>
- <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/> <enums name="textWrapping" value="TextWordWrap"/>
+ <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<sizehint height="expr(var(hb-param-text-height-primary) )" type="PREFERRED"/>
@@ -39,8 +40,8 @@
<anchoritem dst="noteListView" dstEdge="TOP" spacing="0un" src="subtitleGroupBox" srcEdge="BOTTOM"/>
<anchoritem dst="noteListView" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
<anchoritem dst="noteListView" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="emptyListLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="noteListView" srcEdge="LEFT"/>
- <anchoritem dst="emptyListLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="noteListView" srcEdge="RIGHT"/>
+ <anchoritem dst="emptyListLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left))" src="noteListView" srcEdge="LEFT"/>
+ <anchoritem dst="emptyListLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right))" src="noteListView" srcEdge="RIGHT"/>
<anchoritem dst="emptyListLabel" dstEdge="CENTERV" spacing="0un" src="noteListView" srcEdge="CENTERV"/>
</layout>
</widget>
--- a/notes/data/xml/notestodoview.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/data/xml/notestodoview.docml Mon Aug 23 16:00:50 2010 +0100
@@ -26,7 +26,8 @@
</widget>
<widget name="emptyListLabel" type="HbLabel">
<real name="z" value="1"/>
- <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/> <enums name="textWrapping" value="TextWordWrap"/>
+ <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<sizehint height="expr(var(hb-param-text-height-primary) )" type="PREFERRED"/>
@@ -39,8 +40,8 @@
<anchoritem dst="todoListView" dstEdge="TOP" spacing="0un" src="subtitleGroupBox" srcEdge="BOTTOM"/>
<anchoritem dst="todoListView" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
<anchoritem dst="todoListView" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="emptyListLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="todoListView" srcEdge="LEFT"/>
- <anchoritem dst="emptyListLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="todoListView" srcEdge="RIGHT"/>
+ <anchoritem dst="emptyListLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left))" src="todoListView" srcEdge="LEFT"/>
+ <anchoritem dst="emptyListLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right))" src="todoListView" srcEdge="RIGHT"/>
<anchoritem dst="emptyListLabel" dstEdge="CENTERV" spacing="0un" src="todoListView" srcEdge="CENTERV"/>
</layout>
</widget>
--- a/notes/notesui/notesappcontroller/bwins/notesappcontrolleru.def Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesappcontroller/bwins/notesappcontrolleru.def Mon Aug 23 16:00:50 2010 +0100
@@ -2,4 +2,15 @@
??1NotesAppController@@UAE@XZ @ 1 NONAME ; NotesAppController::~NotesAppController(void)
??_ENotesAppController@@UAE@I@Z @ 2 NONAME ; NotesAppController::~NotesAppController(unsigned int)
??0NotesAppController@@QAE@PAVQObject@@@Z @ 3 NONAME ; NotesAppController::NotesAppController(class QObject *)
+ ?trUtf8@NotesAppController@@SA?AVQString@@PBD0@Z @ 4 NONAME ; class QString NotesAppController::trUtf8(char const *, char const *)
+ ?staticMetaObject@NotesAppController@@2UQMetaObject@@B @ 5 NONAME ; struct QMetaObject const NotesAppController::staticMetaObject
+ ?qt_metacall@NotesAppController@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 6 NONAME ; int NotesAppController::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?metaObject@NotesAppController@@UBEPBUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const * NotesAppController::metaObject(void) const
+ ?tr@NotesAppController@@SA?AVQString@@PBD0H@Z @ 8 NONAME ; class QString NotesAppController::tr(char const *, char const *, int)
+ ?appReady@NotesAppController@@IAEXXZ @ 9 NONAME ; void NotesAppController::appReady(void)
+ ?trUtf8@NotesAppController@@SA?AVQString@@PBD0H@Z @ 10 NONAME ; class QString NotesAppController::trUtf8(char const *, char const *, int)
+ ?qt_metacast@NotesAppController@@UAEPAXPBD@Z @ 11 NONAME ; void * NotesAppController::qt_metacast(char const *)
+ ?tr@NotesAppController@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString NotesAppController::tr(char const *, char const *)
+ ?getStaticMetaObject@NotesAppController@@SAABUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const & NotesAppController::getStaticMetaObject(void)
+ ?handleAppReady@NotesAppController@@AAEXXZ @ 14 NONAME ; void NotesAppController::handleAppReady(void)
--- a/notes/notesui/notesappcontroller/eabi/notesappcontrolleru.def Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesappcontroller/eabi/notesappcontrolleru.def Mon Aug 23 16:00:50 2010 +0100
@@ -6,4 +6,11 @@
_ZN18NotesAppControllerD2Ev @ 5 NONAME
_ZTI18NotesAppController @ 6 NONAME
_ZTV18NotesAppController @ 7 NONAME
+ _ZN18NotesAppController11qt_metacallEN11QMetaObject4CallEiPPv @ 8 NONAME
+ _ZN18NotesAppController11qt_metacastEPKc @ 9 NONAME
+ _ZN18NotesAppController14handleAppReadyEv @ 10 NONAME
+ _ZN18NotesAppController16staticMetaObjectE @ 11 NONAME DATA 16
+ _ZN18NotesAppController19getStaticMetaObjectEv @ 12 NONAME
+ _ZN18NotesAppController8appReadyEv @ 13 NONAME
+ _ZNK18NotesAppController10metaObjectEv @ 14 NONAME
--- a/notes/notesui/notesappcontroller/inc/notesappcontroller.h Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesappcontroller/inc/notesappcontroller.h Mon Aug 23 16:00:50 2010 +0100
@@ -31,10 +31,18 @@
class NOTESAPPCONTROLLER_EXPORT NotesAppController : public QObject
{
+ Q_OBJECT
+
public:
explicit NotesAppController(QObject *parent = 0);
virtual ~NotesAppController();
+signals:
+ void appReady();
+
+private slots:
+ void handleAppReady();
+
private:
NotesViewManager *mViewManager;
NotesModelHandler *mNotesModelHandler;
--- a/notes/notesui/notesappcontroller/notesappcontroller.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesappcontroller/notesappcontroller.pro Mon Aug 23 16:00:50 2010 +0100
@@ -29,7 +29,8 @@
../notesviewmanager/inc \
../notesmodelhandler/inc \
../inc \
- ../../inc
+ ../../inc \
+ ./traces
symbian: {
TARGET.CAPABILITY = ALL -TCB
--- a/notes/notesui/notesappcontroller/src/notesappcontroller.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesappcontroller/src/notesappcontroller.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -20,6 +20,11 @@
#include "notesappcontrollerifimpl.h"
#include "notesviewmanager.h"
#include "notesmodelhandler.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesappcontrollerTraces.h"
+#endif
+
/*!
\class NotesAppController
@@ -37,6 +42,7 @@
mNotesModelHandler(0),
mIfImpl(0)
{
+ OstTraceFunctionEntry0( NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_ENTRY );
// Construct the interface implementation.
mIfImpl = new NotesAppControllerIfImpl(this);
@@ -51,6 +57,8 @@
Q_ASSERT_X(
mViewManager, "notesappcontroller.cpp",
"NotesViewManager is 0");
+ connect(mViewManager, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ OstTraceFunctionExit0( NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_EXIT );
}
/*!
@@ -58,6 +66,7 @@
*/
NotesAppController::~NotesAppController()
{
+ OstTraceFunctionEntry0( DUP1_NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_ENTRY );
if (mViewManager) {
delete mViewManager;
mViewManager = 0;
@@ -70,6 +79,18 @@
delete mIfImpl;
mIfImpl = 0;
}
+ OstTraceFunctionExit0( DUP1_NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_EXIT );
+}
+
+/*!
+ Emits the appReday signal.
+ */
+void NotesAppController::handleAppReady()
+{
+ OstTraceFunctionEntry0( NOTESAPPCONTROLLER_HANDLEAPPREADY_ENTRY );
+ emit appReady();
+ disconnect(mViewManager, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ OstTraceFunctionExit0( NOTESAPPCONTROLLER_HANDLEAPPREADY_EXIT );
}
// End of file --Don't remove this.
--- a/notes/notesui/notesappcontroller/src/notesappcontrollerifimpl.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesappcontroller/src/notesappcontrollerifimpl.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -21,6 +21,11 @@
#include "notesmodelhandler.h"
#include "notesappcontroller.h"
#include "notesviewmanager.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesappcontrollerifimplTraces.h"
+#endif
+
/*!
\class NotesAppControllerIfImpl
@@ -41,7 +46,9 @@
:QObject(controller),
mAppController(controller)
{
- // Nothing yet.
+ OstTraceFunctionEntry0( NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_ENTRY );
+ Q_UNUSED(parent);
+ OstTraceFunctionExit0( NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_EXIT );
}
/*!
@@ -49,7 +56,9 @@
*/
NotesAppControllerIfImpl::~NotesAppControllerIfImpl()
{
+ OstTraceFunctionEntry0( DUP1_NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_EXIT );
}
/*!
@@ -61,6 +70,7 @@
*/
AgendaUtil *NotesAppControllerIfImpl::agendaUtil()
{
+ OstTraceFunctionEntry0( NOTESAPPCONTROLLERIFIMPL_AGENDAUTIL_ENTRY );
return mAppController->mNotesModelHandler->agendaInterface();
}
@@ -73,6 +83,7 @@
*/
NotesModel *NotesAppControllerIfImpl::notesModel()
{
+ OstTraceFunctionEntry0( NOTESAPPCONTROLLERIFIMPL_NOTESMODEL_ENTRY );
return mAppController->mNotesModelHandler->notesModel();
}
@@ -85,7 +96,9 @@
*/
void NotesAppControllerIfImpl::switchToView(NotesNamespace::NotesViewIds viewId)
{
+ OstTraceFunctionEntry0( NOTESAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY );
mAppController->mViewManager->switchToView(viewId);
+ OstTraceFunctionExit0( NOTESAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesappcontroller/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesappcontroller/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,16 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLERIFIMPL_AGENDAUTIL_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLERIFIMPL_NOTESMODEL_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLER_HANDLEAPPREADY_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLER_HANDLEAPPREADY_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_EXIT=0x2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesappcontroller/traces/notesappcontrollerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESAPPCONTROLLERTRACES_H__
+#define __NOTESAPPCONTROLLERTRACES_H__
+
+#define KOstTraceComponentID 0x2002bcdb
+
+#define NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_ENTRY 0x8a0001
+#define NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_EXIT 0x8a0002
+#define DUP1_NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_ENTRY 0x8a0003
+#define DUP1_NOTESAPPCONTROLLER_NOTESAPPCONTROLLER_EXIT 0x8a0004
+#define NOTESAPPCONTROLLER_HANDLEAPPREADY_ENTRY 0x8a0005
+#define NOTESAPPCONTROLLER_HANDLEAPPREADY_EXIT 0x8a0006
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesappcontroller/traces/notesappcontrollerifimplTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,22 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESAPPCONTROLLERIFIMPLTRACES_H__
+#define __NOTESAPPCONTROLLERIFIMPLTRACES_H__
+
+#define KOstTraceComponentID 0x2002bcdb
+
+#define NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_ENTRY 0x8a0007
+#define NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_EXIT 0x8a0008
+#define DUP1_NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_ENTRY 0x8a0009
+#define DUP1_NOTESAPPCONTROLLERIFIMPL_NOTESAPPCONTROLLERIFIMPL_EXIT 0x8a000a
+#define NOTESAPPCONTROLLERIFIMPL_AGENDAUTIL_ENTRY 0x8a000b
+#define NOTESAPPCONTROLLERIFIMPL_NOTESMODEL_ENTRY 0x8a000c
+#define NOTESAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY 0x8a000d
+#define NOTESAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT 0x8a000e
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesapplication/inc/notesApplication.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,52 @@
+/*
+* 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: Header file for class NotesApplication.
+*
+*/
+#ifndef NOTESAPPLICATION_H
+#define NOTESAPPLICATION_H
+
+// System includes
+#include <QPointer>
+#include <HbApplication>
+
+// Forward Declarations
+class NotesAppController;
+
+class NotesApplication : public HbApplication
+{
+ Q_OBJECT
+
+public:
+ NotesApplication(int &argc, char *argv[]);
+ virtual ~NotesApplication();
+
+signals:
+ void applicationReady();
+
+public:
+ void createController();
+ bool execution();
+
+private slots:
+ void handleAppReady();
+
+private:
+ QPointer<NotesAppController> mController;
+
+};
+
+#endif // NOTESAPPLICATION_H
+
+// End of file --Don't remove this.
--- a/notes/notesui/notesapplication/notesapplication.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesapplication/notesapplication.pro Mon Aug 23 16:00:50 2010 +0100
@@ -20,11 +20,13 @@
INCLUDEPATH += \
. \
../notesappcontroller/inc \
- ../../inc
+ ../../inc \
+ ./traces
DEPENDPATH += \
. \
./src \
+ ./inc \
../../data
symbian: {
@@ -51,7 +53,12 @@
SKINICON = qtg_large_notes
}
-SOURCES += main.cpp
+SOURCES += \
+ main.cpp \
+ notesapplication.cpp
+
+HEADERS += \
+ notesapplication.h
RESOURCES += notes.qrc
--- a/notes/notesui/notesapplication/src/main.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesapplication/src/main.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -16,23 +16,30 @@
*/
// System includes
-#include <QScopedPointer>
-#include <hbapplication.h>
#include <hbmainwindow.h>
#include <hbtranslator.h>
+
// User includes
-#include "notesappcontroller.h"
+#include "notesapplication.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "mainTraces.h"
+#endif
+
/*!
The main() function.
- Responsible for constructing the NotesAppController object and showing the
+ Responsible for constructing the NotesApplication object and showing the
main window.
*/
int main(int argc, char *argv[])
{
- // Create and initialize an HbApplication instance
- HbApplication app(argc, argv);
+ OstTraceFunctionEntry0( _MAIN_ENTRY );
+ // Create and initialize an NotesApplication instance
+ QScopedPointer<NotesApplication> application(
+ new NotesApplication(argc, argv));
+ //NotesApplication *application = new NotesApplication(argc, argv);
// Main window for providing the scene context
HbMainWindow window;
@@ -45,13 +52,13 @@
notesViewsTranslator.loadCommon();
// Construct the application controller.
- QScopedPointer<NotesAppController> controller(new NotesAppController);
- Q_UNUSED(controller)
-
+ application->createController();
+
// Show the main window.
window.show();
+
// Start the event loop for the application
- return app.exec();
+ return application->execution();
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesapplication/src/notesApplication.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,90 @@
+/*
+* 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 NotesApplication.
+*
+*/
+
+
+// User includes
+#include "notesapplication.h"
+#include "notesappcontroller.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesApplicationTraces.h"
+#endif
+
+
+/*!
+ \class NotesApplication
+
+ This class creates the NotesController object.
+ */
+/*!
+ Constructor.
+ */
+NotesApplication::NotesApplication(int &argc, char *argv[]):
+ HbApplication(argc, argv)
+{
+ OstTraceFunctionEntry0( NOTESAPPLICATION_NOTESAPPLICATION_ENTRY );
+ OstTraceFunctionExit0( NOTESAPPLICATION_NOTESAPPLICATION_EXIT );
+}
+
+/*!
+ Destructor.
+ */
+NotesApplication::~NotesApplication()
+{
+ OstTraceFunctionEntry0( DUP1_NOTESAPPLICATION_NOTESAPPLICATION_ENTRY );
+ if (mController) {
+ delete mController;
+ mController = 0;
+ }
+ OstTraceFunctionExit0( DUP1_NOTESAPPLICATION_NOTESAPPLICATION_EXIT );
+}
+
+/*!
+ creates the NotesController object.
+*/
+void NotesApplication::createController()
+{
+ OstTraceFunctionEntry0( NOTESAPPLICATION_CREATECONTROLLER_ENTRY );
+ mController = new NotesAppController;
+ connect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ OstTraceFunctionExit0( NOTESAPPLICATION_CREATECONTROLLER_EXIT );
+}
+
+/*!
+ Start the event loop for the application.
+*/
+bool NotesApplication::execution()
+{
+ OstTraceFunctionEntry0( NOTESAPPLICATION_EXECUTION_ENTRY );
+ int ret = 0;
+ ret = exec();
+ OstTraceFunctionExit0( NOTESAPPLICATION_EXECUTION_EXIT );
+ return ret;
+}
+
+/*!
+ Emits the applicationReady signal.
+ */
+void NotesApplication::handleAppReady()
+{
+ OstTraceFunctionEntry0( NOTESAPPLICATION_HANDLEAPPREADY_ENTRY );
+ emit applicationReady();
+ disconnect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ OstTraceFunctionExit0( NOTESAPPLICATION_HANDLEAPPREADY_EXIT );
+}
+
+// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesapplication/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesapplication/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,13 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESAPPLICATION_NOTESAPPLICATION_ENTRY=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESAPPLICATION_NOTESAPPLICATION_EXIT=0x5
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPLICATION_CREATECONTROLLER_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPLICATION_CREATECONTROLLER_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPLICATION_EXECUTION_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPLICATION_EXECUTION_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPLICATION_HANDLEAPPREADY_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPLICATION_HANDLEAPPREADY_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPLICATION_NOTESAPPLICATION_ENTRY=0x2
+[TRACE]TRACE_FLOW[0x8A]_NOTESAPPLICATION_NOTESAPPLICATION_EXIT=0x3
+[TRACE]TRACE_FLOW[0x8A]__MAIN_ENTRY=0x1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesapplication/traces/mainTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,15 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __MAINTRACES_H__
+#define __MAINTRACES_H__
+
+#define KOstTraceComponentID 0x20029f80
+
+#define _MAIN_ENTRY 0x8a0001
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesapplication/traces/notesapplicationTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESAPPLICATIONTRACES_H__
+#define __NOTESAPPLICATIONTRACES_H__
+
+#define KOstTraceComponentID 0x20029f80
+
+#define NOTESAPPLICATION_NOTESAPPLICATION_ENTRY 0x8a0002
+#define NOTESAPPLICATION_NOTESAPPLICATION_EXIT 0x8a0003
+#define DUP1_NOTESAPPLICATION_NOTESAPPLICATION_ENTRY 0x8a0004
+#define DUP1_NOTESAPPLICATION_NOTESAPPLICATION_EXIT 0x8a0005
+#define NOTESAPPLICATION_CREATECONTROLLER_ENTRY 0x8a0006
+#define NOTESAPPLICATION_CREATECONTROLLER_EXIT 0x8a0007
+#define NOTESAPPLICATION_EXECUTION_ENTRY 0x8a0008
+#define NOTESAPPLICATION_EXECUTION_EXIT 0x8a0009
+#define NOTESAPPLICATION_HANDLEAPPREADY_ENTRY 0x8a000a
+#define NOTESAPPLICATION_HANDLEAPPREADY_EXIT 0x8a000b
+
+
+#endif
+
+// End of file
+
--- a/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml Mon Aug 23 16:00:50 2010 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.9">
+<hbdocument version="1.1">
<object name="makeFavoriteAction" type="HbAction">
<string locid="txt_notes_opt_mark_as_favorite" name="text" value="Mark as favourite"/>
</object>
@@ -10,8 +10,8 @@
<string locid="txt_notes_opt_discard_changes" name="text" value="Discard changes"/>
</object>
<object name="newNoteAction" type="HbAction">
- <string locid="txt_notes_opt_new_note" name="text" value="New note"/>
- </object>
+ <string locid="txt_notes_opt_new_note" name="text" value="New note"/>
+ </object>
<object name="deleteAction" type="HbAction">
<icon iconName="qtg_mono_delete" name="icon"/>
</object>
@@ -21,48 +21,55 @@
<widget name="notesEditorView" type="HbView">
<widget name="noteEditorWidget" role="HbView:widget" type="HbWidget">
<widget name="notesEditorSubHeading" type="HbGroupBox">
- <string name="heading" value=" "/>
- <bool name="collapsable" value="FALSE"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="PREFERRED"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="MINIMUM"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="MAXIMUM"/>
+ <bool name="collapsable" value="FALSE"/>
+ <bool name="visible" value="TRUE"/>
+ <string name="heading" value=" "/>
</widget>
<widget name="editorHeading" type="HbLabel">
- <enums name="alignment" value="AlignLeft|AlignLeading"/>
+ <enums name="alignment" value="AlignLeft|AlignLeading"/>
<sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED" width="48un"/>
- <string locid="txt_notes_subhead_new_note" name="plainText" value="New note"/>
- </widget>
- <widget name="favoriteIcon" type="HbLabel">
- <enums name="alignment" value="AlignRight|AlignTrailing"/>
- <sizehint height="var(hb-param-graphic-size-secondary)" type="PREFERRED" width="4un"/>
- </widget>
- <widget name="textEdit" type="HbTextEdit"/>
+ <string locid="txt_notes_subhead_new_note" name="plainText"/>
+ </widget>
+ <widget name="favoriteIcon" type="HbLabel">
+ <enums name="alignment" value="AlignRight|AlignTrailing"/>
+ <sizehint height="var(hb-param-graphic-size-secondary)" type="PREFERRED" width="4un"/>
+ <icon iconName=" " name="icon"/>
+ </widget>
+ <widget name="textEdit" type="HbTextEdit">
+ <string name="plainText"/>
+ </widget>
<layout type="anchor">
- <anchoritem dst="notesEditorSubHeading" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="notesEditorSubHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
<anchoritem dst="notesEditorSubHeading" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="notesEditorSubHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="notesEditorSubHeading" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
+ <anchoritem dst="notesEditorSubHeading" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="editorHeading" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="notesEditorSubHeading" srcEdge="LEFT"/>
+ <anchoritem dst="editorHeading" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="TOP"/>
+ <anchoritem dst="editorHeading" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
+ <anchoritem dst="favoriteIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="editorHeading" srcEdge="RIGHT"/>
+ <anchoritem dst="favoriteIcon" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="TOP"/>
+ <anchoritem dst="favoriteIcon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="notesEditorSubHeading" srcEdge="RIGHT"/>
+ <anchoritem dst="favoriteIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
<anchoritem dst="textEdit" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="textEdit" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
<anchoritem dst="textEdit" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
<anchoritem dst="textEdit" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="editorHeading" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
- <anchoritem dst="editorHeading" dstEdge="TOP" spacing="0.5un" src="" srcEdge="TOP"/>
- <anchoritem dst="editorHeading" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
- <anchoritem dst="favoriteIcon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="favoriteIcon" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
- <anchoritem dst="favoriteIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="editorHeading" srcEdge="RIGHT"/>
- <anchoritem dst="favoriteIcon" dstEdge="TOP" spacing="0.5un" src="" srcEdge="TOP"/>
</layout>
</widget>
<widget name="viewMenu" role="HbView:menu" type="HbMenu">
- <ref object="makeFavoriteAction" role="HbMenu:addAction"/>
- <ref object="makeAsTodoAction" role="HbMenu:addAction"/>
+ <ref object="makeFavoriteAction" role="HbWidget:addAction"/>
+ <ref object="makeAsTodoAction" role="HbWidget:addAction"/>
</widget>
<widget name="viewToolbar" role="HbView:toolBar" type="HbToolBar">
<enums name="orientation" value="Horizontal"/>
- <ref object="addToCalendarAction" role="HbToolBar:addAction"/>
- <ref object="deleteAction" role="HbToolBar:addAction"/>
+ <ref object="addToCalendarAction" role="HbWidget:addAction"/>
+ <ref object="deleteAction" role="HbWidget:addAction"/>
</widget>
<string locid="txt_notes_title_notes" name="title" value="Notes"/>
</widget>
- <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
</metadata>
</hbdocument>
--- a/notes/notesui/noteseditor/inc/noteseditor_p.h Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/inc/noteseditor_p.h Mon Aug 23 16:00:50 2010 +0100
@@ -25,7 +25,7 @@
#include <QPointer>
// User includes
-#include "agendaentry.h"
+#include <agendaentry.h>
#include "noteseditor.h"
// Forward declarations
@@ -65,6 +65,7 @@
bool saveNote();
bool saveTodo();
void editingCompleted(bool status);
+ void viewCreationCompleted(int error);
private:
bool isNoteEdited();
--- a/notes/notesui/noteseditor/inc/notesnoteeditor.h Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/inc/notesnoteeditor.h Mon Aug 23 16:00:50 2010 +0100
@@ -25,8 +25,8 @@
#include <QPointer>
// User includes
-#include "agendautil.h"
-#include "agendaentry.h"
+#include <agendautil.h>
+#include <agendaentry.h>
// Forward declarations
class HbView;
--- a/notes/notesui/noteseditor/noteseditor.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/noteseditor.pro Mon Aug 23 16:00:50 2010 +0100
@@ -24,7 +24,8 @@
. \
./src \
./inc \
- ../../../inc
+ ../../../inc \
+ ./traces
DEPENDPATH += \
. \
@@ -37,8 +38,7 @@
TARGET.EPOCALLOWDLLDATA = 1
TARGET.UID3 = 0x20029F82
- INCLUDEPATH += ../../../agendainterface/inc \
- $$APP_LAYER_SYSTEMINCLUDE
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
LIBS += -lagendainterface \
-lcaleneditor
@@ -68,7 +68,7 @@
RESOURCES += \
noteseditor.qrc
-# TODO :need to use noteseditor.ts once it is released to platform
-TRANSLATIONS += notes.ts
+
+TRANSLATIONS += noteseditor.ts
# End of file --Don't remove this.
--- a/notes/notesui/noteseditor/src/noteseditor.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/src/noteseditor.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,8 +19,13 @@
// User includes
#include "noteseditor.h"
#include "noteseditor_p.h"
-#include "agendautil.h"
-#include "agendaentry.h"
+#include <agendautil.h>
+#include <agendaentry.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "noteseditorTraces.h"
+#endif
+
/*!
\class NotesEditor
@@ -46,7 +51,9 @@
NotesEditor::NotesEditor(QObject *parent)
:QObject(parent),d_ptr(new NotesEditorPrivate(0, this))
{
+ OstTraceFunctionEntry0( NOTESEDITOR_NOTESEDITOR_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( NOTESEDITOR_NOTESEDITOR_EXIT );
}
@@ -59,7 +66,9 @@
NotesEditor::NotesEditor(AgendaUtil *agendaUtil, QObject *parent)
:QObject(parent), d_ptr(new NotesEditorPrivate(agendaUtil, this))
{
+ OstTraceFunctionEntry0( DUP1_NOTESEDITOR_NOTESEDITOR_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_NOTESEDITOR_NOTESEDITOR_EXIT );
}
/*!
@@ -67,9 +76,11 @@
*/
NotesEditor::~NotesEditor()
{
+ OstTraceFunctionEntry0( DUP2_NOTESEDITOR_NOTESEDITOR_ENTRY );
if (d_ptr) {
delete d_ptr;
}
+ OstTraceFunctionExit0( DUP2_NOTESEDITOR_NOTESEDITOR_EXIT );
}
/*!
@@ -79,7 +90,9 @@
*/
void NotesEditor::edit(const QString &string)
{
+ OstTraceFunctionEntry0( NOTESEDITOR_EDIT_ENTRY );
d_ptr->edit(string);
+ OstTraceFunctionExit0( NOTESEDITOR_EDIT_EXIT );
}
/*!
@@ -90,7 +103,9 @@
*/
void NotesEditor::edit(const QFile &handle)
{
+ OstTraceFunctionEntry0( DUP1_NOTESEDITOR_EDIT_ENTRY );
d_ptr->edit(handle);
+ OstTraceFunctionExit0( DUP1_NOTESEDITOR_EDIT_EXIT );
}
/*!
@@ -100,7 +115,9 @@
*/
void NotesEditor::edit(AgendaEntry entry)
{
+ OstTraceFunctionEntry0( DUP2_NOTESEDITOR_EDIT_ENTRY );
d_ptr->edit(entry);
+ OstTraceFunctionExit0( DUP2_NOTESEDITOR_EDIT_EXIT );
}
/*!
@@ -110,7 +127,9 @@
*/
void NotesEditor::edit(ulong id)
{
+ OstTraceFunctionEntry0( DUP3_NOTESEDITOR_EDIT_ENTRY );
d_ptr->edit(id);
+ OstTraceFunctionExit0( DUP3_NOTESEDITOR_EDIT_EXIT );
}
/*!
@@ -121,7 +140,9 @@
*/
void NotesEditor::create(NotesEditor::CreateType type)
{
+ OstTraceFunctionEntry0( NOTESEDITOR_CREATE_ENTRY );
d_ptr->create(type);
+ OstTraceFunctionExit0( NOTESEDITOR_CREATE_EXIT );
}
/*!
@@ -131,6 +152,7 @@
*/
ulong NotesEditor::close(NotesEditor::CloseType type)
{
+ OstTraceFunctionEntry0( NOTESEDITOR_CLOSE_ENTRY );
return d_ptr->close(type);
}
--- a/notes/notesui/noteseditor/src/noteseditor_p.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/src/noteseditor_p.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -30,8 +30,13 @@
#include "noteseditor_p.h"
#include "notesnoteeditor.h"
#include "notestodoeditor.h"
-#include "agendautil.h"
-#include "agendaentry.h"
+#include <agendautil.h>
+#include <agendaentry.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "noteseditor_pTraces.h"
+#endif
+
/*!
\class NotesEditorPrivate
@@ -51,10 +56,11 @@
mTranslator(0),
mNoteId(0)
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_ENTRY );
// First get the q-pointer.
q_ptr = static_cast<NotesEditor *> (parent);
- mTranslator = new HbTranslator("notes");
+ mTranslator = new HbTranslator("noteseditor");
mTranslator->loadCommon();
// Here we check if the agendautil passed by the client is 0. If so, then we
@@ -72,6 +78,12 @@
mAgendaUtil, SIGNAL(entriesChanged(QList<ulong> )),
this, SLOT(handleEntriesChanged(QList<ulong> )));
+ // Register for the calenInstance view creation sucessfully
+ connect(
+ mAgendaUtil, SIGNAL(entryViewCreationCompleted(int)),
+ this, SLOT(viewCreationCompleted(int)));
+
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT );
}
/*!
@@ -79,6 +91,7 @@
*/
NotesEditorPrivate::~NotesEditorPrivate()
{
+ OstTraceFunctionEntry0( DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_ENTRY );
if (mOwnsAgendaUtil) {
delete mAgendaUtil;
mAgendaUtil = 0;
@@ -88,6 +101,7 @@
delete mTranslator;
mTranslator = 0;
}
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT );
}
@@ -98,6 +112,7 @@
*/
void NotesEditorPrivate::edit(const QString &string)
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_EDIT_ENTRY );
// Create a agenda entry by setting the text as description for the note.
AgendaEntry newNote;
newNote.setType(AgendaEntry::TypeNote);
@@ -111,6 +126,7 @@
// launch note editor
mNoteEditor->execute(newNote);
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -121,7 +137,9 @@
*/
void NotesEditorPrivate::edit(const QFile &handle)
{
+ OstTraceFunctionEntry0( DUP1_NOTESEDITORPRIVATE_EDIT_ENTRY );
Q_UNUSED(handle)
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -131,6 +149,7 @@
*/
void NotesEditorPrivate::edit(AgendaEntry entry)
{
+ OstTraceFunctionEntry0( DUP2_NOTESEDITORPRIVATE_EDIT_ENTRY );
// Check if its a new note or a note being edited.
if (0 < entry.id()) {
mNewEntry = false;
@@ -158,8 +177,10 @@
mTodoEditor->execute(entry);
} else {
// Invalid entry type.
+ OstTraceFunctionExit0( DUP2_NOTESEDITORPRIVATE_EDIT_EXIT );
return;
}
+ OstTraceFunctionExit0( DUP3_NOTESEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -169,16 +190,17 @@
*/
void NotesEditorPrivate::edit(ulong id)
{
+ OstTraceFunctionEntry0( DUP3_NOTESEDITORPRIVATE_EDIT_ENTRY );
// Fetch the entry using the id provided
AgendaEntry entry = mAgendaUtil->fetchById(id);
- if (!entry.isNull()) {
- // Edit the agenda entry based on the entry type.
- edit(entry);
+ if (entry.isNull()) {
+ // save the entries , to show the entry once instances are created
+ // if entry is null exit ,later call back comes in viewCreationCompleted
+ mNoteId =id;
} else {
- // Invalid entry.
- return;
+ edit(entry);
}
-
+ OstTraceFunctionExit0( DUP5_NOTESEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -189,6 +211,7 @@
*/
void NotesEditorPrivate::create(NotesEditor::CreateType type)
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_CREATE_ENTRY );
switch(type) {
case NotesEditor::CreateNote: {
@@ -238,6 +261,7 @@
break;
}
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_CREATE_EXIT );
}
@@ -248,6 +272,7 @@
*/
ulong NotesEditorPrivate::close(NotesEditor::CloseType type)
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_CLOSE_ENTRY );
switch (type) {
case NotesEditor::CloseWithSave: {
@@ -286,6 +311,7 @@
mNoteId = 0;
break;
}
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_CLOSE_EXIT );
return mNoteId;
}
@@ -296,6 +322,7 @@
*/
QString NotesEditorPrivate::dateFormatString()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_DATEFORMATSTRING_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
QString dateFormat;
@@ -325,6 +352,7 @@
break;
}
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_DATEFORMATSTRING_EXIT );
return dateFormat;
}
@@ -335,6 +363,7 @@
*/
QString NotesEditorPrivate::timeFormatString()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_TIMEFORMATSTRING_ENTRY );
QString timeFormat;
HbExtendedLocale locale = HbExtendedLocale::system();
@@ -350,6 +379,7 @@
timeFormat.append("mm");
}
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_TIMEFORMATSTRING_EXIT );
return timeFormat;
}
@@ -358,11 +388,13 @@
*/
void NotesEditorPrivate::handleEntriesChanged(QList<ulong> ids)
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_ENTRY );
if (!mNewEntry) {
if (ids.contains(mModifiedNote.id())) {
mSaveEntry = false;
}
}
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_EXIT );
}
/*!
@@ -370,9 +402,11 @@
*/
void NotesEditorPrivate::markNoteAsTodo()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_MARKNOTEASTODO_ENTRY );
// This function should not be called by any other function except the
// noteeditor.
if (mModifiedNote.type() != AgendaEntry::TypeNote) {
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT );
return;
}
@@ -411,6 +445,7 @@
window->removeView(mNoteEditor->mEditor);
mNoteEditor->deleteLater();
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT );
}
/*!
@@ -419,9 +454,11 @@
*/
void NotesEditorPrivate::updateNoteText()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_UPDATENOTETEXT_ENTRY );
mModifiedNote.setDescription(mNoteEditor->getDescription());
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_UPDATENOTETEXT_EXIT );
}
/*!
@@ -429,6 +466,7 @@
*/
void NotesEditorPrivate::deleteNote()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_DELETENOTE_ENTRY );
if (!mNewEntry) {
// Delete the note. All the changes are discarded.
@@ -444,6 +482,7 @@
mTodoEditor->deleteLater();
}
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_DELETENOTE_EXIT );
}
/*!
@@ -451,12 +490,14 @@
*/
bool NotesEditorPrivate::saveNote()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_SAVENOTE_ENTRY );
bool status = false;
QString description = mNoteEditor->getDescription();
- // Check the length. If it is 0, don't create/modify the note.
- if (description.length()) {
+ // Check the size after simplified() which removes all the space inside the
+ // description. If it is 0, don't create/modify the note.
+ if (0 < description.simplified().size()) {
// Save the note here.
if (mNewEntry) {
if (AgendaEntry::TypeNote == mModifiedNote.type()) {
@@ -474,7 +515,7 @@
mModifiedNote.setStatus(AgendaEntry::TodoNeedsAction);
}
// Now save the entry.
- mNoteId = mAgendaUtil->addEntry(mModifiedNote);
+ mNoteId = mAgendaUtil->store(mModifiedNote);
if (mNoteId) {
showNotification(
hbTrId("txt_notes_dpopinfo_new_note_saved"));
@@ -492,7 +533,7 @@
mModifiedNote.setDescription(description);
// Now save the entry.
- mNoteId = mAgendaUtil->addEntry(mModifiedNote);
+ mNoteId = mAgendaUtil->store(mModifiedNote);
}
} else {
mModifiedNote.setDescription(description);
@@ -500,7 +541,7 @@
QDateTime(QDate::currentDate(), QTime::currentTime()));
if (isNoteEdited()) {
- bool updateStatus = mAgendaUtil->updateEntry(mModifiedNote);
+ ulong updateStatus = mAgendaUtil->store(mModifiedNote);
if (updateStatus) {
showNotification(
hbTrId("txt_notes_dpopinfo_note_saved"));
@@ -514,6 +555,7 @@
mNoteId = 0;
}
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_SAVENOTE_EXIT );
return status;
}
@@ -522,9 +564,11 @@
*/
bool NotesEditorPrivate::saveTodo()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_SAVETODO_ENTRY );
if (AgendaEntry::TypeTodo != mModifiedNote.type()) {
// This should never happen.
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_SAVETODO_EXIT );
return false;
}
bool status = false;
@@ -532,7 +576,7 @@
if (mNewEntry) {
if (isTodoEdited()) {
// Add the new to-do.
- mNoteId = mAgendaUtil->addEntry(mModifiedNote);
+ mNoteId = mAgendaUtil->store(mModifiedNote);
if (mNoteId) {
status = true;
showNotification(
@@ -560,8 +604,10 @@
}
} else {
if (isTodoEdited()) {
- status = mAgendaUtil->updateEntry(mModifiedNote);
- mNoteId = mModifiedNote.id();
+ mNoteId = mAgendaUtil->store(mModifiedNote);
+ if (mNoteId) {
+ status = true;
+ }
}
}
if (status) {
@@ -570,6 +616,7 @@
}
}
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_SAVETODO_EXIT );
return status;
}
@@ -580,6 +627,7 @@
*/
void NotesEditorPrivate::editingCompleted(bool status)
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_EDITINGCOMPLETED_ENTRY );
if(mNoteEditor) {
mNoteEditor->deleteLater();
@@ -589,6 +637,31 @@
}
emit q_ptr->editingCompleted(status);
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_EDITINGCOMPLETED_EXIT );
+}
+
+/*!
+ Called when instances of calenInstanceview and entryInstanceview is created
+ successfully.
+
+ \param int status to indicate whether the creation was successful or not.
+ */
+void NotesEditorPrivate::viewCreationCompleted(int error)
+{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_ENTRY );
+ if ((KErrNone == error)) {
+ AgendaEntry entry;
+ entry = mAgendaUtil->fetchById(mNoteId);
+ // if entry is there , then show the view.
+ if (!entry.isNull()) {
+ // Edit the agenda entry based on the entry type.
+ edit(entry);
+ } else {
+ // emit this signal so that the client can free the memory.
+ emit q_ptr->editingCompleted(true);
+ }
+ }
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_EXIT );
}
/*!
@@ -598,14 +671,18 @@
*/
bool NotesEditorPrivate::isNoteEdited()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_ISNOTEEDITED_ENTRY );
if (mModifiedNote.description().compare(mOriginalNote.description())) {
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT );
return ETrue;
}
if (mModifiedNote.favourite() != mOriginalNote.favourite()) {
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT );
return ETrue;
}
+ OstTraceFunctionExit0( DUP2_NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT );
return EFalse;
}
@@ -616,26 +693,34 @@
*/
bool NotesEditorPrivate::isTodoEdited()
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_ISTODOEDITED_ENTRY );
if ( mModifiedNote.summary().compare(mOriginalNote.summary())) {
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_ISTODOEDITED_EXIT );
return ETrue;
}
if (mModifiedNote.status() != mOriginalNote.status()) {
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT );
return ETrue;
}
if (mModifiedNote.priority() != mOriginalNote.priority()) {
+ OstTraceFunctionExit0( DUP2_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT );
return ETrue;
}
if (mModifiedNote.endTime() != mOriginalNote.endTime()) {
+ OstTraceFunctionExit0( DUP3_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT );
return ETrue;
}
if (mModifiedNote.description().compare(mOriginalNote.description())) {
+ OstTraceFunctionExit0( DUP4_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT );
return ETrue;
}
if (mModifiedNote.alarm() != mOriginalNote.alarm()) {
+ OstTraceFunctionExit0( DUP5_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT );
return ETrue;
}
+ OstTraceFunctionExit0( DUP6_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT );
return EFalse;
}
@@ -646,10 +731,12 @@
*/
void NotesEditorPrivate::showNotification(QString text)
{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_SHOWNOTIFICATION_ENTRY );
HbNotificationDialog *notificationDialog = new HbNotificationDialog();
notificationDialog->setTimeout(
HbNotificationDialog::ConfirmationNoteTimeout);
notificationDialog->setTitle(text);
notificationDialog->show();
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_SHOWNOTIFICATION_EXIT );
}
// End of file --Don't remove this.
--- a/notes/notesui/noteseditor/src/noteseditordocloader.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/src/noteseditordocloader.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -18,6 +18,11 @@
// User includes
#include "noteseditordocloader.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "noteseditordocloaderTraces.h"
+#endif
+
/*!
\class NotesEditorDocLoader
@@ -36,6 +41,7 @@
*/
QObject* NotesEditorDocLoader::createObject(const QString &type, const QString &name)
{
+ OstTraceFunctionEntry0( NOTESEDITORDOCLOADER_CREATEOBJECT_ENTRY );
return HbDocumentLoader::createObject(type, name);
}
--- a/notes/notesui/noteseditor/src/notesnoteeditor.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/src/notesnoteeditor.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -37,7 +37,12 @@
#include "noteseditorcommon.h"
#include "noteseditor.h"
#include "noteseditor_p.h"
-#include "agendautil.h"
+#include <agendautil.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesnoteeditorTraces.h"
+#endif
+
/*!
\class NotesNoteEditor
@@ -64,6 +69,7 @@
mDiscardChangesActionActive(false),
mIgnoreFirstContentChange(false)
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_NOTESNOTEEDITOR_ENTRY );
mDocLoader = new NotesEditorDocLoader;
Q_ASSERT(mDocLoader);
@@ -162,6 +168,7 @@
if (!mFavouriteIcon) {
qFatal("Unable to get widget from document");
}
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_NOTESNOTEEDITOR_EXIT );
}
/*!
@@ -169,8 +176,10 @@
*/
NotesNoteEditor::~NotesNoteEditor()
{
+ OstTraceFunctionEntry0( DUP1_NOTESNOTEEDITOR_NOTESNOTEEDITOR_ENTRY );
mDocLoader->reset();
delete mDocLoader;
+ OstTraceFunctionExit0( DUP1_NOTESNOTEEDITOR_NOTESNOTEEDITOR_EXIT );
}
/*!
@@ -181,6 +190,7 @@
*/
void NotesNoteEditor::execute(AgendaEntry entry)
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_EXECUTE_ENTRY );
Q_UNUSED(entry)
HbExtendedLocale locale = HbExtendedLocale::system();
@@ -195,7 +205,7 @@
mMarkFavouriteAction->setText(
hbTrId("txt_notes_opt_remove_from_favorites"));
} else {
- iconName = "";
+ iconName = " ";
mMarkFavouriteAction->setText(
hbTrId("txt_notes_opt_mark_as_favorite"));
@@ -210,7 +220,7 @@
// Set the sub heading
mViewHeading->setPlainText(hbTrId("txt_notes_subhead_note"));
} else {
- mFavouriteIcon->setIcon(HbIcon(""));
+ mFavouriteIcon->setIcon(HbIcon(" "));
// For handling the edit of note when text is given as input
mTextEditor->setPlainText(mOwner->mModifiedNote.description());
@@ -237,6 +247,7 @@
this, SLOT(saveNote()));
window->addView(mEditor);
window->setCurrentView(mEditor);
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_EXECUTE_EXIT );
}
/*!
@@ -246,6 +257,7 @@
*/
QString NotesNoteEditor::getDescription()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_GETDESCRIPTION_ENTRY );
return mTextEditor->toPlainText();
}
@@ -254,7 +266,9 @@
*/
void NotesNoteEditor::markNoteAsTodo()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_MARKNOTEASTODO_ENTRY );
mOwner->markNoteAsTodo();
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_MARKNOTEASTODO_EXIT );
}
/*!
@@ -264,6 +278,7 @@
*/
void NotesNoteEditor::saveNote()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_SAVENOTE_ENTRY );
bool status = false;
if (!mOwner->mSaveEntry) {
@@ -288,6 +303,7 @@
this, SLOT(saveNote()));
mOwner->editingCompleted(status);
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_SAVENOTE_EXIT );
}
/*!
@@ -295,6 +311,7 @@
*/
void NotesNoteEditor::deleteNote()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_DELETENOTE_ENTRY );
HbMessageBox *confirmationQuery = new HbMessageBox(
HbMessageBox::MessageTypeQuestion);
confirmationQuery->setDismissPolicy(HbDialog::NoDismiss);
@@ -322,6 +339,7 @@
confirmationQuery->addAction(mCancelDeleteAction);
confirmationQuery->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_DELETENOTE_EXIT );
}
/*!
@@ -330,9 +348,11 @@
*/
void NotesNoteEditor::close()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_CLOSE_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
// Now close the editor.
window->removeView(mEditor);
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_CLOSE_EXIT );
}
/*!
@@ -340,6 +360,7 @@
*/
void NotesNoteEditor::updateNoteText()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_UPDATENOTETEXT_ENTRY );
// mIgnoreFirstContentChange is used since updateNoteText
// slot is called before the cursor is pressed
if(!mIgnoreFirstContentChange) {
@@ -367,6 +388,7 @@
}
mOwner->updateNoteText();
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_UPDATENOTETEXT_EXIT );
}
/*!
@@ -375,6 +397,7 @@
void NotesNoteEditor::checkOrientatioAndLoadSection(
Qt::Orientation screenOrientation)
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_CHECKORIENTATIOANDLOADSECTION_ENTRY );
bool success;
// If horizontal, load the landscape section.
@@ -393,6 +416,7 @@
success, "NotesNoteEditor.cpp",
"Unable to load landscape section");
}
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_CHECKORIENTATIOANDLOADSECTION_EXIT );
}
/*!
@@ -400,11 +424,12 @@
*/
void NotesNoteEditor::markNoteAsFavourite()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_MARKNOTEASFAVOURITE_ENTRY );
if (mOwner->mModifiedNote.favourite()) {
mOwner->mModifiedNote.setFavourite(0);
// Update the icon.
- mFavouriteIcon->setIcon(HbIcon(""));
+ mFavouriteIcon->setIcon(HbIcon(" "));
// Change the text on the action.
mMarkFavouriteAction->setText(
@@ -419,6 +444,7 @@
mMarkFavouriteAction->setText(
hbTrId("txt_notes_opt_remove_from_favorites"));
}
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_MARKNOTEASFAVOURITE_EXIT );
}
/*!
@@ -426,8 +452,10 @@
*/
void NotesNoteEditor::handleDiscardChangesAction()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_HANDLEDISCARDCHANGESACTION_ENTRY );
// Close the note editor
close();
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_HANDLEDISCARDCHANGESACTION_EXIT );
}
/*!
@@ -435,6 +463,7 @@
*/
void NotesNoteEditor::handleAddToCalendarAction()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_HANDLEADDTOCALENDARACTION_ENTRY );
mCalenEditor = new CalenEditor(mOwner->mAgendaUtil);
connect (
@@ -459,6 +488,7 @@
mCalenEditor->create(
calendarEntry, 1, CalenEditor::TypeAppointment);
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_HANDLEADDTOCALENDARACTION_EXIT );
}
/*!
@@ -466,12 +496,14 @@
*/
void NotesNoteEditor::handleEntrySaveFromCalendar()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_HANDLEENTRYSAVEFROMCALENDAR_ENTRY );
mEntrySavedInCalendar = true;
// Delete the old note and go back to the previous view.
if (!mOwner->mNewEntry) {
// Delete the note. All the changes are discarded.
mOwner->mAgendaUtil->deleteEntry(mOwner->mOriginalNote.id());
}
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_HANDLEENTRYSAVEFROMCALENDAR_EXIT );
}
/*!
@@ -479,6 +511,7 @@
*/
void NotesNoteEditor::handleCalendarEditorClosed()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_HANDLECALENDAREDITORCLOSED_ENTRY );
if (mEntrySavedInCalendar) {
mOwner->close(NotesEditor::CloseWithoutSave);
@@ -501,6 +534,7 @@
// Delete the calendar editor.
mCalenEditor->deleteLater();
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_HANDLECALENDAREDITORCLOSED_EXIT );
}
/*!
@@ -508,8 +542,9 @@
*/
void NotesNoteEditor::handleNewNoteAction()
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_HANDLENEWNOTEACTION_ENTRY );
if (mOwner->isNoteEdited()) {
- mOwner->mAgendaUtil->updateEntry(mOwner->mModifiedNote);
+ mOwner->mAgendaUtil->store(mOwner->mModifiedNote);
}
AgendaEntry entry;
@@ -518,7 +553,7 @@
mOwner->mModifiedNote = mOwner->mOriginalNote = entry;
mOwner->mNewEntry = true;
- mFavouriteIcon->setIcon(HbIcon(""));
+ mFavouriteIcon->setIcon(HbIcon(" "));
// For handling the edit of note when text is given as input
mTextEditor->setPlainText(mOwner->mModifiedNote.description());
@@ -537,6 +572,7 @@
mDiscardChangesActionActive = false;
}
mEditor->menu()->removeAction(mNewNoteAction);
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_HANDLENEWNOTEACTION_EXIT );
}
/* !
@@ -544,6 +580,7 @@
*/
void NotesNoteEditor::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( NOTESNOTEEDITOR_SELECTEDACTION_ENTRY );
if (action == mDeleteNoteAction) {
mOwner->deleteNote();
@@ -555,6 +592,7 @@
mOwner->editingCompleted(status);
}
+ OstTraceFunctionExit0( NOTESNOTEEDITOR_SELECTEDACTION_EXIT );
}
// End of file --Don't remove this.
--- a/notes/notesui/noteseditor/src/notestodoeditor.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/src/notestodoeditor.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -45,7 +45,16 @@
#include "noteseditor_p.h"
#include "noteseditorcommon.h"
#include "noteseditordocloader.h"
-#include "agendaentry.h"
+#include <agendaentry.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notestodoeditorTraces.h"
+#endif
+
+// Constants
+const int MaxRowsInTextItem(10);
+const int MaxCharacterLimit(255);
+
/*!
\class NotesTodoEditor
@@ -69,6 +78,7 @@
mDescriptionItemIndex(5),
mDiscardChangesActive(false)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_NOTESTODOEDITOR_ENTRY );
mDocLoader = new NotesEditorDocLoader;
Q_ASSERT(mDocLoader);
@@ -101,6 +111,7 @@
QList <HbAbstractViewItem*> prototypes = mDataForm->itemPrototypes();
prototypes.append(customItem);
mDataForm->setItemPrototypes(prototypes);
+ OstTraceFunctionExit0( NOTESTODOEDITOR_NOTESTODOEDITOR_EXIT );
}
/*!
@@ -108,12 +119,14 @@
*/
NotesTodoEditor::~NotesTodoEditor()
{
+ OstTraceFunctionEntry0( DUP1_NOTESTODOEDITOR_NOTESTODOEDITOR_ENTRY );
if (mFormModel) {
delete mFormModel;
}
mDocLoader->reset();
delete mDocLoader;
+ OstTraceFunctionExit0( DUP1_NOTESTODOEDITOR_NOTESTODOEDITOR_EXIT );
}
/*!
@@ -121,8 +134,10 @@
*/
void NotesTodoEditor::updateSummaryText(const QString &text)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_UPDATESUMMARYTEXT_ENTRY );
mOwner->mModifiedNote.setSummary(text);
addDiscardChangesAction();
+ OstTraceFunctionExit0( NOTESTODOEDITOR_UPDATESUMMARYTEXT_EXIT );
}
/*!
@@ -132,8 +147,10 @@
*/
void NotesTodoEditor::updatePriority(int index)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_UPDATEPRIORITY_ENTRY );
mOwner->mModifiedNote.setPriority(index + 1);
addDiscardChangesAction();
+ OstTraceFunctionExit0( NOTESTODOEDITOR_UPDATEPRIORITY_EXIT );
}
/*!
@@ -143,8 +160,10 @@
*/
void NotesTodoEditor::updateDescription(const QString &text)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_UPDATEDESCRIPTION_ENTRY );
mOwner->mModifiedNote.setDescription(text);
addDiscardChangesAction();
+ OstTraceFunctionExit0( NOTESTODOEDITOR_UPDATEDESCRIPTION_EXIT );
}
/*!
@@ -155,6 +174,7 @@
*/
bool NotesTodoEditor::validAlarmSet()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_VALIDALARMSET_ENTRY );
bool alarmSet(true);
// Sanity Check.
@@ -179,6 +199,7 @@
}else {
HbNotificationDialog::launchDialog(tr("Alarm time is not valid"));
alarmSet = false;
+ OstTraceFunctionExit0( NOTESTODOEDITOR_VALIDALARMSET_EXIT );
return alarmSet;
}
@@ -198,6 +219,7 @@
}else {
HbNotificationDialog::launchDialog(tr("Alarm date is not valid"));
alarmSet = false;
+ OstTraceFunctionExit0( DUP1_NOTESTODOEDITOR_VALIDALARMSET_EXIT );
return alarmSet;
}
@@ -229,8 +251,10 @@
} else {
AgendaAlarm dummyAlarm;
mOwner->mModifiedNote.setAlarm(dummyAlarm);
+ OstTraceFunctionExit0( DUP2_NOTESTODOEDITOR_VALIDALARMSET_EXIT );
return alarmSet;
}
+ OstTraceFunctionExit0( DUP3_NOTESTODOEDITOR_VALIDALARMSET_EXIT );
return alarmSet;
}
@@ -239,6 +263,7 @@
*/
void NotesTodoEditor::addDiscardChangesAction()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_ADDDISCARDCHANGESACTION_ENTRY );
if(!mDiscardChangesActive) {
mDiscardAction = new HbAction(hbTrId("txt_notes_opt_discard_changes"));
@@ -250,6 +275,7 @@
mDiscardChangesActive = true;
}
+ OstTraceFunctionExit0( NOTESTODOEDITOR_ADDDISCARDCHANGESACTION_EXIT );
}
/*!
@@ -259,7 +285,8 @@
*/
void NotesTodoEditor::execute(AgendaEntry entry)
{
- Q_UNUSED(entry)
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_EXECUTE_ENTRY );
+
HbMenu *viewMenu = mEditor->menu();
if (!mDescriptionAction) {
@@ -302,6 +329,7 @@
this, SLOT(saveTodo()));
window->addView(mEditor);
window->setCurrentView(mEditor);
+ OstTraceFunctionExit0( NOTESTODOEDITOR_EXECUTE_EXIT );
}
/*!
@@ -311,14 +339,17 @@
*/
void NotesTodoEditor::create(AgendaEntry entry)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_CREATE_ENTRY );
Q_UNUSED(entry)
+ OstTraceFunctionExit0( NOTESTODOEDITOR_CREATE_EXIT );
}
/*!
Initializes the data form model.
*/
void NotesTodoEditor::initFormModel()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_INITFORMMODEL_ENTRY );
// Delete the model if already there.
if (mFormModel) {
delete mFormModel;
@@ -340,6 +371,7 @@
// Set the model to the form.
mDataForm->setModel(mFormModel);
+ OstTraceFunctionExit0( NOTESTODOEDITOR_INITFORMMODEL_EXIT );
}
/*!
@@ -347,16 +379,20 @@
*/
void NotesTodoEditor::insertSubjectItem()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTSUBJECTITEM_ENTRY );
mSubjectItem = mFormModel->appendDataFormItem(
HbDataFormModelItem::TextItem,
QString(""), mFormModel->invisibleRootItem());
- mSubjectItem->setContentWidgetData(
- QString("text"), mOwner->mModifiedNote.summary());
+ mSubjectItem->setContentWidgetData("text", mOwner->mModifiedNote.summary());
+ mSubjectItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
+ mSubjectItem->setContentWidgetData("maxLength", MaxCharacterLimit);
+ mSubjectItem->setContentWidgetData("objectName", "subjectItem");
mDataForm->addConnection(
mSubjectItem , SIGNAL(textChanged(const QString &)),
this, SLOT(updateSummaryText(const QString &)));
+ OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTSUBJECTITEM_EXIT );
}
/*!
@@ -364,6 +400,7 @@
*/
void NotesTodoEditor::insertDueDateItem()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTDUEDATEITEM_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>
(HbDataFormModelItem::CustomItemBase + DueDateItemOffset);
@@ -385,12 +422,15 @@
mOwner->dateFormatString());
}
mDueDateItem->setContentWidgetData("text",dueDateText);
+
+ OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTDUEDATEITEM_EXIT );
}
/*!
Inserts the reminder enabler item into the model.
*/
void NotesTodoEditor::insertReminderToggle()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTREMINDERTOGGLE_ENTRY );
mReminderEnabler = mFormModel->appendDataFormItem(
HbDataFormModelItem::CheckBoxItem,
tr(""), mFormModel->invisibleRootItem());
@@ -403,10 +443,11 @@
} else {
mReminderEnabler->setContentWidgetData("checkState",Qt::Unchecked);
}
-
+ mReminderEnabler->setContentWidgetData("objectName", "remainderToggleItem");
mDataForm->addConnection(
mReminderEnabler, SIGNAL(stateChanged(int)),
this, SLOT(handleReminderItem(int)));
+ OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTREMINDERTOGGLE_EXIT );
}
/*!
@@ -414,6 +455,7 @@
*/
void NotesTodoEditor::handleReminderItem(int checked)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEREMINDERITEM_ENTRY );
if (Qt::Checked == checked) {
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>
@@ -483,6 +525,7 @@
mReminderItem = 0;
}
}
+ OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEREMINDERITEM_EXIT );
}
/*!
@@ -490,6 +533,7 @@
*/
void NotesTodoEditor::insertPriorityItem()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTPRIORITYITEM_ENTRY );
mPriorityItem = mFormModel->appendDataFormItem(
HbDataFormModelItem::ComboBoxItem,
hbTrId("txt_notes_setlabel_priority"),
@@ -512,6 +556,7 @@
mDataForm->addConnection(
mPriorityItem, SIGNAL(currentIndexChanged(int)),
this, SLOT(updatePriority(int)));
+ OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTPRIORITYITEM_EXIT );
}
/*!
@@ -519,6 +564,7 @@
*/
void NotesTodoEditor::insertDescriptionItem()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTDESCRIPTIONITEM_ENTRY );
mDescriptionItem = mFormModel->appendDataFormItem(
HbDataFormModelItem::TextItem,
hbTrId("txt_notes_formlabel_val_description"),
@@ -527,12 +573,14 @@
mDescriptionItemIndex =
mFormModel->indexFromItem(mDescriptionItem).row();
+ mDescriptionItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
mDescriptionItem->setContentWidgetData(
QString("text"), mOwner->mModifiedNote.description());
mDataForm->addConnection(
mDescriptionItem, SIGNAL(textChanged(const QString)),
this, SLOT(updateDescription(const QString)));
+ OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTDESCRIPTIONITEM_EXIT );
}
/*!
@@ -540,10 +588,12 @@
*/
void NotesTodoEditor::addMenu()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_ADDMENU_ENTRY );
mDeleteAction = mEditor->menu()->addAction(hbTrId("txt_common_opt_delete"));
connect(
mDeleteAction, SIGNAL(triggered()),
this, SLOT(handleDeleteAction()));
+ OstTraceFunctionExit0( NOTESTODOEDITOR_ADDMENU_EXIT );
}
/*!
@@ -551,6 +601,7 @@
*/
void NotesTodoEditor::saveTodo()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_SAVETODO_ENTRY );
// Here we check if the user has set the appropriate alarm time.
// And save only if its fine to do so. Else we note a discrete notification
// asking the user to check for the alarm time.
@@ -570,6 +621,7 @@
mOwner->editingCompleted(status);
}
+ OstTraceFunctionExit0( NOTESTODOEDITOR_SAVETODO_EXIT );
}
/*!
@@ -578,10 +630,12 @@
*/
void NotesTodoEditor::close()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_CLOSE_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
// Now close the editor.
window->removeView(mEditor);
+ OstTraceFunctionExit0( NOTESTODOEDITOR_CLOSE_EXIT );
}
/*!
@@ -590,6 +644,7 @@
*/
void NotesTodoEditor::handleAddDescriptionAction()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEADDDESCRIPTIONACTION_ENTRY );
// Now we add the description item here.
insertDescriptionItem();
@@ -603,6 +658,7 @@
connect(
mDescriptionAction, SIGNAL(triggered()),
this, SLOT(handleRemoveDescriptionAction()));
+ OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEADDDESCRIPTIONACTION_EXIT );
}
/*!
@@ -611,6 +667,7 @@
*/
void NotesTodoEditor::handleRemoveDescriptionAction()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEREMOVEDESCRIPTIONACTION_ENTRY );
// Here we firstset the description text in the entry to empty.
mOwner->mModifiedNote.setDescription("");
@@ -628,6 +685,7 @@
mDescriptionAction, SIGNAL(triggered()),
this, SLOT(handleAddDescriptionAction()));
+ OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEREMOVEDESCRIPTIONACTION_EXIT );
}
/*!
@@ -635,6 +693,7 @@
*/
void NotesTodoEditor::handleDeleteAction()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEDELETEACTION_ENTRY );
HbMessageBox *confirmationQuery = new HbMessageBox(
HbMessageBox::MessageTypeQuestion);
confirmationQuery->setDismissPolicy(HbDialog::NoDismiss);
@@ -662,6 +721,7 @@
confirmationQuery->addAction((mCancelDeleteAction));
confirmationQuery->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEDELETEACTION_EXIT );
}
/*!
@@ -669,8 +729,10 @@
*/
void NotesTodoEditor::handleDiscardChangesAction()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEDISCARDCHANGESACTION_ENTRY );
// Close the to-do editor
close();
+ OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEDISCARDCHANGESACTION_EXIT );
}
/*!
@@ -678,6 +740,7 @@
*/
void NotesTodoEditor::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITOR_SELECTEDACTION_ENTRY );
if (action==mDeleteTodoAction) {
// Delete the to-do entry.
mOwner->deleteNote();
@@ -685,6 +748,7 @@
// Close the to-do editor.
close();
}
+ OstTraceFunctionExit0( NOTESTODOEDITOR_SELECTEDACTION_EXIT );
}
// End of file --Don't remove this.
--- a/notes/notesui/noteseditor/src/notestodoeditorcustomitem.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/noteseditor/src/notestodoeditorcustomitem.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,6 +32,11 @@
#include "notestodoeditorcustomitem.h"
#include "noteseditor_p.h"
#include "noteseditorcommon.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notestodoeditorcustomitemTraces.h"
+#endif
+
/*!
\class NotesTodoEditorCustomItem
@@ -53,7 +58,9 @@
mNotesTodoeditorPvt(noteseditorPvt),
mDueDatePickerIsActive(false)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_ENTRY );
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_EXIT );
}
/*!
@@ -61,6 +68,8 @@
*/
NotesTodoEditorCustomItem::~NotesTodoEditorCustomItem()
{
+ OstTraceFunctionEntry0( DUP1_NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_ENTRY );
+ OstTraceFunctionExit0( DUP1_NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_EXIT );
}
/*!
@@ -70,6 +79,7 @@
*/
HbAbstractViewItem* NotesTodoEditorCustomItem::createItem()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_CREATEITEM_ENTRY );
return new NotesTodoEditorCustomItem(*this);
}
@@ -80,6 +90,7 @@
*/
HbWidget* NotesTodoEditorCustomItem::createCustomWidget()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(modelIndex()
.data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -87,9 +98,11 @@
switch(itemType) {
case HbDataFormModelItem::CustomItemBase + DueDateItemOffset: {
mDueDateItem = new HbPushButton();
+ mDueDateItem->setObjectName("dueDateItem");
connect(
mDueDateItem, SIGNAL(clicked()),
this, SLOT(selectDueDate()));
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mDueDateItem;
}
@@ -101,16 +114,19 @@
widget->setLayout(layout);
mTimeWidget = new HbPushButton();
+ mTimeWidget->setObjectName("alarmTime");
layout->addItem(mTimeWidget);
connect(
mTimeWidget, SIGNAL(clicked()),
this, SLOT(launchTimePicker()));
mDateWidget = new HbPushButton();
+ mDateWidget->setObjectName("alarmDate");
layout->addItem(mDateWidget);
connect(
mDateWidget, SIGNAL(clicked()),
this, SLOT(launchDatePicker()));
+ OstTraceFunctionExit0( DUP1_NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return widget;
}
case HbDataFormModelItem::CustomItemBase + ItemOffsetUnKnown:
@@ -124,14 +140,17 @@
*/
bool NotesTodoEditorCustomItem::canSetModelIndex(const QModelIndex &index) const
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
index.data(HbDataFormModelItem::ItemTypeRole).toInt());
if( itemType == (HbDataFormModelItem::CustomItemBase + DueDateItemOffset) ||
itemType == (HbDataFormModelItem::CustomItemBase + AlarmDateItemOffset)) {
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT );
return true;
} else {
+ OstTraceFunctionExit0( DUP1_NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT );
return false;
}
}
@@ -142,6 +161,7 @@
*/
void NotesTodoEditorCustomItem::restore()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_RESTORE_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -166,6 +186,7 @@
default:
break;
}
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_RESTORE_EXIT );
}
/*!
@@ -173,6 +194,7 @@
*/
void NotesTodoEditorCustomItem::launchTimePicker()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY );
if (mTimePickerDialog) {
delete mTimePickerDialog;
}
@@ -207,6 +229,7 @@
mTimePickerDialog->addAction(mCancelAction);
mTimePickerDialog->open(this, SLOT(selectedAction(HbAction *)));
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_LAUNCHTIMEPICKER_EXIT );
}
/*!
@@ -214,6 +237,7 @@
*/
void NotesTodoEditorCustomItem::launchDatePicker()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_LAUNCHDATEPICKER_ENTRY );
if (mDatePickerDialog) {
delete mDatePickerDialog;
}
@@ -254,6 +278,7 @@
mDatePickerDialog->addAction(mCancelAction);
mDatePickerDialog->open(this, SLOT(selectedAction(HbAction *)));
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_LAUNCHDATEPICKER_EXIT );
}
/*
@@ -261,8 +286,10 @@
*/
void NotesTodoEditorCustomItem::selectDueDate()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_ENTRY );
if( mDueDateItem->isDown()) {
mDueDateItem->setDown(false);
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_EXIT );
return;
}
@@ -307,6 +334,7 @@
mDatePickerDialog->addAction(mCancelAction);
mDatePickerDialog->open(this, SLOT(selectedAction(HbAction *)));
+ OstTraceFunctionExit0( DUP1_NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_EXIT );
}
/*!
@@ -314,9 +342,11 @@
*/
void NotesTodoEditorCustomItem::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_SELECTEDACTION_ENTRY );
if (action == mOkAction) {
handleOkAction();
}
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_SELECTEDACTION_EXIT );
}
/*!
@@ -324,6 +354,7 @@
*/
void NotesTodoEditorCustomItem::handleOkAction()
{
+ OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_HANDLEOKACTION_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
HbDataFormModelItem *modelItem =
@@ -394,6 +425,7 @@
alarmDateItem->setContentWidgetData("alarmDate",dueDateText);
}
}
+ OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_HANDLEOKACTION_EXIT );
}
// End of file --Don't delete.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/noteseditor/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/noteseditor/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,182 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPRIVATE_EDIT_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPRIVATE_EDIT_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPRIVATE_SAVETODO_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITOR_EDIT_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITOR_EDIT_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITOR_NOTESEDITOR_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITOR_NOTESEDITOR_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESNOTEEDITOR_NOTESNOTEEDITOR_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESNOTEEDITOR_NOTESNOTEEDITOR_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT=0xa5
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xa2
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_ENTRY=0x9d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_EXIT=0x9e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_EXIT=0xae
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOEDITOR_NOTESTODOEDITOR_ENTRY=0x6a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOEDITOR_NOTESTODOEDITOR_EXIT=0x6b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOEDITOR_VALIDALARMSET_EXIT=0x74
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITORPRIVATE_EDIT_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITORPRIVATE_EDIT_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITOR_EDIT_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITOR_EDIT_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITOR_NOTESEDITOR_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITOR_NOTESEDITOR_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESTODOEDITOR_VALIDALARMSET_EXIT=0x75
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESEDITORPRIVATE_EDIT_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESEDITORPRIVATE_EDIT_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESEDITOR_EDIT_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESEDITOR_EDIT_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESTODOEDITOR_VALIDALARMSET_EXIT=0x76
+[TRACE]TRACE_FLOW[0x8A]_DUP4_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_DUP5_NOTESEDITORPRIVATE_EDIT_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_DUP5_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_DUP6_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT=0x43
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORDOCLOADER_CREATEOBJECT_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_CLOSE_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_CLOSE_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_CREATE_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_CREATE_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_DATEFORMATSTRING_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_DATEFORMATSTRING_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_DELETENOTE_ENTRY=0x2f
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_DELETENOTE_EXIT=0x30
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_EDITINGCOMPLETED_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_EDITINGCOMPLETED_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_EDIT_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_EDIT_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_ISNOTEEDITED_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_ISTODOEDITED_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_MARKNOTEASTODO_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_SAVENOTE_ENTRY=0x31
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_SAVENOTE_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_SAVETODO_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_SAVETODO_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_SHOWNOTIFICATION_ENTRY=0x44
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_SHOWNOTIFICATION_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_TIMEFORMATSTRING_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_TIMEFORMATSTRING_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_UPDATENOTETEXT_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_UPDATENOTETEXT_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_ENTRY=0xb3
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_EXIT=0xb4
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_CLOSE_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_CREATE_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_CREATE_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_EDIT_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_EDIT_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_NOTESEDITOR_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_NOTESEDITOR_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_CHECKORIENTATIOANDLOADSECTION_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_CHECKORIENTATIOANDLOADSECTION_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_CLOSE_ENTRY=0x54
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_CLOSE_EXIT=0x55
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_DELETENOTE_ENTRY=0x52
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_DELETENOTE_EXIT=0x53
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_EXECUTE_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_EXECUTE_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_GETDESCRIPTION_ENTRY=0x4d
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLEADDTOCALENDARACTION_ENTRY=0x5e
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLEADDTOCALENDARACTION_EXIT=0x5f
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLECALENDAREDITORCLOSED_ENTRY=0x62
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLECALENDAREDITORCLOSED_EXIT=0x63
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLEDISCARDCHANGESACTION_ENTRY=0x5c
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLEDISCARDCHANGESACTION_EXIT=0x5d
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLEENTRYSAVEFROMCALENDAR_ENTRY=0x60
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLEENTRYSAVEFROMCALENDAR_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLENEWNOTEACTION_ENTRY=0x64
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_HANDLENEWNOTEACTION_EXIT=0x65
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_MARKNOTEASFAVOURITE_ENTRY=0x5a
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_MARKNOTEASFAVOURITE_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_MARKNOTEASTODO_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_MARKNOTEASTODO_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_NOTESNOTEEDITOR_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_NOTESNOTEEDITOR_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_SAVENOTE_ENTRY=0x50
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_SAVENOTE_EXIT=0x51
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_SELECTEDACTION_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_SELECTEDACTION_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_UPDATENOTETEXT_ENTRY=0x56
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEEDITOR_UPDATENOTETEXT_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_ENTRY=0xa3
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT=0xa4
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY=0xa0
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xa1
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_CREATEITEM_ENTRY=0x9f
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_HANDLEOKACTION_ENTRY=0xb1
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_HANDLEOKACTION_EXIT=0xb2
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_LAUNCHDATEPICKER_ENTRY=0xaa
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_LAUNCHDATEPICKER_EXIT=0xab
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY=0xa8
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_LAUNCHTIMEPICKER_EXIT=0xa9
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_ENTRY=0x9b
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_EXIT=0x9c
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_RESTORE_ENTRY=0xa6
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_RESTORE_EXIT=0xa7
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_ENTRY=0xac
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_EXIT=0xad
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_SELECTEDACTION_ENTRY=0xaf
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITORCUSTOMITEM_SELECTEDACTION_EXIT=0xb0
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_ADDDISCARDCHANGESACTION_ENTRY=0x77
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_ADDDISCARDCHANGESACTION_EXIT=0x78
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_ADDMENU_ENTRY=0x8b
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_ADDMENU_EXIT=0x8c
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_CLOSE_ENTRY=0x8f
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_CLOSE_EXIT=0x90
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_CREATE_ENTRY=0x7b
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_CREATE_EXIT=0x7c
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_EXECUTE_ENTRY=0x79
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_EXECUTE_EXIT=0x7a
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEADDDESCRIPTIONACTION_ENTRY=0x91
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEADDDESCRIPTIONACTION_EXIT=0x92
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEDELETEACTION_ENTRY=0x95
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEDELETEACTION_EXIT=0x96
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEDISCARDCHANGESACTION_ENTRY=0x97
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEDISCARDCHANGESACTION_EXIT=0x98
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEREMINDERITEM_ENTRY=0x85
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEREMINDERITEM_EXIT=0x86
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEREMOVEDESCRIPTIONACTION_ENTRY=0x93
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_HANDLEREMOVEDESCRIPTIONACTION_EXIT=0x94
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INITFORMMODEL_ENTRY=0x7d
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INITFORMMODEL_EXIT=0x7e
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTDESCRIPTIONITEM_ENTRY=0x89
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTDESCRIPTIONITEM_EXIT=0x8a
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTDUEDATEITEM_ENTRY=0x81
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTDUEDATEITEM_EXIT=0x82
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTPRIORITYITEM_ENTRY=0x87
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTPRIORITYITEM_EXIT=0x88
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTREMINDERTOGGLE_ENTRY=0x83
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTREMINDERTOGGLE_EXIT=0x84
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTSUBJECTITEM_ENTRY=0x7f
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_INSERTSUBJECTITEM_EXIT=0x80
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_NOTESTODOEDITOR_ENTRY=0x68
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_NOTESTODOEDITOR_EXIT=0x69
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_SAVETODO_ENTRY=0x8d
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_SAVETODO_EXIT=0x8e
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_SELECTEDACTION_ENTRY=0x99
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_SELECTEDACTION_EXIT=0x9a
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_UPDATEDESCRIPTION_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_UPDATEDESCRIPTION_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_UPDATEPRIORITY_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_UPDATEPRIORITY_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_UPDATESUMMARYTEXT_ENTRY=0x6c
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_UPDATESUMMARYTEXT_EXIT=0x6d
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_VALIDALARMSET_ENTRY=0x72
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_VALIDALARMSET_EXIT=0x73
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP4_NOTESEDITORPRIVATE_EDIT_EXIT=0x1e
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/noteseditor/traces/noteseditorTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,31 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESEDITORTRACES_H__
+#define __NOTESEDITORTRACES_H__
+
+#define KOstTraceComponentID 0x20029f82
+
+#define NOTESEDITOR_NOTESEDITOR_ENTRY 0x8a0001
+#define NOTESEDITOR_NOTESEDITOR_EXIT 0x8a0002
+#define DUP1_NOTESEDITOR_NOTESEDITOR_ENTRY 0x8a0003
+#define DUP1_NOTESEDITOR_NOTESEDITOR_EXIT 0x8a0004
+#define DUP2_NOTESEDITOR_NOTESEDITOR_ENTRY 0x8a0005
+#define DUP2_NOTESEDITOR_NOTESEDITOR_EXIT 0x8a0006
+#define NOTESEDITOR_EDIT_ENTRY 0x8a0007
+#define NOTESEDITOR_EDIT_EXIT 0x8a0008
+#define DUP1_NOTESEDITOR_EDIT_ENTRY 0x8a0009
+#define DUP1_NOTESEDITOR_EDIT_EXIT 0x8a000a
+#define DUP2_NOTESEDITOR_EDIT_ENTRY 0x8a000b
+#define DUP2_NOTESEDITOR_EDIT_EXIT 0x8a000c
+#define DUP3_NOTESEDITOR_EDIT_ENTRY 0x8a000d
+#define DUP3_NOTESEDITOR_EDIT_EXIT 0x8a000e
+#define NOTESEDITOR_CREATE_ENTRY 0x8a000f
+#define NOTESEDITOR_CREATE_EXIT 0x8a0010
+#define NOTESEDITOR_CLOSE_ENTRY 0x8a0011
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/noteseditor/traces/noteseditor_pTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,67 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESEDITOR_PTRACES_H__
+#define __NOTESEDITOR_PTRACES_H__
+
+#define KOstTraceComponentID 0x20029f82
+
+#define NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_ENTRY 0x8a0012
+#define NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT 0x8a0013
+#define DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_ENTRY 0x8a0014
+#define DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT 0x8a0015
+#define NOTESEDITORPRIVATE_EDIT_ENTRY 0x8a0016
+#define NOTESEDITORPRIVATE_EDIT_EXIT 0x8a0017
+#define DUP1_NOTESEDITORPRIVATE_EDIT_ENTRY 0x8a0018
+#define DUP1_NOTESEDITORPRIVATE_EDIT_EXIT 0x8a0019
+#define DUP2_NOTESEDITORPRIVATE_EDIT_ENTRY 0x8a001a
+#define DUP2_NOTESEDITORPRIVATE_EDIT_EXIT 0x8a001b
+#define DUP3_NOTESEDITORPRIVATE_EDIT_EXIT 0x8a001c
+#define DUP3_NOTESEDITORPRIVATE_EDIT_ENTRY 0x8a001d
+#define DUP5_NOTESEDITORPRIVATE_EDIT_EXIT 0x8a001f
+#define NOTESEDITORPRIVATE_CREATE_ENTRY 0x8a0020
+#define NOTESEDITORPRIVATE_CREATE_EXIT 0x8a0021
+#define NOTESEDITORPRIVATE_CLOSE_ENTRY 0x8a0022
+#define NOTESEDITORPRIVATE_CLOSE_EXIT 0x8a0023
+#define NOTESEDITORPRIVATE_DATEFORMATSTRING_ENTRY 0x8a0024
+#define NOTESEDITORPRIVATE_DATEFORMATSTRING_EXIT 0x8a0025
+#define NOTESEDITORPRIVATE_TIMEFORMATSTRING_ENTRY 0x8a0026
+#define NOTESEDITORPRIVATE_TIMEFORMATSTRING_EXIT 0x8a0027
+#define NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_ENTRY 0x8a0028
+#define NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_EXIT 0x8a0029
+#define NOTESEDITORPRIVATE_MARKNOTEASTODO_ENTRY 0x8a002a
+#define NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT 0x8a002b
+#define DUP1_NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT 0x8a002c
+#define NOTESEDITORPRIVATE_UPDATENOTETEXT_ENTRY 0x8a002d
+#define NOTESEDITORPRIVATE_UPDATENOTETEXT_EXIT 0x8a002e
+#define NOTESEDITORPRIVATE_DELETENOTE_ENTRY 0x8a002f
+#define NOTESEDITORPRIVATE_DELETENOTE_EXIT 0x8a0030
+#define NOTESEDITORPRIVATE_SAVENOTE_ENTRY 0x8a0031
+#define NOTESEDITORPRIVATE_SAVENOTE_EXIT 0x8a0032
+#define NOTESEDITORPRIVATE_SAVETODO_ENTRY 0x8a0033
+#define NOTESEDITORPRIVATE_SAVETODO_EXIT 0x8a0034
+#define DUP1_NOTESEDITORPRIVATE_SAVETODO_EXIT 0x8a0035
+#define NOTESEDITORPRIVATE_EDITINGCOMPLETED_ENTRY 0x8a0036
+#define NOTESEDITORPRIVATE_EDITINGCOMPLETED_EXIT 0x8a0037
+#define NOTESEDITORPRIVATE_ISNOTEEDITED_ENTRY 0x8a0038
+#define NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT 0x8a0039
+#define DUP1_NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT 0x8a003a
+#define DUP2_NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT 0x8a003b
+#define NOTESEDITORPRIVATE_ISTODOEDITED_ENTRY 0x8a003c
+#define NOTESEDITORPRIVATE_ISTODOEDITED_EXIT 0x8a003d
+#define DUP1_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT 0x8a003e
+#define DUP2_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT 0x8a003f
+#define DUP3_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT 0x8a0040
+#define DUP4_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT 0x8a0041
+#define DUP5_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT 0x8a0042
+#define DUP6_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT 0x8a0043
+#define NOTESEDITORPRIVATE_SHOWNOTIFICATION_ENTRY 0x8a0044
+#define NOTESEDITORPRIVATE_SHOWNOTIFICATION_EXIT 0x8a0045
+#define NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_ENTRY 0x8a00b3
+#define NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_EXIT 0x8a00b4
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/noteseditor/traces/noteseditordocloaderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,15 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESEDITORDOCLOADERTRACES_H__
+#define __NOTESEDITORDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x20029f82
+
+#define NOTESEDITORDOCLOADER_CREATEOBJECT_ENTRY 0x8a0046
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/noteseditor/traces/notesnoteeditorTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,47 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESNOTEEDITORTRACES_H__
+#define __NOTESNOTEEDITORTRACES_H__
+
+#define KOstTraceComponentID 0x20029f82
+
+#define NOTESNOTEEDITOR_NOTESNOTEEDITOR_ENTRY 0x8a0047
+#define NOTESNOTEEDITOR_NOTESNOTEEDITOR_EXIT 0x8a0048
+#define DUP1_NOTESNOTEEDITOR_NOTESNOTEEDITOR_ENTRY 0x8a0049
+#define DUP1_NOTESNOTEEDITOR_NOTESNOTEEDITOR_EXIT 0x8a004a
+#define NOTESNOTEEDITOR_EXECUTE_ENTRY 0x8a004b
+#define NOTESNOTEEDITOR_EXECUTE_EXIT 0x8a004c
+#define NOTESNOTEEDITOR_GETDESCRIPTION_ENTRY 0x8a004d
+#define NOTESNOTEEDITOR_MARKNOTEASTODO_ENTRY 0x8a004e
+#define NOTESNOTEEDITOR_MARKNOTEASTODO_EXIT 0x8a004f
+#define NOTESNOTEEDITOR_SAVENOTE_ENTRY 0x8a0050
+#define NOTESNOTEEDITOR_SAVENOTE_EXIT 0x8a0051
+#define NOTESNOTEEDITOR_DELETENOTE_ENTRY 0x8a0052
+#define NOTESNOTEEDITOR_DELETENOTE_EXIT 0x8a0053
+#define NOTESNOTEEDITOR_CLOSE_ENTRY 0x8a0054
+#define NOTESNOTEEDITOR_CLOSE_EXIT 0x8a0055
+#define NOTESNOTEEDITOR_UPDATENOTETEXT_ENTRY 0x8a0056
+#define NOTESNOTEEDITOR_UPDATENOTETEXT_EXIT 0x8a0057
+#define NOTESNOTEEDITOR_CHECKORIENTATIOANDLOADSECTION_ENTRY 0x8a0058
+#define NOTESNOTEEDITOR_CHECKORIENTATIOANDLOADSECTION_EXIT 0x8a0059
+#define NOTESNOTEEDITOR_MARKNOTEASFAVOURITE_ENTRY 0x8a005a
+#define NOTESNOTEEDITOR_MARKNOTEASFAVOURITE_EXIT 0x8a005b
+#define NOTESNOTEEDITOR_HANDLEDISCARDCHANGESACTION_ENTRY 0x8a005c
+#define NOTESNOTEEDITOR_HANDLEDISCARDCHANGESACTION_EXIT 0x8a005d
+#define NOTESNOTEEDITOR_HANDLEADDTOCALENDARACTION_ENTRY 0x8a005e
+#define NOTESNOTEEDITOR_HANDLEADDTOCALENDARACTION_EXIT 0x8a005f
+#define NOTESNOTEEDITOR_HANDLEENTRYSAVEFROMCALENDAR_ENTRY 0x8a0060
+#define NOTESNOTEEDITOR_HANDLEENTRYSAVEFROMCALENDAR_EXIT 0x8a0061
+#define NOTESNOTEEDITOR_HANDLECALENDAREDITORCLOSED_ENTRY 0x8a0062
+#define NOTESNOTEEDITOR_HANDLECALENDAREDITORCLOSED_EXIT 0x8a0063
+#define NOTESNOTEEDITOR_HANDLENEWNOTEACTION_ENTRY 0x8a0064
+#define NOTESNOTEEDITOR_HANDLENEWNOTEACTION_EXIT 0x8a0065
+#define NOTESNOTEEDITOR_SELECTEDACTION_ENTRY 0x8a0066
+#define NOTESNOTEEDITOR_SELECTEDACTION_EXIT 0x8a0067
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/noteseditor/traces/notestodoeditorTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,65 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESTODOEDITORTRACES_H__
+#define __NOTESTODOEDITORTRACES_H__
+
+#define KOstTraceComponentID 0x20029f82
+
+#define NOTESTODOEDITOR_NOTESTODOEDITOR_ENTRY 0x8a0068
+#define NOTESTODOEDITOR_NOTESTODOEDITOR_EXIT 0x8a0069
+#define DUP1_NOTESTODOEDITOR_NOTESTODOEDITOR_ENTRY 0x8a006a
+#define DUP1_NOTESTODOEDITOR_NOTESTODOEDITOR_EXIT 0x8a006b
+#define NOTESTODOEDITOR_UPDATESUMMARYTEXT_ENTRY 0x8a006c
+#define NOTESTODOEDITOR_UPDATESUMMARYTEXT_EXIT 0x8a006d
+#define NOTESTODOEDITOR_UPDATEPRIORITY_ENTRY 0x8a006e
+#define NOTESTODOEDITOR_UPDATEPRIORITY_EXIT 0x8a006f
+#define NOTESTODOEDITOR_UPDATEDESCRIPTION_ENTRY 0x8a0070
+#define NOTESTODOEDITOR_UPDATEDESCRIPTION_EXIT 0x8a0071
+#define NOTESTODOEDITOR_VALIDALARMSET_ENTRY 0x8a0072
+#define NOTESTODOEDITOR_VALIDALARMSET_EXIT 0x8a0073
+#define DUP1_NOTESTODOEDITOR_VALIDALARMSET_EXIT 0x8a0074
+#define DUP2_NOTESTODOEDITOR_VALIDALARMSET_EXIT 0x8a0075
+#define DUP3_NOTESTODOEDITOR_VALIDALARMSET_EXIT 0x8a0076
+#define NOTESTODOEDITOR_ADDDISCARDCHANGESACTION_ENTRY 0x8a0077
+#define NOTESTODOEDITOR_ADDDISCARDCHANGESACTION_EXIT 0x8a0078
+#define NOTESTODOEDITOR_EXECUTE_ENTRY 0x8a0079
+#define NOTESTODOEDITOR_EXECUTE_EXIT 0x8a007a
+#define NOTESTODOEDITOR_CREATE_ENTRY 0x8a007b
+#define NOTESTODOEDITOR_CREATE_EXIT 0x8a007c
+#define NOTESTODOEDITOR_INITFORMMODEL_ENTRY 0x8a007d
+#define NOTESTODOEDITOR_INITFORMMODEL_EXIT 0x8a007e
+#define NOTESTODOEDITOR_INSERTSUBJECTITEM_ENTRY 0x8a007f
+#define NOTESTODOEDITOR_INSERTSUBJECTITEM_EXIT 0x8a0080
+#define NOTESTODOEDITOR_INSERTDUEDATEITEM_ENTRY 0x8a0081
+#define NOTESTODOEDITOR_INSERTDUEDATEITEM_EXIT 0x8a0082
+#define NOTESTODOEDITOR_INSERTREMINDERTOGGLE_ENTRY 0x8a0083
+#define NOTESTODOEDITOR_INSERTREMINDERTOGGLE_EXIT 0x8a0084
+#define NOTESTODOEDITOR_HANDLEREMINDERITEM_ENTRY 0x8a0085
+#define NOTESTODOEDITOR_HANDLEREMINDERITEM_EXIT 0x8a0086
+#define NOTESTODOEDITOR_INSERTPRIORITYITEM_ENTRY 0x8a0087
+#define NOTESTODOEDITOR_INSERTPRIORITYITEM_EXIT 0x8a0088
+#define NOTESTODOEDITOR_INSERTDESCRIPTIONITEM_ENTRY 0x8a0089
+#define NOTESTODOEDITOR_INSERTDESCRIPTIONITEM_EXIT 0x8a008a
+#define NOTESTODOEDITOR_ADDMENU_ENTRY 0x8a008b
+#define NOTESTODOEDITOR_ADDMENU_EXIT 0x8a008c
+#define NOTESTODOEDITOR_SAVETODO_ENTRY 0x8a008d
+#define NOTESTODOEDITOR_SAVETODO_EXIT 0x8a008e
+#define NOTESTODOEDITOR_CLOSE_ENTRY 0x8a008f
+#define NOTESTODOEDITOR_CLOSE_EXIT 0x8a0090
+#define NOTESTODOEDITOR_HANDLEADDDESCRIPTIONACTION_ENTRY 0x8a0091
+#define NOTESTODOEDITOR_HANDLEADDDESCRIPTIONACTION_EXIT 0x8a0092
+#define NOTESTODOEDITOR_HANDLEREMOVEDESCRIPTIONACTION_ENTRY 0x8a0093
+#define NOTESTODOEDITOR_HANDLEREMOVEDESCRIPTIONACTION_EXIT 0x8a0094
+#define NOTESTODOEDITOR_HANDLEDELETEACTION_ENTRY 0x8a0095
+#define NOTESTODOEDITOR_HANDLEDELETEACTION_EXIT 0x8a0096
+#define NOTESTODOEDITOR_HANDLEDISCARDCHANGESACTION_ENTRY 0x8a0097
+#define NOTESTODOEDITOR_HANDLEDISCARDCHANGESACTION_EXIT 0x8a0098
+#define NOTESTODOEDITOR_SELECTEDACTION_ENTRY 0x8a0099
+#define NOTESTODOEDITOR_SELECTEDACTION_EXIT 0x8a009a
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/noteseditor/traces/notestodoeditorcustomitemTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,38 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESTODOEDITORCUSTOMITEMTRACES_H__
+#define __NOTESTODOEDITORCUSTOMITEMTRACES_H__
+
+#define KOstTraceComponentID 0x20029f82
+
+#define NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_ENTRY 0x8a009b
+#define NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_EXIT 0x8a009c
+#define DUP1_NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_ENTRY 0x8a009d
+#define DUP1_NOTESTODOEDITORCUSTOMITEM_NOTESTODOEDITORCUSTOMITEM_EXIT 0x8a009e
+#define NOTESTODOEDITORCUSTOMITEM_CREATEITEM_ENTRY 0x8a009f
+#define NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY 0x8a00a0
+#define NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a00a1
+#define DUP1_NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a00a2
+#define NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_ENTRY 0x8a00a3
+#define NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a00a4
+#define DUP1_NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a00a5
+#define NOTESTODOEDITORCUSTOMITEM_RESTORE_ENTRY 0x8a00a6
+#define NOTESTODOEDITORCUSTOMITEM_RESTORE_EXIT 0x8a00a7
+#define NOTESTODOEDITORCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY 0x8a00a8
+#define NOTESTODOEDITORCUSTOMITEM_LAUNCHTIMEPICKER_EXIT 0x8a00a9
+#define NOTESTODOEDITORCUSTOMITEM_LAUNCHDATEPICKER_ENTRY 0x8a00aa
+#define NOTESTODOEDITORCUSTOMITEM_LAUNCHDATEPICKER_EXIT 0x8a00ab
+#define NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_ENTRY 0x8a00ac
+#define NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_EXIT 0x8a00ad
+#define DUP1_NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_EXIT 0x8a00ae
+#define NOTESTODOEDITORCUSTOMITEM_SELECTEDACTION_ENTRY 0x8a00af
+#define NOTESTODOEDITORCUSTOMITEM_SELECTEDACTION_EXIT 0x8a00b0
+#define NOTESTODOEDITORCUSTOMITEM_HANDLEOKACTION_ENTRY 0x8a00b1
+#define NOTESTODOEDITORCUSTOMITEM_HANDLEOKACTION_EXIT 0x8a00b2
+
+
+#endif
+
+// End of file
+
--- a/notes/notesui/notesmodel/inc/notessortfilterproxymodel.h Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesmodel/inc/notessortfilterproxymodel.h Mon Aug 23 16:00:50 2010 +0100
@@ -24,7 +24,7 @@
// User includes
#include "notesmodeldefines.h"
-#include "agendautil.h"
+#include <agendautil.h>
class NOTESMODEL_EXPORT NotesSortFilterProxyModel : public QSortFilterProxyModel
{
--- a/notes/notesui/notesmodel/notesmodel.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesmodel/notesmodel.pro Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,8 @@
. \
../notesviewmanager/inc \
../inc \
- ../../inc
+ ../../inc \
+ ./traces
DEPENDPATH += \
. \
@@ -35,7 +36,7 @@
TARGET.EPOCALLOWDLLDATA = 1
TARGET.UID3 = 0x20029F81
- INCLUDEPATH += ../../../agendainterface/inc
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
LIBS += \
-lagendainterface
--- a/notes/notesui/notesmodel/src/notesmodel.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesmodel/src/notesmodel.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -26,9 +26,14 @@
// User includes
#include "notesmodel.h"
-#include "agendautil.h"
-#include "agendaentry.h"
+#include <agendautil.h>
+#include <agendaentry.h>
#include "notescommon.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesmodelTraces.h"
+#endif
+
/*!
\class NotesModel
@@ -48,6 +53,7 @@
:QObject(parent),
mAgendaUtil(agendaUtil)
{
+ OstTraceFunctionEntry0( NOTESMODEL_NOTESMODEL_ENTRY );
// Construct the source model.
mSourceModel = new QStandardItemModel(0, 1, this);
@@ -72,6 +78,7 @@
connect(
mAgendaUtil, SIGNAL(instanceViewCreationCompleted(int)),
this,SLOT(handleInstanceViewCreationCompleted(int)));
+ OstTraceFunctionExit0( NOTESMODEL_NOTESMODEL_EXIT );
}
/*!
@@ -79,7 +86,9 @@
*/
NotesModel::~NotesModel()
{
+ OstTraceFunctionEntry0( DUP1_NOTESMODEL_NOTESMODEL_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_NOTESMODEL_NOTESMODEL_EXIT );
}
/*!
@@ -90,7 +99,9 @@
*/
QAbstractItemModel *NotesModel::sourceModel()
{
+ OstTraceFunctionEntry0( NOTESMODEL_SOURCEMODEL_ENTRY );
Q_ASSERT(mSourceModel);
+ OstTraceFunctionExit0( NOTESMODEL_SOURCEMODEL_EXIT );
return mSourceModel;
}
@@ -99,6 +110,7 @@
*/
void NotesModel::populateSourceModel()
{
+ OstTraceFunctionEntry0( NOTESMODEL_POPULATESOURCEMODEL_ENTRY );
// Clear the model if it has any data already
mSourceModel->clear();
mSourceModel->setColumnCount(1);
@@ -128,6 +140,7 @@
// Add the completed to-dos to the model.
appendCompTodosToModel(agendaEntyList);
+ OstTraceFunctionExit0( NOTESMODEL_POPULATESOURCEMODEL_EXIT );
}
/*!
@@ -139,8 +152,10 @@
*/
void NotesModel::updateSourceModel(ulong id)
{
+ OstTraceFunctionEntry0( NOTESMODEL_UPDATESOURCEMODEL_ENTRY );
AgendaEntry entry = mAgendaUtil->fetchById(id);
if (entry.isNull()) {
+ OstTraceFunctionExit0( NOTESMODEL_UPDATESOURCEMODEL_EXIT );
return;
}
@@ -234,6 +249,7 @@
}
}
}
+ OstTraceFunctionExit0( DUP1_NOTESMODEL_UPDATESOURCEMODEL_EXIT );
}
/*!
@@ -244,9 +260,11 @@
*/
void NotesModel::populateSourceModel(QList<ulong> ids)
{
+ OstTraceFunctionEntry0( DUP1_NOTESMODEL_POPULATESOURCEMODEL_ENTRY );
Q_UNUSED(ids)
QTimer::singleShot(1, this, SLOT(populateSourceModel()));
+ OstTraceFunctionExit0( DUP1_NOTESMODEL_POPULATESOURCEMODEL_EXIT );
}
/*!
@@ -257,10 +275,12 @@
*/
void NotesModel::addEntryToModel(ulong id)
{
+ OstTraceFunctionEntry0( NOTESMODEL_ADDENTRYTOMODEL_ENTRY );
// We have different logic for adding a note or an incompleted to-do or a
// completed to-do.
AgendaEntry entry = mAgendaUtil->fetchById(id);
if (entry.isNull()) {
+ OstTraceFunctionExit0( NOTESMODEL_ADDENTRYTOMODEL_EXIT );
return;
}
bool notify = false;
@@ -285,6 +305,7 @@
if (notify) {
emit rowAdded(indexToNotify);
}
+ OstTraceFunctionExit0( DUP1_NOTESMODEL_ADDENTRYTOMODEL_EXIT );
}
/*!
@@ -294,10 +315,12 @@
*/
void NotesModel::removeEntryFromModel(ulong id)
{
+ OstTraceFunctionEntry0( NOTESMODEL_REMOVEENTRYFROMMODEL_ENTRY );
for (int iter = 0; iter < mSourceModel->rowCount(); iter++) {
QModelIndex mdlIndex = mSourceModel->index(iter, 0);
if (!mdlIndex.isValid()) {
+ OstTraceFunctionExit0( NOTESMODEL_REMOVEENTRYFROMMODEL_EXIT );
return;
}
@@ -324,6 +347,7 @@
break;
}
}
+ OstTraceFunctionExit0( DUP1_NOTESMODEL_REMOVEENTRYFROMMODEL_EXIT );
}
/*!
@@ -331,8 +355,10 @@
*/
void NotesModel::handleInstanceViewCreationCompleted(int status)
{
+ OstTraceFunctionEntry0( NOTESMODEL_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY );
Q_UNUSED(status);
populateSourceModel();
+ OstTraceFunctionExit0( NOTESMODEL_HANDLEINSTANCEVIEWCREATIONCOMPLETED_EXIT );
}
/*!
@@ -344,6 +370,7 @@
*/
void NotesModel::modifyEntryInModel(ulong id, int row)
{
+ OstTraceFunctionEntry0( NOTESMODEL_MODIFYENTRYINMODEL_ENTRY );
// Get the model index.
QModelIndex modelIndex = mSourceModel->index(row, 0);
Q_ASSERT(modelIndex.isValid());
@@ -443,6 +470,7 @@
// Set the icons.
mSourceModel->setData(modelIndex, iconList, Qt::DecorationRole);
}
+ OstTraceFunctionExit0( NOTESMODEL_MODIFYENTRYINMODEL_EXIT );
}
/*!
@@ -452,6 +480,7 @@
*/
void NotesModel::appendNotesToModel(QList<AgendaEntry> &agendaEntryList)
{
+ OstTraceFunctionEntry0( NOTESMODEL_APPENDNOTESTOMODEL_ENTRY );
int entriesCount = agendaEntryList.count();
// Iterate and add notes to the model.
mSourceModel->insertRows(mSourceModel->rowCount(), entriesCount);
@@ -544,6 +573,7 @@
// Update the notes count.
mNotesCount++;
}
+ OstTraceFunctionExit0( NOTESMODEL_APPENDNOTESTOMODEL_EXIT );
}
/*!
@@ -553,6 +583,7 @@
*/
void NotesModel::appendInCompTodosToModel(QList<AgendaEntry> &agendaEntryList)
{
+ OstTraceFunctionEntry0( NOTESMODEL_APPENDINCOMPTODOSTOMODEL_ENTRY );
int entriesCount = agendaEntryList.count();
// Iterate and add incomplete to-do to the model.
mSourceModel->insertRows(mSourceModel->rowCount(), entriesCount);
@@ -624,6 +655,7 @@
// Update the incompleted to-do count.
mInCompTodoCount++;
}
+ OstTraceFunctionExit0( NOTESMODEL_APPENDINCOMPTODOSTOMODEL_EXIT );
}
/*!
@@ -633,6 +665,7 @@
*/
void NotesModel::appendCompTodosToModel(QList<AgendaEntry> &agendaEntryList)
{
+ OstTraceFunctionEntry0( NOTESMODEL_APPENDCOMPTODOSTOMODEL_ENTRY );
int entriesCount = agendaEntryList.count();
// Iterate and add complete to-do to the model.
mSourceModel->insertRows(mSourceModel->rowCount(), entriesCount);
@@ -696,6 +729,7 @@
// Update the completed to-do count.
mCompTodoCount++;
}
+ OstTraceFunctionExit0( NOTESMODEL_APPENDCOMPTODOSTOMODEL_EXIT );
}
/*!
@@ -707,8 +741,10 @@
*/
bool NotesModel::insertNoteToModel(QModelIndex &index, ulong id)
{
+ OstTraceFunctionEntry0( NOTESMODEL_INSERTNOTETOMODEL_ENTRY );
AgendaEntry entry = mAgendaUtil->fetchById(id);
if (entry.isNull()) {
+ OstTraceFunctionExit0( NOTESMODEL_INSERTNOTETOMODEL_EXIT );
return false;
}
@@ -791,6 +827,7 @@
index = mdlIndex;
+ OstTraceFunctionExit0( DUP1_NOTESMODEL_INSERTNOTETOMODEL_EXIT );
return true;
}
@@ -804,12 +841,14 @@
*/
bool NotesModel::insertInCompTodoToModel(QModelIndex &index, ulong id)
{
+ OstTraceFunctionEntry0( NOTESMODEL_INSERTINCOMPTODOTOMODEL_ENTRY );
bool success = false;
// Fetch the entry first.
AgendaEntry entry = mAgendaUtil->fetchById(id);
if (entry.isNull()) {
+ OstTraceFunctionExit0( NOTESMODEL_INSERTINCOMPTODOTOMODEL_EXIT );
return success;
}
@@ -896,6 +935,7 @@
}
}
+ OstTraceFunctionExit0( DUP1_NOTESMODEL_INSERTINCOMPTODOTOMODEL_EXIT );
return success;
}
@@ -909,11 +949,13 @@
*/
bool NotesModel::insertCompTodoToModel(QModelIndex &index, ulong id)
{
+ OstTraceFunctionEntry0( NOTESMODEL_INSERTCOMPTODOTOMODEL_ENTRY );
bool success = false;
// Fetch the entry first.
AgendaEntry entry = mAgendaUtil->fetchById(id);
if (entry.isNull()) {
+ OstTraceFunctionExit0( NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT );
return success;
}
@@ -981,8 +1023,13 @@
// Set the to-do done icon.
QList<QVariant> iconList;
iconList.append(HbIcon("qtg_small_todo_done"));
- // To-do is already completed. No need to set alarm.
- iconList.append(QVariant(QVariant::Invalid));
+ if (1 == entry.priority()) {
+ // Set the High Priority icon if priority is high or else not.
+ iconList.append(HbIcon("qtg_small_priority_high"));
+ } else {
+ // To-do is already completed. No need to set alarm.
+ iconList.append(QVariant(QVariant::Invalid));
+ }
// Set the icons.
mSourceModel->setData(
@@ -996,6 +1043,7 @@
}
}
+ OstTraceFunctionExit0( DUP1_NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT );
return success;
}
@@ -1006,6 +1054,7 @@
*/
QString NotesModel::dateFormatString()
{
+ OstTraceFunctionEntry0( NOTESMODEL_DATEFORMATSTRING_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
QString dateFormat;
@@ -1035,6 +1084,7 @@
break;
}
+ OstTraceFunctionExit0( NOTESMODEL_DATEFORMATSTRING_EXIT );
return dateFormat;
}
@@ -1045,6 +1095,7 @@
*/
QString NotesModel::timeFormatString()
{
+ OstTraceFunctionEntry0( NOTESMODEL_TIMEFORMATSTRING_ENTRY );
QString timeFormat;
HbExtendedLocale locale = HbExtendedLocale::system();
@@ -1060,6 +1111,7 @@
timeFormat.append("mm");
}
+ OstTraceFunctionExit0( NOTESMODEL_TIMEFORMATSTRING_EXIT );
return timeFormat;
}
--- a/notes/notesui/notesmodel/src/notessortfilterproxymodel.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesmodel/src/notessortfilterproxymodel.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -22,6 +22,11 @@
// User includes
#include "notessortfilterproxymodel.h"
#include "notescommon.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notessortfilterproxymodelTraces.h"
+#endif
+
/*!
\class NotesSortFilterProxyModel
@@ -43,7 +48,9 @@
:QSortFilterProxyModel(parent),
mAgendaUtil(agendaUtil)
{
+ OstTraceFunctionEntry0( NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_EXIT );
}
/*!
@@ -51,7 +58,9 @@
*/
NotesSortFilterProxyModel::~NotesSortFilterProxyModel()
{
+ OstTraceFunctionEntry0( DUP1_NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_EXIT );
}
/*!
@@ -62,6 +71,7 @@
bool NotesSortFilterProxyModel::lessThan(
const QModelIndex &left, const QModelIndex &right) const
{
+ OstTraceFunctionEntry0( NOTESSORTFILTERPROXYMODEL_LESSTHAN_ENTRY );
return QSortFilterProxyModel::lessThan(left, right);
}
@@ -74,6 +84,7 @@
int sourceRow,
const QModelIndex &sourceParent) const
{
+ OstTraceFunctionEntry0( NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_ENTRY );
// Get the model index of the source model.
QModelIndex modelIndex = sourceModel()->index(
sourceRow, filterKeyColumn(), sourceParent);
@@ -90,11 +101,14 @@
modelIndex, filterRole()).value<int>());
if (AgendaEntry::TypeNote == type
&& QString("note").contains(filterRegExp())) {
+ OstTraceFunctionExit0( NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT );
return true;
} else if (AgendaEntry::TypeTodo == type
&& QString("todo").contains(filterRegExp())) {
+ OstTraceFunctionExit0( DUP1_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT );
return true;
}
+ OstTraceFunctionExit0( DUP2_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT );
return false;
}
@@ -105,8 +119,10 @@
if (1 == favouriteStatus
&& QString("favourites").contains(filterRegExp())) {
+ OstTraceFunctionExit0( DUP3_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT );
return true;
}
+ OstTraceFunctionExit0( DUP4_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT );
return false;
}
@@ -122,10 +138,12 @@
QString string = dataList.value(i).toString();
if (string.contains(filterRegExp())) {
+ OstTraceFunctionExit0( DUP5_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT );
return true;
}
}
+ OstTraceFunctionExit0( DUP6_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT );
return false;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesmodel/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesmodel/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,57 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_ADDENTRYTOMODEL_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_INSERTINCOMPTODOTOMODEL_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_INSERTNOTETOMODEL_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_NOTESMODEL_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_NOTESMODEL_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_POPULATESOURCEMODEL_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_POPULATESOURCEMODEL_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_REMOVEENTRYFROMMODEL_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODEL_UPDATESOURCEMODEL_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_DUP4_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_DUP5_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_DUP6_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_ADDENTRYTOMODEL_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_ADDENTRYTOMODEL_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_APPENDCOMPTODOSTOMODEL_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_APPENDCOMPTODOSTOMODEL_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_APPENDINCOMPTODOSTOMODEL_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_APPENDINCOMPTODOSTOMODEL_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_APPENDNOTESTOMODEL_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_APPENDNOTESTOMODEL_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_DATEFORMATSTRING_ENTRY=0x27
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_DATEFORMATSTRING_EXIT=0x28
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_HANDLEINSTANCEVIEWCREATIONCOMPLETED_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_INSERTCOMPTODOTOMODEL_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_INSERTINCOMPTODOTOMODEL_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_INSERTINCOMPTODOTOMODEL_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_INSERTNOTETOMODEL_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_INSERTNOTETOMODEL_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_MODIFYENTRYINMODEL_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_MODIFYENTRYINMODEL_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_NOTESMODEL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_NOTESMODEL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_POPULATESOURCEMODEL_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_POPULATESOURCEMODEL_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_REMOVEENTRYFROMMODEL_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_REMOVEENTRYFROMMODEL_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_SOURCEMODEL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_SOURCEMODEL_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_TIMEFORMATSTRING_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_TIMEFORMATSTRING_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_UPDATESOURCEMODEL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODEL_UPDATESOURCEMODEL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_NOTESSORTFILTERPROXYMODEL_LESSTHAN_ENTRY=0x2f
+[TRACE]TRACE_FLOW[0x8A]_NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_EXIT=0x2c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesmodel/traces/notesmodelTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,56 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESMODELTRACES_H__
+#define __NOTESMODELTRACES_H__
+
+#define KOstTraceComponentID 0x20029f81
+
+#define NOTESMODEL_NOTESMODEL_ENTRY 0x8a0001
+#define NOTESMODEL_NOTESMODEL_EXIT 0x8a0002
+#define DUP1_NOTESMODEL_NOTESMODEL_ENTRY 0x8a0003
+#define DUP1_NOTESMODEL_NOTESMODEL_EXIT 0x8a0004
+#define NOTESMODEL_SOURCEMODEL_ENTRY 0x8a0005
+#define NOTESMODEL_SOURCEMODEL_EXIT 0x8a0006
+#define NOTESMODEL_POPULATESOURCEMODEL_ENTRY 0x8a0007
+#define NOTESMODEL_POPULATESOURCEMODEL_EXIT 0x8a0008
+#define NOTESMODEL_UPDATESOURCEMODEL_ENTRY 0x8a0009
+#define NOTESMODEL_UPDATESOURCEMODEL_EXIT 0x8a000a
+#define DUP1_NOTESMODEL_UPDATESOURCEMODEL_EXIT 0x8a000b
+#define DUP1_NOTESMODEL_POPULATESOURCEMODEL_ENTRY 0x8a000c
+#define DUP1_NOTESMODEL_POPULATESOURCEMODEL_EXIT 0x8a000d
+#define NOTESMODEL_ADDENTRYTOMODEL_ENTRY 0x8a000e
+#define NOTESMODEL_ADDENTRYTOMODEL_EXIT 0x8a000f
+#define DUP1_NOTESMODEL_ADDENTRYTOMODEL_EXIT 0x8a0010
+#define NOTESMODEL_REMOVEENTRYFROMMODEL_ENTRY 0x8a0011
+#define NOTESMODEL_REMOVEENTRYFROMMODEL_EXIT 0x8a0012
+#define DUP1_NOTESMODEL_REMOVEENTRYFROMMODEL_EXIT 0x8a0013
+#define NOTESMODEL_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY 0x8a0014
+#define NOTESMODEL_HANDLEINSTANCEVIEWCREATIONCOMPLETED_EXIT 0x8a0015
+#define NOTESMODEL_MODIFYENTRYINMODEL_ENTRY 0x8a0016
+#define NOTESMODEL_MODIFYENTRYINMODEL_EXIT 0x8a0017
+#define NOTESMODEL_APPENDNOTESTOMODEL_ENTRY 0x8a0018
+#define NOTESMODEL_APPENDNOTESTOMODEL_EXIT 0x8a0019
+#define NOTESMODEL_APPENDINCOMPTODOSTOMODEL_ENTRY 0x8a001a
+#define NOTESMODEL_APPENDINCOMPTODOSTOMODEL_EXIT 0x8a001b
+#define NOTESMODEL_APPENDCOMPTODOSTOMODEL_ENTRY 0x8a001c
+#define NOTESMODEL_APPENDCOMPTODOSTOMODEL_EXIT 0x8a001d
+#define NOTESMODEL_INSERTNOTETOMODEL_ENTRY 0x8a001e
+#define NOTESMODEL_INSERTNOTETOMODEL_EXIT 0x8a001f
+#define DUP1_NOTESMODEL_INSERTNOTETOMODEL_EXIT 0x8a0020
+#define NOTESMODEL_INSERTINCOMPTODOTOMODEL_ENTRY 0x8a0021
+#define NOTESMODEL_INSERTINCOMPTODOTOMODEL_EXIT 0x8a0022
+#define DUP1_NOTESMODEL_INSERTINCOMPTODOTOMODEL_EXIT 0x8a0023
+#define NOTESMODEL_INSERTCOMPTODOTOMODEL_ENTRY 0x8a0024
+#define NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT 0x8a0025
+#define DUP1_NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT 0x8a0026
+#define NOTESMODEL_DATEFORMATSTRING_ENTRY 0x8a0027
+#define NOTESMODEL_DATEFORMATSTRING_EXIT 0x8a0028
+#define NOTESMODEL_TIMEFORMATSTRING_ENTRY 0x8a0029
+#define NOTESMODEL_TIMEFORMATSTRING_EXIT 0x8a002a
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesmodel/traces/notessortfilterproxymodelTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,27 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESSORTFILTERPROXYMODELTRACES_H__
+#define __NOTESSORTFILTERPROXYMODELTRACES_H__
+
+#define KOstTraceComponentID 0x20029f81
+
+#define NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_ENTRY 0x8a002b
+#define NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_EXIT 0x8a002c
+#define DUP1_NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_ENTRY 0x8a002d
+#define DUP1_NOTESSORTFILTERPROXYMODEL_NOTESSORTFILTERPROXYMODEL_EXIT 0x8a002e
+#define NOTESSORTFILTERPROXYMODEL_LESSTHAN_ENTRY 0x8a002f
+#define NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_ENTRY 0x8a0030
+#define NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0031
+#define DUP1_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0032
+#define DUP2_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0033
+#define DUP3_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0034
+#define DUP4_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0035
+#define DUP5_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0036
+#define DUP6_NOTESSORTFILTERPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0037
+
+
+#endif
+
+// End of file
+
--- a/notes/notesui/notesmodelhandler/notesmodelhandler.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesmodelhandler/notesmodelhandler.pro Mon Aug 23 16:00:50 2010 +0100
@@ -26,14 +26,15 @@
INCLUDEPATH += \
../notesmodel/inc \
- ../../inc
+ ../../inc \
+ ./traces
symbian: {
TARGET.CAPABILITY = ALL -TCB
TARGET.EPOCALLOWDLLDATA = 1
TARGET.UID3 = 0x2002BCDC
- INCLUDEPATH += ../../../agendainterface/inc
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
LIBS += \
-lnotesmodel \
--- a/notes/notesui/notesmodelhandler/src/notesmodelhandler.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesmodelhandler/src/notesmodelhandler.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -19,8 +19,13 @@
#include <QtGui>
// User includes
#include "notesmodelhandler.h"
-#include "agendautil.h"
+#include <agendautil.h>
#include "notesmodel.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesmodelhandlerTraces.h"
+#endif
+
/*!
\class NotesModelHandler
@@ -36,11 +41,13 @@
mAgendaUtil(0),
mNotesModel(0)
{
+ OstTraceFunctionEntry0( NOTESMODELHANDLER_NOTESMODELHANDLER_ENTRY );
QT_TRAP_THROWING(mAgendaUtil = new AgendaUtil(this));
Q_ASSERT_X(mAgendaUtil, "notesviewmanager.cpp", "mAgendaUtil is 0");
// Construct the source model here.
mNotesModel = new NotesModel(mAgendaUtil, this);
+ OstTraceFunctionExit0( NOTESMODELHANDLER_NOTESMODELHANDLER_EXIT );
}
/*!
@@ -48,6 +55,7 @@
*/
NotesModelHandler::~NotesModelHandler()
{
+ OstTraceFunctionEntry0( DUP1_NOTESMODELHANDLER_NOTESMODELHANDLER_ENTRY );
if (mAgendaUtil) {
delete mAgendaUtil;
mAgendaUtil = 0;
@@ -56,6 +64,7 @@
delete mNotesModel;
mNotesModel = 0;
}
+ OstTraceFunctionExit0( DUP1_NOTESMODELHANDLER_NOTESMODELHANDLER_EXIT );
}
/*!
@@ -65,8 +74,10 @@
*/
AgendaUtil *NotesModelHandler::agendaInterface()
{
+ OstTraceFunctionEntry0( NOTESMODELHANDLER_AGENDAINTERFACE_ENTRY );
Q_ASSERT(mAgendaUtil);
+ OstTraceFunctionExit0( NOTESMODELHANDLER_AGENDAINTERFACE_EXIT );
return mAgendaUtil;
}
@@ -77,8 +88,10 @@
*/
NotesModel *NotesModelHandler::notesModel()
{
+ OstTraceFunctionEntry0( NOTESMODELHANDLER_NOTESMODEL_ENTRY );
Q_ASSERT(mNotesModel);
+ OstTraceFunctionExit0( NOTESMODELHANDLER_NOTESMODEL_EXIT );
return mNotesModel;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesmodelhandler/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesmodelhandler/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,10 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODELHANDLER_NOTESMODELHANDLER_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMODELHANDLER_NOTESMODELHANDLER_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODELHANDLER_AGENDAINTERFACE_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODELHANDLER_AGENDAINTERFACE_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODELHANDLER_NOTESMODELHANDLER_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODELHANDLER_NOTESMODELHANDLER_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODELHANDLER_NOTESMODEL_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_NOTESMODELHANDLER_NOTESMODEL_EXIT=0x8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesmodelhandler/traces/notesmodelhandlerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,22 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESMODELHANDLERTRACES_H__
+#define __NOTESMODELHANDLERTRACES_H__
+
+#define KOstTraceComponentID 0x2002bcdc
+
+#define NOTESMODELHANDLER_NOTESMODELHANDLER_ENTRY 0x8a0001
+#define NOTESMODELHANDLER_NOTESMODELHANDLER_EXIT 0x8a0002
+#define DUP1_NOTESMODELHANDLER_NOTESMODELHANDLER_ENTRY 0x8a0003
+#define DUP1_NOTESMODELHANDLER_NOTESMODELHANDLER_EXIT 0x8a0004
+#define NOTESMODELHANDLER_AGENDAINTERFACE_ENTRY 0x8a0005
+#define NOTESMODELHANDLER_AGENDAINTERFACE_EXIT 0x8a0006
+#define NOTESMODELHANDLER_NOTESMODEL_ENTRY 0x8a0007
+#define NOTESMODELHANDLER_NOTESMODEL_EXIT 0x8a0008
+
+
+#endif
+
+// End of file
+
--- a/notes/notesui/notesplugins/noteseditorplugin/noteseditorplugin.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesplugins/noteseditorplugin/noteseditorplugin.pro Mon Aug 23 16:00:50 2010 +0100
@@ -23,7 +23,8 @@
. \
./src \
./inc \
- ../../../inc
+ ../../../inc \
+ ./traces
DEPENDPATH += \
. \
--- a/notes/notesui/notesplugins/noteseditorplugin/src/noteseditorplugin.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesplugins/noteseditorplugin/src/noteseditorplugin.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -24,6 +24,11 @@
// User includes.
#include "noteseditorplugin.h"
#include "noteseditor.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "noteseditorpluginTraces.h"
+#endif
+
/*!
\class NotesEditorPlugin
@@ -49,7 +54,9 @@
*/
NotesEditorPlugin::NotesEditorPlugin(QObject *parent)
{
+ OstTraceFunctionEntry0( NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_ENTRY );
Q_UNUSED(parent)
+ OstTraceFunctionExit0( NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_EXIT );
}
/*!
@@ -57,6 +64,8 @@
*/
NotesEditorPlugin::~NotesEditorPlugin()
{
+ OstTraceFunctionEntry0( DUP1_NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_ENTRY );
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_EXIT );
}
@@ -67,11 +76,13 @@
*/
void NotesEditorPlugin::edit(const QString &string, AgendaUtil *agendaUtil)
{
+ OstTraceFunctionEntry0( NOTESEDITORPLUGIN_EDIT_ENTRY );
if (!mNotesEditor) {
createNotesEditor(agendaUtil);
}
mNotesEditor->edit(string);
+ OstTraceFunctionExit0( NOTESEDITORPLUGIN_EDIT_EXIT );
}
/*!
@@ -82,11 +93,13 @@
*/
void NotesEditorPlugin::edit(const QFile &handle, AgendaUtil *agendaUtil)
{
+ OstTraceFunctionEntry0( DUP1_NOTESEDITORPLUGIN_EDIT_ENTRY );
if (!mNotesEditor) {
createNotesEditor(agendaUtil);
}
mNotesEditor->edit(handle);
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPLUGIN_EDIT_EXIT );
}
/*!
@@ -96,11 +109,13 @@
*/
void NotesEditorPlugin::edit(AgendaEntry entry, AgendaUtil *agendaUtil)
{
+ OstTraceFunctionEntry0( DUP2_NOTESEDITORPLUGIN_EDIT_ENTRY );
if (!mNotesEditor) {
createNotesEditor(agendaUtil);
}
mNotesEditor->edit(entry);
+ OstTraceFunctionExit0( DUP2_NOTESEDITORPLUGIN_EDIT_EXIT );
}
/*!
@@ -110,11 +125,13 @@
*/
void NotesEditorPlugin::edit(ulong id, AgendaUtil *agendaUtil)
{
+ OstTraceFunctionEntry0( DUP3_NOTESEDITORPLUGIN_EDIT_ENTRY );
if (!mNotesEditor) {
createNotesEditor(agendaUtil);
}
mNotesEditor->edit(id);
+ OstTraceFunctionExit0( DUP3_NOTESEDITORPLUGIN_EDIT_EXIT );
}
/*!
@@ -126,11 +143,13 @@
void NotesEditorPlugin::create( NotesEditorInterface::CreateType type,
AgendaUtil *agendaUtil)
{
+ OstTraceFunctionEntry0( NOTESEDITORPLUGIN_CREATE_ENTRY );
if (!mNotesEditor) {
createNotesEditor(agendaUtil);
}
mNotesEditor->create(static_cast<NotesEditor::CreateType>(type));
+ OstTraceFunctionExit0( NOTESEDITORPLUGIN_CREATE_EXIT );
}
/*!
@@ -141,6 +160,7 @@
ulong NotesEditorPlugin::close( NotesEditorInterface::CloseType type,
AgendaUtil *agendaUtil)
{
+ OstTraceFunctionEntry0( NOTESEDITORPLUGIN_CLOSE_ENTRY );
if (!mNotesEditor) {
createNotesEditor(agendaUtil);
}
@@ -153,6 +173,7 @@
*/
void NotesEditorPlugin::createNotesEditor(AgendaUtil *agendaUtil)
{
+ OstTraceFunctionEntry0( NOTESEDITORPLUGIN_CREATENOTESEDITOR_ENTRY );
if (agendaUtil) {
mNotesEditor = new NotesEditor(agendaUtil, this);
} else {
@@ -164,6 +185,7 @@
mNotesEditor, SIGNAL(editingCompleted(bool)),
this, SLOT(handleEditingCompleted(bool)));
}
+ OstTraceFunctionExit0( NOTESEDITORPLUGIN_CREATENOTESEDITOR_EXIT );
}
/*!
@@ -171,6 +193,7 @@
*/
void NotesEditorPlugin::handleEditingCompleted(bool status)
{
+ OstTraceFunctionEntry0( NOTESEDITORPLUGIN_HANDLEEDITINGCOMPLETED_ENTRY );
// Emits the signal.
emit editingCompleted(status);
@@ -178,6 +201,7 @@
if (mNotesEditor) {
mNotesEditor->deleteLater();
}
+ OstTraceFunctionExit0( NOTESEDITORPLUGIN_HANDLEEDITINGCOMPLETED_EXIT );
}
// Exports plugin class NotesEditorPlugin for the target
@@ -185,4 +209,3 @@
Q_EXPORT_PLUGIN2(noteseditorplugin, NotesEditorPlugin)
// End of file --Don't remove this.
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesplugins/noteseditorplugin/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesplugins/noteseditorplugin/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,21 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPLUGIN_EDIT_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPLUGIN_EDIT_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITORPLUGIN_EDIT_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESEDITORPLUGIN_EDIT_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESEDITORPLUGIN_EDIT_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESEDITORPLUGIN_EDIT_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_CLOSE_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_CREATENOTESEDITOR_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_CREATENOTESEDITOR_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_CREATE_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_CREATE_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_EDIT_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_EDIT_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_HANDLEEDITINGCOMPLETED_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_HANDLEEDITINGCOMPLETED_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_EXIT=0x2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesplugins/noteseditorplugin/traces/noteseditorpluginTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,33 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESEDITORPLUGINTRACES_H__
+#define __NOTESEDITORPLUGINTRACES_H__
+
+#define KOstTraceComponentID 0x2002ff88
+
+#define NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_ENTRY 0x8a0001
+#define NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_EXIT 0x8a0002
+#define DUP1_NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_ENTRY 0x8a0003
+#define DUP1_NOTESEDITORPLUGIN_NOTESEDITORPLUGIN_EXIT 0x8a0004
+#define NOTESEDITORPLUGIN_EDIT_ENTRY 0x8a0005
+#define NOTESEDITORPLUGIN_EDIT_EXIT 0x8a0006
+#define DUP1_NOTESEDITORPLUGIN_EDIT_ENTRY 0x8a0007
+#define DUP1_NOTESEDITORPLUGIN_EDIT_EXIT 0x8a0008
+#define DUP2_NOTESEDITORPLUGIN_EDIT_ENTRY 0x8a0009
+#define DUP2_NOTESEDITORPLUGIN_EDIT_EXIT 0x8a000a
+#define DUP3_NOTESEDITORPLUGIN_EDIT_ENTRY 0x8a000b
+#define DUP3_NOTESEDITORPLUGIN_EDIT_EXIT 0x8a000c
+#define NOTESEDITORPLUGIN_CREATE_ENTRY 0x8a000d
+#define NOTESEDITORPLUGIN_CREATE_EXIT 0x8a000e
+#define NOTESEDITORPLUGIN_CLOSE_ENTRY 0x8a000f
+#define NOTESEDITORPLUGIN_CREATENOTESEDITOR_ENTRY 0x8a0010
+#define NOTESEDITORPLUGIN_CREATENOTESEDITOR_EXIT 0x8a0011
+#define NOTESEDITORPLUGIN_HANDLEEDITINGCOMPLETED_ENTRY 0x8a0012
+#define NOTESEDITORPLUGIN_HANDLEEDITINGCOMPLETED_EXIT 0x8a0013
+
+
+#endif
+
+// End of file
+
--- a/notes/notesui/notesviewmanager/inc/notesviewmanager.h Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviewmanager/inc/notesviewmanager.h Mon Aug 23 16:00:50 2010 +0100
@@ -49,6 +49,9 @@
NOTESVIEWMANAGER_EXPORT void switchToView(
NotesNamespace::NotesViewIds viewId);
+signals:
+ void appReady();
+
private:
void loadNotesMainView();
void loadNotesCollectionView();
--- a/notes/notesui/notesviewmanager/notesviewmanager.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviewmanager/notesviewmanager.pro Mon Aug 23 16:00:50 2010 +0100
@@ -32,14 +32,15 @@
../notesmodel/inc \
../notesviews/inc \
../notesappcontroller/inc \
- ../../inc
+ ../../inc \
+ ./traces
symbian: {
TARGET.CAPABILITY = ALL -TCB
TARGET.EPOCALLOWDLLDATA = 1
TARGET.UID3 = 0x20029F84
- INCLUDEPATH += ../../../agendainterface/inc
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
LIBS += \
-lagendainterface \
--- a/notes/notesui/notesviewmanager/src/notesdocloader.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviewmanager/src/notesdocloader.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -24,6 +24,11 @@
#include "notesfavoriteview.h"
#include "notesnoteview.h"
#include "notescommon.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesdocloaderTraces.h"
+#endif
+
/*!
\class NotesDocLoader
@@ -41,27 +46,33 @@
*/
QObject* NotesDocLoader::createObject(const QString &type, const QString &name)
{
+ OstTraceFunctionEntry0( NOTESDOCLOADER_CREATEOBJECT_ENTRY );
if (NOTES_MAIN_VIEW == name) {
QObject *object = new NotesMainView();
object->setObjectName(name);
+ OstTraceFunctionExit0( NOTESDOCLOADER_CREATEOBJECT_EXIT );
return object;
} else if (NOTES_COLLECTION_VIEW == name) {
QObject *object = new NotesCollectionView();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP1_NOTESDOCLOADER_CREATEOBJECT_EXIT );
return object;
- } else if (NOTES_TODO_VIEW == name) {
+ } else if (NOTES_TODO_VIEW == name) {
QObject *object = new NotesTodoView();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP2_NOTESDOCLOADER_CREATEOBJECT_EXIT );
return object;
- } else if (NOTES_FAVORITES_VIEW == name) {
+ } else if (NOTES_FAVORITES_VIEW == name) {
QObject *object = new NotesFavoriteView();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP3_NOTESDOCLOADER_CREATEOBJECT_EXIT );
return object;
} else if (NOTES_NOTE_VIEW == name) {
QObject *object = new NotesNoteView();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP4_NOTESDOCLOADER_CREATEOBJECT_EXIT );
return object;
- }
+ }
return HbDocumentLoader::createObject(type, name);
}
--- a/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -11,7 +11,7 @@
*
* Contributors:
*
-* Description: Definition file for class NotesDocLoader.
+* Description: Definition file for class NotesViewManager.
*
*/
@@ -38,7 +38,12 @@
#include "notescommon.h"
#include "notesmodel.h"
#include "notessortfilterproxymodel.h"
-#include "agendautil.h"
+#include <agendautil.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesviewmanagerTraces.h"
+#endif
+
/*!
\class NotesViewManager
@@ -57,40 +62,38 @@
:QObject(parent),
mAppControllerIf(controllerIf)
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_NOTESVIEWMANAGER_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
mAgendaUtil = mAppControllerIf.agendaUtil();
// Check the Application Startup reason from Activity Manager
int activityReason = qobject_cast<HbApplication*>(qApp)->activateReason();
-
- if (Hb::ActivationReasonActivity == activityReason) // Check if application is started
- // from an application
- {
- // Application is started from an activity
+
+ // Check if application is started from an application
+ if (Hb::ActivationReasonActivity == activityReason) {
+ // Application is started from an activity
// extract activity data
- QVariant data = qobject_cast<HbApplication*>(qApp)->activateData();
- // Restore state from activity data
- QByteArray serializedModel = data.toByteArray();
- QDataStream stream(&serializedModel, QIODevice::ReadOnly);
- int viewId;
- stream >> viewId; // read stream into an int
+ QVariant data = qobject_cast<HbApplication*>(qApp)->activateData();
+ // Restore state from activity data
+ QByteArray serializedModel = data.toByteArray();
+ QDataStream stream(&serializedModel, QIODevice::ReadOnly);
+ int viewId;
+ stream >> viewId; // read stream into an int
- if (NotesNamespace::NotesMainViewId == viewId) // Check if viewId is main view
- {
- // Load MainView
- loadNotesMainView();
- }
- else if (NotesNamespace::NotesCollectionViewId == viewId) // Check if the viewId is collective view
- {
- //no implementation yet, UI Specs not available
- }
- }
- else // application started by either service framework or normally
- {
- // Load the main view at the start up.
- loadNotesMainView();
- }
+ // Check if viewId is main view.
+ if (NotesNamespace::NotesMainViewId == viewId) {
+ // Load MainView
+ loadNotesMainView();
+ } else if (NotesNamespace::NotesCollectionViewId == viewId) {
+ // Check if the viewId is collective view
+ //no implementation yet, UI Specs not available
+ }
+ } else {
+ // application started by either service framework or normally
+ // Load the main view at the start up.
+ loadNotesMainView();
+ }
connect(
mAgendaUtil, SIGNAL(instanceViewCreationCompleted(int)),
@@ -100,6 +103,7 @@
connect(
window, SIGNAL(viewReady()),
this, SLOT(loadOtherViews()));
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_NOTESVIEWMANAGER_EXIT );
}
/*!
@@ -107,7 +111,9 @@
*/
NotesViewManager::~NotesViewManager()
{
+ OstTraceFunctionEntry0( DUP1_NOTESVIEWMANAGER_NOTESVIEWMANAGER_ENTRY );
// No implementation yet
+ OstTraceFunctionExit0( DUP1_NOTESVIEWMANAGER_NOTESVIEWMANAGER_EXIT );
}
/*!
@@ -117,74 +123,70 @@
*/
void NotesViewManager::switchToView(NotesNamespace::NotesViewIds viewId)
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_SWITCHTOVIEW_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
switch (viewId) {
case NotesNamespace::NotesMainViewId:
+ {
window->removeView(window->currentView());
window->addView(mMainView);
window->setCurrentView(mMainView);
mMainView->captureScreenShot(false);
break;
-
+ }
case NotesNamespace::NotesCollectionViewId:
- if (mMainView)
- {
- if (mMainView == window->currentView())
- {
- mMainView->captureScreenShot(true);
- }
- }
+ {
+ if (mMainView) {
+ if (mMainView == window->currentView()) {
+ mMainView->captureScreenShot(true);
+ }
+ }
window->removeView(window->currentView());
window->addView(mCollectionView);
window->setCurrentView(mCollectionView);
break;
-
+ }
case NotesNamespace::NotesTodoViewId:
- if (mMainView)
- {
- if (mMainView == window->currentView())
- {
- mMainView->captureScreenShot(true);
- }
- }
-
+ {
+ if (mMainView) {
+ if (mMainView == window->currentView()) {
+ mMainView->captureScreenShot(true);
+ }
+ }
window->removeView(window->currentView());
window->addView(mTodoView);
window->setCurrentView(mTodoView);
break;
-
+ }
case NotesNamespace::NotesFavoritesViewId:
- if (mMainView)
- {
- if (mMainView == window->currentView())
- {
- mMainView->captureScreenShot(true);
- }
- }
-
+ {
+ if (mMainView) {
+ if (mMainView == window->currentView()) {
+ mMainView->captureScreenShot(true);
+ }
+ }
window->removeView(window->currentView());
window->addView(mFavoriteView);
window->setCurrentView(mFavoriteView);
break;
-
+ }
case NotesNamespace::NotesNoteViewId:
- if (mMainView)
- {
- if (mMainView == window->currentView())
- {
- mMainView->captureScreenShot(true);
- }
- }
-
+ {
+ if (mMainView) {
+ if (mMainView == window->currentView()) {
+ mMainView->captureScreenShot(true);
+ }
+ }
window->removeView(window->currentView());
window->addView(mNoteView);
window->setCurrentView(mNoteView);
break;
-
+ }
default:
break;
}
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_SWITCHTOVIEW_EXIT );
}
/*!
@@ -192,6 +194,7 @@
*/
void NotesViewManager::loadNotesMainView()
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_LOADNOTESMAINVIEW_ENTRY );
bool loadSuccess;
// Construct the document loader instance
@@ -218,6 +221,7 @@
// Set the main view to the window
hbInstance->allMainWindows().first()->addView(mMainView);
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_LOADNOTESMAINVIEW_EXIT );
}
/*!
@@ -225,6 +229,7 @@
*/
void NotesViewManager::loadNotesCollectionView()
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_LOADNOTESCOLLECTIONVIEW_ENTRY );
bool loadSuccess;
// Construct the document loader instance
@@ -238,6 +243,7 @@
docLoader->findWidget(NOTES_COLLECTION_VIEW));
// Setup the view.
mCollectionView->setupView(mAppControllerIf, docLoader);
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_LOADNOTESCOLLECTIONVIEW_EXIT );
}
/*!
@@ -245,6 +251,7 @@
*/
void NotesViewManager::loadTodoView()
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_LOADTODOVIEW_ENTRY );
bool loadSuccess;
@@ -263,6 +270,7 @@
connect (
mTodoView, SIGNAL(deleteEntry(ulong)),
this, SLOT(deleteEntryFromView(ulong)));
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_LOADTODOVIEW_EXIT );
}
/*!
@@ -270,6 +278,7 @@
*/
void NotesViewManager::loadFavoritesView()
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_LOADFAVORITESVIEW_ENTRY );
bool loadSuccess;
// Construct the document loader instance
@@ -288,6 +297,7 @@
connect (
mFavoriteView, SIGNAL(deleteEntry(ulong)),
this, SLOT(deleteEntryFromView(ulong)));
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_LOADFAVORITESVIEW_EXIT );
}
/*!
@@ -295,6 +305,7 @@
*/
void NotesViewManager::loadNoteView()
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_LOADNOTEVIEW_ENTRY );
bool loadSuccess;
// Construct the document loader instance
@@ -312,6 +323,7 @@
connect(
mNoteView, SIGNAL(deleteEntry(ulong)),
this, SLOT(deleteEntryFromView(ulong)));
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_LOADNOTEVIEW_EXIT );
}
/*!
@@ -319,6 +331,7 @@
*/
void NotesViewManager::loadOtherViews()
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_LOADOTHERVIEWS_ENTRY );
mMainView->setupAfterViewReady();
// Load the collection view.
@@ -335,6 +348,7 @@
disconnect(
window, SIGNAL(viewReady()),
this, SLOT(loadOtherViews()));
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_LOADOTHERVIEWS_EXIT );
}
/*!
@@ -342,6 +356,7 @@
*/
void NotesViewManager::deleteEntryFromView(ulong entryId)
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_DELETEENTRYFROMVIEW_ENTRY );
mEntryId = entryId;
HbMessageBox *confirmationQuery = new HbMessageBox(
HbMessageBox::MessageTypeQuestion);
@@ -375,6 +390,7 @@
confirmationQuery->addAction(mCancelAction);
confirmationQuery->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_DELETEENTRYFROMVIEW_EXIT );
}
/*!
@@ -382,10 +398,12 @@
*/
void NotesViewManager::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_SELECTEDACTION_ENTRY );
if (action == mDeleteAction) {
// Delete the given note.
mAgendaUtil->deleteEntry(mEntryId);
}
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_SELECTEDACTION_EXIT );
}
/*!
@@ -393,6 +411,7 @@
*/
void NotesViewManager::handleInstanceViewCreationCompleted(int status)
{
+ OstTraceFunctionEntry0( NOTESVIEWMANAGER_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY );
Q_UNUSED(status)
// Update the title for main view.
@@ -409,5 +428,13 @@
// Update the favorites view.
mFavoriteView->updateFavoriteView();
+
+ // 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
+ // NotesApplication object needs to emit applicationReady Signal.
+ emit appReady();
+ OstTraceFunctionExit0( NOTESVIEWMANAGER_HANDLEINSTANCEVIEWCREATIONCOMPLETED_EXIT );
}
+
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviewmanager/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviewmanager/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,32 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESDOCLOADER_CREATEOBJECT_EXIT=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESVIEWMANAGER_NOTESVIEWMANAGER_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESVIEWMANAGER_NOTESVIEWMANAGER_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESDOCLOADER_CREATEOBJECT_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESDOCLOADER_CREATEOBJECT_EXIT=0x5
+[TRACE]TRACE_FLOW[0x8A]_DUP4_NOTESDOCLOADER_CREATEOBJECT_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_NOTESDOCLOADER_CREATEOBJECT_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_NOTESDOCLOADER_CREATEOBJECT_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_DELETEENTRYFROMVIEW_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_DELETEENTRYFROMVIEW_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_HANDLEINSTANCEVIEWCREATIONCOMPLETED_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADFAVORITESVIEW_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADFAVORITESVIEW_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADNOTESCOLLECTIONVIEW_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADNOTESCOLLECTIONVIEW_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADNOTESMAINVIEW_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADNOTESMAINVIEW_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADNOTEVIEW_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADNOTEVIEW_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADOTHERVIEWS_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADOTHERVIEWS_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADTODOVIEW_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_LOADTODOVIEW_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_NOTESVIEWMANAGER_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_NOTESVIEWMANAGER_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_SELECTEDACTION_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_SELECTEDACTION_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_SWITCHTOVIEW_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_NOTESVIEWMANAGER_SWITCHTOVIEW_EXIT=0xc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviewmanager/traces/notesdocloaderTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESDOCLOADERTRACES_H__
+#define __NOTESDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x20029f84
+
+#define NOTESDOCLOADER_CREATEOBJECT_ENTRY 0x8a0001
+#define NOTESDOCLOADER_CREATEOBJECT_EXIT 0x8a0002
+#define DUP1_NOTESDOCLOADER_CREATEOBJECT_EXIT 0x8a0003
+#define DUP2_NOTESDOCLOADER_CREATEOBJECT_EXIT 0x8a0004
+#define DUP3_NOTESDOCLOADER_CREATEOBJECT_EXIT 0x8a0005
+#define DUP4_NOTESDOCLOADER_CREATEOBJECT_EXIT 0x8a0006
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviewmanager/traces/notesviewmanagerTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,38 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESVIEWMANAGERTRACES_H__
+#define __NOTESVIEWMANAGERTRACES_H__
+
+#define KOstTraceComponentID 0x20029f84
+
+#define NOTESVIEWMANAGER_NOTESVIEWMANAGER_ENTRY 0x8a0007
+#define NOTESVIEWMANAGER_NOTESVIEWMANAGER_EXIT 0x8a0008
+#define DUP1_NOTESVIEWMANAGER_NOTESVIEWMANAGER_ENTRY 0x8a0009
+#define DUP1_NOTESVIEWMANAGER_NOTESVIEWMANAGER_EXIT 0x8a000a
+#define NOTESVIEWMANAGER_SWITCHTOVIEW_ENTRY 0x8a000b
+#define NOTESVIEWMANAGER_SWITCHTOVIEW_EXIT 0x8a000c
+#define NOTESVIEWMANAGER_LOADNOTESMAINVIEW_ENTRY 0x8a000d
+#define NOTESVIEWMANAGER_LOADNOTESMAINVIEW_EXIT 0x8a000e
+#define NOTESVIEWMANAGER_LOADNOTESCOLLECTIONVIEW_ENTRY 0x8a000f
+#define NOTESVIEWMANAGER_LOADNOTESCOLLECTIONVIEW_EXIT 0x8a0010
+#define NOTESVIEWMANAGER_LOADTODOVIEW_ENTRY 0x8a0011
+#define NOTESVIEWMANAGER_LOADTODOVIEW_EXIT 0x8a0012
+#define NOTESVIEWMANAGER_LOADFAVORITESVIEW_ENTRY 0x8a0013
+#define NOTESVIEWMANAGER_LOADFAVORITESVIEW_EXIT 0x8a0014
+#define NOTESVIEWMANAGER_LOADNOTEVIEW_ENTRY 0x8a0015
+#define NOTESVIEWMANAGER_LOADNOTEVIEW_EXIT 0x8a0016
+#define NOTESVIEWMANAGER_LOADOTHERVIEWS_ENTRY 0x8a0017
+#define NOTESVIEWMANAGER_LOADOTHERVIEWS_EXIT 0x8a0018
+#define NOTESVIEWMANAGER_DELETEENTRYFROMVIEW_ENTRY 0x8a0019
+#define NOTESVIEWMANAGER_DELETEENTRYFROMVIEW_EXIT 0x8a001a
+#define NOTESVIEWMANAGER_SELECTEDACTION_ENTRY 0x8a001b
+#define NOTESVIEWMANAGER_SELECTEDACTION_EXIT 0x8a001c
+#define NOTESVIEWMANAGER_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY 0x8a001d
+#define NOTESVIEWMANAGER_HANDLEINSTANCEVIEWCREATIONCOMPLETED_EXIT 0x8a001e
+
+
+#endif
+
+// End of file
+
--- a/notes/notesui/notesviews/notesviews.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviews/notesviews.pro Mon Aug 23 16:00:50 2010 +0100
@@ -27,7 +27,8 @@
../noteseditor/inc \
../notesappcontroller/inc \
../../inc \
- ../../../inc
+ ../../../inc \
+ ./traces
DEPENDPATH += \
. \
@@ -39,8 +40,7 @@
TARGET.EPOCALLOWDLLDATA = 1
TARGET.UID3 = 0x20029F83
- INCLUDEPATH += ../../../agendainterface/inc \
- $$APP_LAYER_SYSTEMINCLUDE
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
LIBS += \
-lagendainterface \
--- a/notes/notesui/notesviews/src/notescollectionview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviews/src/notescollectionview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,13 +32,18 @@
#include <HbStyleLoader>
// User includes
+#include <agendautil.h>
#include "notescollectionview.h"
#include "notescommon.h"
#include "notesdocloader.h"
-#include "agendautil.h"
#include "notesmodel.h"
#include "noteseditor.h"
#include "notessortfilterproxymodel.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notescollectionviewTraces.h"
+#endif
+
/*!
\class NotesCollectionView
@@ -56,7 +61,9 @@
NotesCollectionView::NotesCollectionView(QGraphicsWidget *parent)
:HbView(parent)
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_EXIT );
}
/*!
@@ -64,10 +71,12 @@
*/
NotesCollectionView::~NotesCollectionView()
{
+ OstTraceFunctionEntry0( DUP1_NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
mDocLoader = 0;
}
+ OstTraceFunctionExit0( DUP1_NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_EXIT );
}
/*!
@@ -80,6 +89,7 @@
void NotesCollectionView::setupView(
NotesAppControllerIf &controllerIf, NotesDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
mNotesModel = mAppControllerIf->notesModel();
@@ -152,6 +162,7 @@
connect(
mAddNoteAction, SIGNAL(triggered()),
this, SLOT(createNewNote()));
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_SETUPVIEW_EXIT );
}
/*!
@@ -159,6 +170,7 @@
*/
void NotesCollectionView::populateListView()
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_POPULATELISTVIEW_ENTRY );
QStandardItemModel *model = new QStandardItemModel(this);
model->setColumnCount(1);
@@ -192,6 +204,7 @@
HbStyleLoader::registerFilePath(":/style");
mListView->setLayoutName("custom");
mListView->setModel(model);
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_POPULATELISTVIEW_EXIT );
}
/*!
@@ -199,8 +212,10 @@
*/
void NotesCollectionView::displayAllNotesView()
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_DISPLAYALLNOTESVIEW_ENTRY );
// Switch to collections view.
mAppControllerIf->switchToView(NotesNamespace::NotesMainViewId);
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_DISPLAYALLNOTESVIEW_EXIT );
}
/*!
@@ -208,6 +223,7 @@
*/
void NotesCollectionView::resetCollectionView()
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_ENTRY );
QString countString(hbTrId("txt_notes_list_note_count"));
// Update the count of to-do's.
@@ -224,6 +240,7 @@
notesStringList.append(
countString.arg(QString::number(recentNotesCount())));
mListView->model()->setData(mdlIndex, notesStringList, Qt::DisplayRole);
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_EXIT );
}
/*!
@@ -231,6 +248,7 @@
*/
void NotesCollectionView::createNewNote()
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_CREATENEWNOTE_ENTRY );
// Here we Display an editor to the use to enter text.
mNotesEditor = new NotesEditor(mAgendaUtil, this);
connect(
@@ -238,6 +256,7 @@
this, SLOT(handleEditingCompleted(bool)));
mNotesEditor->create(NotesEditor::CreateNote);
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_CREATENEWNOTE_EXIT );
}
/*!
@@ -245,6 +264,7 @@
*/
void NotesCollectionView::handleEditingCompleted(bool status)
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_HANDLEEDITINGCOMPLETED_ENTRY );
Q_UNUSED(status)
// Refresh the content of the view.
@@ -254,6 +274,7 @@
mNotesEditor->deleteLater();
mAppControllerIf->switchToView(NotesNamespace::NotesMainViewId);
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_HANDLEEDITINGCOMPLETED_EXIT );
}
/*!
@@ -262,10 +283,12 @@
*/
void NotesCollectionView::updateData(ulong id)
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_UPDATEDATA_ENTRY );
Q_UNUSED(id)
// Refresh the content of the view.
resetCollectionView();
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_UPDATEDATA_EXIT );
}
/*!
@@ -274,10 +297,12 @@
*/
void NotesCollectionView::updateData(QList<ulong> ids)
{
+ OstTraceFunctionEntry0( DUP1_NOTESCOLLECTIONVIEW_UPDATEDATA_ENTRY );
Q_UNUSED(ids)
// Refresh the content of the view.
resetCollectionView();
+ OstTraceFunctionExit0( DUP1_NOTESCOLLECTIONVIEW_UPDATEDATA_EXIT );
}
/*!
@@ -288,6 +313,7 @@
*/
void NotesCollectionView::handleActivated(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_HANDLEACTIVATED_ENTRY );
switch (index.row()) {
case 0: {
@@ -323,6 +349,7 @@
// Nothing yet.
break;
}
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_HANDLEACTIVATED_EXIT );
}
/*!
@@ -333,6 +360,7 @@
void NotesCollectionView::updateFavouritesCount(
const QModelIndex &index, int start, int end)
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_UPDATEFAVOURITESCOUNT_ENTRY );
Q_UNUSED(index)
Q_UNUSED(start)
Q_UNUSED(end)
@@ -348,6 +376,7 @@
favStringList.append(countString.arg(mFavouriteModel->rowCount()));
mListView->model()->setData(mdlIndex, favStringList, Qt::DisplayRole);
}
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_UPDATEFAVOURITESCOUNT_EXIT );
}
/*!
@@ -355,7 +384,9 @@
*/
void NotesCollectionView::handleActionStateChanged()
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_HANDLEACTIONSTATECHANGED_ENTRY );
mViewCollectionAction->setChecked(true);
+ OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_HANDLEACTIONSTATECHANGED_EXIT );
}
@@ -366,6 +397,7 @@
*/
int NotesCollectionView::todosCount()
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_TODOSCOUNT_ENTRY );
QList<ulong> entries = mAgendaUtil->entryIds(
(AgendaUtil::FilterFlags)
(AgendaUtil::IncludeCompletedTodos
@@ -380,6 +412,7 @@
*/
int NotesCollectionView::recentNotesCount()
{
+ OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_RECENTNOTESCOUNT_ENTRY );
QList<ulong> entries = mAgendaUtil->entryIds(AgendaUtil::IncludeNotes);
return entries.count();
}
--- a/notes/notesui/notesviews/src/notesfavoriteview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviews/src/notesfavoriteview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -33,13 +33,18 @@
#include <HbNotificationDialog>
// User includes
+#include <agendautil.h>
#include "notesfavoriteview.h"
#include "notescommon.h"
#include "notesdocloader.h"
-#include "agendautil.h"
#include "notesmodel.h"
#include "notessortfilterproxymodel.h"
#include "noteseditor.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesfavoriteviewTraces.h"
+#endif
+
/*!
\class NotesFavoriteView
@@ -60,7 +65,9 @@
mDeleteAction(0),
mIsLongTop(false)
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_EXIT );
}
/*!
@@ -68,11 +75,13 @@
*/
NotesFavoriteView::~NotesFavoriteView()
{
+ OstTraceFunctionEntry0( DUP1_NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
mDocLoader = 0;
}
+ OstTraceFunctionExit0( DUP1_NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_EXIT );
}
/*!
@@ -85,6 +94,7 @@
void NotesFavoriteView::setupView(
NotesAppControllerIf &controllerIf, NotesDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
mNotesModel = mAppControllerIf->notesModel();
@@ -165,6 +175,7 @@
// Set the graphics size for the icons.
HbListViewItem *prototype = mListView->listItemPrototype();
prototype->setGraphicsSize(HbListViewItem::SmallIcon);
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_SETUPVIEW_EXIT );
}
/*
@@ -172,7 +183,9 @@
*/
void NotesFavoriteView::updateFavoriteView()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_UPDATEFAVORITEVIEW_ENTRY );
updateView();
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_UPDATEFAVORITEVIEW_EXIT );
}
/*!
@@ -181,12 +194,14 @@
*/
void NotesFavoriteView::createNewNote()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_CREATENEWNOTE_ENTRY );
// Here we Display an editor to the use to enter text.
mNotesEditor = new NotesEditor(mAgendaUtil, this);
connect(
mNotesEditor, SIGNAL(editingCompleted(bool)),
this, SLOT(handleEditingCompleted(bool)));
mNotesEditor->create(NotesEditor::CreateNote);
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_CREATENEWNOTE_EXIT );
}
/*!
@@ -199,9 +214,11 @@
*/
void NotesFavoriteView::handleItemReleased(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_HANDLEITEMRELEASED_ENTRY );
if (!mIsLongTop) {
// Sanity check.
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -211,6 +228,7 @@
if (0 >= noteId) {
// Something wrong.
+ OstTraceFunctionExit0( DUP1_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -220,6 +238,7 @@
if (entry.isNull()) {
// Entry invalid.
+ OstTraceFunctionExit0( DUP2_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -230,6 +249,7 @@
this, SLOT(handleEditingCompleted(bool)));
mNotesEditor->edit(entry);
}
+ OstTraceFunctionExit0( DUP3_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT );
}
/*!
@@ -243,6 +263,7 @@
void NotesFavoriteView::handleItemLongPressed(
HbAbstractViewItem *item, const QPointF &coords)
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_HANDLEITEMLONGPRESSED_ENTRY );
mSelectedItem = item;
mIsLongTop = true;
@@ -275,6 +296,7 @@
// Show the menu.
contextMenu->open(this, SLOT(selectedMenuAction(HbAction*)));
contextMenu->setPreferredPos(coords);
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_HANDLEITEMLONGPRESSED_EXIT );
}
/*!
@@ -282,15 +304,18 @@
*/
void NotesFavoriteView::deleteNote()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_DELETENOTE_ENTRY );
Q_ASSERT(mSelectedItem);
QModelIndex index = mSelectedItem->modelIndex();
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_DELETENOTE_EXIT );
return;
}
ulong entryId =
index.data(NotesNamespace::IdRole).value<qulonglong>();
if (!entryId) {
+ OstTraceFunctionExit0( DUP1_NOTESFAVORITEVIEW_DELETENOTE_EXIT );
return;
}
@@ -298,6 +323,7 @@
emit deleteEntry(entryId);
mSelectedItem = 0;
+ OstTraceFunctionExit0( DUP2_NOTESFAVORITEVIEW_DELETENOTE_EXIT );
}
/*!
@@ -305,6 +331,7 @@
*/
void NotesFavoriteView::markNoteAsNotFavourite()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_MARKNOTEASNOTFAVOURITE_ENTRY );
ulong noteId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
AgendaEntry entry = mAgendaUtil->fetchById(noteId);
@@ -312,7 +339,8 @@
if (entry.favourite()) {
entry.setFavourite(0);
}
- mAgendaUtil->updateEntry(entry);
+ mAgendaUtil->store(entry);
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_MARKNOTEASNOTFAVOURITE_EXIT );
}
/*!
@@ -320,15 +348,18 @@
*/
void NotesFavoriteView::markNoteAsTodo()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_MARKNOTEASTODO_ENTRY );
Q_ASSERT(mSelectedItem);
QModelIndex index = mSelectedItem->modelIndex();
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT );
return;
}
ulong noteId = index.data(NotesNamespace::IdRole).value<qulonglong> ();
if (!noteId) {
+ OstTraceFunctionExit0( DUP1_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT );
return;
}
// Get the entry details.
@@ -336,6 +367,7 @@
if (entry.isNull()) {
// Entry invalid.
+ OstTraceFunctionExit0( DUP2_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT );
return;
}
@@ -377,6 +409,7 @@
notificationDialog->setTitle(
hbTrId("txt_notes_dpopinfo_note_moved_to_todos"));
notificationDialog->show();
+ OstTraceFunctionExit0( DUP3_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT );
}
/*!
@@ -388,10 +421,12 @@
*/
void NotesFavoriteView::handleEditingCompleted(bool status)
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_HANDLEEDITINGCOMPLETED_ENTRY );
Q_UNUSED(status)
// Cleanup.
mNotesEditor->deleteLater();
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_HANDLEEDITINGCOMPLETED_EXIT );
}
/*!
@@ -399,8 +434,10 @@
*/
void NotesFavoriteView::displayCollectionView()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_DISPLAYCOLLECTIONVIEW_ENTRY );
// Switch to collections view.
mAppControllerIf->switchToView(NotesNamespace::NotesCollectionViewId);
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_DISPLAYCOLLECTIONVIEW_EXIT );
}
/*!
@@ -408,8 +445,10 @@
*/
void NotesFavoriteView::displayAllNotesView()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_DISPLAYALLNOTESVIEW_ENTRY );
// Switch to collections view.
mAppControllerIf->switchToView(NotesNamespace::NotesMainViewId);
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_DISPLAYALLNOTESVIEW_EXIT );
}
/*!
@@ -417,7 +456,9 @@
*/
void NotesFavoriteView::handleActionStateChanged()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_HANDLEACTIONSTATECHANGED_ENTRY );
mAllNotesAction->setChecked(true);
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_HANDLEACTIONSTATECHANGED_EXIT );
}
/*!
@@ -428,6 +469,7 @@
*/
void NotesFavoriteView::handleOrientationChanged(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_HANDLEORIENTATIONCHANGED_ENTRY );
HbListViewItem *prototype = mListView->listItemPrototype();
if (Qt::Horizontal == orientation) {
@@ -435,6 +477,7 @@
} else {
prototype->setStretchingStyle(HbListViewItem::NoStretching);
}
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_HANDLEORIENTATIONCHANGED_EXIT );
}
/*
@@ -442,6 +485,7 @@
*/
void NotesFavoriteView::openNote()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_OPENNOTE_ENTRY );
ulong noteId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
AgendaEntry entry = mAgendaUtil->fetchById(noteId);
@@ -454,6 +498,7 @@
// Launch the notes editor with the obtained info.
mNotesEditor->edit(entry);
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_OPENNOTE_EXIT );
}
/*
@@ -461,6 +506,7 @@
*/
void NotesFavoriteView::selectedMenuAction(HbAction *action)
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_SELECTEDMENUACTION_ENTRY );
if(action == mOpenAction) {
openNote();
} else if (action == mDeleteAction) {
@@ -470,6 +516,7 @@
} else if (action == mMarkTodoAction) {
markNoteAsTodo();
}
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_SELECTEDMENUACTION_EXIT );
}
/*!
@@ -477,7 +524,9 @@
*/
void NotesFavoriteView::handleMenuClosed()
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_HANDLEMENUCLOSED_ENTRY );
mIsLongTop = false;
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_HANDLEMENUCLOSED_EXIT );
}
/*!
@@ -485,6 +534,7 @@
*/
void NotesFavoriteView::updateView(ulong id)
{
+ OstTraceFunctionEntry0( NOTESFAVORITEVIEW_UPDATEVIEW_ENTRY );
Q_UNUSED(id)
// Get the numbers of favorite notes.
@@ -495,7 +545,7 @@
mEmptyListLabel->hide();
mListView->show();
}
+ OstTraceFunctionExit0( NOTESFAVORITEVIEW_UPDATEVIEW_EXIT );
}
// End of file --Don't remove this.
-
--- a/notes/notesui/notesviews/src/notesmainview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviews/src/notesmainview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -34,15 +34,20 @@
#include <hbactivitymanager> // hbactivitymanager
// User includes
+#include <agendautil.h>
#include "agendaeventviewer.h"
#include "notesmainview.h"
#include "notescommon.h"
#include "notesdocloader.h"
-#include "agendautil.h"
#include "notesmodel.h"
#include "notessortfilterproxymodel.h"
#include "noteseditor.h"
-#include "notescommon.h" // NotesNamespace
+#include "notescommon.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesmainviewTraces.h"
+#endif
+ // NotesNamespace
/*!
\class NotesMainView
@@ -64,7 +69,9 @@
mIsLongTop(false),
mIsScreenShotCapruted(false)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_NOTESMAINVIEW_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( NOTESMAINVIEW_NOTESMAINVIEW_EXIT );
}
/*!
@@ -72,11 +79,13 @@
*/
NotesMainView::~NotesMainView()
{
+ OstTraceFunctionEntry0( DUP1_NOTESMAINVIEW_NOTESMAINVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
mDocLoader = 0;
}
+ OstTraceFunctionExit0( DUP1_NOTESMAINVIEW_NOTESMAINVIEW_EXIT );
}
/*!
@@ -89,6 +98,7 @@
void NotesMainView::setupView(
NotesAppControllerIf &controllerIf, NotesDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
@@ -146,21 +156,26 @@
HbListViewItem *prototype = mListView->listItemPrototype();
prototype->setGraphicsSize(HbListViewItem::SmallIcon);
- // Get a pointer to activity Manager
- HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
-
- // clean up any previous versions of this activity from the activity manager.
- // ignore return value as the first boot would always return a false
- // bool declared on for debugging purpose
- bool ok = activityManager->removeActivity(notes);
+ // Get a pointer to activity Manager
+ HbActivityManager* activityManager =
+ qobject_cast<HbApplication*>(qApp)->activityManager();
+
+ // clean up any previous versions of this activity from the activity manager
+ // ignore return value as the first boot would always return a false
+ // bool declared on for debugging purpose
+ bool ok = activityManager->removeActivity(notes);
+
+ // connect main view for the first time to recieve aboutToQuit signal
+ connect(
+ qobject_cast<HbApplication*>(qApp), SIGNAL(aboutToQuit()),
+ this, SLOT(saveActivity()));
- // connect main view for the first time to recieve aboutToQuit signal
- connect(qobject_cast<HbApplication*>(qApp), SIGNAL(aboutToQuit()), this, SLOT(saveActivity()));
-
- }
+ OstTraceFunctionExit0( NOTESMAINVIEW_SETUPVIEW_EXIT );
+}
void NotesMainView::setupAfterViewReady()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_SETUPAFTERVIEWREADY_ENTRY );
// Get the toolbar/menu actions.
mAddNoteAction = static_cast<HbAction *> (
mDocLoader->findObject("newNoteAction"));
@@ -204,6 +219,7 @@
connect(
mAgendaUtil, SIGNAL(entryUpdated(ulong)),
this, SLOT(updateSubTitle(ulong)));
+ OstTraceFunctionExit0( NOTESMAINVIEW_SETUPAFTERVIEWREADY_EXIT );
}
/*
@@ -211,7 +227,9 @@
*/
void NotesMainView::updateTitle()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_UPDATETITLE_ENTRY );
updateSubTitle();
+ OstTraceFunctionExit0( NOTESMAINVIEW_UPDATETITLE_EXIT );
}
/*!
@@ -220,6 +238,7 @@
*/
void NotesMainView::createNewNote()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_CREATENEWNOTE_ENTRY );
// Here we Display an editor to the use to enter text.
mNotesEditor = new NotesEditor(mAgendaUtil, this);
@@ -230,6 +249,7 @@
// capture screenshot for future use, if application
// is exited/Quit from notesEditor
captureScreenShot(true);
+ OstTraceFunctionExit0( NOTESMAINVIEW_CREATENEWNOTE_EXIT );
}
/*!
@@ -242,18 +262,21 @@
*/
void NotesMainView::handleItemReleased(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_HANDLEITEMRELEASED_ENTRY );
if(!mIsLongTop) {
// Sanity check.
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
- // First get the id of the note and get the corresponding information from
- // agendautil.
+ // First get the id of the note and get the corresponding information
+ // from agendautil.
ulong noteId = index.data(NotesNamespace::IdRole).value<qulonglong>();
if (0 >= noteId) {
// Something wrong.
+ OstTraceFunctionExit0( DUP1_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -261,6 +284,7 @@
AgendaEntry entry = mAgendaUtil->fetchById(noteId);
if (entry.isNull()) {
// Entry invalid.
+ OstTraceFunctionExit0( DUP2_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -288,6 +312,7 @@
// is exited/Quit from eventViewer/notesEditor
captureScreenShot(true);
}
+ OstTraceFunctionExit0( DUP3_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT );
}
/*!
@@ -301,6 +326,7 @@
void NotesMainView::handleItemLongPressed(
HbAbstractViewItem *item, const QPointF &coords)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_HANDLEITEMLONGPRESSED_ENTRY );
mIsLongTop = true;
mSelectedItem = item;
@@ -352,6 +378,7 @@
// Show the menu.
contextMenu->open(this, SLOT(selectedMenuAction(HbAction*)));
contextMenu->setPreferredPos(coords);
+ OstTraceFunctionExit0( NOTESMAINVIEW_HANDLEITEMLONGPRESSED_EXIT );
}
/*!
@@ -359,16 +386,19 @@
*/
void NotesMainView::deleteNote()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_DELETENOTE_ENTRY );
Q_ASSERT(mSelectedItem);
QModelIndex index = mSelectedItem->modelIndex();
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESMAINVIEW_DELETENOTE_EXIT );
return;
}
ulong noteId =
index.data(NotesNamespace::IdRole).value<qulonglong>();
if (!noteId) {
+ OstTraceFunctionExit0( DUP1_NOTESMAINVIEW_DELETENOTE_EXIT );
return;
}
@@ -376,6 +406,7 @@
emit deleteEntry(noteId);
mSelectedItem = 0;
+ OstTraceFunctionExit0( DUP2_NOTESMAINVIEW_DELETENOTE_EXIT );
}
/*!
@@ -387,6 +418,7 @@
*/
void NotesMainView::markTodoStatus()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_MARKTODOSTATUS_ENTRY );
ulong noteId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
AgendaEntry entry = mAgendaUtil->fetchById(noteId);
@@ -399,6 +431,7 @@
mAgendaUtil->setCompleted(entry, false, currentDateTime);
}
+ OstTraceFunctionExit0( NOTESMAINVIEW_MARKTODOSTATUS_EXIT );
}
/*!
@@ -406,6 +439,7 @@
*/
void NotesMainView::markNoteAsFavourite()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_MARKNOTEASFAVOURITE_ENTRY );
ulong noteId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
AgendaEntry entry = mAgendaUtil->fetchById(noteId);
@@ -415,8 +449,9 @@
} else {
entry.setFavourite(1);
}
- mAgendaUtil->updateEntry(entry);
+ mAgendaUtil->store(entry);
+ OstTraceFunctionExit0( NOTESMAINVIEW_MARKNOTEASFAVOURITE_EXIT );
}
/*!
@@ -428,6 +463,7 @@
*/
void NotesMainView::handleEditingCompleted(bool status)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_HANDLEEDITINGCOMPLETED_ENTRY );
Q_UNUSED(status)
// Cleanup.
@@ -435,6 +471,7 @@
// set captured screenshot as invalid as the control is returned back
// to the main view
captureScreenShot(false);
+ OstTraceFunctionExit0( NOTESMAINVIEW_HANDLEEDITINGCOMPLETED_EXIT );
}
/*!
@@ -442,11 +479,13 @@
*/
void NotesMainView::displayCollectionView()
{
- // no need to capture the screen shot for future use as
- // NotesViewManager::switchToView takes care of it
+ OstTraceFunctionEntry0( NOTESMAINVIEW_DISPLAYCOLLECTIONVIEW_ENTRY );
+ // no need to capture the screen shot for future use as
+ // NotesViewManager::switchToView takes care of it
// Switch to collections view.
mAppControllerIf->switchToView(NotesNamespace::NotesCollectionViewId);
+ OstTraceFunctionExit0( NOTESMAINVIEW_DISPLAYCOLLECTIONVIEW_EXIT );
}
/*!
@@ -456,7 +495,9 @@
*/
void NotesMainView::scrollTo(QModelIndex index)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_SCROLLTO_ENTRY );
mListView->scrollTo(index, HbAbstractItemView::EnsureVisible);
+ OstTraceFunctionExit0( NOTESMAINVIEW_SCROLLTO_EXIT );
}
/*!
@@ -466,10 +507,12 @@
*/
void NotesMainView::handleViewingCompleted()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_HANDLEVIEWINGCOMPLETED_ENTRY );
mAgendaEventViewer->deleteLater();
// set captured screenshot as invalid as the control is returned back
// to the main view
captureScreenShot(false);
+ OstTraceFunctionExit0( NOTESMAINVIEW_HANDLEVIEWINGCOMPLETED_EXIT );
}
/*!
@@ -477,7 +520,9 @@
*/
void NotesMainView::handleActionStateChanged()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_HANDLEACTIONSTATECHANGED_ENTRY );
mAllNotesAction->setChecked(true);
+ OstTraceFunctionExit0( NOTESMAINVIEW_HANDLEACTIONSTATECHANGED_EXIT );
}
/*!
@@ -486,15 +531,18 @@
void NotesMainView::editTodo()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_EDITTODO_ENTRY );
// Get the selected list item index
QModelIndex index = mSelectedItem->modelIndex();
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESMAINVIEW_EDITTODO_EXIT );
return;
}
ulong todoId =
index.data(NotesNamespace::IdRole).value<qulonglong>();
if (!todoId) {
+ OstTraceFunctionExit0( DUP1_NOTESMAINVIEW_EDITTODO_EXIT );
return;
}
@@ -510,6 +558,7 @@
// is exited/Quit from notesEditor
captureScreenShot(true);
+ OstTraceFunctionExit0( DUP2_NOTESMAINVIEW_EDITTODO_EXIT );
}
/*!
@@ -520,6 +569,7 @@
*/
void NotesMainView::handleOrientationChanged(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_HANDLEORIENTATIONCHANGED_ENTRY );
HbListViewItem *prototype = mListView->listItemPrototype();
if (Qt::Horizontal == orientation) {
@@ -527,6 +577,7 @@
} else {
prototype->setStretchingStyle(HbListViewItem::NoStretching);
}
+ OstTraceFunctionExit0( NOTESMAINVIEW_HANDLEORIENTATIONCHANGED_EXIT );
}
/*!
@@ -534,6 +585,7 @@
*/
void NotesMainView::updateSubTitle(ulong id)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_UPDATESUBTITLE_ENTRY );
Q_UNUSED(id)
// Get the number of notes and to-do entries.
@@ -553,6 +605,7 @@
mSubTitle->setHeading(
hbTrId("txt_notes_subhead_ln_notes",entries.count()));
+ OstTraceFunctionExit0( NOTESMAINVIEW_UPDATESUBTITLE_EXIT );
}
/*!
@@ -560,14 +613,17 @@
*/
void NotesMainView::markNoteAsTodo()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_MARKNOTEASTODO_ENTRY );
Q_ASSERT(mSelectedItem);
QModelIndex index = mSelectedItem->modelIndex();
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESMAINVIEW_MARKNOTEASTODO_EXIT );
return;
}
ulong noteId = index.data(NotesNamespace::IdRole).value<qulonglong> ();
if (!noteId) {
+ OstTraceFunctionExit0( DUP1_NOTESMAINVIEW_MARKNOTEASTODO_EXIT );
return;
}
// Get the entry details.
@@ -575,6 +631,7 @@
if (entry.isNull()) {
// Entry invalid.
+ OstTraceFunctionExit0( DUP2_NOTESMAINVIEW_MARKNOTEASTODO_EXIT );
return;
}
@@ -598,6 +655,9 @@
// Remove favourite if marked so.
entry.setFavourite(0);
+
+ // Set the priority of the to-do as normal
+ entry.setPriority(2);
// Set the status of the to-do.
entry.setStatus(AgendaEntry::TodoNeedsAction);
@@ -607,6 +667,7 @@
// Delete the old entry.
mAgendaUtil->deleteEntry(entry.id());
+ OstTraceFunctionExit0( DUP3_NOTESMAINVIEW_MARKNOTEASTODO_EXIT );
}
@@ -616,6 +677,7 @@
*/
void NotesMainView::openNote()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_OPENNOTE_ENTRY );
ulong noteId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
AgendaEntry entry = mAgendaUtil->fetchById(noteId);
@@ -644,6 +706,7 @@
// capture screenshot for future use, if application
// is exited/Quit from notesEditor/eventViewer
captureScreenShot(true);
+ OstTraceFunctionExit0( NOTESMAINVIEW_OPENNOTE_EXIT );
}
/*!
@@ -651,6 +714,7 @@
*/
void NotesMainView::selectedMenuAction(HbAction *action)
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_SELECTEDMENUACTION_ENTRY );
if (action == mOpenAction) {
openNote();
} else if (action == mEditTodoAction) {
@@ -664,6 +728,7 @@
} else if (action == mTodoStatusAction) {
markTodoStatus();
}
+ OstTraceFunctionExit0( NOTESMAINVIEW_SELECTEDMENUACTION_EXIT );
}
/*!
@@ -671,7 +736,9 @@
*/
void NotesMainView::handleMenuClosed()
{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_HANDLEMENUCLOSED_ENTRY );
mIsLongTop = false;
+ OstTraceFunctionExit0( NOTESMAINVIEW_HANDLEMENUCLOSED_EXIT );
}
/*!
@@ -679,39 +746,51 @@
\param captureScreenShot bool to indicate if screenshot needs to be captured
*/
void NotesMainView::captureScreenShot(bool captureScreenShot)
- {
- if (captureScreenShot) // check if screen shot needs to be captured
- {
- mScreenShot.clear();
- mScreenShot.insert("screenshot", QPixmap::grabWidget(mainWindow(), mainWindow()->rect()));
- }
- mIsScreenShotCapruted = captureScreenShot; // set mIsScreenShotCapruted set validity of screenshot
- }
+{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_CAPTURESCREENSHOT_ENTRY );
+ // check if screen shot needs to be captured
+ if (captureScreenShot) {
+ mScreenShot.clear();
+ mScreenShot.insert(
+ "screenshot", QPixmap::grabWidget(
+ mainWindow(), mainWindow()->rect()));
+ }
+ // set mIsScreenShotCapruted set validity of screenshot
+ mIsScreenShotCapruted = captureScreenShot;
+ OstTraceFunctionExit0( NOTESMAINVIEW_CAPTURESCREENSHOT_EXIT );
+}
-/*!
+/*!
saveActivity saves main view as an activity
-*/
+*/
void NotesMainView::saveActivity()
- {
- // Get a pointer to activity Manager
- HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
-
- if (!mIsScreenShotCapruted) // check if a valid screenshot is already captured
- {
- mScreenShot.clear();
- mScreenShot.insert("screenshot", QPixmap::grabWidget(mainWindow(), mainWindow()->rect()));
- }
-
- // save any data necessary to save the state
- QByteArray serializedActivity;
- QDataStream stream(&serializedActivity, QIODevice::WriteOnly | QIODevice::Append);
- stream << NotesNamespace::NotesMainViewId;
-
- // add the activity to the activity manager
- bool ok = activityManager->addActivity(notes, serializedActivity, mScreenShot);
- if ( !ok )
- {
- qFatal("Add failed" );
- }
- }
+{
+ OstTraceFunctionEntry0( NOTESMAINVIEW_SAVEACTIVITY_ENTRY );
+ // Get a pointer to activity Manager
+ HbActivityManager* activityManager =
+ qobject_cast<HbApplication*>(qApp)->activityManager();
+
+ // check if a valid screenshot is already captured
+ if (!mIsScreenShotCapruted) {
+ mScreenShot.clear();
+ mScreenShot.insert(
+ "screenshot", QPixmap::grabWidget(
+ mainWindow(), mainWindow()->rect()));
+ }
+
+ // save any data necessary to save the state
+ QByteArray serializedActivity;
+ QDataStream stream(
+ &serializedActivity, QIODevice::WriteOnly | QIODevice::Append);
+ stream << NotesNamespace::NotesMainViewId;
+
+ // add the activity to the activity manager
+ bool ok = activityManager->addActivity(
+ notes, serializedActivity, mScreenShot);
+ if (!ok) {
+ qFatal("Add failed" );
+ }
+ OstTraceFunctionExit0( NOTESMAINVIEW_SAVEACTIVITY_EXIT );
+}
+
// End of file --Don't remove this.
--- a/notes/notesui/notesviews/src/notesnoteview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviews/src/notesnoteview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -30,13 +30,18 @@
#include <HbLabel>
// User includes
+#include <agendautil.h>
#include "notesnoteview.h"
#include "notescommon.h"
#include "notesdocloader.h"
#include "notesmodel.h"
#include "notessortfilterproxymodel.h"
#include "noteseditor.h"
-#include "agendautil.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesnoteviewTraces.h"
+#endif
+
/*!
@@ -57,19 +62,23 @@
mSelectedItem(0),
mDeleteAction(0),
mIsLongTop(false)
- {
+{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_NOTESNOTEVIEW_ENTRY );
// Nothing yet.
- }
+ OstTraceFunctionExit0( NOTESNOTEVIEW_NOTESNOTEVIEW_EXIT );
+}
/*!
Destructor.
*/
NotesNoteView::~NotesNoteView()
{
+ OstTraceFunctionEntry0( DUP1_NOTESNOTEVIEW_NOTESNOTEVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
mDocLoader = 0;
}
+ OstTraceFunctionExit0( DUP1_NOTESNOTEVIEW_NOTESNOTEVIEW_EXIT );
}
/*!
@@ -82,6 +91,7 @@
void NotesNoteView::setupView(
NotesAppControllerIf &controllerIf, NotesDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
mNotesModel = mAppControllerIf->notesModel();
@@ -164,6 +174,7 @@
// Set the graphics size for the icons.
HbListViewItem *prototype = mListView->listItemPrototype();
prototype->setGraphicsSize(HbListViewItem::SmallIcon);
+ OstTraceFunctionExit0( NOTESNOTEVIEW_SETUPVIEW_EXIT );
}
/*
@@ -171,7 +182,9 @@
*/
void NotesNoteView::updateNoteView()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_UPDATENOTEVIEW_ENTRY );
updateView();
+ OstTraceFunctionExit0( NOTESNOTEVIEW_UPDATENOTEVIEW_EXIT );
}
/*!
@@ -179,12 +192,14 @@
*/
void NotesNoteView::createNewNote()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_CREATENEWNOTE_ENTRY );
// Here we Display an editor to the use to enter text.
mNotesEditor = new NotesEditor(mAgendaUtil, this);
connect(
mNotesEditor, SIGNAL(editingCompleted(bool)),
this, SLOT(handleEditingCompleted(bool)));
mNotesEditor->create(NotesEditor::CreateNote);
+ OstTraceFunctionExit0( NOTESNOTEVIEW_CREATENEWNOTE_EXIT );
}
/*!
@@ -197,18 +212,21 @@
*/
void NotesNoteView::handleItemReleased(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_HANDLEITEMRELEASED_ENTRY );
if(!mIsLongTop) {
// Sanity check.
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
- // First get the id of the note and get the corresponding information from
- // agendautil.
+ // First get the id of the note and get the corresponding information
+ // from agendautil.
ulong noteId = index.data(NotesNamespace::IdRole).value<qulonglong>();
if (0 >= noteId) {
// Something wrong.
+ OstTraceFunctionExit0( DUP1_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -217,6 +235,7 @@
if (entry.isNull()) {
// Entry invalid.
+ OstTraceFunctionExit0( DUP2_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -227,6 +246,7 @@
this, SLOT(handleEditingCompleted(bool)));
mNotesEditor->edit(entry);
}
+ OstTraceFunctionExit0( DUP3_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT );
}
/*!
@@ -240,6 +260,7 @@
void NotesNoteView::handleItemLongPressed(
HbAbstractViewItem *item, const QPointF &coords)
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_HANDLEITEMLONGPRESSED_ENTRY );
mSelectedItem = item;
mIsLongTop = true;
@@ -275,6 +296,7 @@
// Show the menu.
contextMenu->open(this, SLOT(selectedMenuAction(HbAction*)));
contextMenu->setPreferredPos(coords);
+ OstTraceFunctionExit0( NOTESNOTEVIEW_HANDLEITEMLONGPRESSED_EXIT );
}
/*!
@@ -282,21 +304,25 @@
*/
void NotesNoteView::deleteNote()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_DELETENOTE_ENTRY );
Q_ASSERT(mSelectedItem);
QModelIndex index = mSelectedItem->modelIndex();
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESNOTEVIEW_DELETENOTE_EXIT );
return;
}
ulong noteId =
index.data(NotesNamespace::IdRole).value<qulonglong>();
if (!noteId) {
+ OstTraceFunctionExit0( DUP1_NOTESNOTEVIEW_DELETENOTE_EXIT );
return;
}
// Emitting the signal , deletion would be handle in view manager.
emit deleteEntry(noteId);
mSelectedItem = 0;
+ OstTraceFunctionExit0( DUP2_NOTESNOTEVIEW_DELETENOTE_EXIT );
}
/*!
@@ -304,6 +330,7 @@
*/
void NotesNoteView::markNoteAsFavourite()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_MARKNOTEASFAVOURITE_ENTRY );
ulong noteId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
AgendaEntry entry = mAgendaUtil->fetchById(noteId);
@@ -313,23 +340,27 @@
} else {
entry.setFavourite(1);
}
- mAgendaUtil->updateEntry(entry);
+ mAgendaUtil->store(entry);
+ OstTraceFunctionExit0( NOTESNOTEVIEW_MARKNOTEASFAVOURITE_EXIT );
}
/*!
- Slot to make a note as to-do.
+ Slot to make a note as to-do.
*/
void NotesNoteView::markNoteAsTodo()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_MARKNOTEASTODO_ENTRY );
Q_ASSERT(mSelectedItem);
QModelIndex index = mSelectedItem->modelIndex();
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESNOTEVIEW_MARKNOTEASTODO_EXIT );
return;
}
ulong noteId =
index.data(NotesNamespace::IdRole).value<qulonglong>();
if (!noteId) {
+ OstTraceFunctionExit0( DUP1_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT );
return;
}
// Get the entry details.
@@ -337,6 +368,7 @@
if (entry.isNull()) {
// Entry invalid.
+ OstTraceFunctionExit0( DUP2_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT );
return;
}
@@ -378,6 +410,7 @@
notificationDialog->setTitle(
hbTrId("txt_notes_dpopinfo_note_moved_to_todos"));
notificationDialog->show();
+ OstTraceFunctionExit0( DUP3_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT );
}
/*!
@@ -389,10 +422,12 @@
*/
void NotesNoteView::handleEditingCompleted(bool status)
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_HANDLEEDITINGCOMPLETED_ENTRY );
Q_UNUSED(status)
// Cleanup.
mNotesEditor->deleteLater();
+ OstTraceFunctionExit0( NOTESNOTEVIEW_HANDLEEDITINGCOMPLETED_EXIT );
}
/*!
@@ -400,9 +435,11 @@
*/
void NotesNoteView::displayCollectionView()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_DISPLAYCOLLECTIONVIEW_ENTRY );
// Switch to collections view.
mAppControllerIf->switchToView(NotesNamespace::NotesCollectionViewId);
+ OstTraceFunctionExit0( NOTESNOTEVIEW_DISPLAYCOLLECTIONVIEW_EXIT );
}
/*!
@@ -410,8 +447,10 @@
*/
void NotesNoteView::displayAllNotesView()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_DISPLAYALLNOTESVIEW_ENTRY );
// Switch to collections view.
mAppControllerIf->switchToView(NotesNamespace::NotesMainViewId);
+ OstTraceFunctionExit0( NOTESNOTEVIEW_DISPLAYALLNOTESVIEW_EXIT );
}
/*!
@@ -419,7 +458,9 @@
*/
void NotesNoteView::handleActionStateChanged()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_HANDLEACTIONSTATECHANGED_ENTRY );
mAllNotesAction->setChecked(true);
+ OstTraceFunctionExit0( NOTESNOTEVIEW_HANDLEACTIONSTATECHANGED_EXIT );
}
/*!
@@ -430,6 +471,7 @@
*/
void NotesNoteView::handleOrientationChanged(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_HANDLEORIENTATIONCHANGED_ENTRY );
HbListViewItem *prototype = mListView->listItemPrototype();
if (Qt::Horizontal == orientation) {
@@ -437,6 +479,7 @@
} else {
prototype->setStretchingStyle(HbListViewItem::NoStretching);
}
+ OstTraceFunctionExit0( NOTESNOTEVIEW_HANDLEORIENTATIONCHANGED_EXIT );
}
/*
@@ -444,6 +487,7 @@
*/
void NotesNoteView::openNote()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_OPENNOTE_ENTRY );
ulong noteId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
@@ -457,6 +501,7 @@
// Launch the notes editor with the obtained info.
mNotesEditor->edit(entry);
+ OstTraceFunctionExit0( NOTESNOTEVIEW_OPENNOTE_EXIT );
}
/*!
@@ -464,6 +509,7 @@
*/
void NotesNoteView::selectedMenuAction(HbAction *action)
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_SELECTEDMENUACTION_ENTRY );
if (action == mOpenAction) {
openNote();
} else if (action == mDeleteAction) {
@@ -473,6 +519,7 @@
} else if (action == mMarkTodoAction) {
markNoteAsTodo();
}
+ OstTraceFunctionExit0( NOTESNOTEVIEW_SELECTEDMENUACTION_EXIT );
}
/*!
@@ -480,7 +527,9 @@
*/
void NotesNoteView::handleMenuClosed()
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_HANDLEMENUCLOSED_ENTRY );
mIsLongTop = false;
+ OstTraceFunctionExit0( NOTESNOTEVIEW_HANDLEMENUCLOSED_EXIT );
}
/*!
@@ -488,6 +537,7 @@
*/
void NotesNoteView::updateView(ulong id)
{
+ OstTraceFunctionEntry0( NOTESNOTEVIEW_UPDATEVIEW_ENTRY );
Q_UNUSED(id)
// Get the numbers of notes.
@@ -498,7 +548,7 @@
mEmptyListLabel->hide();
mListView->show();
}
+ OstTraceFunctionExit0( NOTESNOTEVIEW_UPDATEVIEW_EXIT );
}
// End of file --Don't remove this.
-
--- a/notes/notesui/notesviews/src/notestodoview.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/notesui/notesviews/src/notestodoview.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -32,14 +32,19 @@
#include <HbListViewItem>
// User includes
+#include <agendautil.h>
#include "agendaeventviewer.h"
#include "notestodoview.h"
#include "notescommon.h"
#include "notesdocloader.h"
-#include "agendautil.h"
#include "notesmodel.h"
#include "notessortfilterproxymodel.h"
#include "noteseditor.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notestodoviewTraces.h"
+#endif
+
/*!
\class NotesTodoView
@@ -60,7 +65,9 @@
mDeleteAction(0),
mIsLongTop(false)
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_NOTESTODOVIEW_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( NOTESTODOVIEW_NOTESTODOVIEW_EXIT );
}
/*!
@@ -68,10 +75,12 @@
*/
NotesTodoView::~NotesTodoView()
{
+ OstTraceFunctionEntry0( DUP1_NOTESTODOVIEW_NOTESTODOVIEW_ENTRY );
if (mDocLoader) {
- delete mDocLoader;
- mDocLoader = 0;
- }
+ delete mDocLoader;
+ mDocLoader = 0;
+ }
+ OstTraceFunctionExit0( DUP1_NOTESTODOVIEW_NOTESTODOVIEW_EXIT );
}
/*!
@@ -84,6 +93,7 @@
void NotesTodoView::setupView(
NotesAppControllerIf &controllerIf, NotesDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
mNotesModel = mAppControllerIf->notesModel();
@@ -166,6 +176,7 @@
// Set the graphics size for the icons.
HbListViewItem *prototype = mListView->listItemPrototype();
prototype->setGraphicsSize(HbListViewItem::SmallIcon);
+ OstTraceFunctionExit0( NOTESTODOVIEW_SETUPVIEW_EXIT );
}
/*
@@ -173,7 +184,9 @@
*/
void NotesTodoView::updateTitle()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_UPDATETITLE_ENTRY );
updateSubTitle();
+ OstTraceFunctionExit0( NOTESTODOVIEW_UPDATETITLE_EXIT );
}
/*!
@@ -181,12 +194,14 @@
*/
void NotesTodoView::createNewTodo()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_CREATENEWTODO_ENTRY );
mNotesEditor = new NotesEditor(mAgendaUtil, this);
connect(
mNotesEditor, SIGNAL(editingCompleted(bool)),
this, SLOT(handleEditingCompleted(bool)));
mNotesEditor->create(NotesEditor::CreateTodo);
+ OstTraceFunctionExit0( NOTESTODOVIEW_CREATENEWTODO_EXIT );
}
/*!
@@ -199,9 +214,11 @@
*/
void NotesTodoView::handleItemReleased(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_HANDLEITEMRELEASED_ENTRY );
if(!mIsLongTop) {
// Sanity check.
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -211,6 +228,7 @@
if (0 >= toDoId) {
// Something wrong.
+ OstTraceFunctionExit0( DUP1_NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT );
return;
}
@@ -223,6 +241,7 @@
// Launch agenda event viewer
mAgendaEventViewer->view(toDoId, AgendaEventViewer::ActionEditDelete);
}
+ OstTraceFunctionExit0( DUP2_NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT );
}
/*!
@@ -236,6 +255,7 @@
void NotesTodoView::handleItemLongPressed(
HbAbstractViewItem *item, const QPointF &coords)
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_HANDLEITEMLONGPRESSED_ENTRY );
mSelectedItem = item;
mIsLongTop = true;
@@ -274,6 +294,7 @@
// Show the menu.
contextMenu->open(this, SLOT(selectedMenuAction(HbAction*)));
contextMenu->setPreferredPos(coords);
+ OstTraceFunctionExit0( NOTESTODOVIEW_HANDLEITEMLONGPRESSED_EXIT );
}
/*!
@@ -281,15 +302,18 @@
*/
void NotesTodoView::deleteTodo()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_DELETETODO_ENTRY );
Q_ASSERT(mSelectedItem);
QModelIndex index = mSelectedItem->modelIndex();
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESTODOVIEW_DELETETODO_EXIT );
return;
}
ulong entryId =
index.data(NotesNamespace::IdRole).value<qulonglong>();
if (!entryId) {
+ OstTraceFunctionExit0( DUP1_NOTESTODOVIEW_DELETETODO_EXIT );
return;
}
@@ -297,6 +321,7 @@
emit deleteEntry(entryId);
mSelectedItem = 0;
+ OstTraceFunctionExit0( DUP2_NOTESTODOVIEW_DELETETODO_EXIT );
}
/*!
@@ -304,6 +329,7 @@
*/
void NotesTodoView::markTodoStatus()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_MARKTODOSTATUS_ENTRY );
ulong entryId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
AgendaEntry entry = mAgendaUtil->fetchById(entryId);
@@ -315,6 +341,7 @@
} else if (AgendaEntry::TodoCompleted == entry.status()) {
mAgendaUtil->setCompleted(entry, false, currentDateTime);
}
+ OstTraceFunctionExit0( NOTESTODOVIEW_MARKTODOSTATUS_EXIT );
}
/*!
@@ -322,10 +349,12 @@
*/
void NotesTodoView::editTodo()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_EDITTODO_ENTRY );
QModelIndex index = mSelectedItem->modelIndex();
// Sanity check.
if (!index.isValid()) {
+ OstTraceFunctionExit0( NOTESTODOVIEW_EDITTODO_EXIT );
return;
}
@@ -335,6 +364,7 @@
if (0 >= noteId) {
// Something wrong.
+ OstTraceFunctionExit0( DUP1_NOTESTODOVIEW_EDITTODO_EXIT );
return;
}
@@ -343,6 +373,7 @@
if (entry.isNull()) {
// Entry invalid.
+ OstTraceFunctionExit0( DUP2_NOTESTODOVIEW_EDITTODO_EXIT );
return;
}
@@ -352,6 +383,7 @@
mNotesEditor, SIGNAL(editingCompleted(bool)),
this, SLOT(handleEditingCompleted(bool)));
mNotesEditor->edit(entry);
+ OstTraceFunctionExit0( DUP3_NOTESTODOVIEW_EDITTODO_EXIT );
}
/*!
@@ -363,10 +395,12 @@
*/
void NotesTodoView::handleEditingCompleted(bool status)
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_ENTRY );
Q_UNUSED(status)
// Cleanup.
mNotesEditor->deleteLater();
+ OstTraceFunctionExit0( NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_EXIT );
}
/*!
@@ -374,8 +408,10 @@
*/
void NotesTodoView::displayCollectionView()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_DISPLAYCOLLECTIONVIEW_ENTRY );
// Switch to collections view.
mAppControllerIf->switchToView(NotesNamespace::NotesCollectionViewId);
+ OstTraceFunctionExit0( NOTESTODOVIEW_DISPLAYCOLLECTIONVIEW_EXIT );
}
/*!
@@ -383,8 +419,10 @@
*/
void NotesTodoView::displayAllNotesView()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_DISPLAYALLNOTESVIEW_ENTRY );
// Switch to collections view.
mAppControllerIf->switchToView(NotesNamespace::NotesMainViewId);
+ OstTraceFunctionExit0( NOTESTODOVIEW_DISPLAYALLNOTESVIEW_EXIT );
}
/*!
@@ -392,8 +430,10 @@
*/
void NotesTodoView::handleEditingCompleted()
{
+ OstTraceFunctionEntry0( DUP1_NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_ENTRY );
// Cleanup.
mNotesEditor->deleteLater();
+ OstTraceFunctionExit0( DUP1_NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_EXIT );
}
/*!
@@ -401,8 +441,10 @@
*/
void NotesTodoView::handleViewingCompleted()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_HANDLEVIEWINGCOMPLETED_ENTRY );
// Cleanup.
mAgendaEventViewer->deleteLater();
+ OstTraceFunctionExit0( NOTESTODOVIEW_HANDLEVIEWINGCOMPLETED_EXIT );
}
/*!
@@ -410,7 +452,9 @@
*/
void NotesTodoView::handleActionStateChanged()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_HANDLEACTIONSTATECHANGED_ENTRY );
mAllNotesAction->setChecked(true);
+ OstTraceFunctionExit0( NOTESTODOVIEW_HANDLEACTIONSTATECHANGED_EXIT );
}
/*!
@@ -421,6 +465,7 @@
*/
void NotesTodoView::handleOrientationChanged(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_HANDLEORIENTATIONCHANGED_ENTRY );
HbListViewItem *prototype = mListView->listItemPrototype();
if (Qt::Horizontal == orientation) {
@@ -428,6 +473,7 @@
} else {
prototype->setStretchingStyle(HbListViewItem::NoStretching);
}
+ OstTraceFunctionExit0( NOTESTODOVIEW_HANDLEORIENTATIONCHANGED_EXIT );
}
/*!
@@ -435,21 +481,23 @@
*/
void NotesTodoView::updateSubTitle(ulong id)
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_UPDATESUBTITLE_ENTRY );
Q_UNUSED(id)
- // Get the number of notes and to-do entries.
+ // Get the number of incompleted to-do entries.
QList<ulong> entries = mAgendaUtil->entryIds(
AgendaUtil::IncludeIncompletedTodos);
mSubTitle->setHeading(
hbTrId("txt_notes_subhead_todos_ln_pending",entries.count()));
- if (0 >= entries.count()) {
+ if (0 < mProxyModel->rowCount()) {
+ mEmptyListLabel->hide();
+ mListView->show();
+ } else {
mEmptyListLabel->show();
mListView->hide();
- } else {
- mEmptyListLabel->hide();
- mListView->show();
}
+ OstTraceFunctionExit0( NOTESTODOVIEW_UPDATESUBTITLE_EXIT );
}
/*
@@ -457,6 +505,7 @@
*/
void NotesTodoView::openTodo()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_OPENTODO_ENTRY );
ulong noteId = mSelectedItem->modelIndex().data(
NotesNamespace::IdRole).value<qulonglong>();
AgendaEntry entry = mAgendaUtil->fetchById(noteId);
@@ -471,6 +520,7 @@
// Launch agenda event viewer
mAgendaEventViewer->view(
entry, AgendaEventViewer::ActionEditDelete);
+ OstTraceFunctionExit0( NOTESTODOVIEW_OPENTODO_EXIT );
}
/*
@@ -478,6 +528,7 @@
*/
void NotesTodoView::selectedMenuAction(HbAction *action)
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_SELECTEDMENUACTION_ENTRY );
if (action == mOpenAction) {
openTodo();
} else if (action == mEditAction) {
@@ -487,6 +538,7 @@
} else if (action == mTodoStatusAction) {
markTodoStatus();
}
+ OstTraceFunctionExit0( NOTESTODOVIEW_SELECTEDMENUACTION_EXIT );
}
@@ -495,6 +547,9 @@
*/
void NotesTodoView::handleMenuClosed()
{
+ OstTraceFunctionEntry0( NOTESTODOVIEW_HANDLEMENUCLOSED_ENTRY );
mIsLongTop = false;
+ OstTraceFunctionExit0( NOTESTODOVIEW_HANDLEMENUCLOSED_EXIT );
}
+
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviews/traces/OstTraceDefinitions.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviews/traces/fixed_id.definitions Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,231 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESCOLLECTIONVIEW_UPDATEDATA_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESCOLLECTIONVIEW_UPDATEDATA_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESFAVORITEVIEW_DELETENOTE_EXIT=0x30
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMAINVIEW_DELETENOTE_EXIT=0x60
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMAINVIEW_EDITTODO_EXIT=0x72
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMAINVIEW_MARKNOTEASTODO_EXIT=0x7a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMAINVIEW_NOTESMAINVIEW_ENTRY=0x4d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESMAINVIEW_NOTESMAINVIEW_EXIT=0x4e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESNOTEVIEW_DELETENOTE_EXIT=0x9a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT=0x93
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT=0xa0
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESNOTEVIEW_NOTESNOTEVIEW_ENTRY=0x89
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESNOTEVIEW_NOTESNOTEVIEW_EXIT=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOVIEW_DELETETODO_EXIT=0xc7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOVIEW_EDITTODO_EXIT=0xcd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_ENTRY=0xd6
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_EXIT=0xd7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT=0xc1
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOVIEW_NOTESTODOVIEW_ENTRY=0xb7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_NOTESTODOVIEW_NOTESTODOVIEW_EXIT=0xb8
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESFAVORITEVIEW_DELETENOTE_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESMAINVIEW_DELETENOTE_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESMAINVIEW_EDITTODO_EXIT=0x73
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT=0x5a
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESMAINVIEW_MARKNOTEASTODO_EXIT=0x7b
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESNOTEVIEW_DELETENOTE_EXIT=0x9b
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT=0x94
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT=0xa1
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESTODOVIEW_DELETETODO_EXIT=0xc8
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESTODOVIEW_EDITTODO_EXIT=0xce
+[TRACE]TRACE_FLOW[0x8A]_DUP2_NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT=0xc2
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESMAINVIEW_MARKNOTEASTODO_EXIT=0x7c
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT=0x95
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT=0xa2
+[TRACE]TRACE_FLOW[0x8A]_DUP3_NOTESTODOVIEW_EDITTODO_EXIT=0xcf
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_CREATENEWNOTE_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_CREATENEWNOTE_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_DISPLAYALLNOTESVIEW_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_DISPLAYALLNOTESVIEW_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_HANDLEACTIONSTATECHANGED_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_HANDLEACTIONSTATECHANGED_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_HANDLEACTIVATED_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_HANDLEACTIVATED_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_HANDLEEDITINGCOMPLETED_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_HANDLEEDITINGCOMPLETED_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_POPULATELISTVIEW_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_POPULATELISTVIEW_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_RECENTNOTESCOUNT_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_SETUPVIEW_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_SETUPVIEW_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_TODOSCOUNT_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_UPDATEDATA_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_UPDATEDATA_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_UPDATEFAVOURITESCOUNT_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_NOTESCOLLECTIONVIEW_UPDATEFAVOURITESCOUNT_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_CREATENEWNOTE_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_CREATENEWNOTE_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_DELETENOTE_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_DELETENOTE_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_DISPLAYALLNOTESVIEW_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_DISPLAYALLNOTESVIEW_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_DISPLAYCOLLECTIONVIEW_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_DISPLAYCOLLECTIONVIEW_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEACTIONSTATECHANGED_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEACTIONSTATECHANGED_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEEDITINGCOMPLETED_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEEDITINGCOMPLETED_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEITEMLONGPRESSED_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEITEMLONGPRESSED_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_ENTRY=0x27
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT=0x28
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEMENUCLOSED_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEMENUCLOSED_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEORIENTATIONCHANGED_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_HANDLEORIENTATIONCHANGED_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_MARKNOTEASNOTFAVOURITE_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_MARKNOTEASNOTFAVOURITE_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_MARKNOTEASTODO_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_OPENNOTE_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_OPENNOTE_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_SELECTEDMENUACTION_ENTRY=0x45
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_SELECTEDMENUACTION_EXIT=0x46
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_SETUPVIEW_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_SETUPVIEW_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_UPDATEFAVORITEVIEW_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_UPDATEFAVORITEVIEW_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_UPDATEVIEW_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_NOTESFAVORITEVIEW_UPDATEVIEW_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_CAPTURESCREENSHOT_ENTRY=0x83
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_CAPTURESCREENSHOT_EXIT=0x84
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_CREATENEWNOTE_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_CREATENEWNOTE_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_DELETENOTE_ENTRY=0x5e
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_DELETENOTE_EXIT=0x5f
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_DISPLAYCOLLECTIONVIEW_ENTRY=0x68
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_DISPLAYCOLLECTIONVIEW_EXIT=0x69
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_EDITTODO_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_EDITTODO_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEACTIONSTATECHANGED_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEACTIONSTATECHANGED_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEEDITINGCOMPLETED_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEEDITINGCOMPLETED_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEITEMLONGPRESSED_ENTRY=0x5c
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEITEMLONGPRESSED_EXIT=0x5d
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEITEMRELEASED_ENTRY=0x57
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT=0x58
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEMENUCLOSED_ENTRY=0x81
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEMENUCLOSED_EXIT=0x82
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEORIENTATIONCHANGED_ENTRY=0x74
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEORIENTATIONCHANGED_EXIT=0x75
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEVIEWINGCOMPLETED_ENTRY=0x6c
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_HANDLEVIEWINGCOMPLETED_EXIT=0x6d
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_MARKNOTEASFAVOURITE_ENTRY=0x64
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_MARKNOTEASFAVOURITE_EXIT=0x65
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_MARKNOTEASTODO_ENTRY=0x78
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_MARKNOTEASTODO_EXIT=0x79
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_MARKTODOSTATUS_ENTRY=0x62
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_MARKTODOSTATUS_EXIT=0x63
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_NOTESMAINVIEW_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_NOTESMAINVIEW_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_OPENNOTE_ENTRY=0x7d
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_OPENNOTE_EXIT=0x7e
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SAVEACTIVITY_ENTRY=0x85
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SAVEACTIVITY_EXIT=0x86
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SCROLLTO_ENTRY=0x6a
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SCROLLTO_EXIT=0x6b
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SELECTEDMENUACTION_ENTRY=0x7f
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SELECTEDMENUACTION_EXIT=0x80
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SETUPAFTERVIEWREADY_ENTRY=0x51
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SETUPAFTERVIEWREADY_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SETUPVIEW_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_SETUPVIEW_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_UPDATESUBTITLE_ENTRY=0x76
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_UPDATESUBTITLE_EXIT=0x77
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_UPDATETITLE_ENTRY=0x53
+[TRACE]TRACE_FLOW[0x8A]_NOTESMAINVIEW_UPDATETITLE_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_CREATENEWNOTE_ENTRY=0x8f
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_CREATENEWNOTE_EXIT=0x90
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_DELETENOTE_ENTRY=0x98
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_DELETENOTE_EXIT=0x99
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_DISPLAYALLNOTESVIEW_ENTRY=0xa7
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_DISPLAYALLNOTESVIEW_EXIT=0xa8
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_DISPLAYCOLLECTIONVIEW_ENTRY=0xa5
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_DISPLAYCOLLECTIONVIEW_EXIT=0xa6
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEACTIONSTATECHANGED_ENTRY=0xa9
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEACTIONSTATECHANGED_EXIT=0xaa
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEEDITINGCOMPLETED_ENTRY=0xa3
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEEDITINGCOMPLETED_EXIT=0xa4
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEITEMLONGPRESSED_ENTRY=0x96
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEITEMLONGPRESSED_EXIT=0x97
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEITEMRELEASED_ENTRY=0x91
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT=0x92
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEMENUCLOSED_ENTRY=0xb1
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEMENUCLOSED_EXIT=0xb2
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEORIENTATIONCHANGED_ENTRY=0xab
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_HANDLEORIENTATIONCHANGED_EXIT=0xac
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_MARKNOTEASFAVOURITE_ENTRY=0x9c
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_MARKNOTEASFAVOURITE_EXIT=0x9d
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_MARKNOTEASTODO_ENTRY=0x9e
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT=0x9f
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_NOTESNOTEVIEW_ENTRY=0x87
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_NOTESNOTEVIEW_EXIT=0x88
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_OPENNOTE_ENTRY=0xad
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_OPENNOTE_EXIT=0xae
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_SELECTEDMENUACTION_ENTRY=0xaf
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_SELECTEDMENUACTION_EXIT=0xb0
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_SETUPVIEW_ENTRY=0x8b
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_SETUPVIEW_EXIT=0x8c
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_UPDATENOTEVIEW_ENTRY=0x8d
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_UPDATENOTEVIEW_EXIT=0x8e
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_UPDATEVIEW_ENTRY=0xb3
+[TRACE]TRACE_FLOW[0x8A]_NOTESNOTEVIEW_UPDATEVIEW_EXIT=0xb4
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_CREATENEWTODO_ENTRY=0xbd
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_CREATENEWTODO_EXIT=0xbe
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_DELETETODO_ENTRY=0xc5
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_DELETETODO_EXIT=0xc6
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_DISPLAYALLNOTESVIEW_ENTRY=0xd4
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_DISPLAYALLNOTESVIEW_EXIT=0xd5
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_DISPLAYCOLLECTIONVIEW_ENTRY=0xd2
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_DISPLAYCOLLECTIONVIEW_EXIT=0xd3
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_EDITTODO_ENTRY=0xcb
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_EDITTODO_EXIT=0xcc
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEACTIONSTATECHANGED_ENTRY=0xda
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEACTIONSTATECHANGED_EXIT=0xdb
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_ENTRY=0xd0
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_EXIT=0xd1
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEITEMLONGPRESSED_ENTRY=0xc3
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEITEMLONGPRESSED_EXIT=0xc4
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEITEMRELEASED_ENTRY=0xbf
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT=0xc0
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEMENUCLOSED_ENTRY=0xe4
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEMENUCLOSED_EXIT=0xe5
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEORIENTATIONCHANGED_ENTRY=0xdc
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEORIENTATIONCHANGED_EXIT=0xdd
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEVIEWINGCOMPLETED_ENTRY=0xd8
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_HANDLEVIEWINGCOMPLETED_EXIT=0xd9
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_MARKTODOSTATUS_ENTRY=0xc9
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_MARKTODOSTATUS_EXIT=0xca
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_NOTESTODOVIEW_ENTRY=0xb5
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_NOTESTODOVIEW_EXIT=0xb6
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_OPENTODO_ENTRY=0xe0
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_OPENTODO_EXIT=0xe1
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_SELECTEDMENUACTION_ENTRY=0xe2
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_SELECTEDMENUACTION_EXIT=0xe3
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_SETUPVIEW_ENTRY=0xb9
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_SETUPVIEW_EXIT=0xba
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_UPDATESUBTITLE_ENTRY=0xde
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_UPDATESUBTITLE_EXIT=0xdf
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_UPDATETITLE_ENTRY=0xbb
+[TRACE]TRACE_FLOW[0x8A]_NOTESTODOVIEW_UPDATETITLE_EXIT=0xbc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviews/traces/notescollectionviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,42 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESCOLLECTIONVIEWTRACES_H__
+#define __NOTESCOLLECTIONVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x20029f83
+
+#define NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_ENTRY 0x8a0001
+#define NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_EXIT 0x8a0002
+#define DUP1_NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_ENTRY 0x8a0003
+#define DUP1_NOTESCOLLECTIONVIEW_NOTESCOLLECTIONVIEW_EXIT 0x8a0004
+#define NOTESCOLLECTIONVIEW_SETUPVIEW_ENTRY 0x8a0005
+#define NOTESCOLLECTIONVIEW_SETUPVIEW_EXIT 0x8a0006
+#define NOTESCOLLECTIONVIEW_POPULATELISTVIEW_ENTRY 0x8a0007
+#define NOTESCOLLECTIONVIEW_POPULATELISTVIEW_EXIT 0x8a0008
+#define NOTESCOLLECTIONVIEW_DISPLAYALLNOTESVIEW_ENTRY 0x8a0009
+#define NOTESCOLLECTIONVIEW_DISPLAYALLNOTESVIEW_EXIT 0x8a000a
+#define NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_ENTRY 0x8a000b
+#define NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_EXIT 0x8a000c
+#define NOTESCOLLECTIONVIEW_CREATENEWNOTE_ENTRY 0x8a000d
+#define NOTESCOLLECTIONVIEW_CREATENEWNOTE_EXIT 0x8a000e
+#define NOTESCOLLECTIONVIEW_HANDLEEDITINGCOMPLETED_ENTRY 0x8a000f
+#define NOTESCOLLECTIONVIEW_HANDLEEDITINGCOMPLETED_EXIT 0x8a0010
+#define NOTESCOLLECTIONVIEW_UPDATEDATA_ENTRY 0x8a0011
+#define NOTESCOLLECTIONVIEW_UPDATEDATA_EXIT 0x8a0012
+#define DUP1_NOTESCOLLECTIONVIEW_UPDATEDATA_ENTRY 0x8a0013
+#define DUP1_NOTESCOLLECTIONVIEW_UPDATEDATA_EXIT 0x8a0014
+#define NOTESCOLLECTIONVIEW_HANDLEACTIVATED_ENTRY 0x8a0015
+#define NOTESCOLLECTIONVIEW_HANDLEACTIVATED_EXIT 0x8a0016
+#define NOTESCOLLECTIONVIEW_UPDATEFAVOURITESCOUNT_ENTRY 0x8a0017
+#define NOTESCOLLECTIONVIEW_UPDATEFAVOURITESCOUNT_EXIT 0x8a0018
+#define NOTESCOLLECTIONVIEW_HANDLEACTIONSTATECHANGED_ENTRY 0x8a0019
+#define NOTESCOLLECTIONVIEW_HANDLEACTIONSTATECHANGED_EXIT 0x8a001a
+#define NOTESCOLLECTIONVIEW_TODOSCOUNT_ENTRY 0x8a001b
+#define NOTESCOLLECTIONVIEW_RECENTNOTESCOUNT_ENTRY 0x8a001c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviews/traces/notesfavoriteviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,60 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESFAVORITEVIEWTRACES_H__
+#define __NOTESFAVORITEVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x20029f83
+
+#define NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_ENTRY 0x8a001d
+#define NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_EXIT 0x8a001e
+#define DUP1_NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_ENTRY 0x8a001f
+#define DUP1_NOTESFAVORITEVIEW_NOTESFAVORITEVIEW_EXIT 0x8a0020
+#define NOTESFAVORITEVIEW_SETUPVIEW_ENTRY 0x8a0021
+#define NOTESFAVORITEVIEW_SETUPVIEW_EXIT 0x8a0022
+#define NOTESFAVORITEVIEW_UPDATEFAVORITEVIEW_ENTRY 0x8a0023
+#define NOTESFAVORITEVIEW_UPDATEFAVORITEVIEW_EXIT 0x8a0024
+#define NOTESFAVORITEVIEW_CREATENEWNOTE_ENTRY 0x8a0025
+#define NOTESFAVORITEVIEW_CREATENEWNOTE_EXIT 0x8a0026
+#define NOTESFAVORITEVIEW_HANDLEITEMRELEASED_ENTRY 0x8a0027
+#define NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT 0x8a0028
+#define DUP1_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT 0x8a0029
+#define DUP2_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT 0x8a002a
+#define DUP3_NOTESFAVORITEVIEW_HANDLEITEMRELEASED_EXIT 0x8a002b
+#define NOTESFAVORITEVIEW_HANDLEITEMLONGPRESSED_ENTRY 0x8a002c
+#define NOTESFAVORITEVIEW_HANDLEITEMLONGPRESSED_EXIT 0x8a002d
+#define NOTESFAVORITEVIEW_DELETENOTE_ENTRY 0x8a002e
+#define NOTESFAVORITEVIEW_DELETENOTE_EXIT 0x8a002f
+#define DUP1_NOTESFAVORITEVIEW_DELETENOTE_EXIT 0x8a0030
+#define DUP2_NOTESFAVORITEVIEW_DELETENOTE_EXIT 0x8a0031
+#define NOTESFAVORITEVIEW_MARKNOTEASNOTFAVOURITE_ENTRY 0x8a0032
+#define NOTESFAVORITEVIEW_MARKNOTEASNOTFAVOURITE_EXIT 0x8a0033
+#define NOTESFAVORITEVIEW_MARKNOTEASTODO_ENTRY 0x8a0034
+#define NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT 0x8a0035
+#define DUP1_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT 0x8a0036
+#define DUP2_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT 0x8a0037
+#define DUP3_NOTESFAVORITEVIEW_MARKNOTEASTODO_EXIT 0x8a0038
+#define NOTESFAVORITEVIEW_HANDLEEDITINGCOMPLETED_ENTRY 0x8a0039
+#define NOTESFAVORITEVIEW_HANDLEEDITINGCOMPLETED_EXIT 0x8a003a
+#define NOTESFAVORITEVIEW_DISPLAYCOLLECTIONVIEW_ENTRY 0x8a003b
+#define NOTESFAVORITEVIEW_DISPLAYCOLLECTIONVIEW_EXIT 0x8a003c
+#define NOTESFAVORITEVIEW_DISPLAYALLNOTESVIEW_ENTRY 0x8a003d
+#define NOTESFAVORITEVIEW_DISPLAYALLNOTESVIEW_EXIT 0x8a003e
+#define NOTESFAVORITEVIEW_HANDLEACTIONSTATECHANGED_ENTRY 0x8a003f
+#define NOTESFAVORITEVIEW_HANDLEACTIONSTATECHANGED_EXIT 0x8a0040
+#define NOTESFAVORITEVIEW_HANDLEORIENTATIONCHANGED_ENTRY 0x8a0041
+#define NOTESFAVORITEVIEW_HANDLEORIENTATIONCHANGED_EXIT 0x8a0042
+#define NOTESFAVORITEVIEW_OPENNOTE_ENTRY 0x8a0043
+#define NOTESFAVORITEVIEW_OPENNOTE_EXIT 0x8a0044
+#define NOTESFAVORITEVIEW_SELECTEDMENUACTION_ENTRY 0x8a0045
+#define NOTESFAVORITEVIEW_SELECTEDMENUACTION_EXIT 0x8a0046
+#define NOTESFAVORITEVIEW_HANDLEMENUCLOSED_ENTRY 0x8a0047
+#define NOTESFAVORITEVIEW_HANDLEMENUCLOSED_EXIT 0x8a0048
+#define NOTESFAVORITEVIEW_UPDATEVIEW_ENTRY 0x8a0049
+#define NOTESFAVORITEVIEW_UPDATEVIEW_EXIT 0x8a004a
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviews/traces/notesmainviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,74 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESMAINVIEWTRACES_H__
+#define __NOTESMAINVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x20029f83
+
+#define NOTESMAINVIEW_NOTESMAINVIEW_ENTRY 0x8a004b
+#define NOTESMAINVIEW_NOTESMAINVIEW_EXIT 0x8a004c
+#define DUP1_NOTESMAINVIEW_NOTESMAINVIEW_ENTRY 0x8a004d
+#define DUP1_NOTESMAINVIEW_NOTESMAINVIEW_EXIT 0x8a004e
+#define NOTESMAINVIEW_SETUPVIEW_ENTRY 0x8a004f
+#define NOTESMAINVIEW_SETUPVIEW_EXIT 0x8a0050
+#define NOTESMAINVIEW_SETUPAFTERVIEWREADY_ENTRY 0x8a0051
+#define NOTESMAINVIEW_SETUPAFTERVIEWREADY_EXIT 0x8a0052
+#define NOTESMAINVIEW_UPDATETITLE_ENTRY 0x8a0053
+#define NOTESMAINVIEW_UPDATETITLE_EXIT 0x8a0054
+#define NOTESMAINVIEW_CREATENEWNOTE_ENTRY 0x8a0055
+#define NOTESMAINVIEW_CREATENEWNOTE_EXIT 0x8a0056
+#define NOTESMAINVIEW_HANDLEITEMRELEASED_ENTRY 0x8a0057
+#define NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT 0x8a0058
+#define DUP1_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT 0x8a0059
+#define DUP2_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT 0x8a005a
+#define DUP3_NOTESMAINVIEW_HANDLEITEMRELEASED_EXIT 0x8a005b
+#define NOTESMAINVIEW_HANDLEITEMLONGPRESSED_ENTRY 0x8a005c
+#define NOTESMAINVIEW_HANDLEITEMLONGPRESSED_EXIT 0x8a005d
+#define NOTESMAINVIEW_DELETENOTE_ENTRY 0x8a005e
+#define NOTESMAINVIEW_DELETENOTE_EXIT 0x8a005f
+#define DUP1_NOTESMAINVIEW_DELETENOTE_EXIT 0x8a0060
+#define DUP2_NOTESMAINVIEW_DELETENOTE_EXIT 0x8a0061
+#define NOTESMAINVIEW_MARKTODOSTATUS_ENTRY 0x8a0062
+#define NOTESMAINVIEW_MARKTODOSTATUS_EXIT 0x8a0063
+#define NOTESMAINVIEW_MARKNOTEASFAVOURITE_ENTRY 0x8a0064
+#define NOTESMAINVIEW_MARKNOTEASFAVOURITE_EXIT 0x8a0065
+#define NOTESMAINVIEW_HANDLEEDITINGCOMPLETED_ENTRY 0x8a0066
+#define NOTESMAINVIEW_HANDLEEDITINGCOMPLETED_EXIT 0x8a0067
+#define NOTESMAINVIEW_DISPLAYCOLLECTIONVIEW_ENTRY 0x8a0068
+#define NOTESMAINVIEW_DISPLAYCOLLECTIONVIEW_EXIT 0x8a0069
+#define NOTESMAINVIEW_SCROLLTO_ENTRY 0x8a006a
+#define NOTESMAINVIEW_SCROLLTO_EXIT 0x8a006b
+#define NOTESMAINVIEW_HANDLEVIEWINGCOMPLETED_ENTRY 0x8a006c
+#define NOTESMAINVIEW_HANDLEVIEWINGCOMPLETED_EXIT 0x8a006d
+#define NOTESMAINVIEW_HANDLEACTIONSTATECHANGED_ENTRY 0x8a006e
+#define NOTESMAINVIEW_HANDLEACTIONSTATECHANGED_EXIT 0x8a006f
+#define NOTESMAINVIEW_EDITTODO_ENTRY 0x8a0070
+#define NOTESMAINVIEW_EDITTODO_EXIT 0x8a0071
+#define DUP1_NOTESMAINVIEW_EDITTODO_EXIT 0x8a0072
+#define DUP2_NOTESMAINVIEW_EDITTODO_EXIT 0x8a0073
+#define NOTESMAINVIEW_HANDLEORIENTATIONCHANGED_ENTRY 0x8a0074
+#define NOTESMAINVIEW_HANDLEORIENTATIONCHANGED_EXIT 0x8a0075
+#define NOTESMAINVIEW_UPDATESUBTITLE_ENTRY 0x8a0076
+#define NOTESMAINVIEW_UPDATESUBTITLE_EXIT 0x8a0077
+#define NOTESMAINVIEW_MARKNOTEASTODO_ENTRY 0x8a0078
+#define NOTESMAINVIEW_MARKNOTEASTODO_EXIT 0x8a0079
+#define DUP1_NOTESMAINVIEW_MARKNOTEASTODO_EXIT 0x8a007a
+#define DUP2_NOTESMAINVIEW_MARKNOTEASTODO_EXIT 0x8a007b
+#define DUP3_NOTESMAINVIEW_MARKNOTEASTODO_EXIT 0x8a007c
+#define NOTESMAINVIEW_OPENNOTE_ENTRY 0x8a007d
+#define NOTESMAINVIEW_OPENNOTE_EXIT 0x8a007e
+#define NOTESMAINVIEW_SELECTEDMENUACTION_ENTRY 0x8a007f
+#define NOTESMAINVIEW_SELECTEDMENUACTION_EXIT 0x8a0080
+#define NOTESMAINVIEW_HANDLEMENUCLOSED_ENTRY 0x8a0081
+#define NOTESMAINVIEW_HANDLEMENUCLOSED_EXIT 0x8a0082
+#define NOTESMAINVIEW_CAPTURESCREENSHOT_ENTRY 0x8a0083
+#define NOTESMAINVIEW_CAPTURESCREENSHOT_EXIT 0x8a0084
+#define NOTESMAINVIEW_SAVEACTIVITY_ENTRY 0x8a0085
+#define NOTESMAINVIEW_SAVEACTIVITY_EXIT 0x8a0086
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviews/traces/notesnoteviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,60 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESNOTEVIEWTRACES_H__
+#define __NOTESNOTEVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x20029f83
+
+#define NOTESNOTEVIEW_NOTESNOTEVIEW_ENTRY 0x8a0087
+#define NOTESNOTEVIEW_NOTESNOTEVIEW_EXIT 0x8a0088
+#define DUP1_NOTESNOTEVIEW_NOTESNOTEVIEW_ENTRY 0x8a0089
+#define DUP1_NOTESNOTEVIEW_NOTESNOTEVIEW_EXIT 0x8a008a
+#define NOTESNOTEVIEW_SETUPVIEW_ENTRY 0x8a008b
+#define NOTESNOTEVIEW_SETUPVIEW_EXIT 0x8a008c
+#define NOTESNOTEVIEW_UPDATENOTEVIEW_ENTRY 0x8a008d
+#define NOTESNOTEVIEW_UPDATENOTEVIEW_EXIT 0x8a008e
+#define NOTESNOTEVIEW_CREATENEWNOTE_ENTRY 0x8a008f
+#define NOTESNOTEVIEW_CREATENEWNOTE_EXIT 0x8a0090
+#define NOTESNOTEVIEW_HANDLEITEMRELEASED_ENTRY 0x8a0091
+#define NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT 0x8a0092
+#define DUP1_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT 0x8a0093
+#define DUP2_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT 0x8a0094
+#define DUP3_NOTESNOTEVIEW_HANDLEITEMRELEASED_EXIT 0x8a0095
+#define NOTESNOTEVIEW_HANDLEITEMLONGPRESSED_ENTRY 0x8a0096
+#define NOTESNOTEVIEW_HANDLEITEMLONGPRESSED_EXIT 0x8a0097
+#define NOTESNOTEVIEW_DELETENOTE_ENTRY 0x8a0098
+#define NOTESNOTEVIEW_DELETENOTE_EXIT 0x8a0099
+#define DUP1_NOTESNOTEVIEW_DELETENOTE_EXIT 0x8a009a
+#define DUP2_NOTESNOTEVIEW_DELETENOTE_EXIT 0x8a009b
+#define NOTESNOTEVIEW_MARKNOTEASFAVOURITE_ENTRY 0x8a009c
+#define NOTESNOTEVIEW_MARKNOTEASFAVOURITE_EXIT 0x8a009d
+#define NOTESNOTEVIEW_MARKNOTEASTODO_ENTRY 0x8a009e
+#define NOTESNOTEVIEW_MARKNOTEASTODO_EXIT 0x8a009f
+#define DUP1_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT 0x8a00a0
+#define DUP2_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT 0x8a00a1
+#define DUP3_NOTESNOTEVIEW_MARKNOTEASTODO_EXIT 0x8a00a2
+#define NOTESNOTEVIEW_HANDLEEDITINGCOMPLETED_ENTRY 0x8a00a3
+#define NOTESNOTEVIEW_HANDLEEDITINGCOMPLETED_EXIT 0x8a00a4
+#define NOTESNOTEVIEW_DISPLAYCOLLECTIONVIEW_ENTRY 0x8a00a5
+#define NOTESNOTEVIEW_DISPLAYCOLLECTIONVIEW_EXIT 0x8a00a6
+#define NOTESNOTEVIEW_DISPLAYALLNOTESVIEW_ENTRY 0x8a00a7
+#define NOTESNOTEVIEW_DISPLAYALLNOTESVIEW_EXIT 0x8a00a8
+#define NOTESNOTEVIEW_HANDLEACTIONSTATECHANGED_ENTRY 0x8a00a9
+#define NOTESNOTEVIEW_HANDLEACTIONSTATECHANGED_EXIT 0x8a00aa
+#define NOTESNOTEVIEW_HANDLEORIENTATIONCHANGED_ENTRY 0x8a00ab
+#define NOTESNOTEVIEW_HANDLEORIENTATIONCHANGED_EXIT 0x8a00ac
+#define NOTESNOTEVIEW_OPENNOTE_ENTRY 0x8a00ad
+#define NOTESNOTEVIEW_OPENNOTE_EXIT 0x8a00ae
+#define NOTESNOTEVIEW_SELECTEDMENUACTION_ENTRY 0x8a00af
+#define NOTESNOTEVIEW_SELECTEDMENUACTION_EXIT 0x8a00b0
+#define NOTESNOTEVIEW_HANDLEMENUCLOSED_ENTRY 0x8a00b1
+#define NOTESNOTEVIEW_HANDLEMENUCLOSED_EXIT 0x8a00b2
+#define NOTESNOTEVIEW_UPDATEVIEW_ENTRY 0x8a00b3
+#define NOTESNOTEVIEW_UPDATEVIEW_EXIT 0x8a00b4
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesviews/traces/notestodoviewTraces.h Mon Aug 23 16:00:50 2010 +0100
@@ -0,0 +1,63 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __NOTESTODOVIEWTRACES_H__
+#define __NOTESTODOVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x20029f83
+
+#define NOTESTODOVIEW_NOTESTODOVIEW_ENTRY 0x8a00b5
+#define NOTESTODOVIEW_NOTESTODOVIEW_EXIT 0x8a00b6
+#define DUP1_NOTESTODOVIEW_NOTESTODOVIEW_ENTRY 0x8a00b7
+#define DUP1_NOTESTODOVIEW_NOTESTODOVIEW_EXIT 0x8a00b8
+#define NOTESTODOVIEW_SETUPVIEW_ENTRY 0x8a00b9
+#define NOTESTODOVIEW_SETUPVIEW_EXIT 0x8a00ba
+#define NOTESTODOVIEW_UPDATETITLE_ENTRY 0x8a00bb
+#define NOTESTODOVIEW_UPDATETITLE_EXIT 0x8a00bc
+#define NOTESTODOVIEW_CREATENEWTODO_ENTRY 0x8a00bd
+#define NOTESTODOVIEW_CREATENEWTODO_EXIT 0x8a00be
+#define NOTESTODOVIEW_HANDLEITEMRELEASED_ENTRY 0x8a00bf
+#define NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT 0x8a00c0
+#define DUP1_NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT 0x8a00c1
+#define DUP2_NOTESTODOVIEW_HANDLEITEMRELEASED_EXIT 0x8a00c2
+#define NOTESTODOVIEW_HANDLEITEMLONGPRESSED_ENTRY 0x8a00c3
+#define NOTESTODOVIEW_HANDLEITEMLONGPRESSED_EXIT 0x8a00c4
+#define NOTESTODOVIEW_DELETETODO_ENTRY 0x8a00c5
+#define NOTESTODOVIEW_DELETETODO_EXIT 0x8a00c6
+#define DUP1_NOTESTODOVIEW_DELETETODO_EXIT 0x8a00c7
+#define DUP2_NOTESTODOVIEW_DELETETODO_EXIT 0x8a00c8
+#define NOTESTODOVIEW_MARKTODOSTATUS_ENTRY 0x8a00c9
+#define NOTESTODOVIEW_MARKTODOSTATUS_EXIT 0x8a00ca
+#define NOTESTODOVIEW_EDITTODO_ENTRY 0x8a00cb
+#define NOTESTODOVIEW_EDITTODO_EXIT 0x8a00cc
+#define DUP1_NOTESTODOVIEW_EDITTODO_EXIT 0x8a00cd
+#define DUP2_NOTESTODOVIEW_EDITTODO_EXIT 0x8a00ce
+#define DUP3_NOTESTODOVIEW_EDITTODO_EXIT 0x8a00cf
+#define NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_ENTRY 0x8a00d0
+#define NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_EXIT 0x8a00d1
+#define NOTESTODOVIEW_DISPLAYCOLLECTIONVIEW_ENTRY 0x8a00d2
+#define NOTESTODOVIEW_DISPLAYCOLLECTIONVIEW_EXIT 0x8a00d3
+#define NOTESTODOVIEW_DISPLAYALLNOTESVIEW_ENTRY 0x8a00d4
+#define NOTESTODOVIEW_DISPLAYALLNOTESVIEW_EXIT 0x8a00d5
+#define DUP1_NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_ENTRY 0x8a00d6
+#define DUP1_NOTESTODOVIEW_HANDLEEDITINGCOMPLETED_EXIT 0x8a00d7
+#define NOTESTODOVIEW_HANDLEVIEWINGCOMPLETED_ENTRY 0x8a00d8
+#define NOTESTODOVIEW_HANDLEVIEWINGCOMPLETED_EXIT 0x8a00d9
+#define NOTESTODOVIEW_HANDLEACTIONSTATECHANGED_ENTRY 0x8a00da
+#define NOTESTODOVIEW_HANDLEACTIONSTATECHANGED_EXIT 0x8a00db
+#define NOTESTODOVIEW_HANDLEORIENTATIONCHANGED_ENTRY 0x8a00dc
+#define NOTESTODOVIEW_HANDLEORIENTATIONCHANGED_EXIT 0x8a00dd
+#define NOTESTODOVIEW_UPDATESUBTITLE_ENTRY 0x8a00de
+#define NOTESTODOVIEW_UPDATESUBTITLE_EXIT 0x8a00df
+#define NOTESTODOVIEW_OPENTODO_ENTRY 0x8a00e0
+#define NOTESTODOVIEW_OPENTODO_EXIT 0x8a00e1
+#define NOTESTODOVIEW_SELECTEDMENUACTION_ENTRY 0x8a00e2
+#define NOTESTODOVIEW_SELECTEDMENUACTION_EXIT 0x8a00e3
+#define NOTESTODOVIEW_HANDLEMENUCLOSED_ENTRY 0x8a00e4
+#define NOTESTODOVIEW_HANDLEMENUCLOSED_EXIT 0x8a00e5
+
+
+#endif
+
+// End of file
+
--- a/notes/rom/notesresources.iby Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/rom/notesresources.iby Mon Aug 23 16:00:50 2010 +0100
@@ -23,6 +23,7 @@
S60_APP_RESOURCE(notes)
data=DATAZ_/QT_TRANSLATIONS_DIR/notes.qm QT_TRANSLATIONS_DIR/notes.qm
+data=DATAZ_/QT_TRANSLATIONS_DIR/noteseditor.qm QT_TRANSLATIONS_DIR/noteseditor.qm
#endif // __NOTESRESOURCES_IBY__
--- a/notes/tsrc/unittest_noteseditor/src/unittest_noteseditor.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/tsrc/unittest_noteseditor/src/unittest_noteseditor.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -18,12 +18,12 @@
// System include
#include <QtTest/QtTest>
#include <HbMainWindow>
-#include <NotesEditor>
#include <AgendaUtil>
#include <AgendaEntry>
// User includes
#include "unittest_noteseditor.h"
+#include "noteseditor.h"
/*!
@@ -211,7 +211,7 @@
entry.setType(AgendaEntry::TypeNote);
entry.setDescription("A simple note");
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
notesEditor->edit(id);
@@ -260,7 +260,7 @@
entry.setStatus(AgendaEntry::TodoNeedsAction);
entry.setPriority(2);
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
// Call edit on agenda entry
notesEditor->edit(entry);
@@ -303,7 +303,7 @@
entry.setStatus(AgendaEntry::TodoNeedsAction);
entry.setPriority(2);
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
// Call edit using the id
notesEditor->edit(id);
@@ -452,7 +452,7 @@
entry.setStatus(AgendaEntry::TodoNeedsAction);
entry.setPriority(2);
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
// Call edit on agenda entry
notesEditor->edit(entry);
@@ -495,7 +495,7 @@
entry.setStatus(AgendaEntry::TodoNeedsAction);
entry.setPriority(2);
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
// Call edit on agenda entry
notesEditor->edit(entry);
--- a/notes/tsrc/unittest_noteseditor/unittest_noteseditor.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/tsrc/unittest_noteseditor/unittest_noteseditor.pro Mon Aug 23 16:00:50 2010 +0100
@@ -26,7 +26,8 @@
. \
./src
-INCLUDEPATH += .
+INCLUDEPATH += . \
+ ..\..\notesui\noteseditor\inc
symbian: {
--- a/notes/tsrc/unittest_notesmodel/src/unittest_notesmodel.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/tsrc/unittest_notesmodel/src/unittest_notesmodel.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -23,8 +23,8 @@
#include <e32base.h>
// User includes
+#include <agendautil.h>
#include "notesmodel.h"
-#include "agendautil.h"
class TestNotesModel : public QObject
{
@@ -155,7 +155,7 @@
entry.setDescription("Hello");
entry.setLastModifiedDateTime(
QDateTime(QDate::currentDate(), QTime::currentTime()));
- QVERIFY(mAgendaUtil->addEntry(entry));
+ QVERIFY(mAgendaUtil->store(entry));
// Now check the count in the model.
startTimer(1000);
@@ -191,7 +191,7 @@
entry.setLastModifiedDateTime(
QDateTime(QDate::currentDate(), QTime::currentTime()));
ulong id;
- QVERIFY(id = mAgendaUtil->addEntry(entry));
+ QVERIFY(id = mAgendaUtil->store(entry));
// Now check the count in the model.
startTimer(1000);
@@ -240,7 +240,7 @@
entry.setLastModifiedDateTime(
QDateTime(QDate::currentDate(), QTime::currentTime()));
ulong id;
- QVERIFY(id = mAgendaUtil->addEntry(entry));
+ QVERIFY(id = mAgendaUtil->store(entry));
// Now check the count in the model.
startTimer(1000);
QVERIFY(model->rowCount());
@@ -250,7 +250,7 @@
entry = mAgendaUtil->fetchById(id);
QVERIFY(!entry.isNull());
entry.setDescription("Hello world");
- QVERIFY(mAgendaUtil->updateEntry(entry));
+ QVERIFY(mAgendaUtil->store(entry));
// Verify if the model has the updated content.
startTimer(1000);
--- a/notes/tsrc/unittest_notesmodel/unittest_notesmodel.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/notes/tsrc/unittest_notesmodel/unittest_notesmodel.pro Mon Aug 23 16:00:50 2010 +0100
@@ -25,7 +25,6 @@
INCLUDEPATH += \
. \
../../notesui/notesmodel/inc \
- ../../../agendainterface/agendautil/inc \
../../inc
symbian: {
--- a/organizer_plat/agenda_interface_api/inc/agendautil.h Mon Jul 19 15:12:16 2010 +0100
+++ b/organizer_plat/agenda_interface_api/inc/agendautil.h Mon Aug 23 16:00:50 2010 +0100
@@ -72,14 +72,11 @@
AgendaUtil(QObject* parent = 0);
~AgendaUtil();
- ulong addEntry(const AgendaEntry& entry);
+ ulong store(AgendaEntry &entry, AgendaUtil::RecurrenceRange range = ThisAndAll);
ulong cloneEntry(const AgendaEntry& entry, AgendaEntry::Type type);
bool deleteEntry(ulong id);
void deleteRepeatedEntry(
AgendaEntry& entry, AgendaUtil::RecurrenceRange range);
- bool updateEntry(const AgendaEntry& entry, bool isChild = false);
- bool storeRepeatingEntry(const AgendaEntry& entry, bool copyToChildren);
- bool createException(const AgendaEntry& entry,QDateTime instanceOriginalDateTime);
QList<ulong> entryIds(
AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
QList<AgendaEntry> fetchAllEntries(
@@ -101,7 +98,6 @@
QDateTime& start, QDateTime& end,
AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
AgendaEntry parentEntry(AgendaEntry& entry);
- void clearRepeatingProperties(AgendaEntry& entry);
void getPreviousInstanceTimes(AgendaEntry& entry, QDateTime& startTime,
QDateTime& endTime);
void getNextInstanceTimes(AgendaEntry& entry, QDateTime& startTime,
--- a/organizer_plat/agenda_interface_api/tsrc/unittest_agendautil/src/unittest_agendautil.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/organizer_plat/agenda_interface_api/tsrc/unittest_agendautil/src/unittest_agendautil.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -39,11 +39,11 @@
void cleanupTestCase();
// Test cases.
- void test_addEntry();
+ void test_storeWithNewEntry();
void test_deleteEntry();
void test_deleteRepeatedEntry();
void test_fetchById();
- void test_updateEntry();
+ void test_storeWithExistingEntry();
void test_createEntryIdListForDay();
void test_entryIds();
void test_fetchAllEntries();
@@ -140,9 +140,9 @@
}
}
/*
- Tests the AgendaUtil::addEntry.
+ Tests the AgendaUtil::store.
*/
-void TestAgendaUtil::test_addEntry()
+void TestAgendaUtil::test_storeWithNewEntry()
{
// Test case setup.
AgendaEntry entry;
@@ -154,7 +154,7 @@
entry.setStartAndEndTime(dateTimeSet, dateTimeSet);
// Run the case.
- ulong id = mAgendaUtil->addEntry(entry);
+ ulong id = mAgendaUtil->store(entry);
// Verify.
AgendaEntry newEntry = mAgendaUtil->fetchById(id);
@@ -180,7 +180,7 @@
entry.setStartAndEndTime(
QDateTime::currentDateTime(),
QDateTime::currentDateTime());
- ulong id = mAgendaUtil->addEntry(entry);
+ ulong id = mAgendaUtil->store(entry);
// Run the case.
QVERIFY(mAgendaUtil->deleteEntry(id));
@@ -210,7 +210,7 @@
repeatRule.setInterval(1);
entry.setRepeatRule(repeatRule);
- ulong id = mAgendaUtil->addEntry(entry);
+ ulong id = mAgendaUtil->store(entry);
AgendaEntry savedEntry = mAgendaUtil->fetchById(id);
QVERIFY(!savedEntry.isNull());
QVERIFY(savedEntry.isRepeating());
@@ -237,7 +237,7 @@
entry.setStartAndEndTime(dateTimeSet, dateTimeSet);
// Run the case.
- ulong id = mAgendaUtil->addEntry(entry);
+ ulong id = mAgendaUtil->store(entry);
// Verify.
AgendaEntry retrievedEntry = mAgendaUtil->fetchById(id);
@@ -257,22 +257,22 @@
}
/*!
- Test the api AgendaUtil::updateEntry.
+ Test the api AgendaUtil::store.
*/
-void TestAgendaUtil::test_updateEntry()
+void TestAgendaUtil::test_storeWithExistingEntry()
{
// Test case setup.
AgendaEntry entry;
entry.setType(AgendaEntry::TypeAppoinment);
entry.setSummary("Test case");
- entry.setDescription("Entry to test the updateEntry API");
+ entry.setDescription("Entry to test the store API");
entry.setLocation("Nokia");
entry.setStartAndEndTime(
QDateTime::currentDateTime(),
QDateTime::currentDateTime());
// Save the entry
- ulong id = mAgendaUtil->addEntry(entry);
+ ulong id = mAgendaUtil->store(entry);
// Fetch the same entry
AgendaEntry savedEntry = mAgendaUtil->fetchById(id);
@@ -284,7 +284,7 @@
QDateTime::currentDateTime().addDays(1));
// Update the entry
- bool success = mAgendaUtil->updateEntry(savedEntry);
+ ulong success = mAgendaUtil->store(savedEntry);
QVERIFY(success);
// Fetch the updated entry again
@@ -321,7 +321,7 @@
futureEntry.setStartAndEndTime(futureDay, futureDay);
futureEntry.setType(AgendaEntry::TypeEvent);
futureEntry.setSummary("Test case");
- ulong id = mAgendaUtil->addEntry(futureEntry);
+ ulong id = mAgendaUtil->store(futureEntry);
// Run the test case
QList<AgendaEntry> entriesList;
entriesList.append(mAgendaUtil->createEntryIdListForDay(futureDay));
@@ -380,7 +380,7 @@
QDateTime firstEntryStart(QDate(2020, 05, 01), QTime(9, 0, 0, 0));
QDateTime firstEntryEnd(QDate(2020, 05, 01), QTime(10, 0, 0, 0));
firstEntry.setStartAndEndTime(firstEntryStart, firstEntryEnd);
- ulong id = mAgendaUtil->addEntry(firstEntry);
+ ulong id = mAgendaUtil->store(firstEntry);
numOfEntries++;
// ToDo.
@@ -390,7 +390,7 @@
QDateTime firstToDoStart(QDate(2026, 05, 01), QTime(10, 0, 0, 0));
QDateTime firstToDoEnd(QDate(2026, 05, 01), QTime(10, 0, 0, 0));
firstToDo.setStartAndEndTime(firstToDoStart, firstToDoEnd);
- id = mAgendaUtil->addEntry(firstToDo);
+ id = mAgendaUtil->store(firstToDo);
numOfEntries++;
// Run the test case
@@ -454,7 +454,7 @@
QDateTime firstEntryStart(QDate(2020, 05, 01), QTime(9, 0, 0, 0));
QDateTime firstEntryEnd(QDate(2020, 05, 01), QTime(10, 0, 0, 0));
firstEntry.setStartAndEndTime(firstEntryStart, firstEntryEnd);
- ulong id = mAgendaUtil->addEntry(firstEntry);
+ ulong id = mAgendaUtil->store(firstEntry);
numOfEntries++;
// ToDo.
@@ -464,7 +464,7 @@
QDateTime firstToDoStart(QDate(2026, 05, 01), QTime(10, 0, 0, 0));
QDateTime firstToDoEnd(QDate(2026, 05, 01), QTime(10, 0, 0, 0));
firstToDo.setStartAndEndTime(firstToDoStart, firstToDoEnd);
- id = mAgendaUtil->addEntry(firstToDo);
+ id = mAgendaUtil->store(firstToDo);
numOfEntries++;
// Run the test case
@@ -563,7 +563,7 @@
QDateTime firstEntryEnd(
QDate(2020, 05, 01), QTime(10, 0, 0, 0));
firstEntry.setStartAndEndTime(firstEntryStart, firstEntryEnd);
- ulong id = mAgendaUtil->addEntry(firstEntry);
+ ulong id = mAgendaUtil->store(firstEntry);
// Create the range for which entries are needed
QDateTime fromRange(
@@ -646,7 +646,7 @@
QDateTime firstEntryEnd(
QDate(2020, 05, 01), QTime(10, 0, 0, 0));
firstEntry.setStartAndEndTime(firstEntryStart, firstEntryEnd);
- ulong id = mAgendaUtil->addEntry(firstEntry);
+ ulong id = mAgendaUtil->store(firstEntry);
numOfEntries++;
// Events.
@@ -658,7 +658,7 @@
QDateTime firstEventEnd(
QDate(2023, 05, 01), QTime(12, 0, 0, 0));
firstEvent.setStartAndEndTime(firstEventStart, firstEventEnd);
- id = mAgendaUtil->addEntry(firstEvent);
+ id = mAgendaUtil->store(firstEvent);
numOfEntries++;
// ToDos.
@@ -670,7 +670,7 @@
QDateTime firstToDoEnd(
QDate(2026, 05, 01), QTime(10, 0, 0, 0));
firstToDo.setStartAndEndTime(firstToDoStart, firstToDoEnd);
- id = mAgendaUtil->addEntry(firstToDo);
+ id = mAgendaUtil->store(firstToDo);
numOfEntries++;
return numOfEntries;
@@ -691,7 +691,7 @@
// Shouldn't clone the entry as AgendaEntry is not yet saved.
QVERIFY(!notSavedEntryId);
- long noteId = mAgendaUtil->addEntry(noteEntry);
+ long noteId = mAgendaUtil->store(noteEntry);
QVERIFY(noteId);
// Fetch the saved note entry for cloning
@@ -718,7 +718,7 @@
AgendaEntry noteEntry(AgendaEntry::TypeNote);
noteEntry.setDescription(QString("test cloning of note to meeting"));
- long noteId = mAgendaUtil->addEntry(noteEntry);
+ long noteId = mAgendaUtil->store(noteEntry);
QVERIFY(noteId);
// Fetch the saved note entry for cloning
@@ -745,7 +745,7 @@
todoEntry.setDescription(QString("test cloning of todo to note"));
QDateTime dueDate(QDate(2011, 06, 01), QTime(10, 0, 0, 0));
todoEntry.setStartAndEndTime(dueDate, dueDate);
- long todoId = mAgendaUtil->addEntry(todoEntry);
+ long todoId = mAgendaUtil->store(todoEntry);
QVERIFY(todoId);
// Fetch the saved note entry for cloning
@@ -774,7 +774,7 @@
todoEntry.setSummary(QString("test cloning of todo to meeting"));
QDateTime dueDate(QDate(2011, 06, 01), QTime(10, 0, 0, 0));
todoEntry.setStartAndEndTime(dueDate, dueDate);
- long todoId = mAgendaUtil->addEntry(todoEntry);
+ long todoId = mAgendaUtil->store(todoEntry);
QVERIFY(todoId);
// Fetch the saved note entry for cloning
@@ -805,7 +805,7 @@
QDateTime startDate(QDate(2011, 06, 01), QTime(10, 0, 0, 0));
QDateTime endDate(QDate(2011, 06, 01), QTime(12, 0, 0, 0));
appointment.setStartAndEndTime(startDate, endDate);
- long appointmentId = mAgendaUtil->addEntry(appointment);
+ long appointmentId = mAgendaUtil->store(appointment);
QVERIFY(appointmentId);
// Fetch the saved note entry for cloning
@@ -834,7 +834,7 @@
QDateTime startDate(QDate(2011, 06, 01), QTime(10, 0, 0, 0));
QDateTime endDate(QDate(2011, 06, 01), QTime(12, 0, 0, 0));
appointment.setStartAndEndTime(startDate, endDate);
- long appointmentId = mAgendaUtil->addEntry(appointment);
+ long appointmentId = mAgendaUtil->store(appointment);
QVERIFY(appointmentId);
// Fetch the saved note entry for cloning
@@ -864,7 +864,7 @@
QDateTime dueDate(QDate(2011, 06, 01), QTime(0, 0, 0, 0));
todoEntry.setStartAndEndTime(dueDate, dueDate);
- ulong todoId = mAgendaUtil->addEntry(todoEntry);
+ ulong todoId = mAgendaUtil->store(todoEntry);
QVERIFY(todoId);
// Complete the to-do.
@@ -888,7 +888,7 @@
QDateTime dueDate(QDate(2011, 06, 01), QTime(0, 0, 0, 0));
todoEntry.setStartAndEndTime(dueDate, dueDate);
- ulong todoId = mAgendaUtil->addEntry(todoEntry);
+ ulong todoId = mAgendaUtil->store(todoEntry);
QVERIFY(todoId);
// Complete the to-do.
--- a/organizer_plat/calendar_editor_api/inc/caleneditor.h Mon Jul 19 15:12:16 2010 +0100
+++ b/organizer_plat/calendar_editor_api/inc/caleneditor.h Mon Aug 23 16:00:50 2010 +0100
@@ -38,7 +38,7 @@
# define CALENEDITOR_EXPORT Q_DECL_IMPORT
#endif
-class CALENEDITOR_EXPORT CalenEditor : public QObject //HbView
+class CalenEditor : public QObject //HbView
{
Q_OBJECT
@@ -48,20 +48,23 @@
TypeUnKnown = -1
};
- explicit CalenEditor(QObject *parent = 0);
- explicit CalenEditor(AgendaUtil *agendaUtil, QObject *parent = 0);
- virtual ~CalenEditor();
-
-public:
- void edit(const QFile &handle, bool launchCalendar);
- void edit(AgendaEntry entry, bool launchCalendar);
- void edit(ulong id, bool launchCalendar);
- void create(QDateTime newEntryDateTime,
+ CALENEDITOR_EXPORT explicit CalenEditor(QObject *parent = 0);
+ CALENEDITOR_EXPORT explicit CalenEditor(AgendaUtil *agendaUtil, QObject *parent = 0);
+ CALENEDITOR_EXPORT virtual ~CalenEditor();
+ CALENEDITOR_EXPORT void edit(const QFile &handle, bool launchCalendar);
+ CALENEDITOR_EXPORT void edit(AgendaEntry entry, bool launchCalendar);
+ CALENEDITOR_EXPORT void edit(ulong id, bool launchCalendar);
+ CALENEDITOR_EXPORT void create(QDateTime newEntryDateTime,
bool launchCalendar,
CalenEditor::CreateType type = TypeAppointment);
- void create(AgendaEntry entry,
+ CALENEDITOR_EXPORT void create(AgendaEntry entry,
bool launchCalendar,
CalenEditor::CreateType type = TypeAppointment);
+ /**
+ * This Function saves the entries
+ * Should only be called after edit or create function has been called
+ */
+ CALENEDITOR_EXPORT void saveAndCloseEditor();
signals:
void entrySaved();
--- a/organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/unittest_caleneditor.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/unittest_caleneditor.pro Mon Aug 23 16:00:50 2010 +0100
@@ -30,6 +30,7 @@
DEFINES += TESTCALENEDITOR \
CALENEDITOR_LIB
INCLUDEPATH += . \
+ ../../../../calendarui/caleneditor/traces \
../../../../calendarui/caleneditor/inc \
../../../../calendarui/agendainterface/inc \
../../../../calendarui/commonutils/inc \
@@ -59,8 +60,7 @@
caleneditor_p.cpp \
caleneditordocloader.cpp
-HEADERS += caleneditor.h \
- caleneditorcustomitem.h \
+HEADERS += caleneditorcustomitem.h \
caleneditorcommon.h \
caleneditordocloader.h \
caleneditor_p.h
--- a/organizer_plat/calendar_launcher_api/inc/CalenLauncher.h Mon Jul 19 15:12:16 2010 +0100
+++ b/organizer_plat/calendar_launcher_api/inc/CalenLauncher.h Mon Aug 23 16:00:50 2010 +0100
@@ -14,7 +14,7 @@
* Description: Calendar Launcher
*
*/
-#include <qobject>
+#include <QObject>
#include <qdatetime.h>
#ifdef CALENLAUNCHER_LIB
@@ -29,7 +29,7 @@
public:
enum CalenView{
MonthView = 0,
- DayView
+ AgendaView
};
CalenLauncher(QObject* parent = 0);
~CalenLauncher();
--- a/organizer_plat/calendar_launcher_api/tsrc/unittest_calenlauncher/unittest_calenlauncher.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/organizer_plat/calendar_launcher_api/tsrc/unittest_calenlauncher/unittest_calenlauncher.pro Mon Aug 23 16:00:50 2010 +0100
@@ -22,7 +22,7 @@
DEPENDPATH += . \
./src \
../../../../calendarui/calenlauncher/src \
- ../../../../calendarui/calenlauncher/inc
+ ../../inc
INCLUDEPATH += .
--- a/organizer_plat/notes_editor_api/tsrc/unittest_noteseditorplugin/src/unittest_noteseditorplugin.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/organizer_plat/notes_editor_api/tsrc/unittest_noteseditorplugin/src/unittest_noteseditorplugin.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -233,7 +233,7 @@
entry.setDescription(
QString("Test Editing of Note by providing entry local Id"));
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
interface->edit(id);
@@ -301,7 +301,7 @@
entry.setStatus(AgendaEntry::TodoNeedsAction);
entry.setPriority(2);
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
AgendaEntry storedEntry = agendaUtil->fetchById(id);
@@ -365,7 +365,7 @@
entry.setStatus(AgendaEntry::TodoNeedsAction);
entry.setPriority(2);
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
AgendaEntry storedEntry = agendaUtil->fetchById(id);
// Call edit on agenda entry
@@ -589,7 +589,7 @@
entry.setStatus(AgendaEntry::TodoNeedsAction);
entry.setPriority(2);
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
AgendaEntry storedEntry = agendaUtil->fetchById(id);
// Call edit on agenda entry
@@ -651,7 +651,7 @@
entry.setStatus(AgendaEntry::TodoNeedsAction);
entry.setPriority(2);
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
AgendaEntry storedEntry = agendaUtil->fetchById(id);
// Call edit on agenda entry
@@ -756,7 +756,7 @@
entry.setDescription(
QString("Test Editing of Note by providing entry local Id"));
- ulong id = agendaUtil->addEntry(entry);
+ ulong id = agendaUtil->store(entry);
// Edits to-do entry by providing entry id and agendautil.
interface->edit(id, agendaUtil);
--- a/pimappsupport/chinesecalendaralg/calcontablesrc/CalconTable.cpp Mon Jul 19 15:12:16 2010 +0100
+++ b/pimappsupport/chinesecalendaralg/calcontablesrc/CalconTable.cpp Mon Aug 23 16:00:50 2010 +0100
@@ -78,7 +78,7 @@
time+=TTimeIntervalDays(27);
TBool hadLeapMonth=EFalse;
- iSession.Connect();
+ User::LeaveIfError(iSession.Connect());
TInt err=iFile.Replace(iSession, _L("c:\\calcondata.cpp"), EFileShareExclusive);
if (err!=KErrNone)
return;
--- a/tsrc/tsrc.pro Mon Jul 19 15:12:16 2010 +0100
+++ b/tsrc/tsrc.pro Mon Aug 23 16:00:50 2010 +0100
@@ -22,8 +22,7 @@
../clock/tsrc \
../notes/tsrc \
../organizer_plat/tsrc \
- ../organizer_pub/tsrc \
- ../pimappsupport/tsrc
+ ../organizer_pub/tsrc
CONFIG += ordered