# HG changeset patch # User hgs # Date 1280132678 -19800 # Node ID 2c54b51f39c4e2db30920aeced9680a546c6e32d # Parent 0b38fc5b94c636871d69b97491ece40471972811 201029 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/agendautil.pro --- a/agendainterface/agendautil/agendautil.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/agendainterface/agendautil/agendautil.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/bwins/agendainterfaceu.def --- a/agendainterface/agendautil/bwins/agendainterfaceu.def Mon Jul 12 02:32:28 2010 +0530 +++ b/agendainterface/agendautil/bwins/agendainterfaceu.def Mon Jul 26 13:54:38 2010 +0530 @@ -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 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 & AgendaEntry::categories(void) - ?entriesChanged@AgendaUtil@@IAEXV?$QList@K@@@Z @ 31 NONAME ; void AgendaUtil::entriesChanged(class QList) - ??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 &) - ??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 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 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 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 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 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 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 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 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 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 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 & 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 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 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 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 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 & AgendaEntry::categories(void) + ?entriesChanged@AgendaUtil@@IAEXV?$QList@K@@@Z @ 29 NONAME ; void AgendaUtil::entriesChanged(class QList) + ??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 &) + ??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 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 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 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 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 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 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 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 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 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 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 & 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 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 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 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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/eabi/agendainterfaceu.def --- a/agendainterface/agendautil/eabi/agendainterfaceu.def Mon Jul 12 02:32:28 2010 +0530 +++ b/agendainterface/agendautil/eabi/agendainterfaceu.def Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/inc/agendaentry.h --- a/agendainterface/agendautil/inc/agendaentry.h Mon Jul 12 02:32:28 2010 +0530 +++ /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 - -// 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& days); - QList byDay() const; - - void setByMonthDay(const QList& monthDays); - QList byMonthDay() const; - - void setByMonth(const QList& months); - QList 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& attendees(); - const QList& attendees() const; - QList& categories(); - const QList& 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& rdates); - QList 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/inc/agendaentry_p.h --- a/agendainterface/agendautil/inc/agendaentry_p.h Mon Jul 12 02:32:28 2010 +0530 +++ b/agendainterface/agendautil/inc/agendaentry_p.h Mon Jul 26 13:54:38 2010 +0530 @@ -23,7 +23,7 @@ #include // User includes -#include "agendaentry.h" +#include class AgendaAttendeePrivate { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/inc/agendautil.h --- a/agendainterface/agendautil/inc/agendautil.h Mon Jul 12 02:32:28 2010 +0530 +++ /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 -#include - -// 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 entryIds( - AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll); - QList fetchAllEntries( - AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll); - QList fetchEntriesInRange( - QDateTime rangeStart, QDateTime rangeEnd, - AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll); - QList 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& dates); - bool areNoEntriesInCalendar(); - static QDateTime minTime(); - static QDateTime maxTime(); - - static bool isWorkdaysRepeatingEntry(const AgendaRepeatRule& repeatRule); - -Q_SIGNALS: - void entriesChanged(QList 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/inc/agendautil_p.h --- a/agendainterface/agendautil/inc/agendautil_p.h Mon Jul 12 02:32:28 2010 +0530 +++ b/agendainterface/agendautil/inc/agendautil_p.h Mon Jul 26 13:54:38 2010 +0530 @@ -29,7 +29,7 @@ #include // User includes -#include "agendautil.h" +#include // 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& 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& oldEntries ); - bool isFieldSame( CCalEntry& entryOne, CCalEntry& entryTwo, - DifferenceFlag flag); - void copyField( const CCalEntry& src, CCalEntry& dst, - DifferenceFlag field ); - void storeEachChildEntry(CCalEntry &entry, - RPointerArray &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: diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/src/agendaentry.cpp --- a/agendainterface/agendautil/src/agendaentry.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/agendainterface/agendautil/src/agendaentry.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -14,7 +14,7 @@ * Description: * */ -#include "agendaentry.h" +#include #include "agendaentry_p.h" #include diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/src/agendautil.cpp --- a/agendainterface/agendautil/src/agendautil.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/agendainterface/agendautil/src/agendautil.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -14,7 +14,7 @@ * Description: * */ -#include "agendautil.h" +#include #include "agendautil_p.h" #include @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/agendautil/src/agendautil_p.cpp --- a/agendainterface/agendautil/src/agendautil_p.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/agendainterface/agendautil/src/agendautil_p.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -32,8 +32,8 @@ #include // User includes +#include #include "agendautil_p.h" -#include "agendaentry.h" #include "agendaentry_p.h" #include "CleanupResetAndDestroy.h" @@ -201,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 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(entry.type()), - globalUid, - static_cast(entry.method()), - 0); - + calEntry + = CCalEntry::NewL( + static_cast (entry.type()), + globalUid, + static_cast (entry.method()), + 0); + CleanupStack::Pop(globalUid); - - // Add description. - TPtrC description(reinterpret_cast( - 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(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(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 entryArray; - CleanupResetAndDestroyPushL(entryArray); - CleanupStack::PushL(globalUid); - // Construct a CCalEntry object and start filling the details. - CCalEntry* newEntry = 0; - newEntry = CCalEntry::NewL( - static_cast(entry.type()), - globalUid, - static_cast(entry.method()), - 0); - - CleanupStack::Pop(globalUid); - - // Add the summary. - if (!entry.summary().isNull()) { - TPtrC summary(reinterpret_cast( - 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(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(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( - 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( - 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; } /*! @@ -517,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(); @@ -527,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. @@ -568,7 +508,7 @@ != entry.repeatRule().type()) { AgendaRepeatRule agendaRepeatRule = entry.repeatRule(); TCalRRule repeatRule = - createTCalRRuleFromAgendaRRule(agendaRepeatRule); + createTCalRRuleFromAgendaRRule(agendaRepeatRule, isNonFloating); newEntry->SetRRuleL(repeatRule); } @@ -697,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 ( - entry.description().utf16()))); - } - - // Update the method. - if (storedEntry.method() != entry.method() && - AgendaEntry::MethodUnknown != entry.method()) { - calEntry->SetMethodL( - static_cast (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 (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 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& 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 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 ( - entry.description().utf16()))); - } - - // Update the location. - if (storedEntry.location() != entry.location() - && !entry.location().isNull()) { - calEntry->SetLocationL( - TPtrC(reinterpret_cast ( - 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 ( - entry.summary().utf16()))); - } - - // Update the method. - if (storedEntry.method() != entry.method() && - AgendaEntry::MethodUnknown != entry.method()) { - calEntry->SetMethodL( - static_cast (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 (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(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 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 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 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 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 ( - entry.summary().utf16()))); - - // set the locaiton - calEntry->SetLocationL(TPtrC(reinterpret_cast ( - 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 ( - 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 (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 (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 ( - entry.description().utf16()))); - } - - // Update the method. - if (AgendaEntry::MethodUnknown != entry.method()) { - newEntry->SetMethodL( - static_cast (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 (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 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 ( - entry.description().utf16()))); - } - - // Store the location. - if (!entry.location().isNull()) { - newEntry->SetLocationL( - TPtrC(reinterpret_cast ( - 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 ( - entry.summary().utf16()))); - } - - // Update the method. - if (AgendaEntry::MethodUnknown != entry.method()) { - newEntry->SetMethodL( - static_cast (entry.method())); - } - - // Store the time. - QDateTime startDateTime = entry.startTime(); - QDate startDate = startDateTime.date(); - QTime startTime = startDateTime.time(); - - TDateTime startCalendarDateTime( - startDate.year(), - static_cast (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(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 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. @@ -1640,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) { @@ -1677,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) { @@ -1788,7 +1045,9 @@ instanceList[i]->Entry().EntryTypeL() == CCalEntry::EEvent) { // Previous day all-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--; } } @@ -2025,30 +1284,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 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 @@ -2460,7 +1695,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; @@ -2669,7 +1905,7 @@ entry.setStartAndEndTime(startDateTime, endDateTime); // Attendees. - RPointerArray& calAttendees = calEntry.AttendeesL(); + RPointerArray calAttendees = calEntry.AttendeesL(); for (int i = 0; i < calAttendees.Count(); i++) { AgendaAttendee attendee; @@ -2698,7 +1934,7 @@ } // Categories. - const RPointerArray& calCategories = calEntry.CategoryListL(); + const RPointerArray calCategories = calEntry.CategoryListL(); for (int i = 0; i < calCategories.Count(); i++) { AgendaCategory category; @@ -2845,6 +2081,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 (agendaEntry.description().utf16())); + calEntry.SetDescriptionL(description); + + if(AgendaEntry::MethodUnknown != agendaEntry.method()) { + calEntry.SetMethodL( + static_cast (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 (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 (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 (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 (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 (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 (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& attendees, CCalEntry& entry) { @@ -3510,229 +2888,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 newRDates; - RArray 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& oldEntries ) -{ - // For each oldChild..., 0th index will be parent - for (int i=1; i &oldEntries, - bool resetLocalUid) - { - - // Start from 1 as we don't want to copy the old parent entry. - for(int i=1; iSetLocalUidL( 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 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 entries; - CleanupClosePushL(entries); - entries.Append( oldEntries[i] ); - iCalEntryView->StoreL( entries, successCount ); - CleanupStack::Pop( &entries ); - } - } - } - TCalTime AgendaUtilPrivate::generateRecurrenceIdFromEntry( CCalEntry& entry, TCalTime instanceDate ) { @@ -3816,7 +2971,7 @@ } TCalRRule AgendaUtilPrivate::createTCalRRuleFromAgendaRRule( - AgendaRepeatRule &agendaRRule) + AgendaRepeatRule &agendaRRule, bool isNonFloating ) { TCalRRule repeatRule( @@ -3830,10 +2985,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 (repeatUntilDate.date().month() - 1), @@ -3842,9 +2993,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 qDays = agendaRRule.byDay(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/inc/agendaentry.h --- a/agendainterface/inc/agendaentry.h Mon Jul 12 02:32:28 2010 +0530 +++ /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 - -// 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& days); - QList byDay() const; - - void setByMonthDay(const QList& monthDays); - QList byMonthDay() const; - - void setByMonth(const QList& months); - QList 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& attendees(); - const QList& attendees() const; - QList& categories(); - const QList& 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& rdates); - QList 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/inc/agendainterfacedefines.h --- a/agendainterface/inc/agendainterfacedefines.h Mon Jul 12 02:32:28 2010 +0530 +++ /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 - -#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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 agendainterface/inc/agendautil.h --- a/agendainterface/inc/agendautil.h Mon Jul 12 02:32:28 2010 +0530 +++ /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 -#include - -// 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 entryIds( - AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll); - QList fetchAllEntries( - AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll); - QList fetchEntriesInRange( - QDateTime rangeStart, QDateTime rangeEnd, - AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll); - QList 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& dates); - bool areNoEntriesInCalendar(); - static QDateTime minTime(); - static QDateTime maxTime(); - - static bool isWorkdaysRepeatingEntry(const AgendaRepeatRule& repeatRule); - -Q_SIGNALS: - void entriesChanged(QList 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertinterface/alarmalertinterface.pro --- a/alarmui/alarmalertwidget/alarmalertinterface/alarmalertinterface.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertinterface/alarmalertinterface.pro Mon Jul 26 13:54:38 2010 +0530 @@ -7,7 +7,8 @@ INCLUDEPATH += ./inc \ ../alarmalertplugin/inc \ - ../../inc + ../../inc \ + ./traces DEPENDPATH += ./inc \ ./src \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp --- a/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 timeString; TBuf 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() == Stop) { @@ -234,6 +253,7 @@ } else if (*source->Value() == 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwrapper.cpp --- a/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwrapper.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwrapper.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertinterface/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertinterface/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertinterface/traces/alarmalertwidgetTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertinterface/traces/alarmalertwidgetTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertinterface/traces/alarmalertwrapperTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertinterface/traces/alarmalertwrapperTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertinterface/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertinterface/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro --- a/alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc --- a/alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc Mon Jul 26 13:54:38 2010 +0530 @@ -1,7 +1,4 @@ - - icons/pri_small_bell.svg - xml/alarmalert_calendar_unlocked.docml xml/alarmalert_clock_unlocked.docml diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/data/icons/pri_small_bell.svg --- a/alarmui/alarmalertwidget/alarmalertplugin/data/icons/pri_small_bell.svg Mon Jul 12 02:32:28 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml --- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml Mon Jul 26 13:54:38 2010 +0530 @@ -1,12 +1,10 @@ - + - - - + @@ -18,13 +16,13 @@ - + - + @@ -50,7 +48,7 @@ - + @@ -70,8 +68,8 @@ - - + +
@@ -82,7 +80,7 @@ - + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml --- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml Mon Jul 26 13:54:38 2010 +0530 @@ -1,12 +1,10 @@ - + - - - + @@ -18,8 +16,8 @@ - - + + @@ -32,7 +30,7 @@ - + @@ -48,8 +46,8 @@ - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml --- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml Mon Jul 26 13:54:38 2010 +0530 @@ -1,12 +1,10 @@ - + - - - + @@ -18,7 +16,7 @@ - + @@ -47,8 +45,8 @@ - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertdocloader.cpp --- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertdocloader.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertdocloader.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp --- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 (alertDocLoader->findWidget("dialog")); alertDialog->setupNormalUI(alertDocLoader); ret = alertDialog; + OstTraceFunctionExit0( ALARMALERTPLUGIN_CREATEDEVICEDIALOG_EXIT ); return ret; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp --- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 (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 ( 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 ( mAlertDocLoader->findObject("snoozeAction")); @@ -349,6 +383,7 @@ 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 ( 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 ( 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"); @@ -466,6 +499,7 @@ stopAction->setText(hbTrId("txt_calendar_button_alarm_dialog_snooze")); 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 ( mAlertDocLoader->findWidget("alarmDescription")); @@ -527,6 +561,7 @@ stopAction->setText(hbTrId("txt_calendar_button_alarm_dialog_snooze")); 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertdocloaderTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertdocloaderTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertpluginTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertpluginTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertwidget_pTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertwidget_pTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/alarmalertwidget/alarmalertplugin/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 alarmui/rom/AlmAlertResources.iby --- a/alarmui/rom/AlmAlertResources.iby Mon Jul 12 02:32:28 2010 +0530 +++ b/alarmui/rom/AlmAlertResources.iby Mon Jul 26 13:54:38 2010 +0530 @@ -19,10 +19,11 @@ #ifndef __ALMALERTRESOURCES_IBY__ #define __ALMALERTRESOURCES_IBY__ +#include - -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__ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/agendaeventviewer.pro --- a/calendarui/agendaeventviewer/agendaeventviewer.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/agendaeventviewer/agendaeventviewer.pro Mon Jul 26 13:54:38 2010 +0530 @@ -24,7 +24,8 @@ . \ ./src \ ./inc \ - ../inc + ../inc \ + ./traces diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/data/agendaeventviewer.docml --- a/calendarui/agendaeventviewer/data/agendaeventviewer.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/agendaeventviewer/data/agendaeventviewer.docml Mon Jul 26 13:54:38 2010 +0530 @@ -16,7 +16,7 @@ - + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/inc/agendaeventview.h --- a/calendarui/agendaeventviewer/inc/agendaeventview.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/agendaeventviewer/inc/agendaeventview.h Mon Jul 26 13:54:38 2010 +0530 @@ -66,7 +66,7 @@ void addRepeatData(); void addDescriptionData(); void getPriorityIcon(int priority, QString& priorityIcon); - QString repeatRule() const; + QString repeatRule(); QString alarmTimeText() const; void removeWidget(); void updateCompletedReminderData(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/src/agendaeventview.cpp --- a/calendarui/agendaeventviewer/src/agendaeventview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -52,10 +52,15 @@ #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 +94,8 @@ mMaptileStatus(-1), mNotesPluginLoaded(false) { - + OstTraceFunctionEntry0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY ); + mTranslator->loadCommon(); mDocLoader = new AgendaEventViewerDocLoader; // Load to-do viewer's docml. @@ -148,6 +154,7 @@ } + OstTraceFunctionExit0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT ); } /*! @@ -155,6 +162,7 @@ */ AgendaEventView::~AgendaEventView() { + OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY ); // Remove the translator if (mTranslator) { @@ -188,6 +196,7 @@ mProgressTimer = NULL; } + OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT ); } /*! @@ -198,6 +207,7 @@ void AgendaEventView::execute(AgendaEntry entry, AgendaEventViewer::Actions action) { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_EXECUTE_ENTRY ); mOriginalAgendaEntry = entry; mAgendaEntry = entry; @@ -247,6 +257,7 @@ connect(mBackAction, SIGNAL(triggered()), this, SLOT(close())); + OstTraceFunctionExit0( AGENDAEVENTVIEW_EXECUTE_EXIT ); } /*! @@ -254,6 +265,7 @@ */ void AgendaEventView::addViewerData() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDVIEWERDATA_ENTRY ); // Add the title to event viewer. addGroupBoxData(); @@ -289,6 +301,7 @@ // Set the description. addDescriptionData(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDVIEWERDATA_EXIT ); } /*! @@ -296,6 +309,7 @@ */ void AgendaEventView::addMenuItem() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDMENUITEM_ENTRY ); if (mAgendaEntry.type() == AgendaEntry::TypeTodo) { @@ -313,6 +327,7 @@ SLOT(markTodoStatus())); menu->addAction(mMarkTodoAction); } + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDMENUITEM_EXIT ); } /*! @@ -320,6 +335,7 @@ */ void AgendaEventView::addToolBarItem(AgendaEventViewer::Actions action) { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDTOOLBARITEM_ENTRY ); HbToolBar *toolBar = qobject_cast ( mDocLoader->findWidget(AGENDA_EVENT_VIEWER_TOOLBAR)); @@ -350,6 +366,7 @@ toolBar->addAction(saveAction); } + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDTOOLBARITEM_EXIT ); } /*! @@ -357,6 +374,7 @@ */ void AgendaEventView::addGroupBoxData() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDGROUPBOXDATA_ENTRY ); HbGroupBox *groupBox = qobject_cast ( mDocLoader->findWidget(AGENDA_EVENT_VIEWER_GROUPBOX)); @@ -367,10 +385,10 @@ } 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")); + groupBox->setHeading(hbTrId("txt_calendar_subhead_all_day_event")); } + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDGROUPBOXDATA_EXIT ); } /*! @@ -378,6 +396,7 @@ */ void AgendaEventView::addSubjectAndPriorityData() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_ENTRY ); QStringList itemList; itemList.append(hbTrId("txt_calendar_dblist_subject")); @@ -401,6 +420,7 @@ mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole); + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_EXIT ); } /*! @@ -408,6 +428,7 @@ */ void AgendaEventView::addDateTimeData() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDDATETIMEDATA_ENTRY ); QStringList itemData; HbExtendedLocale systemLocale = HbExtendedLocale::system(); @@ -443,43 +464,46 @@ 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(startTimeText); + data.append(CHARACTER_HYPHEN); + data.append(endTimeText); data.append(CHARACTER_SPACE); - data.append(hbTrId("txt_calendar_dblist_meeting_date").arg( - startDateText)); + data.append(startDateText); } else { - data.append(hbTrId("txt_calendar_dblist_start_time_date").arg( - startTimeText).arg(startDateText)); + // 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(hbTrId("txt_calendar_dblist_end_time_date").arg( - endTimeText).arg(endDateText)); + 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)); + r_qtn_date_usual_with_zero)); + data.append(dateTimeText); break; case AgendaEntry::TypeEvent: dateTimeText.append(systemLocale.format(startDateTime.date(), - r_qtn_date_usual_with_zero)); + r_qtn_date_usual_with_zero)); if (CalenDateUtils::onSameDay(startDateTime, endDateTime.addSecs(-60))) { - data.append(hbTrId("txt_calendar_dblist_meeting_date").arg( - dateTimeText)); + data.append(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); + data.append(" - "); + data.append(endDate); } break; default: @@ -488,6 +512,7 @@ itemData.append(data); mDateTimeWidget->setEventViewerItemData(itemData, Qt::DisplayRole); + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDDATETIMEDATA_EXIT ); } /*! @@ -495,6 +520,7 @@ */ void AgendaEventView::addLocationData() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDLOCATIONDATA_ENTRY ); QStringList itemData; QString progressIcon(QString::null); if ( mLocationFeatureEnabled ) { @@ -517,6 +543,7 @@ itemData.append(QString::null); itemData.append(mAgendaEntry.location()); mLocationWidget->setEventViewerItemData(itemData, Qt::DisplayRole); + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDLOCATIONDATA_EXIT ); } /*! @@ -524,18 +551,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,6 +580,7 @@ itemData.append(QString::null); itemData.append(alarmTimeText()); mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole); + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDREMINDERDATA_EXIT ); } /*! @@ -553,6 +588,7 @@ */ void AgendaEventView::addCompletedTodoData() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_ENTRY ); QStringList itemData; QString completedText; HbExtendedLocale systemLocale = HbExtendedLocale::system();; @@ -567,6 +603,7 @@ itemData.append(hbTrId("txt_calendar_dblist_completed_date")); itemData.append(completedText); mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole); + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_EXIT ); } /*! @@ -574,16 +611,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,6 +634,7 @@ */ void AgendaEventView::addDescriptionData() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_ENTRY ); QStringList itemData; itemData.append(QString::null); itemData.append(QString::null); @@ -601,6 +645,7 @@ itemData.append(hbTrId("txt_calendar_dblist_description")); itemData.append(mAgendaEntry.description()); mDescriptionWidget->setEventViewerItemData(itemData, Qt::DisplayRole); + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_EXIT ); } /*! @@ -608,6 +653,7 @@ */ void AgendaEventView::getPriorityIcon(int priority, QString &priorityIcon) { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETPRIORITYICON_ENTRY ); switch(priority) { case 1:priorityIcon.append("qtg_small_priority_high"); @@ -618,16 +664,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 +693,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 +716,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 +737,7 @@ */ QString AgendaEventView::alarmTimeText() const { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ALARMTIMETEXT_ENTRY ); QString alarmDateTimeText; QDateTime startTime; @@ -694,14 +754,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 +773,7 @@ */ void AgendaEventView::removeWidget() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_REMOVEWIDGET_ENTRY ); if (mAgendaEntry.location().isEmpty()) { mLocationWidget->hide(); @@ -739,7 +803,8 @@ } } - if (mAgendaEntry.repeatRule().type() == AgendaRepeatRule::InvalidRule) { + if ((mAgendaEntry.repeatRule().type() == AgendaRepeatRule::InvalidRule) && + (mAgendaEntry.recurrenceId().isNull())) { mRepeatWidget->hide(); mLinearLayout->removeItem(mRepeatWidget); } @@ -752,6 +817,7 @@ mLinearLayout->invalidate(); mLinearLayout->activate(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_REMOVEWIDGET_EXIT ); } /*! @@ -759,6 +825,7 @@ */ void AgendaEventView::updateCompletedReminderData() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_ENTRY ); if (AgendaEntry::TodoCompleted == mAgendaEntry.status()) { addCompletedTodoData(); @@ -788,6 +855,7 @@ mLinearLayout->invalidate(); mLinearLayout->activate(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_EXIT ); } /*! @@ -795,6 +863,7 @@ */ void AgendaEventView::removeAllWidgets() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_REMOVEALLWIDGETS_ENTRY ); for (int i = 2; i < mLinearLayout->count(); i++) { mLinearLayout->removeAt(i); @@ -802,6 +871,7 @@ mLinearLayout->invalidate(); mLinearLayout->activate(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_REMOVEALLWIDGETS_EXIT ); } /*! @@ -809,6 +879,7 @@ */ void AgendaEventView::addAllWidgets() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDALLWIDGETS_ENTRY ); mLinearLayout->addItem(mLocationWidget); mLocationWidget->show(); @@ -824,6 +895,7 @@ mLinearLayout->invalidate(); mLinearLayout->activate(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDALLWIDGETS_EXIT ); } /*! @@ -831,6 +903,7 @@ */ void AgendaEventView::showDeleteOccurencePopup() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY ); HbDialog *popUp = new HbDialog(); popUp->setDismissPolicy(HbDialog::NoDismiss); popUp->setTimeout(HbDialog::NoTimeout); @@ -859,11 +932,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 +945,7 @@ */ void AgendaEventView::showDeleteConfirmationQuery() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY ); HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion); popup->setDismissPolicy(HbDialog::NoDismiss); @@ -912,6 +987,7 @@ SLOT(handleDeleteAction())); popup->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popup)); popup->open(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_EXIT ); } /*! @@ -919,6 +995,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 +1003,7 @@ // Delete the entry. mOwner->mAgendaUtil->deleteEntry(mAgendaEntry.id()); + OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEDELETEACTION_EXIT ); } /*! @@ -933,6 +1011,7 @@ */ void AgendaEventView::markTodoStatus() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_MARKTODOSTATUS_ENTRY ); QDateTime currentDateTime = QDateTime::currentDateTime(); @@ -953,6 +1032,7 @@ updateCompletedReminderData(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_MARKTODOSTATUS_EXIT ); } /*! @@ -960,6 +1040,7 @@ */ void AgendaEventView::edit() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_EDIT_ENTRY ); mOwner->editingStarted(); @@ -998,6 +1079,7 @@ } + OstTraceFunctionExit0( AGENDAEVENTVIEW_EDIT_EXIT ); } /*! @@ -1005,6 +1087,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 +1102,7 @@ showDeleteConfirmationQuery(); } + OstTraceFunctionExit0( AGENDAEVENTVIEW_DELETEAGENDAENTRY_EXIT ); } /*! @@ -1026,18 +1110,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 +1135,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 +1149,7 @@ */ void AgendaEventView::handleEntryUpdation(ulong id) { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYUPDATION_ENTRY ); AgendaEntry updatedEntry = mOwner->mAgendaUtil->fetchById(id); @@ -1064,9 +1157,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 +1199,7 @@ close(); } + OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYUPDATION_EXIT ); } /*! @@ -1109,6 +1207,7 @@ */ void AgendaEventView::handleEntryDeletion(ulong id) { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_ENTRY ); if (id == mAgendaEntry.id()) { // Close the agenda entry viewer @@ -1116,6 +1215,7 @@ mOwner->deletingCompleted(); } + OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_EXIT ); } /*! @@ -1123,6 +1223,7 @@ */ void AgendaEventView::handleNoteEditorClosed(bool status) { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_ENTRY ); Q_UNUSED(status); // To avoid loading the plugin again for editing, @@ -1130,6 +1231,7 @@ mOwner->editingCompleted(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_EXIT ); } /*! @@ -1137,11 +1239,13 @@ */ void AgendaEventView::handleCalendarEditorClosed() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_ENTRY ); // Cleanup. mCalenEditor->deleteLater(); mOwner->editingCompleted(); + OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_EXIT ); } /*! @@ -1149,6 +1253,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 +1273,7 @@ break; } + OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_EXIT ); } /*! @@ -1175,6 +1281,7 @@ */ void AgendaEventView::getSubjectIcon(AgendaEntry::Type type, QString &subjectIcon) { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETSUBJECTICON_ENTRY ); switch(type) { case AgendaEntry::TypeAppoinment: { @@ -1183,7 +1290,11 @@ 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: @@ -1200,6 +1311,7 @@ break; } + OstTraceFunctionExit0( AGENDAEVENTVIEW_GETSUBJECTICON_EXIT ); } /*! @@ -1207,6 +1319,7 @@ */ void AgendaEventView::updateProgressIndicator() { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_ENTRY ); if (!mMaptileStatusReceived) { QString iconName("qtg_anim_small_loading_"); mProgressIconCount = mProgressIconCount % 10 + 1; @@ -1256,6 +1369,7 @@ } } + OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_EXIT ); } /*! @@ -1263,11 +1377,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 +1391,7 @@ */ void AgendaEventView::getProgressIndicatorstatus(QString &progressIcon) { + OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_ENTRY ); MapTileService::AddressType addressType; addressType = MapTileService::AddressPlain; int eventId = mAgendaEntry.id(); @@ -1305,17 +1422,20 @@ int ,int)), this, SLOT(receiveMapTileStatus(int,int,int))); progressIcon.append(QString::null); } + OstTraceFunctionExit0( AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/src/agendaeventviewer.cpp --- a/calendarui/agendaeventviewer/src/agendaeventviewer.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/agendaeventviewer/src/agendaeventviewer.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/src/agendaeventviewer_p.cpp --- a/calendarui/agendaeventviewer/src/agendaeventviewer_p.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/agendaeventviewer/src/agendaeventviewer_p.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 (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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/src/agendaeventviewerdocloader.cpp --- a/calendarui/agendaeventviewer/src/agendaeventviewerdocloader.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/agendaeventviewer/src/agendaeventviewerdocloader.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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); } } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp --- a/calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/agendaeventviewer/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/traces/agendaeventviewTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/agendaeventviewer/traces/agendaeventviewTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,94 @@ +// 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_UPDATECOMPLETEDREMINDERDATA_ENTRY 0x8a0027 +#define AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_EXIT 0x8a0028 +#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 + + +#endif + +// End of file + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/traces/agendaeventviewerTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/agendaeventviewer/traces/agendaeventviewerTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/traces/agendaeventviewer_pTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/agendaeventviewer/traces/agendaeventviewer_pTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/traces/agendaeventviewerdocloaderTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/agendaeventviewer/traces/agendaeventviewerdocloaderTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/traces/agendaeventvieweritemTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/agendaeventviewer/traces/agendaeventvieweritemTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/agendaeventviewer/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/agendaeventviewer/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,127 @@ +#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_UPDATECOMPLETEDREMINDERDATA_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_ENTRY=0x49 +[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_EXIT=0x4a +[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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/application/application.pro --- a/calendarui/application/application.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/application/application.pro Mon Jul 26 13:54:38 2010 +0530 @@ -62,9 +62,11 @@ } # Input -HEADERS += calenserviceprovider.h +HEADERS += calenserviceprovider.h \ + calenapplication.h SOURCES += main.cpp \ + calenapplication.cpp \ calenserviceprovider.cpp RESOURCES += calendar.qrc diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/application/inc/calenapplication.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/application/inc/calenapplication.h Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,49 @@ +/* +* 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 +#include + +// Forward Declarations. +class CCalenController; + +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 mController; +}; + +// End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/application/src/calenapplication.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/application/src/calenapplication.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 "calenserviceprovider.h" +#include "calenapplication.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 + CalenServiceProvider service(mController); + } +} + +/*! + 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/application/src/main.cpp --- a/calendarui/application/src/main.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/application/src/main.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -15,45 +15,45 @@ * */ - +// system includes #include -#include -#include #include #include -#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 application( + new CalenApplication(argc, argv)); + //CalenApplication *application = new CalenApplication(argc, argv); + + // Main window for providing the scene context HbMainWindow window; - //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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/bwins/caleneditoru.def --- a/calendarui/caleneditor/bwins/caleneditoru.def Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/bwins/caleneditoru.def Mon Jul 26 13:54:38 2010 +0530 @@ -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) diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/eabi/caleneditoru.def --- a/calendarui/caleneditor/eabi/caleneditoru.def Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/eabi/caleneditoru.def Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/inc/caleneditor.h --- a/calendarui/caleneditor/inc/caleneditor.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/inc/caleneditor.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 @@ -49,20 +49,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 calls after edit or create function has called + */ + CALENEDITOR_EXPORT void saveAndCloseEditor(); signals: void entrySaved(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/inc/caleneditor_p.h --- a/calendarui/caleneditor/inc/caleneditor_p.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/inc/caleneditor_p.h Mon Jul 26 13:54:38 2010 +0530 @@ -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); + QTime defaultTimeSameDay(); + void refreshTimeForUncheckAllDay(); private slots: void handleSubjectChange(const QString subject); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/inc/caleneditorrepeatfield.h --- a/calendarui/caleneditor/inc/caleneditorrepeatfield.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/inc/caleneditorrepeatfield.h Mon Jul 26 13:54:38 2010 +0530 @@ -65,14 +65,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; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/src/caleneditor.cpp --- a/calendarui/caleneditor/src/caleneditor.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditor.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -148,5 +148,13 @@ 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/src/caleneditor_p.cpp --- a/calendarui/caleneditor/src/caleneditor_p.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditor_p.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -67,6 +67,9 @@ #include "caleneditor_pTraces.h" #endif +// Constants +const int SecsInOneYear( 3600 ); + /*! \class CalenEditorPrivate @@ -197,20 +200,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), @@ -225,7 +227,7 @@ OstTraceFunctionEntry0( CALENEDITORPRIVATE_CALENEDITORPRIVATE_ENTRY ); // First get the q-pointer. q_ptr = static_cast (parent); - mMainWindow = NULL; + mMainWindow = 0; mTranslator->loadCommon(); if (!agendaUtil) { @@ -246,7 +248,7 @@ OstTraceFunctionEntry0( DUP1_CALENEDITORPRIVATE_CALENEDITORPRIVATE_ENTRY ); if(mOwnsAgendaUtil) { delete mAgendaUtil; - mAgendaUtil = NULL; + mAgendaUtil = 0; } if (mOriginalEntry) { delete mOriginalEntry; @@ -258,23 +260,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) { @@ -285,7 +287,7 @@ // delete the mainwindow object if created any if (mMainWindow) { delete mMainWindow; - mMainWindow = NULL; + mMainWindow = 0; } OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_CALENEDITORPRIVATE_EXIT ); } @@ -421,7 +423,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, @@ -579,8 +581,7 @@ 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")); + headingWidget->setHeading(hbTrId("txt_calendar_subhead_all_day_event")); }else if (entryType == AgendaEntry::TypeTodo) { headingWidget->setHeading(hbTrId("txt_calendar_subhead_to_do")); } @@ -775,6 +776,8 @@ 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 { @@ -849,6 +852,62 @@ } /*! + Calculates default time when Event is on same day. + */ +QTime CalenEditorPrivate::defaultTimeSameDay() +{ + QTime currentTime = QTime::currentTime(); + + //Start time should be one hour more than current time. + currentTime = currentTime.addSecs(SecsInOneYear); + + int hour = currentTime.hour(); + int minutes = currentTime.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; + } + currentTime.setHMS(hour, minutes, 0, 0); + if (addHour) { + currentTime = currentTime.addSecs(SecsInOneYear); + } + return currentTime; +} + +/*! + 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.setDate(fromDateTime.date()); + fromDateTime.setTime(defaultTimeSameDay()); + } + mNewEntryDateTime = fromDateTime; + toDateTime = fromDateTime.addSecs(SecsInOneYear); + + // 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() @@ -871,7 +930,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) { @@ -892,21 +950,9 @@ } 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.setTime(defaultTimeSameDay()); } } mViewFromItem->populateDateTime(fromDateTime, true); @@ -976,7 +1022,7 @@ } } } else { - toDateTime = fromDateTime.addSecs(60 * 60); + toDateTime = fromDateTime.addSecs(SecsInOneYear); } mViewToItem->populateDateTime(toDateTime, false); @@ -993,6 +1039,8 @@ // 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 @@ -1048,7 +1096,7 @@ // 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(SecsInOneYear); } 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 @@ -1128,7 +1176,7 @@ // 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(-SecsInOneYear); fromDateChanged = true; } else { // for exisitng entry @@ -1217,8 +1265,6 @@ SIGNAL(textChanged(const QString)), this, SLOT(handleDescriptionChange(const QString))); mDescriptionItemAdded = true; - //Scroll to the description item added. - mCalenEditorForm->scrollTo(mCalenEditorModel->index(descIndex, 0), HbAbstractItemView::EnsureVisible); OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATEDESCRIPTIONITEM_EXIT ); } @@ -1249,7 +1295,7 @@ // Remove the description from the entry mEditedEntry->setDescription(""); - mDescriptionItem = NULL; + mDescriptionItem = 0; mDescriptionItemAdded = false; OstTraceFunctionExit0( CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_EXIT ); } @@ -1301,6 +1347,8 @@ tempEndTime.setTime(tempEndQTime); enableFromTotimeFileds(false, tempSartTime, tempEndTime); + mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime); + QDate referenceDate; if (mRepeatField->isRepeatUntilItemAdded()) { referenceDate = mRepeatField->repeatUntilDate(); @@ -1320,22 +1368,12 @@ } } 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(); updateReminderChoices(); @@ -1396,7 +1434,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); @@ -1408,9 +1446,8 @@ } 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*))); } } @@ -1559,7 +1596,7 @@ { popup->removeAction(list[i]); } - HbAction *deleteAction = new HbAction(hbTrId("txt_calendar_button_dialog_delete"), + HbAction *deleteAction = new HbAction(hbTrId("txt_common_button_delete"), popup); popup->addAction(deleteAction); connect(deleteAction, SIGNAL(triggered()), this, @@ -1604,6 +1641,20 @@ if (mEditRange == ThisAndAll) { mRepeatField->saveRepeatRule(); } + + // Set back the all day endtime back + if(mOriginalEntry->type() == AgendaEntry::TypeEvent) { + // The time has to be set for the allday exceptional entries and + // while editing all the instances of a repeating all day entry + if(mEditRange == ThisOnly || + (mAllDayCheckBoxItem && + mAllDayCheckBoxItem->contentWidgetData("checkState") == Qt::Checked)) { + // Set EndTime of AllDay event to 00:00:00 of next day + QDateTime actualEndTime = mEditedEntry->endTime().addSecs(60); + mEditedEntry->setStartAndEndTime(mEditedEntry->startTime(), actualEndTime); + } + } + // TODO: Need to check entry status here. EntryStillExistsL switch (mDataHandler->shouldSaveOrDeleteOrDoNothing(mLaunchCalendar)) { case CalenEditorPrivate::ActionSave: @@ -1633,63 +1684,29 @@ bool CalenEditorPrivate::saveEntry() { OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVEENTRY_ENTRY ); - // 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")); + + if (!handleAllDayToSave()) { + // creating an exceptional entry + if (!mIsChild && (mEditRange == ThisOnly)) { + mAgendaUtil->store(*mEditedEntry, AgendaUtil::ThisOnly); + } else { + mAgendaUtil->store(*mEditedEntry); } - emit q_ptr->entrySaved(); - OstTraceFunctionExit0( CALENEDITORPRIVATE_SAVEENTRY_EXIT ); - return true; - } else if ((mEditRange == ThisOnly)) { - // If we are editing only this occurence, then - // clear the repeating properties of it - mAgendaUtil->clearRepeatingProperties(*mEditedEntry); } - - 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 (mNewEntry) { + if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) { + HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_new_meeting_saved")); + } else if(mEditedEntry->type() == AgendaEntry::TypeEvent) { + HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_new_all_day_event_saved")); } - 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")); - } + } else { + if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) { + HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_meeting_updated")); + } else if(mEditedEntry->type() == AgendaEntry::TypeEvent) { + HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_all_day_event_updated")); } - emit q_ptr->entrySaved(); - } else if (error) { - mDataHandler->displayErrorMsg(error); - OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_SAVEENTRY_EXIT ); - return false; } + emit q_ptr->entrySaved(); OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_SAVEENTRY_EXIT ); return true; @@ -1728,26 +1745,29 @@ */ bool CalenEditorPrivate::handleAllDayToSave() { - OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY ); - if (!mIsAllDayItemAdded) { - // All day item was not added, return true + OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY ); + + 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); + + // Check the state of AllDay checkBox and + // Check whether allday event is exceptional or not. + if (!mIsAllDayItemAdded && (mOriginalEntry->type() == AgendaEntry::TypeEvent)) { + + // All day item was not added, return false + mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime); OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT ); return false; } - // Check the state of AllDay checkBox // 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); - if (mNewEntry && (mAllDayCheckBoxItem->contentWidgetData("checkState") == Qt::Checked)) { // changes Start/End times of entry to Beginning ot the day @@ -1945,4 +1965,11 @@ return mIsAllDayItemAdded; } +/*! + save the entry from other views. + */ +void CalenEditorPrivate::forcedSaveEntry() +{ + saveAndCloseEditor(); +} // End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/src/caleneditorcustomitem.cpp --- a/calendarui/caleneditor/src/caleneditorcustomitem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditorcustomitem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -61,12 +61,12 @@ */ CalenEditorCustomItem::CalenEditorCustomItem(QGraphicsItem *parent) :HbDataFormViewItem(parent), - mPushButtonTime(NULL), - mPushButtonDate(NULL), - mRepeatUntilWidget(NULL), - mReminderTimeWidget(NULL), - mDatePicker(NULL), - mTimePicker(NULL) + mPushButtonTime(0), + mPushButtonDate(0), + mRepeatUntilWidget(0), + mReminderTimeWidget(0), + mDatePicker(0), + mTimePicker(0) { OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY ); mMinDate = CalenDateUtils::minTime().date(); @@ -74,8 +74,8 @@ 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 ); } /*! @@ -365,7 +365,7 @@ } // Create a date picker if(mDatePicker) { - mDatePicker = NULL; + mDatePicker = 0; } mDatePicker = new HbDateTimePicker(mDate, popUp); mDatePicker->setMinimumDate(mMinDate); @@ -402,7 +402,7 @@ } // Create a time picker. if(mTimePicker) { - mTimePicker = NULL; + mTimePicker = 0; } mTimePicker = new HbDateTimePicker(mTime, popUp); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/src/caleneditordatahandler.cpp --- a/calendarui/caleneditor/src/caleneditordatahandler.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditordatahandler.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -23,7 +23,7 @@ // User Includes #include "caleneditordatahandler.h" #include "calendateutils.h" -#include "agendaentry.h" +#include #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "caleneditordatahandlerTraces.h" @@ -247,10 +247,7 @@ 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()); } } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/src/caleneditorreminderfield.cpp --- a/calendarui/caleneditor/src/caleneditorreminderfield.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditorreminderfield.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -57,7 +57,7 @@ mCalenEditor(calenEditor), mEditorForm(form), mCalenEditorModel(model), - mCustomReminderTimeItem(NULL), + mCustomReminderTimeItem(0), mReminderTimeAdded(false) { OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_ENTRY ); @@ -350,7 +350,7 @@ 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( @@ -474,7 +474,7 @@ mCalenEditorModel->removeItem( mCalenEditorModel->index( reminderIndex.row(), 0)); - mCustomReminderTimeItem = NULL; + mCustomReminderTimeItem = 0; } OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_REMOVEREMINDERTIMEFIELD_EXIT ); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/caleneditor/src/caleneditorrepeatfield.cpp --- a/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -32,6 +32,7 @@ // User Included #include "caleneditorrepeatfield.h" #include "caleneditorcustomitem.h" +#include "calendateutils.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "caleneditorrepeatfieldTraces.h" @@ -45,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 @@ -58,9 +92,9 @@ mCalenEditor(calenEditor), mEditorForm(form), mCalenEditorModel(model), - mRepeatItem(NULL), - mRepeatComboBox(NULL), - mCustomRepeatUntilItem(NULL), + mRepeatItem(0), + mRepeatComboBox(0), + mCustomRepeatUntilItem(0), mIsBiWeekly(false), mIsWorkdays(false), mRepeatUntilItemAdded(false) @@ -157,31 +191,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: @@ -220,11 +254,12 @@ QVariant role = mRepeatComboBox->itemData(index, userRole); int value = role.toInt(); switch (value) { - case 1: { + 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, @@ -233,11 +268,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, @@ -247,11 +283,12 @@ 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, @@ -261,11 +298,12 @@ 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, @@ -275,12 +313,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)); @@ -288,11 +327,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, @@ -310,7 +350,7 @@ mCalenEditorModel->index( repeatIndex.row()+ 1, 0)); mRepeatUntilItemAdded = false; - mCustomRepeatUntilItem = NULL; + mCustomRepeatUntilItem = 0; } } break; @@ -363,7 +403,8 @@ 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 ); } @@ -392,13 +433,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; @@ -409,19 +450,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); @@ -647,19 +688,17 @@ } } else if (mRepeatRuleType == AgendaRepeatRule::MonthlyRule) { QList 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 ); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/calenplugins/agendaeventviewerplugin/agendaeventviewerplugin.pro --- a/calendarui/calenplugins/agendaeventviewerplugin/agendaeventviewerplugin.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/calenplugins/agendaeventviewerplugin/agendaeventviewerplugin.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/calenplugins/agendaeventviewerplugin/inc/eventviewerplugininterface.h --- a/calendarui/calenplugins/agendaeventviewerplugin/inc/eventviewerplugininterface.h Mon Jul 12 02:32:28 2010 +0530 +++ /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 -#include -#include -#include - -// 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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/calenplugins/agendaeventviewerplugin/src/agendaeventviewerplugin.cpp --- a/calendarui/calenplugins/agendaeventviewerplugin/src/agendaeventviewerplugin.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/calenplugins/agendaeventviewerplugin/src/agendaeventviewerplugin.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -17,7 +17,7 @@ // User Includes. #include "agendaeventviewerplugin.h" -#include "agendaentry.h" +#include /*! \class AgendaEventViewerPlugin diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/commonutils/commonutils.pro --- a/calendarui/commonutils/commonutils.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/commonutils/commonutils.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/commonutils/inc/calenagendautils.h --- a/calendarui/commonutils/inc/calenagendautils.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/commonutils/inc/calenagendautils.h Mon Jul 26 13:54:38 2010 +0530 @@ -23,7 +23,7 @@ // INCLUDES -#include "agendaentry.h" +#include #include // Q_DECL_EXPORT macro #ifdef CALENDATEUTILS_DLL diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/commonutils/src/calendateutils.cpp --- a/calendarui/commonutils/src/calendateutils.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/commonutils/src/calendateutils.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -21,7 +21,7 @@ #include "calendarui_debug.h" #include "calendateutils.h" -#include "agendautil.h" +#include // LOCAL CONSTANTS AND MACROS const int KDefaultStartTime(8); // 8 am ( 0 to 23 hour scale) diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/bwins/calencontrolleru.def --- a/calendarui/controller/bwins/calencontrolleru.def Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/bwins/calencontrolleru.def Mon Jul 26 13:54:38 2010 +0530 @@ -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 &) ?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) diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/controller.pro --- a/calendarui/controller/controller.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/controller.pro Mon Jul 26 13:54:38 2010 +0530 @@ -21,7 +21,8 @@ ./src DEFINES += CALENCONTROLLER_DLL INCLUDEPATH += ./inc \ - ../inc \ + ../inc \ + ../application/inc \ ../views/inc \ ../views/dayview/inc \ ../globaldata/inc \ @@ -106,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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/data/calendar.qrc --- a/calendarui/controller/data/calendar.qrc Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/data/calendar.qrc Mon Jul 26 13:54:38 2010 +0530 @@ -2,5 +2,6 @@ xml/calenagendaview.docml xml/calenmonthview.docml + xml/calendayview.docml diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/data/xml/calendayview.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/controller/data/xml/calendayview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/data/xml/calenmonthview.docml --- a/calendarui/controller/data/xml/calenmonthview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/data/xml/calenmonthview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -23,6 +23,7 @@ + @@ -33,64 +34,50 @@ + - - - + - - - + - - - + - - - + - - - + - - - + - - - - - - + + + @@ -149,7 +136,7 @@ - + @@ -202,7 +189,9 @@ - + + + @@ -257,7 +246,9 @@ - + + + @@ -312,7 +303,9 @@ - + + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/eabi/calencontrolleru.def --- a/calendarui/controller/eabi/calencontrolleru.def Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/eabi/calencontrolleru.def Mon Jul 26 13:54:38 2010 +0530 @@ -38,4 +38,7 @@ _ZTI16CCalenController @ 37 NONAME _ZTV16CCalenController @ 38 NONAME _ZThn8_N16CCalenController12NewServicesLEv @ 39 NONAME + _ZN16CCalenController12emitAppReadyEv @ 40 NONAME + _ZN16CCalenController8appReadyEv @ 41 NONAME + _ZN16CCalenController11raiseWindowEv @ 42 NONAME diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/inc/calenactionui.h --- a/calendarui/controller/inc/calenactionui.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/inc/calenactionui.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 /** diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/inc/calencontroller.h --- a/calendarui/controller/inc/calencontroller.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/inc/calencontroller.h Mon Jul 26 13:54:38 2010 +0530 @@ -19,15 +19,17 @@ #ifndef CALENCONTROLLER_H #define CALENCONTROLLER_H -// INCLUDES -#include // CAsyncCallBack -#include // TVwsViewId -#include // TApaCommand -#include // Q_DECL_EXPORT macro +// System includes +#include // CAsyncCallBack +#include // TVwsViewId +#include // TApaCommand +#include // Q_DECL_EXPORT macro #include #include -#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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/inc/caleneditui.h --- a/calendarui/controller/inc/caleneditui.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/inc/caleneditui.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 /** diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/inc/calenviewmanager.h --- a/calendarui/controller/inc/calenviewmanager.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/inc/calenviewmanager.h Mon Jul 26 13:54:38 2010 +0530 @@ -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,8 +158,8 @@ void handleDeletingCompleted(); void handleInstanceViewCreation(int status); void handleEntryViewCreation(int status); - void handleDayViewReady(); void handleEntriesChanged(QList); + void handleEntryUpdation(ulong id); private: // Data @@ -166,7 +173,7 @@ CalenDocLoader *mMonthViewDocLoader; CalenAgendaView *mCalenAgendaViewAlt; CalenDocLoader *mAgendaViewAltDocLoader; - CalenNativeView *mCalenDayView; + CalenDayView *mCalenDayView; int mCurrentViewId; int mPreviousViewsId; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/src/calenactionui.cpp --- a/calendarui/controller/src/calenactionui.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/src/calenactionui.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -158,4 +158,13 @@ return continueCommand; } +// ---------------------------------------------------------------------------- +// CCalenActionUi::saveEntry +// save the entry from editor +// ---------------------------------------------------------------------------- +// +void CCalenActionUi::saveAndCloseEditor() + { + iEditUi->saveAndCloseEditor(); + } // End of file diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/src/calencontroller.cpp --- a/calendarui/controller/src/calencontroller.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/src/calencontroller.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -649,20 +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())); } - OstTraceFunctionExit0( CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_EXIT ); + } - +void CCalenController::raiseWindow() + { + MainWindow().raise(); + disconnect(&MainWindow(), SIGNAL(viewReady()), + this, SLOT(raiseWindow())); + } // ---------------------------------------------------------------------------- // CCalenController::getFirstView // returns the first view with which calendar has been launched @@ -705,4 +717,13 @@ return QObject::eventFilter(object, event); } -// End of file + +/* + * Emits the appReady signal. + */ +void CCalenController::emitAppReady() +{ + emit appReady(); +} + +// End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/src/calendeleteui.cpp --- a/calendarui/controller/src/calendeleteui.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/src/calendeleteui.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -400,7 +400,7 @@ 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); @@ -490,7 +490,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))); @@ -602,7 +602,7 @@ 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_common_button_cancel"), popup); popup->addAction(mCancelAction); @@ -746,7 +746,9 @@ | 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); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/src/calendocloader.cpp --- a/calendarui/controller/src/calendocloader.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/src/calendocloader.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -15,6 +15,8 @@ * */ +// System includes +#include // User includes #include "calendocloader.h" @@ -27,6 +29,9 @@ #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" @@ -140,6 +145,30 @@ 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); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/src/caleneditingstate.cpp --- a/calendarui/controller/src/caleneditingstate.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/src/caleneditingstate.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -173,10 +173,10 @@ } break; default: - CCalenState::HandleNotificationL( aNotification, aStateMachine ); - break; + iOutstandingNotifications.InsertL(aNotification); + break; } - + OstTraceFunctionExit0( CCALENEDITINGSTATE_HANDLENOTIFICATIONL_EXIT ); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/src/caleneditui.cpp --- a/calendarui/controller/src/caleneditui.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/src/caleneditui.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -24,7 +24,7 @@ #include "calencontroller.h" #include "hb_calencommands.hrh" #include "calenservicesimpl.h" -#include "agendaentry.h" +#include #include "caleneditor.h" #include "calendateutils.h" #include "OstTraceDefinitions.h" @@ -196,5 +196,13 @@ OstTraceFunctionExit0( CCALENEDITUI_HANDLENOTIFICATION_EXIT ); } - +// ---------------------------------------------------------------------------- +// CCalenEditUi::saveEntry +// save the entry from editor +// ---------------------------------------------------------------------------- +// +void CCalenEditUi::saveAndCloseEditor() + { + iEditor->saveAndCloseEditor(); + } // End of file diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/controller/src/calenviewmanager.cpp --- a/calendarui/controller/src/calenviewmanager.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/controller/src/calenviewmanager.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -39,7 +39,7 @@ #include "calendarui_debug.h" #include "calencommon.h" #include "calendayview.h" -#include "agendautil.h" +#include #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "calenviewmanagerTraces.h" @@ -75,6 +75,10 @@ this, SLOT(handleEntryViewCreation(int))); connect(mController.agendaInterface(), SIGNAL(entriesChanged(QList)), this, SLOT(handleEntriesChanged(QList))); + connect(mController.agendaInterface(), SIGNAL(entryUpdated(ulong)), + this, SLOT(handleEntryUpdation(ulong))); + connect(mController.agendaInterface(), SIGNAL(entryAdded(ulong)), + this, SLOT(handleEntryUpdation(ulong))); OstTraceFunctionExit0( CALENVIEWMANAGER_CALENVIEWMANAGER_EXIT ); } @@ -297,6 +301,35 @@ } // ---------------------------------------------------------------------------- +// 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 + (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); + } +} + +// ---------------------------------------------------------------------------- // CalenViewManager::handleMainViewReady // Slot to handle viewReady() signal from mainwindow // (other items were commented in a header). @@ -349,7 +382,7 @@ loadAgendaView(); if (!mCalenDayView) { - mCalenDayView = new CalenDayView(mController.Services()); + loadDayView(); } } else //agenda view was launched as first view @@ -681,11 +714,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: @@ -725,13 +764,20 @@ case ECalenNotifyInstanceDeleted: case ECalenNotifyEntryClosed: case ECalenNotifySystemLocaleChanged: + case ECalenNotifySystemTimeChanged: case ECalenNotifySystemLanguageChanged: { - activateCurrentView(); - if (mCalenMonthView) { - mCalenMonthView->captureScreenshot(); - } else if (mCalenAgendaView) { - mCalenAgendaView->captureScreenshot(); - } + + 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: { @@ -776,10 +822,14 @@ // 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().IssueNotificationL(ECalenNotifyEntryClosed); // invalidate captured screenshots as either agenda view is activated now @@ -882,6 +932,12 @@ 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 ); } @@ -903,37 +959,40 @@ } // ---------------------------------------------------------------------------- -// CalenViewManager::handleDayViewReady -// Launches day view when it is added to MainWindow and ready to be displayed -// ---------------------------------------------------------------------------- -// -void CalenViewManager::handleDayViewReady() -{ - OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEDAYVIEWREADY_ENTRY ); - - // 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(); - OstTraceFunctionExit0( CALENVIEWMANAGER_HANDLEDAYVIEWREADY_EXIT ); -} - -// ---------------------------------------------------------------------------- // CalenViewManager::handleEntriesChanged // this function will be called when someone else has changed the database // ---------------------------------------------------------------------------- // void CalenViewManager::handleEntriesChanged(QList ids) { + Q_UNUSED(ids); // Update and refresh the view. 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)); + } + } + } + +} + +// ---------------------------------------------------------------------------- // CalenViewManager::launchSettingsView // Launches settings view // (other items were commented in a header). diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/customisationmanager/customisationmanager.pro --- a/calendarui/customisationmanager/customisationmanager.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/customisationmanager/customisationmanager.pro Mon Jul 26 13:54:38 2010 +0530 @@ -22,7 +22,8 @@ DEFINES += CALENCUSTOMISATIONMANAGER_DLL -INCLUDEPATH += ./inc ../inc +INCLUDEPATH += ./inc ../inc \ + ./traces # Platforms diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/customisationmanager/src/calencustomisationmanager.cpp --- a/calendarui/customisationmanager/src/calencustomisationmanager.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/customisationmanager/src/calencustomisationmanager.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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& 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 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& 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 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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/customisationmanager/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/customisationmanager/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/customisationmanager/traces/calencustomisationmanagerTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/customisationmanager/traces/calencustomisationmanagerTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/customisationmanager/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/customisationmanager/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/inc/calenagendautils.h --- a/calendarui/inc/calenagendautils.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/inc/calenagendautils.h Mon Jul 26 13:54:38 2010 +0530 @@ -23,7 +23,7 @@ // INCLUDES -#include "agendaentry.h" +#include #include // Q_DECL_EXPORT macro #ifdef CALENDATEUTILS_DLL diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/inc/calencommon.h --- a/calendarui/inc/calencommon.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/inc/calencommon.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/inc/calendarui_debug.h --- a/calendarui/inc/calendarui_debug.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/inc/calendarui_debug.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 #include #include #include #include - //#include + 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 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; ); \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/calenregionalutil.pro --- a/calendarui/regionalplugins/calenregionalutil/calenregionalutil.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/calenregionalutil/calenregionalutil.pro Mon Jul 26 13:54:38 2010 +0530 @@ -24,7 +24,8 @@ INCLUDEPATH += ./inc INCLUDEPATH += ../inc \ - ../../inc + ../../inc \ + ./traces # Input HEADERS += ./inc/calenextrarowformatter.h \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/src/calenextrarowformatter.cpp --- a/calendarui/regionalplugins/calenregionalutil/src/calenextrarowformatter.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/calenregionalutil/src/calenextrarowformatter.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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& 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; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/src/calenlunarinfo.cpp --- a/calendarui/regionalplugins/calenregionalutil/src/calenlunarinfo.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/calenregionalutil/src/calenlunarinfo.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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( iTerrestialBranch ); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/src/calenlunarinfoprovider.cpp --- a/calendarui/regionalplugins/calenregionalutil/src/calenlunarinfoprovider.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/calenregionalutil/src/calenlunarinfoprovider.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -22,6 +22,11 @@ #include "CalenSolarTerms.h" #include +#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; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizedinfo.cpp --- a/calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizedinfo.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizedinfo.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizer.cpp --- a/calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizer.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/calenregionalutil/src/calenlunarlocalizer.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 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 ( 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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp --- a/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -27,6 +27,11 @@ #include #include +#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 ); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/calenregionalutil/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/traces/calenextrarowformatterTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/calenregionalutil/traces/calenextrarowformatterTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/traces/calenlunarinfoTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/calenregionalutil/traces/calenlunarinfoTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/traces/calenlunarinfoproviderTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/calenregionalutil/traces/calenlunarinfoproviderTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/traces/calenlunarlocalizedinfoTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/calenregionalutil/traces/calenlunarlocalizedinfoTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/traces/calenlunarlocalizerTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/calenregionalutil/traces/calenlunarlocalizerTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/traces/calensolartermsTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/calenregionalutil/traces/calensolartermsTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/calenregionalutil/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/calenregionalutil/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/lunarchinese.pro --- a/calendarui/regionalplugins/lunarchinese/lunarchinese.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/lunarchinese/lunarchinese.pro Mon Jul 26 13:54:38 2010 +0530 @@ -20,7 +20,8 @@ DEPENDPATH += ./inc ./src INCLUDEPATH += ./inc -INCLUDEPATH += ../inc ../../inc +INCLUDEPATH += ../inc ../../inc \ + ./traces # Input @@ -90,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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp --- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -38,6 +38,11 @@ #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"); @@ -58,9 +63,8 @@ iServices(aServices), iInfoBarText(NULL) { - TRACE_ENTRY_POINT; - - TRACE_EXIT_POINT; + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_ENTRY ); + OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_EXIT ); } // ----------------------------------------------------------------------------- @@ -70,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; } @@ -86,9 +91,7 @@ // CCalenLunarChinesePlugin::~CCalenLunarChinesePlugin() { - TRACE_ENTRY_POINT; - - + OstTraceFunctionEntry0( DUP1_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_ENTRY ); //Deregister services if ( iServices ) { @@ -117,7 +120,7 @@ delete iTranslator; iTranslator = 0; } - TRACE_EXIT_POINT; + OstTraceFunctionExit0( DUP1_CCALENLUNARCHINESEPLUGIN_CCALENLUNARCHINESEPLUGIN_EXIT ); } // ----------------------------------------------------------------------------- @@ -126,7 +129,7 @@ // void CCalenLunarChinesePlugin::ConstructL() { - TRACE_ENTRY_POINT; + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_ENTRY ); iServices->RegisterForNotificationsL( this, ECalenNotifyContextChanged ); iServices->GetCommandRange( iStart, iEnd ); @@ -140,7 +143,7 @@ //Qt class having a slot ,calls when user clicked show lunar data option iRegionalInfo = new CalenRegionalInfo(*this); - TRACE_EXIT_POINT; + OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_EXIT ); } // ----------------------------------------------------------------------------- @@ -150,8 +153,7 @@ void CCalenLunarChinesePlugin::FormatExtraRowStringL() { - TRACE_ENTRY_POINT; - + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_FORMATEXTRAROWSTRINGL_ENTRY ); if ( iLocInfo ) { iExtraRowText.Set( iLocalizer->GetExtraRowTextL( *iLocInfo) ); @@ -160,8 +162,7 @@ { iExtraRowText.Set( KNullDesC ); } - - TRACE_EXIT_POINT; + OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_FORMATEXTRAROWSTRINGL_EXIT ); } // ----------------------------------------------------------------------------- @@ -170,8 +171,8 @@ // HbWidget* CCalenLunarChinesePlugin::InfobarL( ) { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_INFOBARL_ENTRY ); + OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_INFOBARL_EXIT ); return NULL; } @@ -182,7 +183,7 @@ // QString* CCalenLunarChinesePlugin::InfobarTextL( ) { - TRACE_ENTRY_POINT; + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_INFOBARTEXTL_ENTRY ); if(iInfoBarText) { delete iInfoBarText; @@ -195,7 +196,6 @@ iInfoBarText = iExtraRowText.AllocLC(); CleanupStack::Pop(); - TRACE_EXIT_POINT; return (new QString((QChar*)iInfoBarText->Des().Ptr(),iInfoBarText->Length())); } @@ -207,6 +207,7 @@ void CCalenLunarChinesePlugin::CustomiseMenu(HbMenu* aHbMenu) { + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CUSTOMISEMENU_ENTRY ); HbAction* lunarAction = new HbAction("Show Lunar Data"); QList actionList = aHbMenu->actions(); TInt count = actionList.count() - 1; //To show the option "show lunar data" @@ -216,6 +217,7 @@ 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 ); } // ----------------------------------------------------------------------------- @@ -224,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; } @@ -243,8 +244,8 @@ TAny* CCalenLunarChinesePlugin::CalenCommandHandlerExtensionL( TUid /*aExtensionUid*/ ) { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CALENCOMMANDHANDLEREXTENSIONL_ENTRY ); + OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_CALENCOMMANDHANDLEREXTENSIONL_EXIT ); return NULL; } @@ -254,8 +255,7 @@ // MCalenCommandHandler* CCalenLunarChinesePlugin::CommandHandlerL( TInt aCommand ) { - TRACE_ENTRY_POINT; - + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_COMMANDHANDLERL_ENTRY ); MCalenCommandHandler* commandHandler = NULL; if(ECalenRegionalPluginTapEvent == aCommand) @@ -263,8 +263,8 @@ commandHandler = this; } + OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_COMMANDHANDLERL_EXIT ); return commandHandler; - TRACE_EXIT_POINT; } // ----------------------------------------------------------------------------- @@ -273,7 +273,7 @@ // void CCalenLunarChinesePlugin::UpdateLocalizerInfoL() { - TRACE_ENTRY_POINT; + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_UPDATELOCALIZERINFOL_ENTRY ); QDateTime focusDateTime= iServices->Context().focusDateAndTime(); TDateTime tempDateTime( focusDateTime.date().year(), @@ -288,7 +288,7 @@ { iLocInfo = iLocalizer->LocalizeL( lunarInfo ); } - TRACE_EXIT_POINT; + OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_UPDATELOCALIZERINFOL_EXIT ); } // ----------------------------------------------------------------------------- @@ -298,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 ); } // ----------------------------------------------------------------------------- @@ -313,6 +313,7 @@ // void CCalenLunarChinesePlugin::ShowDetailsL( ) { + OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_SHOWDETAILSL_ENTRY ); QString msgText; if(iLocInfo) { QStringList headerIds; @@ -349,6 +350,7 @@ } } ExecuteMessageDialogL(msgText); +OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_SHOWDETAILSL_EXIT ); } // ----------------------------------------------------------------------------- @@ -357,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); @@ -375,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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePluginProxy.cpp --- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePluginProxy.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePluginProxy.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/src/CalenRegionalInfoData.cpp --- a/calendarui/regionalplugins/lunarchinese/src/CalenRegionalInfoData.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/regionalplugins/lunarchinese/src/CalenRegionalInfoData.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -18,6 +18,11 @@ // User includes #include "CalenRegionalInfoData.h" #include "CalenLunarChinesePlugin.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CalenRegionalInfoDataTraces.h" +#endif + // ============================ MEMBER FUNCTIONS =============================== @@ -28,7 +33,9 @@ // CalenRegionalInfo::CalenRegionalInfo(CCalenLunarChinesePlugin &plugin): mPlugin(plugin) { + OstTraceFunctionEntry0( CALENREGIONALINFO_CALENREGIONALINFO_ENTRY ); + OstTraceFunctionExit0( CALENREGIONALINFO_CALENREGIONALINFO_EXIT ); } // ----------------------------------------------------------------------------- @@ -37,7 +44,9 @@ // CalenRegionalInfo::~CalenRegionalInfo() { + OstTraceFunctionEntry0( DUP1_CALENREGIONALINFO_CALENREGIONALINFO_ENTRY ); + OstTraceFunctionExit0( DUP1_CALENREGIONALINFO_CALENREGIONALINFO_EXIT ); } // ----------------------------------------------------------------------------- @@ -47,5 +56,7 @@ // void CalenRegionalInfo::showRegionalDetails() { + OstTraceFunctionEntry0( CALENREGIONALINFO_SHOWREGIONALDETAILS_ENTRY ); mPlugin.ShowDetailsL(); + OstTraceFunctionExit0( CALENREGIONALINFO_SHOWREGIONALDETAILS_EXIT ); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/traces/CalenLunarChinesePluginProxyTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/lunarchinese/traces/CalenLunarChinesePluginProxyTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/traces/CalenLunarChinesePluginTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/lunarchinese/traces/CalenLunarChinesePluginTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/traces/CalenRegionalInfoDataTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/lunarchinese/traces/CalenRegionalInfoDataTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/lunarchinese/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/regionalplugins/lunarchinese/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/regionalplugins/lunarchinese/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/rom/calendarresources.iby --- a/calendarui/rom/calendarresources.iby Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/rom/calendarresources.iby Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/bwins/calenviewsu.def --- a/calendarui/views/bwins/calenviewsu.def Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/bwins/calenviewsu.def Mon Jul 26 13:54:38 2010 +0530 @@ -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 &) - ?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 &) - ?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 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 &) - ?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 CalenMonthView::monthDataList(void) + ?monthDataList@CalenMonthView@@QAEAAV?$QList@VCalenMonthData@@@@XZ @ 10 NONAME ; class QList & CalenMonthView::monthDataList(void) + ?completePopulation@CalenMonthView@@AAEXXZ @ 11 NONAME ; void CalenMonthView::completePopulation(void) + ??0CalenAgendaViewWidget@@QAE@AAVMCalenServices@@PAVCalenDocLoader@@@Z @ 12 NONAME ; CalenAgendaViewWidget::CalenAgendaViewWidget(class MCalenServices &, class CalenDocLoader *) + ?handleAppendingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 13 NONAME ; void CalenMonthGrid::handleAppendingRows(class QList &) + ?handleChangeOrientation@CalenMonthView@@AAEXXZ @ 14 NONAME ; void CalenMonthView::handleChangeOrientation(void) + ?staticMetaObject@CalenSettingsView@@2UQMetaObject@@B @ 15 NONAME ; struct QMetaObject const CalenSettingsView::staticMetaObject + ?docLoader@CalenAgendaView@@QAEPAVCalenDocLoader@@XZ @ 16 NONAME ; class CalenDocLoader * CalenAgendaView::docLoader(void) + ?getStaticMetaObject@CalenSettingsView@@SAABUQMetaObject@@XZ @ 17 NONAME ; struct QMetaObject const & CalenSettingsView::getStaticMetaObject(void) + ?updateMonthDataArrayWithActiveDates@CalenMonthView@@AAEXXZ @ 18 NONAME ; void CalenMonthView::updateMonthDataArrayWithActiveDates(void) + ?scrollingFinished@CalenMonthGrid@@QAEXXZ @ 19 NONAME ; void CalenMonthGrid::scrollingFinished(void) + ?setCurrentIdex@CalenMonthGrid@@QAEXH@Z @ 20 NONAME ; void CalenMonthGrid::setCurrentIdex(int) + ?setupView@CalenAgendaView@@QAEXPAVCalenDocLoader@@@Z @ 21 NONAME ; void CalenAgendaView::setupView(class CalenDocLoader *) + ??_ECalenMonthGrid@@UAE@I@Z @ 22 NONAME ; CalenMonthGrid::~CalenMonthGrid(unsigned int) + ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 23 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *) + ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 24 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *) + ?populatePrevMonth@CalenMonthView@@QAEXXZ @ 25 NONAME ; void CalenMonthView::populatePrevMonth(void) + ?qt_metacall@CalenSettingsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 26 NONAME ; int CalenSettingsView::qt_metacall(enum QMetaObject::Call, int, void * *) + ??1CalenPluginLabel@@UAE@XZ @ 27 NONAME ; CalenPluginLabel::~CalenPluginLabel(void) + ?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 28 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &) + ?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 29 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void) + ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 30 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int) + ?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 31 NONAME ; void * CalenMonthView::qt_metacast(char const *) + ?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 32 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject + ?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 33 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *) + ?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 34 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const + ?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 35 NONAME ; void CalenPreviewPane::startAutoScroll(void) + ?doLazyLoading@CalenMonthView@@QAEXXZ @ 36 NONAME ; void CalenMonthView::doLazyLoading(void) + ?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 37 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *) + ??1CalenSettingsView@@UAE@XZ @ 38 NONAME ; CalenSettingsView::~CalenSettingsView(void) + ?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 39 NONAME ; class QDateTime CalenPreviewPane::Date(void) + ?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int) + ?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const + ??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 42 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *) + ?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 43 NONAME ; int CalenMonthView::rowsInPrevMonth(void) + ?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 44 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList &) + ?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 45 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const + ?clearListModel@CalenAgendaView@@QAEXXZ @ 46 NONAME ; void CalenAgendaView::clearListModel(void) + ?gestureEvent@CalenMonthGrid@@MAEXPAVQGestureEvent@@@Z @ 47 NONAME ; void CalenMonthGrid::gestureEvent(class QGestureEvent *) + ??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 48 NONAME ; CalenDayView::CalenDayView(class MCalenServices &) + ?populateNextMonth@CalenMonthView@@QAEXXZ @ 49 NONAME ; void CalenMonthView::populateNextMonth(void) + ?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 50 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &) + ?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 51 NONAME ; void * CalenMonthGrid::qt_metacast(char const *) + ?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 52 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void) + ?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 53 NONAME ; int CalenMonthView::rowsInFutMonth(void) + ?launchDayView@CalenMonthView@@QAEXXZ @ 54 NONAME ; void CalenMonthView::launchDayView(void) + ?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 55 NONAME ; int CalenMonthView::getCurrGridIndex(void) + ?gestureEvent@CalenPreviewPane@@MAEXPAVQGestureEvent@@@Z @ 56 NONAME ; void CalenPreviewPane::gestureEvent(class QGestureEvent *) + ?prependRows@CalenMonthGrid@@QAEXXZ @ 57 NONAME ; void CalenMonthGrid::prependRows(void) + ?orientationChanged@CalenMonthGrid@@MAEXW4Orientation@Qt@@@Z @ 58 NONAME ; void CalenMonthGrid::orientationChanged(enum Qt::Orientation) + ?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 59 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *) + ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 60 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int) + ??1CalenThickLinesDrawer@@UAE@XZ @ 61 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void) + ?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 62 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *) + ??_ECalenMonthView@@UAE@I@Z @ 63 NONAME ; CalenMonthView::~CalenMonthView(unsigned int) + ??1CalenAgendaView@@UAE@XZ @ 64 NONAME ; CalenAgendaView::~CalenAgendaView(void) + ?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 65 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &) + ??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 66 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *) + ??0CalenAgendaView@@QAE@AAVMCalenServices@@@Z @ 67 NONAME ; CalenAgendaView::CalenAgendaView(class MCalenServices &) + ?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 68 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void) + ?stopScrolling@CalenPreviewPane@@QAEXXZ @ 69 NONAME ; void CalenPreviewPane::stopScrolling(void) + ?refreshView@CalenSettingsView@@QAEXXZ @ 70 NONAME ; void CalenSettingsView::refreshView(void) + ?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 71 NONAME ; void CalenMonthView::addBackgroundFrame(void) + ?createGrid@CalenMonthView@@AAEXXZ @ 72 NONAME ; void CalenMonthView::createGrid(void) + ?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 73 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *) + ?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void) + ?launchPreviousView@CalenSettingsView@@AAEXXZ @ 75 NONAME ; void CalenSettingsView::launchPreviousView(void) + ?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 76 NONAME ; void CalenMonthView::setCurrGridIndex(int) + ?setDateToLabel@CalenMonthView@@AAEXXZ @ 77 NONAME ; void CalenMonthView::setDateToLabel(void) + ?addWeekNumbers@CalenMonthView@@AAEXXZ @ 78 NONAME ; void CalenMonthView::addWeekNumbers(void) + ?downGesture@CalenMonthGrid@@AAEXXZ @ 79 NONAME ; void CalenMonthGrid::downGesture(void) + ?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 80 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *) + ?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 81 NONAME ; void CalenDayView::setupView(class CalenDocLoader *) + ?upGesture@CalenMonthGrid@@AAEXXZ @ 82 NONAME ; void CalenMonthGrid::upGesture(void) + ??1CalenMonthView@@UAE@XZ @ 83 NONAME ; CalenMonthView::~CalenMonthView(void) + ?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 84 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &) + ?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 85 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject + ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 86 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int) + ?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 87 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *) + ?initializeForm@CalenSettingsView@@QAEXXZ @ 88 NONAME ; void CalenSettingsView::initializeForm(void) + ?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 89 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int) + ?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 90 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void) + ?goToToday@CalenMonthView@@AAEXXZ @ 91 NONAME ; void CalenMonthView::goToToday(void) + ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int) + ?onContextChanged@CalenMonthView@@EAEXXZ @ 93 NONAME ; void CalenMonthView::onContextChanged(void) + ?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 94 NONAME ; void * CalenPreviewPane::qt_metacast(char const *) + ?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 95 NONAME ; int CalenMonthGrid::getCurrentIndex(void) + ?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 96 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int) + ?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 97 NONAME ; void CalenMonthView::removeWeekNumbers(void) + ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 98 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int) + ??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 99 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &) + ?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void) + ?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 101 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *) + ??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 102 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *) + ?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 103 NONAME ; void CalenMonthView::onLocaleChanged(int) + ?doPopulation@CalenMonthView@@UAEXXZ @ 104 NONAME ; void CalenMonthView::doPopulation(void) + ?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 105 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int) + ?captureScreenshot@CalenNativeView@@QAEX_N@Z @ 106 NONAME ; void CalenNativeView::captureScreenshot(bool) + ?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 107 NONAME ; void CalenPreviewPane::GetInstanceListL(void) + ?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 108 NONAME ; void CalenMonthView::getInstanceList(class QList &, class QDateTime, class QDateTime) + ?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 109 NONAME ; class QString CalenMonthView::tr(char const *, char const *) + ??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 110 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *) + ?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 111 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void) + ?appendRows@CalenMonthGrid@@QAEXXZ @ 112 NONAME ; void CalenMonthGrid::appendRows(void) + ?HandleNotification@CalenAgendaView@@UAEXW4TCalenNotification@@@Z @ 113 NONAME ; void CalenAgendaView::HandleNotification(enum TCalenNotification) + ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 114 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int) + ??0CalenPluginLabel@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 115 NONAME ; CalenPluginLabel::CalenPluginLabel(class MCalenServices &, class QGraphicsItem *) + ?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 116 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) + ?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 117 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList &) + ?getCurrentDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 118 NONAME ; class QDateTime CalenMonthView::getCurrentDay(void) + ?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 119 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject + ?doPopulation@CalenAgendaView@@UAEXXZ @ 120 NONAME ; void CalenAgendaView::doPopulation(void) + ?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 121 NONAME ; class QString CalenSettingsView::tr(char const *, char const *) + ?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 122 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void) + ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 123 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *) + ?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 124 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject + ?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 125 NONAME ; void CalenMonthView::populateWithInstanceView(void) + ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 126 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *) + ??1CalenAgendaViewWidget@@UAE@XZ @ 127 NONAME ; CalenAgendaViewWidget::~CalenAgendaViewWidget(void) + ?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 128 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime) + ?doPopulation@CalenDayView@@UAEXXZ @ 129 NONAME ; void CalenDayView::doPopulation(void) + ??1CalenDayView@@UAE@XZ @ 130 NONAME ; CalenDayView::~CalenDayView(void) + ?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 131 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void) ?updateMonthGridModel@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@H_N@Z @ 132 NONAME ; void CalenMonthGrid::updateMonthGridModel(class QList &, int, bool) ??1CalenMonthGrid@@UAE@XZ @ 133 NONAME ; CalenMonthGrid::~CalenMonthGrid(void) ?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 134 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const @@ -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) diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/inc/calendaycontainer.h --- a/calendarui/views/dayview/inc/calendaycontainer.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/inc/calendaycontainer.h Mon Jul 26 13:54:38 2010 +0530 @@ -11,7 +11,9 @@ * * Contributors: * -* Description: Day view control of calendar +* Description: Day view container - parent widget for events (CalenDayItem) and +* hours area widgets (CalenDayEventsPane) +* Responsible for positioning and resizing events widgets. * */ @@ -20,10 +22,8 @@ //System includes #include - #include "../../../../../mw/hb/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h" -//User includes //Forward declarations class CalenDayInfo; @@ -34,87 +34,45 @@ 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 reset(); - - /** - * - */ void viewResized (const QSizeF &size); - /** - * Sets day's info structer to the container. - * - * @param dayInfo Day info. - */ void setDayInfo( CalenDayInfo* dayInfo ); + + void setDate( const QDate &date ); + const QDate &date() const; public slots: - - /** - * 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 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 - /** - * 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 { + class LayoutValues { + public: LayoutValues() :eventAreaX(0), eventAreaWidth(0), @@ -122,8 +80,7 @@ slotHeight(0), unitInPixels(0), maxColumns(0) - {} - + {} qreal eventAreaX; qreal eventAreaWidth; qreal eventMargin; @@ -132,60 +89,40 @@ 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); + TouchEventAbsorber* crateAbsorberBetweenSlots(int startSlot, int endSlot, bool forAllDayEvents); private: - bool mGeometryUpdated; - - QDateTime mDateTime; - /** - * Day event info. - * Not own. - */ - CalenDayInfo* mInfo; - - LayoutValues mLayoutValues; - QList mAbsorbers; + CalenDayInfo* mInfo; //! mAbsorbers; //! #include #include #include @@ -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); @@ -55,8 +58,8 @@ HbTextItem *mEventDesc; CalenDayStatusStrip *mColorStripe; qreal mEventDescMinWidth; - qreal mFrameMinWidth; - + qreal mFrameMinWidth; + const CalenDayContainer *mContainer; }; #endif // CALENDAYITEM_H diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/inc/calendayutils.h --- a/calendarui/views/dayview/inc/calendayutils.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/inc/calendayutils.h Mon Jul 26 13:54:38 2010 +0530 @@ -50,7 +50,7 @@ * @param currentDate [in] current date */ void getEventValidStartEndTime( QDateTime& start, QDateTime& end, - AgendaEntry& entry, QDateTime& currentDate ); + const AgendaEntry& entry, QDateTime& currentDate ); protected: CalenDayUtils(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/inc/calendayview.h --- a/calendarui/views/dayview/inc/calendayview.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/inc/calendayview.h Mon Jul 26 13:54:38 2010 +0530 @@ -144,6 +144,12 @@ public slots: void changeView(TCalenCommandId viewId); + + /** + * Scrolls content to correct position after view repopulation + */ + void setupViewport(); + private: /** * @@ -159,25 +165,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; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/resources/calendayeventspane.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/resources/calendayeventspane.css Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/resources/calendayhourelement.css --- a/calendarui/views/dayview/resources/calendayhourelement.css Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/resources/calendayhourelement.css Mon Jul 26 13:54:38 2010 +0530 @@ -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 { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/resources/calendaywidgets.qrc --- a/calendarui/views/dayview/resources/calendaywidgets.qrc Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/resources/calendaywidgets.qrc Mon Jul 26 13:54:38 2010 +0530 @@ -4,6 +4,7 @@ calendayhourelement.widgetml calendayitem.css calendayitem.widgetml + calendayeventspane.css fade_out.fxml fade_in.fxml diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendaycontainer.cpp --- a/calendarui/views/dayview/src/calendaycontainer.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendaycontainer.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -11,8 +11,9 @@ * * Contributors: * -* Description: Day view control of calendar -* +* Description: Day view container - parent widget for events (CalenDayItem) and +* hours area widgets (CalenDayEventsPane) +* Responsible for positioning and resizing events widgets. */ //System includes @@ -38,28 +39,23 @@ #include "calendayinfo.h" #include "calendayview.h" -// ----------------------------------------------------------------------------- -// CalenDayContainer() -// Constructor -// ----------------------------------------------------------------------------- -// +/*! + \brief Constructor + + Sets container initial geometry, creates hours area widgets. + */ 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++) { CalenDayEventsPane* element = new CalenDayEventsPane(this); - element->setPreferredHeight(paneHeight); - element->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); // Draw top line at midnight if (i == 0) { - element->drawTopLine(true); + element->setDrawTopLine(true); } timeLinesLayout->addItem(element); } @@ -69,20 +65,18 @@ setLayout(timeLinesLayout); } -// ----------------------------------------------------------------------------- -// ~CalenDayContainer() -// Destructor -// ----------------------------------------------------------------------------- -// + +/*! + \brief Destructor + */ CalenDayContainer::~CalenDayContainer() { } -// ----------------------------------------------------------------------------- -// itemAdded() -// -// ----------------------------------------------------------------------------- -// + +/* + \reimp + */ void CalenDayContainer::itemAdded( int index, HbAbstractViewItem *item, bool animate ) { @@ -91,11 +85,10 @@ Q_UNUSED( animate ) } -// ----------------------------------------------------------------------------- -// reset() -// -// ----------------------------------------------------------------------------- -// + +/* + \reimp + */ void CalenDayContainer::reset() { // remove absorbers if exist @@ -114,22 +107,20 @@ setPos( position ); } -// ----------------------------------------------------------------------------- -// itemRemoved() -// -// ----------------------------------------------------------------------------- -// + +/* + \reimp + */ void CalenDayContainer::itemRemoved( HbAbstractViewItem *item, bool animate ) { Q_UNUSED( item ) Q_UNUSED( animate ) } -// ----------------------------------------------------------------------------- -// viewResized() -// -// ----------------------------------------------------------------------------- -// + +/* + \reimp + */ void CalenDayContainer::viewResized (const QSizeF &size) { resize(size); @@ -139,22 +130,20 @@ } } -// ----------------------------------------------------------------------------- -// createDefaultPrototype() -// -// ----------------------------------------------------------------------------- -// + +/* + \reimp + */ HbAbstractViewItem * CalenDayContainer::createDefaultPrototype() const { - CalenDayItem *calendarViewItem = new CalenDayItem; + CalenDayItem *calendarViewItem = new CalenDayItem(this); return calendarViewItem; } -// ----------------------------------------------------------------------------- -// setItemModelIndex() -// -// ----------------------------------------------------------------------------- -// + +/* + \reimp + */ void CalenDayContainer::setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index) { @@ -181,11 +170,15 @@ HbAbstractItemContainer::setItemModelIndex(item, index); } -// ----------------------------------------------------------------------------- -// updateTimedEventGeometry() -// Updates geometry of a timed event. -// ----------------------------------------------------------------------------- -// + +// TODO: updateTimedEventGeometry and updateAllDayEventGeometry +// methods are very similar and probably can be merged to avoid +// code duplication +/*! + \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) { @@ -272,14 +265,18 @@ } QRectF eventGeometry( eventStartX, eventStartY, eventWidth, eventHeight ); - item->setGeometry(eventGeometry);} + item->setGeometry(eventGeometry); +} -// ----------------------------------------------------------------------------- -// updateAllDayEventGeometry() -// Updates geometry of a timed event. -// ----------------------------------------------------------------------------- -// +// TODO: updateTimedEventGeometry and updateAllDayEventGeometry +// methods are very similar and probably can be merged to avoid +// code duplication +/*! + \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) { @@ -340,11 +337,10 @@ } -// ----------------------------------------------------------------------------- -// movingBackwards() -// -// ----------------------------------------------------------------------------- -// +/*! + \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 @@ -355,8 +351,10 @@ layoutValues.unitInPixels = deviceProfile.unitValue(); if ( mInfo && mInfo->AlldayCount()) - { // 9.5 -> all-day area width - layoutValues.eventAreaX = 9.5 * layoutValues.unitInPixels; + { + // adccoriding to ui spec all-day event area should take + // 1/4 of content area + layoutValues.eventAreaX = contentWidth / 4; } else { @@ -375,24 +373,44 @@ CalenDayUtils::instance()->hourElementHeight() / 2; // 8.2 un (min. touchable event) from layout guide + // used to check should we create absorber over some overlapping region layoutValues.maxColumns = layoutValues.eventAreaWidth / (8.2 * layoutValues.unitInPixels); } -// ----------------------------------------------------------------------------- -// setDayInfo() -// Sets day's info structer to the container. -// ----------------------------------------------------------------------------- -// + +/*! + \brief Sets day's info structer to the container. + \a dayInfo day's info data + */ void CalenDayContainer::setDayInfo( CalenDayInfo* dayInfo ) { mInfo = dayInfo; } // ----------------------------------------------------------------------------- -// orientationChanged() -// Slot handles layout switch. +// setDate() +// Sets date to the container. Changes according to model which is connected to given view. // ----------------------------------------------------------------------------- // +void CalenDayContainer::setDate(const QDate &date) +{ + mDate = date; +} + +// ----------------------------------------------------------------------------- +// date() +// Returns date of the 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); @@ -414,11 +432,11 @@ 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 @@ -428,6 +446,19 @@ mAbsorbers.clear(); } + //create absorber for all-day events + Qt::Orientation orientation = CalenDayUtils::instance()->orientation(); + int allDayCount = mInfo->AlldayCount(); + + if ((orientation == Qt::Vertical && allDayCount > 1) || + (orientation == Qt::Horizontal && allDayCount > 2)) + { + TouchEventAbsorber* absorber = crateAbsorberBetweenSlots(0, 0, true); + mAbsorbers.append(absorber); + } + + + // create absorbers for timed events const QList& regionList = mInfo->RegionList(); for(int i=0; i < regionList.count(); i++) @@ -435,7 +466,7 @@ if(regionList[i].iColumns.count() > mLayoutValues.maxColumns ) { TouchEventAbsorber* absorber = - crateAbsorberBetweenSlots(regionList[i].iStartSlot, regionList[i].iEndSlot); + crateAbsorberBetweenSlots(regionList[i].iStartSlot, regionList[i].iEndSlot, false); mAbsorbers.append(absorber); } @@ -443,33 +474,41 @@ } -// ----------------------------------------------------------------------------- -// crateAbsorberBetweenSlots() -// Creates single absorber in given location -// ----------------------------------------------------------------------------- -// + +/*! + \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) + (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, + 48 * 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 (event->gesture( @@ -484,11 +523,9 @@ } } -// ----------------------------------------------------------------------------- -// TouchEventAbsorber() -// default ctor -// ----------------------------------------------------------------------------- -// +/*! + \brief Constructor + */ TouchEventAbsorber::TouchEventAbsorber(QGraphicsItem *parent) : HbWidget(parent) { #ifdef _DEBUG @@ -497,21 +534,23 @@ 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) diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendaycontentscrollarea.cpp --- a/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -44,12 +44,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 +56,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 @@ -402,7 +401,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; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendayeventspane.cpp --- a/calendarui/views/dayview/src/calendayeventspane.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendayeventspane.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendayhourelement.cpp --- a/calendarui/views/dayview/src/calendayhourelement.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendayhourelement.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -136,8 +136,25 @@ } } + painter->restore(); } +/*! + \brief It set time for hour element. + */ +void CalenDayHourElement::setTime(const QTime &time) +{ + mHour = time; +} + +/*! + \brief It return time of hour element. + */ +QTime CalenDayHourElement::time() const +{ + return mHour; +} + // End of File diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendayhourscrollarea.cpp --- a/calendarui/views/dayview/src/calendayhourscrollarea.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendayhourscrollarea.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -42,14 +42,9 @@ HbScrollArea(parent), mDateTime(QDateTime()) { - // Set scroll settings - setScrollDirections(Qt::Vertical); - setScrollingStyle(HbScrollArea::PanWithFollowOn); - setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff); - grabGesture(Qt::PanGesture, Qt::ReceivePartialGestures); + grabGesture(Qt::PanGesture); - // Get height and width of hour elements and set fixed size policy - qreal hourElementHeight = CalenDayUtils::instance()->hourElementHeight(); + // Get width of hour elements and fix its size qreal hourElementWidth = CalenDayUtils::instance()->hourElementWidth(); // Create widget for hour elements @@ -61,15 +56,9 @@ for (int i = 0; i < 24; 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); @@ -87,6 +76,7 @@ */ CalenDayHourScrollArea::~CalenDayHourScrollArea() { + mHourElements.clear(); } /*! diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendayitem.cpp --- a/calendarui/views/dayview/src/calendayitem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendayitem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -28,14 +28,16 @@ #include "calendayitem.h" #include "calendaystatusstrip.h" #include "calendaymodel.h" +#include "calendayutils.h" +#include "calendaycontainer.h" // ----------------------------------------------------------------------------- // CalenDayItem() // Constructor. // ----------------------------------------------------------------------------- // -CalenDayItem::CalenDayItem(): - mUpdated(false), mBg(0), mEventDesc(0), mColorStripe(0), +CalenDayItem::CalenDayItem(const CalenDayContainer *container): + mContainer(container), mUpdated(false), mBg(0), mEventDesc(0), mColorStripe(0), mEventDescMinWidth(0.0), mFrameMinWidth(0.0) { } @@ -46,7 +48,7 @@ // ----------------------------------------------------------------------------- // 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 @@ -82,6 +84,7 @@ //Minimum width is assured by widgetml and css //additionally called here to prevent minimum size hint caching inside effectiveSizeHint setMinimumWidth(stripeWidth); + } // ----------------------------------------------------------------------------- @@ -186,16 +189,24 @@ 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()) { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendayitemview.cpp --- a/calendarui/views/dayview/src/calendayitemview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendayitemview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -125,12 +125,14 @@ } //reset day info mInfo->Reset(); - + CalenDayModel* model(0); model = static_cast(this->model()); if ( !model ) { return; } + + mContainer->setDate(model->modelDate().date()); int rowCount = model->rowCount( ); SCalenApptInfo apptInfo; for( int row = 0; row < rowCount; row++ ) { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendaystatusstrip.cpp --- a/calendarui/views/dayview/src/calendaystatusstrip.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendaystatusstrip.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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) { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendayutils.cpp --- a/calendarui/views/dayview/src/calendayutils.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendayutils.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -152,7 +152,7 @@ \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(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/src/calendayview.cpp --- a/calendarui/views/dayview/src/calendayview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/src/calendayview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -15,10 +15,11 @@ * */ -//system includes +// System includes #include #include #include +#include #include #include #include @@ -27,8 +28,10 @@ #include #include #include -//user includes + +// User includes #include "calendayview.h" +#include "calencommon.h" #include "calencontext.h" #include "calenservices.h" #include "calendocloader.h" @@ -51,56 +54,18 @@ // 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,6 +79,7 @@ HbStyleLoader::registerFilePath(":/calendayhourelement.widgetml"); HbStyleLoader::registerFilePath(":/calendayitem.css"); HbStyleLoader::registerFilePath(":/calendayitem.widgetml"); + HbStyleLoader::registerFilePath(":/calendayeventspane.css"); } // ----------------------------------------------------------------------------- @@ -123,7 +89,11 @@ // CalenDayView::~CalenDayView() { - mSettingsManager->stopMonitoring(mRegionalInfo); + mSettingsManager->stopMonitoring(mRegionalInfo); + if (mDocLoader) { + delete mDocLoader; + mDocLoader = NULL; + } } // ----------------------------------------------------------------------------- @@ -162,7 +132,13 @@ 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(); } @@ -196,7 +172,34 @@ // 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 (this->layout()); + + // Set up day info + mHeadingLabel = qobject_cast (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 (mDocLoader->findWidget( + CALEN_DAYVIEW_HOURSCROLLAREA)); + + // Set up content scroll area + mContentScrollArea + = static_cast (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 @@ -341,7 +344,7 @@ dateTime.setTime(mServices.Context().defaultCalTimeForViewsL().time()); mServices.Context().setFocusDateAndTime(dateTime); mServices.IssueCommandL(ECalenNewMeeting) - ); + ); } // ----------------------------------------------------------------------------- @@ -418,73 +421,48 @@ // 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 - - 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); +void CalenDayView::showHideRegionalInformationChanged( + const XQSettingsKey& key, + const QVariant&) +{ + if (key.key() == mRegionalInfo.key()) { + int showRegionalInfo = + mSettingsManager->readItemValue(mRegionalInfo).toUInt(); - 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 (pluginEnabled()) - { - HbLabel *pluginInfoLabel = qobject_cast ( - mRegionalInfoGroupBox->contentWidget()); - - pluginInfoLabel->setPlainText(*pluginString); + if (showRegionalInfo) { + QString *pluginString = pluginText(); + if (pluginString) { + if (!mRegionalInfoGroupBox) { + mRegionalInfoGroupBox = qobject_cast ( + 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); + } - mVLayout->insertItem(1, mRegionalInfoGroupBox); - } - } - } - else - { + if (pluginEnabled()) { + HbLabel *pluginInfoLabel = qobject_cast ( + 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 @@ -494,20 +472,28 @@ void CalenDayView::setupViewport() { QDateTime currentTime = QDateTime::currentDateTime(); - - //Filter flags (only timed events) - AgendaUtil::FilterFlags filter = AgendaUtil::FilterFlags( - AgendaUtil::IncludeAppointments ); - QList 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 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); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -18,8 +18,16 @@ #include #include +#include +#include +#include +#include + #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" diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.pro --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayeventspane/unittest_calendayeventspane.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 ." diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/calendayhourelementtest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/calendayhourelementtest.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -11,13 +11,22 @@ * * Contributors: * - * Description: Test class for CalenDayContentWidget + * Description: Test class for TestCalenDayHourElement * */ #include #include -#include "calendayhourelement.h" +#include "calendayhourelementtest.h" +#include "calendayhourscrollarea.h" + +#include +#include +#include +#include + +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("testedValue"); + QTest::addColumn("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" diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.pro --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.pro Mon Jul 26 13:54:38 2010 +0530 @@ -11,7 +11,7 @@ # # Contributors: # -# Description: calendaycontentwidget test project file +# Description: calendayhourelement test project file # TEMPLATE = app @@ -22,22 +22,32 @@ 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 + 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 +55,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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -17,8 +17,16 @@ #include #include +#include +#include +#include +#include + #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" diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro Mon Jul 26 13:54:38 2010 +0530 @@ -17,6 +17,10 @@ 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 + MOC_DIR = moc CONFIG += qtestlib @@ -45,6 +49,8 @@ calendayhourscrollarea.cpp \ calendayutils.cpp +RESOURCES += ../../../resources/calendaywidgets.qrc + symbian : { TARGET.CAPABILITY = CAP_APPLICATION MMP_RULES += "USERINCLUDE ." diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendaycontainer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendaycontainer.h Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,41 @@ +/* +* 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 + + +//Forward declarations + + +class CalenDayContainer +{ + +public: + CalenDayContainer(){} + + const QDate &date() const { return QDate(); } + +}; + + +#endif // CALENDAYCONTAINER_H +// End of File diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayutils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayutils.h Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: CalenDayUtils utility class header. + * + */ + +#ifndef CALENDAYUTILS_H_ +#define CALENDAYUTILS_H_ + +class CalenDayUtils + { +public: + static CalenDayUtils *instance() + { + } + ~CalenDayUtils() + { + } + + qreal screenWidth() + { + return 0; + } + qreal hourElementWidth() + { + return 0; + } + qreal hourElementHeight() + { + return 0; + } + qreal contentWidth() + { + return 0; + } + + Qt::Orientation orientation() + { + return Qt::Vertical; + } + + HbMainWindow* mainWindow() + { + return 0; + } + + bool isHorizontalSwipe(qreal angle) + { + Q_UNUSED(angle); + return false; + } + + void getEventValidStartEndTime( QDateTime& start, QDateTime& end, const AgendaEntry& entry, QDateTime& currentDate ) + { + } + +protected: + CalenDayUtils() + { + } + }; + +#endif /* CALENDAYUTILS_H_ */ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -19,6 +19,7 @@ #include "calendayitem.h" +#include "calendaycontainer.h" class TestCalenDayItem : public QObject { @@ -39,6 +40,7 @@ private: CalenDayItem *mItem; + CalenDayContainer *mContainer; }; /*! @@ -78,7 +80,8 @@ */ void TestCalenDayItem::init() { - mItem = new CalenDayItem(); + mContainer = new CalenDayContainer(); + mItem = new CalenDayItem(mContainer); } /*! @@ -90,6 +93,11 @@ delete mItem; mItem = NULL; } + + if (mContainer) { + delete mContainer; + mContainer = NULL; + } } /*! @@ -104,7 +112,7 @@ QVERIFY(!testItem); //2) - testItem = new CalenDayItem(); + testItem = new CalenDayItem(mContainer); QVERIFY(testItem); delete testItem; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Mon Jul 26 13:54:38 2010 +0530 @@ -33,7 +33,9 @@ # Input HEADERS += calendayitem.h \ - calendaystatusstrip.h + calendaystatusstrip.h \ + calendaycontainer.h \ + calendayutils.h SOURCES += unittest_calendayitem.cpp \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendaycontainer.h --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendaycontainer.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendaycontainer.h Mon Jul 26 13:54:38 2010 +0530 @@ -88,6 +88,16 @@ { Q_UNUSED(dayInfo); } + + void setDate( const QDate &date ) + { + Q_UNUSED(date); + } + + const QDate &date() const + { + return QDate(); + } public slots: diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodel/unittest_calendaymodel.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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" diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/unittest_calendaymodelmanager.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/unittest_calendaymodelmanager.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaymodelmanager/unittest_calendaymodelmanager.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -17,6 +17,7 @@ #include #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(&(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" diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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); } /*! diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbdeviceprofile.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbdeviceprofile.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#include +#include +#include +#include +#include +#include + +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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbinstance.h --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbinstance.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbinstance.h Mon Jul 26 13:54:38 2010 +0530 @@ -41,6 +41,11 @@ Qt::Orientation orientation() const { return gTestOrientation; } + + QList allMainWindows(){ + QList list; + return list; + } }; #endif // HBMAINWINDOW_H diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbstyle.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbstyle.h Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,307 @@ +/**************************************************************************** + ** + ** 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 +#include +#include +#include +#include +#include + +class HbStylePrivate; +class HbStyleParameters; +class HbStyleOption; +class HbWidgetBase; +class HbWidget; +class HbStyleParameters; + +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 + }; + + virtual QGraphicsItem *createPrimitive(HbStyle::Primitive primitive, + QGraphicsItem *parent = 0) const + { + Q_UNUSED(primitive); + Q_UNUSED(parent); + return 0; + } + virtual 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); + } + +protected: + + virtual void polish(HbWidget *widget, HbStyleParameters ¶ms) + { + Q_UNUSED(params); + Q_UNUSED(widget); + } + virtual void updateThemedParams(HbWidget *widget) + { + Q_UNUSED(widget); + } + virtual bool hasOrientationSpecificStyleRules(HbWidget *widget) + { + Q_UNUSED(widget); + return false; + } + + HbStyle(HbStylePrivate &dd, QStyle *parent) + { + Q_UNUSED(dd); + Q_UNUSED(parent); + } + + }; + +#endif // HBSTYLE_H diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -18,79 +18,129 @@ #include #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; 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 testHorizontalSwipe(); + 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 +148,48 @@ 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 + 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); -} + { + //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" diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro --- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro Mon Jul 26 13:54:38 2010 +0530 @@ -35,8 +35,10 @@ ./../../../../../inc/ # Input -HEADERS += calendayutils.h \ - calendaycommonheaders.h +HEADERS += hbdeviceprofile.h \ + hbinstance.h \ + calendayutils.h \ + calendaycommonheaders.h SOURCES += unittest_calendayutils.cpp \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/eabi/calenviewsu.def --- a/calendarui/views/eabi/calenviewsu.def Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/eabi/calenviewsu.def Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/inc/calenagendaviewwidget.h --- a/calendarui/views/inc/calenagendaviewwidget.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/inc/calenagendaviewwidget.h Mon Jul 26 13:54:38 2010 +0530 @@ -103,6 +103,17 @@ */ void createNewEvent(); + + bool hasAllDayIcon(); + void checkEntryIcons(); + bool isAllDayIcon(); + bool isExceptionIcon(); + bool isAlarmIcon(); + bool isRepeatingIcon(); + + + + private: /** @@ -353,6 +364,14 @@ * @brief Holds notes editor plugin load info. */ bool mNotesPluginLoaded; + int mIndex; + bool mIconCheck; + bool mNextEntry; + bool mAllDayLeftIcon; + bool mRightAlarmIcon; + bool mRightRepeatIcon; + bool mRightExceptionIcon; + bool mLeftAllDayIcon; }; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/inc/caleneventlistviewitem.h --- a/calendarui/views/inc/caleneventlistviewitem.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/inc/caleneventlistviewitem.h Mon Jul 26 13:54:38 2010 +0530 @@ -20,16 +20,36 @@ // System includes #include +#include "calenagendaviewwidget.h" class CalenEventListViewItem : public HbListViewItem { Q_OBJECT + Q_PROPERTY(bool leftAllDayIcon READ hasAllDayIcon WRITE setAllDayLeftIcon) + Q_PROPERTY(bool repeatingIcon READ hasRepeatingIcon WRITE setRepeatingIcon) + Q_PROPERTY(bool alarmIcon READ hasAlarmIcon WRITE setAlarmIcon) + Q_PROPERTY(bool exceptionIcon READ hasExceptionIcon WRITE setExceptionIcon) public: - CalenEventListViewItem(QGraphicsItem *parent = 0); + CalenEventListViewItem(CalenAgendaViewWidget *parent = 0); ~CalenEventListViewItem(); HbAbstractViewItem * createItem(); void updateChildItems(); + bool hasAllDayIcon(); + void setAllDayLeftIcon(bool icon = false); + bool hasRepeatingIcon(); + void setRepeatingIcon(bool icon = false); + bool hasAlarmIcon(); + void setAlarmIcon(bool icon = false); + bool hasExceptionIcon(); + void setExceptionIcon(bool icon = false); +private: + + bool mAllDayIcon ; + bool mExceptionIcon ; + bool mAlarmIcon ; + bool mRepeatingIcon ; + CalenAgendaViewWidget* mParent; }; #endif // __CALEN_EVENT_LIST_VIEW_ITEM_H__ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/inc/calenmonthgrid.h --- a/calendarui/views/inc/calenmonthgrid.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/inc/calenmonthgrid.h Mon Jul 26 13:54:38 2010 +0530 @@ -89,7 +89,6 @@ private: QStandardItemModel *mModel; - QList mMonthDataArray; scrollDirection mDirection; bool mIsPanGesture; bool mIsAtomicScroll; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/inc/calenmonthview.h --- a/calendarui/views/inc/calenmonthview.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/inc/calenmonthview.h Mon Jul 26 13:54:38 2010 +0530 @@ -78,7 +78,7 @@ void populatePrevMonth(); void populateNextMonth(); void onLocaleChanged(int reason); - QList monthDataList(); + QList& monthDataList(); void updateModelWithPrevMonth(); void updateModelWithFutureMonth(); void populatePreviewPane(QDateTime &dateTime); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/inc/calennativeview.h --- a/calendarui/views/inc/calennativeview.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/inc/calennativeview.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/inc/calenpreviewpane.h --- a/calendarui/views/inc/calenpreviewpane.h Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/inc/calenpreviewpane.h Mon Jul 26 13:54:38 2010 +0530 @@ -57,6 +57,7 @@ private: void GetInstanceListL(); + void checkStartTimeOfEvent(QDateTime &dateTime); public slots: void onTwoSecondsTimeout(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/resources/caleneventlistviewitem.css --- a/calendarui/views/resources/caleneventlistviewitem.css Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/resources/caleneventlistviewitem.css Mon Jul 26 13:54:38 2010 +0530 @@ -1,4 +1,4 @@ -CalenEventListViewItem[layoutName="custom"]{ +CalenEventListViewItem[layoutName="custom"]:portrait{ layout: custom; } @@ -7,6 +7,7 @@ } CalenEventListViewItem::icon-1[layoutName="custom"]{ + top: -var(hb-param-margin-gene-top); left: -var(hb-param-margin-gene-left); right: var(hb-param-margin-gene-middle-horizontal); fixed-width: var(hb-param-graphic-size-primary-small); @@ -28,6 +29,7 @@ } CalenEventListViewItem::icon-4{ + 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); @@ -42,14 +44,112 @@ } -CalenEventListViewItem::text-2{ +CalenEventListViewItem[leftAllDayIcon="true"][alarmIcon="false"][repeatingIcon="false"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 43un; +} + + +CalenEventListViewItem[leftAllDayIcon="true"][alarmIcon="false"][repeatingIcon="true"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 39un; +} + + +CalenEventListViewItem[leftAllDayIcon="true"][alarmIcon="true"][repeatingIcon="true"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 35un; +} + + +CalenEventListViewItem[leftAllDayIcon="true"][alarmIcon="false"][exceptionIcon="true"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 38un; +} + + +CalenEventListViewItem[leftAllDayIcon="true"][alarmIcon="true"][exceptionIcon="true"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 33un; +} + + +CalenEventListViewItem[leftAllDayIcon="true"][alarmIcon="true"][exceptionIcon="false"][repeatingIcon="false"]::text-2[layoutName="custom"]:portrait{ top: -var(hb-param-margin-gene-top); font-variant: primary; - text-height: var(hb-param-text-height-secondary); + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 38un; +} + + +CalenEventListViewItem[leftAllDayIcon="false"][alarmIcon="false"][repeatingIcon="false"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 38un; +} + + +CalenEventListViewItem[leftAllDayIcon="false"][alarmIcon="false"][repeatingIcon="true"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 34un; +} + + +CalenEventListViewItem[leftAllDayIcon="false"][alarmIcon="true"][repeatingIcon="true"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); text-align: left; fixed-width: 29un; } + +CalenEventListViewItem[leftAllDayIcon="false"][alarmIcon="false"][exceptionIcon="true"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 34un; +} + + +CalenEventListViewItem[leftAllDayIcon="false"][alarmIcon="true"][exceptionIcon="true"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 29un; +} + +CalenEventListViewItem[leftAllDayIcon="false"][alarmIcon="true"][exceptionIcon="false"][repeatingIcon="false"]::text-2[layoutName="custom"]:portrait{ + top: -var(hb-param-margin-gene-top); + font-variant: primary; + text-height: var(hb-param-text-height-primary); + text-align: left; + fixed-width: 34un; +} + CalenEventListViewItem::text-3{ top: -var(hb-param-margin-gene-middle-vertical); bottom: var(hb-param-margin-gene-bottom); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/resources/caleneventlistviewitem.widgetml --- a/calendarui/views/resources/caleneventlistviewitem.widgetml Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/resources/caleneventlistviewitem.widgetml Mon Jul 26 13:54:38 2010 +0530 @@ -1,9 +1,10 @@ - + - + - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/resources/calengriditemprototype.css --- a/calendarui/views/resources/calengriditemprototype.css Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/resources/calengriditemprototype.css Mon Jul 26 13:54:38 2010 +0530 @@ -15,8 +15,8 @@ } CalenGridItemPrototype::eventIconItem[layoutName="calendarCustomGridItem"] { - fixed-height: 1un; - fixed-width: 1un; + fixed-height: 1.5un; + fixed-width: 1.5un; } CalenGridItemPrototype::focusIconItem[layoutName="calendarCustomGridItem"] { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/src/calenagendaviewwidget.cpp --- a/calendarui/views/src/calenagendaviewwidget.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/src/calenagendaviewwidget.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -63,8 +63,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); @@ -79,7 +78,9 @@ mDocLoader(docLoader), mRegionalInfoGroupBox(NULL), mLongTapEventFlag(false), -mNotesPluginLoaded(false) +mNotesPluginLoaded(false), +mIndex(0), +mIconCheck(false) { OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY ); @@ -372,8 +373,10 @@ // of items in the list. Remove the extra rows mListModel->removeRows(0, mListModel->rowCount() - mInstanceArray.count()); } + mIndex = 0; + 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 @@ -626,7 +629,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 @@ -707,6 +712,9 @@ // 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 @@ -787,7 +795,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); // Enable item stretching by adding the dynamic property @@ -1013,7 +1023,8 @@ // Set the context setContextFromHighlight(entry); - + + mIconCheck = false; // Launch the event viewer. mServices.IssueCommandL(ECalenEventView); @@ -1257,4 +1268,67 @@ OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_EXIT ); } +bool CalenAgendaViewWidget::hasAllDayIcon() + { + return mIconCheck; + } + + + +void CalenAgendaViewWidget::checkEntryIcons() + { + // return allDayLeftIcon; + 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]; + + mRightAlarmIcon = false; + mRightRepeatIcon = false; + mRightExceptionIcon = false; + mLeftAllDayIcon = false; + + if(!entry.alarm().isNull()){ + mRightAlarmIcon = true; + } + if (entry.isRepeating()){ + mRightRepeatIcon = true; + } + if (!entry.recurrenceId().isNull()){ + mRightExceptionIcon = true; + } + + if(!entry.isTimedEntry()){ + //all day icon is not there if its a timed entry + mLeftAllDayIcon = true; + } + //check if shift to next entry + if(mNextEntry) + mIndex++; + + } + +bool CalenAgendaViewWidget::isAllDayIcon() + { + return mLeftAllDayIcon; + } + +bool CalenAgendaViewWidget::isExceptionIcon() + { + return mRightExceptionIcon; + } + +bool CalenAgendaViewWidget::isAlarmIcon() + { + return mRightAlarmIcon; + } + +bool CalenAgendaViewWidget::isRepeatingIcon() + { + return mRightRepeatIcon; + } + // End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/src/caleneventlistviewitem.cpp --- a/calendarui/views/src/caleneventlistviewitem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/src/caleneventlistviewitem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -26,8 +26,8 @@ #endif -CalenEventListViewItem::CalenEventListViewItem(QGraphicsItem *parent) : -HbListViewItem(parent) +CalenEventListViewItem::CalenEventListViewItem(CalenAgendaViewWidget *parent) : +HbListViewItem(parent),mAllDayIcon(false),mParent(parent) { OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY ); @@ -53,10 +53,52 @@ void CalenEventListViewItem::updateChildItems() { OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_ENTRY ); + if(mParent->hasAllDayIcon()) + { + mParent->checkEntryIcons(); + mAllDayIcon = mParent->isAllDayIcon(); + mExceptionIcon = mParent->isExceptionIcon(); + mAlarmIcon = mParent->isAlarmIcon(); + mRepeatingIcon = mParent->isRepeatingIcon(); + } HbListViewItem::updateChildItems(); OstTraceFunctionExit0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_EXIT ); } +bool CalenEventListViewItem::hasAllDayIcon() + { + return mAllDayIcon ; + } + +void CalenEventListViewItem::setAllDayLeftIcon(bool icon) + { + mAllDayIcon = icon; + } +bool CalenEventListViewItem::hasRepeatingIcon() + { + return mRepeatingIcon; + } + +void CalenEventListViewItem::setRepeatingIcon(bool icon) + { + mRepeatingIcon = icon; + } +bool CalenEventListViewItem::hasAlarmIcon() + { + return mAlarmIcon; + } +void CalenEventListViewItem::setAlarmIcon(bool icon ) + { + mAlarmIcon = icon ; + } +bool CalenEventListViewItem::hasExceptionIcon() + { + return mExceptionIcon; + } +void CalenEventListViewItem::setExceptionIcon(bool icon ) + { + mExceptionIcon = icon ; + } // End of file diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/src/calenmonthgrid.cpp --- a/calendarui/views/src/calenmonthgrid.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/src/calenmonthgrid.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -24,6 +24,7 @@ #include #include #include +#include // User includes #include "calenmonthgrid.h" @@ -262,7 +263,6 @@ QModelIndex lastVisibleIndex = mModel->index(indexToBeScrolled, 0); scrollTo(lastVisibleIndex); } - mMonthDataArray = monthDataArray; OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDMODEL_EXIT ); } @@ -275,8 +275,6 @@ QList &monthDataArray) { OstTraceFunctionEntry0( CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_ENTRY ); - - mMonthDataArray = monthDataArray; // Prepend the required rows handlePrependingRows(monthDataArray); @@ -318,7 +316,6 @@ { OstTraceFunctionEntry0( CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_ENTRY ); - mMonthDataArray = monthDataArray; int count(monthDataArray.count()); for(int i = 0; i < count; i++) { // Check if the day has events @@ -436,13 +433,24 @@ // 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; @@ -451,12 +459,12 @@ 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; @@ -551,7 +559,8 @@ QModelIndex modelIndex = item->modelIndex(); // Get the date which is visible at the above row - QDateTime date = mMonthDataArray[modelIndex.row()].Day(); + QList& monthDataArray = mView->monthDataList(); + QDateTime date = monthDataArray[modelIndex.row()].Day(); // Check if this date belong to current active month or // previous month else future month @@ -643,8 +652,7 @@ // Get the updated dates from the view mView->updateModelWithPrevMonth(); - QList monthDataList = mView->monthDataList(); - mMonthDataArray = monthDataList; + QList& monthDataList = mView->monthDataList(); // Prepend the required rows handlePrependingRows(monthDataList); @@ -769,8 +777,7 @@ // Get the updated dates from the view mView->updateModelWithFutureMonth(); - QList monthDataList = mView->monthDataList(); - mMonthDataArray = monthDataList; + QList& monthDataList = mView->monthDataList(); // Get the model count before we add any rows into the mode int rowCount = mModel->rowCount(); @@ -913,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& 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); @@ -999,7 +1007,8 @@ // and stop the loop where it the current month ends int start = 0; - int end = mMonthDataArray.count(); + QList& monthDataList = mView->monthDataList(); + int end = monthDataList.count(); // Calculate the start and end values QDate firstDateInGrid = mView->firstDayOfGrid().date(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/src/calenmonthview.cpp --- a/calendarui/views/src/calenmonthview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/src/calenmonthview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -56,6 +56,9 @@ #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 @@ -369,20 +372,26 @@ static_cast (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); @@ -677,13 +686,15 @@ { 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 @@ -702,7 +713,7 @@ void CalenMonthView::doPopulation() { OstTraceFunctionEntry0( CALENMONTHVIEW_DOPOPULATION_ENTRY ); - + // Get the layout and add the preview pane layout. QGraphicsLinearLayout* viewLayout = static_cast (widget()->layout()); @@ -935,7 +946,7 @@ /*! Returns the array of CalenMonthData items */ -QList CalenMonthView::monthDataList() +QList& CalenMonthView::monthDataList() { OstTraceFunctionEntry0( CALENMONTHVIEW_MONTHDATALIST_ENTRY ); @@ -1238,9 +1249,12 @@ int offset = mFirstDayOfGrid.date().daysTo(datesWithEvents.at(i)); mMonthDataArray[offset].SetHasEvents(true); } - datesWithEvents.clear(); + if (datesEventsCount) { + mEntriesInDataBase = true; + } + OstTraceFunctionExit0( CALENMONTHVIEW_POPULATEWITHINSTANCEVIEW_EXIT ); } @@ -1272,6 +1286,10 @@ } datesWithEvents.clear(); + if (datesEventsCount) { + mEntriesInDataBase = true; + } + OstTraceFunctionExit0( CALENMONTHVIEW_POPULATEPREVMONTH_EXIT ); } @@ -1302,6 +1320,10 @@ mMonthDataArray[offset].SetHasEvents(true); } datesWithEvents.clear(); + + if (datesEventsCount) { + mEntriesInDataBase = true; + } OstTraceFunctionExit0( CALENMONTHVIEW_POPULATENEXTMONTH_EXIT ); } @@ -1478,12 +1500,13 @@ 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 ); } @@ -1577,7 +1600,10 @@ { OstTraceFunctionEntry0( CALENMONTHVIEW_ONLOCALECHANGED_ENTRY ); - Q_UNUSED(reason); + if ((reason & EChangesSystemTime) + || (reason & EChangesMidnightCrossover)) { + mCurrentDay = CalenDateUtils::today(); + } OstTraceFunctionExit0( CALENMONTHVIEW_ONLOCALECHANGED_EXIT ); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/src/calennativeview.cpp --- a/calendarui/views/src/calennativeview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/src/calennativeview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -50,7 +50,8 @@ Default constructor. */ CalenNativeView::CalenNativeView(MCalenServices &services) : - mServices(services), mIsCapturedScreenShotValid(false) + mServices(services), mIsCapturedScreenShotValid(false), + mEntriesInDataBase(false) { OstTraceFunctionEntry0( CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY ); @@ -114,6 +115,7 @@ OstTraceFunctionEntry0( CALENNATIVEVIEW_DELETEALLENTRIES_ENTRY ); mServices.IssueCommandL(ECalenDeleteAllEntries); + mEntriesInDataBase = false; OstTraceFunctionExit0( CALENNATIVEVIEW_DELETEALLENTRIES_EXIT ); } @@ -224,7 +226,11 @@ case ECalenNotifySystemLocaleChanged: { onLocaleChanged(EChangesLocale); } - break; + break; + case ECalenNotifySystemTimeChanged: { + onLocaleChanged(EChangesSystemTime); + } + break; case ECalenNotifyContextChanged: { onContextChanged(); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/src/calenpreviewpane.cpp --- a/calendarui/views/src/calenpreviewpane.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/src/calenpreviewpane.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include @@ -51,7 +53,7 @@ #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(" "); @@ -80,6 +82,9 @@ connect(this, SIGNAL(scrollingEnded()), this, SLOT(scrollingFinished())); + grabGesture(Qt::TapGesture); + grabGesture(Qt::PanGesture); + OstTraceFunctionExit0( CALENPREVIEWPANE_CALENPREVIEWPANE_EXIT ); } @@ -176,15 +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")); } // Check the entry type, based on the type display time field in // preview pane. QString start; if(mInstanceArray[i].type() != AgendaEntry::TypeTodo && - mInstanceArray[i].type() != AgendaEntry::TypeAnniversary) { + mInstanceArray[i].type() != AgendaEntry::TypeAnniversary && + mInstanceArray[i].type() != AgendaEntry::TypeEvent) { 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); @@ -361,20 +369,31 @@ OstTraceFunctionEntry0( CALENPREVIEWPANE_GESTUREEVENT_ENTRY ); if(HbPanGesture *gesture = qobject_cast(event->gesture(Qt::PanGesture))) { - if (gesture->state() == Qt::GestureStarted) { - // TODO: This work aroung till framework provides an api + if (gesture->state() == Qt::GestureUpdated) { + // 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); @@ -384,13 +403,13 @@ OstTraceFunctionExit0( 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); @@ -402,13 +421,12 @@ } } } - } else if(HbTapGesture *gesture = qobject_cast(event->gesture(Qt::TapGesture))) { - if (gesture->state() == Qt::GestureFinished) { - if (gesture->tapStyleHint() == HbTapGesture::Tap) { + } else if(QTapGesture *tapGesture = qobject_cast(event->gesture(Qt::TapGesture))) { + if (tapGesture && tapGesture->state() == Qt::GestureFinished) { + HbInstantFeedback::play(HbFeedback::Basic); // Preview pane tapped mServices.IssueCommandL(ECalenAgendaView); event->accept(Qt::TapGesture); - } } } @@ -445,4 +463,19 @@ 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); + } +} + // End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 calendarui/views/views.pro --- a/calendarui/views/views.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/calendarui/views/views.pro Mon Jul 26 13:54:38 2010 +0530 @@ -31,6 +31,7 @@ CONFIG += hb +HB += hbfeedback symbian: { LIBS += -leuser \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockmw/clocksettingsutility/src/settingsutility.cpp --- a/clock/clockmw/clocksettingsutility/src/settingsutility.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockmw/clocksettingsutility/src/settingsutility.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -106,9 +106,9 @@ 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. } @@ -124,9 +124,9 @@ int value = -1; if (EClockAnalog == locale.ClockFormat()) { - value = 0; + value = 1; } else if (EClockDigital == locale.ClockFormat()){ - value = 1; + value = 0; } else { // Nothing to do. } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockmw/clocktimezone/src/timezoneclient.cpp --- a/clock/clockmw/clocktimezone/src/timezoneclient.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockmw/clocktimezone/src/timezoneclient.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -68,6 +68,7 @@ if (mReferenceCount) { delete mTimezoneClient; mTimezoneClient = 0; + mReferenceCount = false; } } @@ -466,6 +467,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(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockalarmeditor/src/clockalarmcustomitem.cpp --- a/clock/clockui/clockalarmeditor/src/clockalarmcustomitem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockalarmeditor/src/clockalarmcustomitem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -91,6 +91,8 @@ static_cast(this)->itemView()->model()); HbDataFormModelItem* modlItem = model->itemFromIndex(modelIndex()); mCustomButton->setProperty("text", modlItem->contentWidgetData("text")); + mCustomButton->setProperty( + "objectName", modlItem->contentWidgetData("objectName")); } } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp --- a/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -327,8 +327,7 @@ // 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_clock_formlabel_day"))); // Add the alarm days beginning from the start of week. QStringList alarmDays; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockappcontroller/inc/clockappcontroller.h --- a/clock/clockui/clockappcontroller/inc/clockappcontroller.h Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockappcontroller/inc/clockappcontroller.h Mon Jul 26 13:54:38 2010 +0530 @@ -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; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockappcontroller/src/clockappcontroller.cpp --- a/clock/clockui/clockappcontroller/src/clockappcontroller.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockappcontroller/src/clockappcontroller.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -43,6 +43,7 @@ Q_ASSERT_X( mViewManager, "clockappcontroller.cpp", "ClockViewManager is 0"); + connect(mViewManager, SIGNAL(appReady()), this, SLOT(handleAppReady())); } /*! @@ -60,4 +61,13 @@ } } +/*! + Emits the appReday signal. + */ +void ClockAppController::handleAppReady() +{ + emit appReady(); + disconnect(mViewManager, SIGNAL(appReady()), this, SLOT(handleAppReady())); +} + // End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockapplication/clockapplication.pro --- a/clock/clockui/clockapplication/clockapplication.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockapplication/clockapplication.pro Mon Jul 26 13:54:38 2010 +0530 @@ -24,7 +24,8 @@ DEPENDPATH += \ . \ - ./src + ./src \ + ./inc symbian: { TARGET.CAPABILITY = ALL -TCB @@ -38,7 +39,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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockapplication/inc/clockapplication.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockapplication/inc/clockapplication.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#include + +// 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 mController; +}; + +#endif // CLOCKAPPLICATION_H + +// End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockapplication/src/clockapplication.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockapplication/src/clockapplication.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,75 @@ +/* +* 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" + +/*! + \class ClockApplication + + This class creates the ClockAppController object. + */ +/*! + Constructor. + */ +ClockApplication::ClockApplication(int &argc, char *argv[]): + HbApplication(argc, argv) +{ +} + +/*! + Destructor. + */ +ClockApplication::~ClockApplication() +{ + if (mController) { + delete mController; + mController = 0; + } +} + +/*! + creates the ClockAppController object. +*/ +void ClockApplication::createController() +{ + mController = new ClockAppController; + connect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady())); +} + +/*! + Start the event loop for the application. +*/ +bool ClockApplication::execution() +{ + int ret = 0; + ret = exec(); + return ret; +} + +/*! + Emits the applicationReady signal. + */ +void ClockApplication::handleAppReady() +{ + emit applicationReady(); + disconnect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady())); +} + +// End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockapplication/src/main.cpp --- a/clock/clockui/clockapplication/src/main.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockapplication/src/main.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -17,13 +17,11 @@ // System includes #include -#include #include -#include #include // User includes -#include "clockappcontroller.h" +#include "clockapplication.h" /*! The main entry point of the clock application. @@ -32,9 +30,10 @@ */ int main(int argc, char *argv[]) { - // Initialization - HbApplication app(argc, argv); - + // Create and initialize an ClockApplication instance + QScopedPointer application( + new ClockApplication(argc, argv)); + // Main window widget. // Includes decorator such as signal strength and battery life indicator. HbMainWindow window; @@ -47,14 +46,13 @@ translator.loadCommon(); // Construct the application controller. - QScopedPointer 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockcityselectionlist/inc/clockcityselectionlist_p.h --- a/clock/clockui/clockcityselectionlist/inc/clockcityselectionlist_p.h Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockcityselectionlist/inc/clockcityselectionlist_p.h Mon Jul 26 13:54:38 2010 +0530 @@ -36,6 +36,7 @@ class HbLineEdit; class HbDialog; class HbComboBox; +class HbShrinkingVkbHost; class ClockCitySelectionList; class ClockCityListProxyModel; class TimezoneClient; @@ -61,6 +62,7 @@ void handleTimeZoneSelection(int index); void selectedAction(HbAction *action); void loadSection(Qt::Orientation orientation); + void cancelSearch(); private: void showCityList(); @@ -68,6 +70,7 @@ void addCityNameField(); void addTimeZoneField(); void addCountryListField(); + void focusLineEdit(); private: QPointer mListModel; @@ -83,6 +86,8 @@ QPointer mCityNameEdit; QPointer mTimeZoneComboBox; QPointer mCountryComboBox; + + QPointer mVirtualKeyboard; HbAction *mOkAction; HbAction *mCancelAction; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp --- a/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -19,6 +19,8 @@ // System includes #include #include +#include +#include #include #include #include @@ -34,6 +36,7 @@ #include #include #include +#include // User includes #include "clockcityselectionlist_p.h" @@ -94,6 +97,9 @@ if(mCountryList.count()) { mCountryList.clear(); } + if (mVirtualKeyboard) { + delete mVirtualKeyboard; + } } @@ -366,6 +372,56 @@ } /*! + Slot to handle close action of search panel. + This slot cancels the search and dismisses the vkb. + */ +void ClockCitySelectionListPrivate::cancelSearch() +{ + // 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)); +} + +/*! + Focuses the line edit when the city selection list is opened. + */ +void ClockCitySelectionListPrivate::focusLineEdit() +{ + if (mSearchBox) { + // mView->scene()->setFocusItem(mSearchBox); + HbLineEdit *searchBoxEditor = 0; + searchBoxEditor = static_cast( + 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; + } + } +} + +/*! Displays the city selection list. */ void ClockCitySelectionListPrivate::showCityList() @@ -383,7 +439,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 (mLoader->findWidget(CITYLISTVIEW)); if (!mListView) { @@ -401,7 +459,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); @@ -442,6 +502,9 @@ window->addView(mView); window->setCurrentView(mView); + + // Focus the search box. + focusLineEdit(); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clocksettingsview/data/xml/clockregionalsettingsview.docml --- a/clock/clockui/clocksettingsview/data/xml/clockregionalsettingsview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clocksettingsview/data/xml/clockregionalsettingsview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -22,7 +22,7 @@ - + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml --- a/clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -23,7 +23,7 @@ - +
diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clocksettingsview/inc/clocksettingsview.h --- a/clock/clockui/clocksettingsview/inc/clocksettingsview.h Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clocksettingsview/inc/clocksettingsview.h Mon Jul 26 13:54:38 2010 +0530 @@ -83,6 +83,7 @@ HbDataFormModelItem *mTimeDataFormItem; HbDataFormModelItem *mDateDataFormItem; HbDataFormModelItem *mPlaceDataFormItem; + HbDataFormModelItem *mRegionalDataFormItem; HbDataFormModelItem *mClockTypeItem; HbDataFormModelItem *mAlarmSnoozeItem; ClockSettingsDocLoader *mDocLoader; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clocksettingsview/inc/settingscustomitem.h --- a/clock/clockui/clocksettingsview/inc/settingscustomitem.h Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clocksettingsview/inc/settingscustomitem.h Mon Jul 26 13:54:38 2010 +0530 @@ -23,7 +23,6 @@ #include #include #include -#include // 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 mTimeWidget; QPointer mDateWidget; QPointer mPlaceWidget; + QPointer mRegSettingsWidget; + QPointer mWorkdaysWidget; HbAction *mOkAction; HbAction *mCancelAction; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clocksettingsview/src/clocksettingsview.cpp --- a/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -391,8 +391,11 @@ HbDataFormModelItem::DataItemType regionalSettingsItem = static_cast (HbDataFormModelItem::CustomItemBase + RegionalSettingsItem); - (mSettingsModel->appendDataFormItem( - regionalSettingsItem))->setContentWidgetData( + mRegionalDataFormItem = mSettingsModel->appendDataFormItem( + regionalSettingsItem); + mRegionalDataFormItem->setContentWidgetData( + "text", hbTrId("txt_clock_button_regional_date_time_settings")); + mRegionalDataFormItem->setContentWidgetData( "objectName", "regionalSettings"); // Add the clock type item. @@ -421,10 +424,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; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clocksettingsview/src/settingscustomitem.cpp --- a/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -107,19 +107,43 @@ 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; } @@ -170,23 +194,24 @@ 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; + 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 +230,7 @@ } } - return workdaysItem; + return mWorkdaysWidget; } default: @@ -339,7 +364,7 @@ */ void SettingsCustomItem::launchCitySelectionList() { - mCitySelectionList = new ClockCitySelectionList(this); + mCitySelectionList = new ClockCitySelectionList(mTimezoneClient, this); connect( mCitySelectionList, SIGNAL(citySelected(LocationInfo)), this, SLOT(updatePlaceItem(LocationInfo))); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviewmanager/inc/clockviewmanager.h --- a/clock/clockui/clockviewmanager/inc/clockviewmanager.h Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviewmanager/inc/clockviewmanager.h Mon Jul 26 13:54:38 2010 +0530 @@ -43,6 +43,9 @@ public: CLOCKVIEWMANAGER_EXPORT void showView(ClockViews view); +signals: + void appReady(); + private: void loadMainView(); void loadWorldClockView(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviewmanager/src/clockviewmanager.cpp --- a/clock/clockui/clockviewmanager/src/clockviewmanager.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviewmanager/src/clockviewmanager.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -19,8 +19,9 @@ // System includes #include #include -#include // hbapplication -#include // hbactivitymanager +#include +#include +#include // User includes #include "clockviewmanager.h" @@ -148,6 +149,9 @@ // Find the main view. mMainView = static_cast ( docLoader->findWidget(CLOCK_MAIN_VIEW)); + + // Disable animation effect on toolbar. + HbEffect::disable(mMainView->toolBar()->graphicsItem()); // Setup the view. mMainView->setupView(mAppControllerIf, docLoader); @@ -172,6 +176,9 @@ // Get the world list view. mWorldClockView = static_cast ( docLoader->findWidget(CLOCK_WORLD_VIEW)); + + // Disable animation effect on toolbar. + HbEffect::disable(mWorldClockView->toolBar()->graphicsItem()); mWorldClockView->setupView(mAppControllerIf, docLoader); } @@ -191,6 +198,12 @@ 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(); } // End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/data/style/clockhomecityitem.css --- a/clock/clockui/clockviews/data/style/clockhomecityitem.css Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/data/style/clockhomecityitem.css Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/data/style/clockhomecityitem.widgetml --- a/clock/clockui/clockviews/data/style/clockhomecityitem.widgetml Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/data/style/clockhomecityitem.widgetml Mon Jul 26 13:54:38 2010 +0530 @@ -2,40 +2,42 @@ - - + + - + + + + + - + - - - - + + - - + + - + + + + + + + + - - - - - - - - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/data/style/clockhomecityitem_color.css --- a/clock/clockui/clockviews/data/style/clockhomecityitem_color.css Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/data/style/clockhomecityitem_color.css Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/data/style/hblistviewitem.css --- a/clock/clockui/clockviews/data/style/hblistviewitem.css Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/data/style/hblistviewitem.css Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/data/style/hblistviewitem.widgetml --- a/clock/clockui/clockviews/data/style/hblistviewitem.widgetml Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/data/style/hblistviewitem.widgetml Mon Jul 26 13:54:38 2010 +0530 @@ -4,48 +4,49 @@ - - + + - + + + + + - - - - - - - - - + + + + + + - - + - + + + + + + + + - + - - - - - - - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/data/style/hblistviewitem_color.css --- a/clock/clockui/clockviews/data/style/hblistviewitem_color.css Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/data/style/hblistviewitem_color.css Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/data/xml/clockmainview.docml --- a/clock/clockui/clockviews/data/xml/clockmainview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/data/xml/clockmainview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -88,7 +88,7 @@ - +
@@ -103,7 +103,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -162,8 +162,8 @@ - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/data/xml/clockworldview.docml --- a/clock/clockui/clockviews/data/xml/clockworldview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/data/xml/clockworldview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -44,7 +44,7 @@ - +
diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/src/clockhomecityitem.cpp --- a/clock/clockui/clockviews/src/clockhomecityitem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/src/clockhomecityitem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -49,7 +49,7 @@ // 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); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/src/clockmainview.cpp --- a/clock/clockui/clockviews/src/clockmainview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/src/clockmainview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -520,7 +520,7 @@ gmtOffset += tr(" "); // Append GMT sting. - gmtOffset += hbTrId("txt_common_common_gmt"); + gmtOffset += hbTrId("txt_clock_main_view_setlabel_gmt"); // Append space. gmtOffset += tr(" "); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockviews/src/clockworldview.cpp --- a/clock/clockui/clockviews/src/clockworldview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockviews/src/clockworldview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -131,7 +131,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. @@ -233,7 +233,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,10 +260,12 @@ 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); } } @@ -618,7 +620,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 +631,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 { @@ -660,7 +662,6 @@ 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 +671,12 @@ 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)); + return decorationString; } @@ -687,8 +690,10 @@ 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,6 +725,21 @@ } } + + 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); + } } } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockwidget/clockwidgetimpl/inc/analogclockwidget.h --- a/clock/clockui/clockwidget/clockwidgetimpl/inc/analogclockwidget.h Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockwidget/clockwidgetimpl/inc/analogclockwidget.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 mTimer; - QPointer mClockBackground; - QPointer mClockHourHand; - QPointer mClockMinuteHand; - QPointer mClockSecondHand; + void constructPrimitives(); + void updatePrimitives(); + +private: + QPointer mTimer; + QPointer mClockBackground; + QPointer mClockHourHand; + QPointer mClockMinuteHand; + QPointer mClockSecondHand; }; #endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css --- a/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css Mon Jul 26 13:54:38 2010 +0530 @@ -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; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.widgetml --- a/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.widgetml Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.widgetml Mon Jul 26 13:54:38 2010 +0530 @@ -5,20 +5,20 @@ - - - - + + + + - - - - + + + + - - - - + + + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp --- a/clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -32,104 +32,153 @@ 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); + bool result = HbStyleLoader::registerFilePath( + ":/resource/analogclockwidget.widgetml"); + result = HbStyleLoader::registerFilePath( + ":/resource/analogclockwidget.css"); + + constructPrimitives(); + mTimer = new QTimer(this); + connect(mTimer, SIGNAL(timeout()), SLOT(tick())); } /*! Destructor. */ AnalogClockWidget::~AnalogClockWidget() -{ - mTimer->stop(); - HbStyleLoader::unregisterFilePath(":/resource"); +{ + mTimer->stop(); + HbStyleLoader::unregisterFilePath(":/resource/analogclockwidget.widgetml"); + HbStyleLoader::unregisterFilePath(":/resource/analogclockwidget.css"); } /*! - Handles resize event from HbWidget + Constructs the widget primitive items. */ -void AnalogClockWidget::resizeEvent(QGraphicsSceneResizeEvent *event) +void AnalogClockWidget::constructPrimitives() { - QGraphicsWidget::resizeEvent(event); - updatePrimitives(); + 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")); + } } /*! - @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); - + 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); + } } /*! - Updates clock visualization according to current time + Updates clock visualization according to current time. */ void AnalogClockWidget::tick() { - updatePrimitives(); - update(); + updatePrimitives(); + update(); } /*! - 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) +{ + HbWidget::setGeometry(rect); + updatePrimitives(); +} // End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 clock/rom/clockresources.iby --- a/clock/rom/clockresources.iby Mon Jul 12 02:32:28 2010 +0530 +++ b/clock/rom/clockresources.iby Mon Jul 26 13:54:38 2010 +0530 @@ -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__ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/data/xml/notesfavoriteview.docml --- a/notes/data/xml/notesfavoriteview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/data/xml/notesfavoriteview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -26,7 +26,8 @@ - + + @@ -39,8 +40,8 @@ - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/data/xml/notesmainview.docml --- a/notes/data/xml/notesmainview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/data/xml/notesmainview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -26,7 +26,8 @@ - + + @@ -38,8 +39,8 @@ - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/data/xml/notesnoteview.docml --- a/notes/data/xml/notesnoteview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/data/xml/notesnoteview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -26,7 +26,8 @@ - + + @@ -39,8 +40,8 @@ - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/data/xml/notestodoview.docml --- a/notes/data/xml/notestodoview.docml Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/data/xml/notestodoview.docml Mon Jul 26 13:54:38 2010 +0530 @@ -26,7 +26,8 @@ - + + @@ -39,8 +40,8 @@ - - + + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/bwins/notesappcontrolleru.def --- a/notes/notesui/notesappcontroller/bwins/notesappcontrolleru.def Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesappcontroller/bwins/notesappcontrolleru.def Mon Jul 26 13:54:38 2010 +0530 @@ -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) diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/eabi/notesappcontrolleru.def --- a/notes/notesui/notesappcontroller/eabi/notesappcontrolleru.def Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesappcontroller/eabi/notesappcontrolleru.def Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/inc/notesappcontroller.h --- a/notes/notesui/notesappcontroller/inc/notesappcontroller.h Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesappcontroller/inc/notesappcontroller.h Mon Jul 26 13:54:38 2010 +0530 @@ -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; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/notesappcontroller.pro --- a/notes/notesui/notesappcontroller/notesappcontroller.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesappcontroller/notesappcontroller.pro Mon Jul 26 13:54:38 2010 +0530 @@ -29,7 +29,8 @@ ../notesviewmanager/inc \ ../notesmodelhandler/inc \ ../inc \ - ../../inc + ../../inc \ + ./traces symbian: { TARGET.CAPABILITY = ALL -TCB diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/src/notesappcontroller.cpp --- a/notes/notesui/notesappcontroller/src/notesappcontroller.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesappcontroller/src/notesappcontroller.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/src/notesappcontrollerifimpl.cpp --- a/notes/notesui/notesappcontroller/src/notesappcontrollerifimpl.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesappcontroller/src/notesappcontrollerifimpl.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesappcontroller/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesappcontroller/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/traces/notesappcontrollerTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesappcontroller/traces/notesappcontrollerTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesappcontroller/traces/notesappcontrollerifimplTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesappcontroller/traces/notesappcontrollerifimplTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesapplication/inc/notesApplication.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesapplication/inc/notesApplication.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#include + +// 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 mController; + +}; + +#endif // NOTESAPPLICATION_H + +// End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesapplication/notesapplication.pro --- a/notes/notesui/notesapplication/notesapplication.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesapplication/notesapplication.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesapplication/src/main.cpp --- a/notes/notesui/notesapplication/src/main.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesapplication/src/main.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -16,23 +16,30 @@ */ // System includes -#include -#include #include #include + // 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 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 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesapplication/src/notesApplication.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesapplication/src/notesApplication.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesapplication/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesapplication/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesapplication/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesapplication/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesapplication/traces/mainTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesapplication/traces/mainTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesapplication/traces/notesapplicationTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesapplication/traces/notesapplicationTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/inc/noteseditor_p.h --- a/notes/notesui/noteseditor/inc/noteseditor_p.h Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/inc/noteseditor_p.h Mon Jul 26 13:54:38 2010 +0530 @@ -25,7 +25,7 @@ #include // User includes -#include "agendaentry.h" +#include #include "noteseditor.h" // Forward declarations diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/inc/notesnoteeditor.h --- a/notes/notesui/noteseditor/inc/notesnoteeditor.h Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/inc/notesnoteeditor.h Mon Jul 26 13:54:38 2010 +0530 @@ -25,8 +25,8 @@ #include // User includes -#include "agendautil.h" -#include "agendaentry.h" +#include +#include // Forward declarations class HbView; diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/noteseditor.pro --- a/notes/notesui/noteseditor/noteseditor.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/noteseditor.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/src/noteseditor.cpp --- a/notes/notesui/noteseditor/src/noteseditor.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/src/noteseditor.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -19,8 +19,13 @@ // User includes #include "noteseditor.h" #include "noteseditor_p.h" -#include "agendautil.h" -#include "agendaentry.h" +#include +#include +#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); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/src/noteseditor_p.cpp --- a/notes/notesui/noteseditor/src/noteseditor_p.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/src/noteseditor_p.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -30,8 +30,13 @@ #include "noteseditor_p.h" #include "notesnoteeditor.h" #include "notestodoeditor.h" -#include "agendautil.h" -#include "agendaentry.h" +#include +#include +#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 (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,7 @@ mAgendaUtil, SIGNAL(entriesChanged(QList )), this, SLOT(handleEntriesChanged(QList ))); +OstTraceFunctionExit0( NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT ); } /*! @@ -79,6 +86,7 @@ */ NotesEditorPrivate::~NotesEditorPrivate() { + OstTraceFunctionEntry0( DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_ENTRY ); if (mOwnsAgendaUtil) { delete mAgendaUtil; mAgendaUtil = 0; @@ -88,6 +96,7 @@ delete mTranslator; mTranslator = 0; } +OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT ); } @@ -98,6 +107,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 +121,7 @@ // launch note editor mNoteEditor->execute(newNote); +OstTraceFunctionExit0( NOTESEDITORPRIVATE_EDIT_EXIT ); } /*! @@ -121,7 +132,9 @@ */ void NotesEditorPrivate::edit(const QFile &handle) { + OstTraceFunctionEntry0( DUP1_NOTESEDITORPRIVATE_EDIT_ENTRY ); Q_UNUSED(handle) +OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_EDIT_EXIT ); } /*! @@ -131,6 +144,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 +172,10 @@ mTodoEditor->execute(entry); } else { // Invalid entry type. + OstTraceFunctionExit0( DUP2_NOTESEDITORPRIVATE_EDIT_EXIT ); return; } +OstTraceFunctionExit0( DUP3_NOTESEDITORPRIVATE_EDIT_EXIT ); } /*! @@ -169,6 +185,7 @@ */ 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()) { @@ -176,9 +193,11 @@ edit(entry); } else { // Invalid entry. + OstTraceFunctionExit0( DUP4_NOTESEDITORPRIVATE_EDIT_EXIT ); return; } +OstTraceFunctionExit0( DUP5_NOTESEDITORPRIVATE_EDIT_EXIT ); } /*! @@ -189,6 +208,7 @@ */ void NotesEditorPrivate::create(NotesEditor::CreateType type) { +OstTraceFunctionEntry0( NOTESEDITORPRIVATE_CREATE_ENTRY ); switch(type) { case NotesEditor::CreateNote: { @@ -238,6 +258,7 @@ break; } +OstTraceFunctionExit0( NOTESEDITORPRIVATE_CREATE_EXIT ); } @@ -248,6 +269,7 @@ */ ulong NotesEditorPrivate::close(NotesEditor::CloseType type) { +OstTraceFunctionEntry0( NOTESEDITORPRIVATE_CLOSE_ENTRY ); switch (type) { case NotesEditor::CloseWithSave: { @@ -286,6 +308,7 @@ mNoteId = 0; break; } + OstTraceFunctionExit0( NOTESEDITORPRIVATE_CLOSE_EXIT ); return mNoteId; } @@ -296,6 +319,7 @@ */ QString NotesEditorPrivate::dateFormatString() { + OstTraceFunctionEntry0( NOTESEDITORPRIVATE_DATEFORMATSTRING_ENTRY ); HbExtendedLocale locale = HbExtendedLocale::system(); QString dateFormat; @@ -325,6 +349,7 @@ break; } + OstTraceFunctionExit0( NOTESEDITORPRIVATE_DATEFORMATSTRING_EXIT ); return dateFormat; } @@ -335,6 +360,7 @@ */ QString NotesEditorPrivate::timeFormatString() { + OstTraceFunctionEntry0( NOTESEDITORPRIVATE_TIMEFORMATSTRING_ENTRY ); QString timeFormat; HbExtendedLocale locale = HbExtendedLocale::system(); @@ -350,6 +376,7 @@ timeFormat.append("mm"); } + OstTraceFunctionExit0( NOTESEDITORPRIVATE_TIMEFORMATSTRING_EXIT ); return timeFormat; } @@ -358,11 +385,13 @@ */ void NotesEditorPrivate::handleEntriesChanged(QList ids) { + OstTraceFunctionEntry0( NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_ENTRY ); if (!mNewEntry) { if (ids.contains(mModifiedNote.id())) { mSaveEntry = false; } } +OstTraceFunctionExit0( NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_EXIT ); } /*! @@ -370,9 +399,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 +442,7 @@ window->removeView(mNoteEditor->mEditor); mNoteEditor->deleteLater(); +OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT ); } /*! @@ -419,9 +451,11 @@ */ void NotesEditorPrivate::updateNoteText() { +OstTraceFunctionEntry0( NOTESEDITORPRIVATE_UPDATENOTETEXT_ENTRY ); mModifiedNote.setDescription(mNoteEditor->getDescription()); +OstTraceFunctionExit0( NOTESEDITORPRIVATE_UPDATENOTETEXT_EXIT ); } /*! @@ -429,6 +463,7 @@ */ void NotesEditorPrivate::deleteNote() { +OstTraceFunctionEntry0( NOTESEDITORPRIVATE_DELETENOTE_ENTRY ); if (!mNewEntry) { // Delete the note. All the changes are discarded. @@ -444,6 +479,7 @@ mTodoEditor->deleteLater(); } +OstTraceFunctionExit0( NOTESEDITORPRIVATE_DELETENOTE_EXIT ); } /*! @@ -451,6 +487,7 @@ */ bool NotesEditorPrivate::saveNote() { +OstTraceFunctionEntry0( NOTESEDITORPRIVATE_SAVENOTE_ENTRY ); bool status = false; QString description = mNoteEditor->getDescription(); @@ -474,7 +511,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 +529,7 @@ mModifiedNote.setDescription(description); // Now save the entry. - mNoteId = mAgendaUtil->addEntry(mModifiedNote); + mNoteId = mAgendaUtil->store(mModifiedNote); } } else { mModifiedNote.setDescription(description); @@ -500,7 +537,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 +551,7 @@ mNoteId = 0; } + OstTraceFunctionExit0( NOTESEDITORPRIVATE_SAVENOTE_EXIT ); return status; } @@ -522,9 +560,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 +572,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 +600,10 @@ } } else { if (isTodoEdited()) { - status = mAgendaUtil->updateEntry(mModifiedNote); - mNoteId = mModifiedNote.id(); + mNoteId = mAgendaUtil->store(mModifiedNote); + if (mNoteId) { + status = true; + } } } if (status) { @@ -570,6 +612,7 @@ } } + OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_SAVETODO_EXIT ); return status; } @@ -580,6 +623,7 @@ */ void NotesEditorPrivate::editingCompleted(bool status) { +OstTraceFunctionEntry0( NOTESEDITORPRIVATE_EDITINGCOMPLETED_ENTRY ); if(mNoteEditor) { mNoteEditor->deleteLater(); @@ -589,6 +633,7 @@ } emit q_ptr->editingCompleted(status); +OstTraceFunctionExit0( NOTESEDITORPRIVATE_EDITINGCOMPLETED_EXIT ); } /*! @@ -598,14 +643,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 +665,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 +703,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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/src/noteseditordocloader.cpp --- a/notes/notesui/noteseditor/src/noteseditordocloader.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/src/noteseditordocloader.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/src/notesnoteeditor.cpp --- a/notes/notesui/noteseditor/src/notesnoteeditor.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/src/notesnoteeditor.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -37,7 +37,12 @@ #include "noteseditorcommon.h" #include "noteseditor.h" #include "noteseditor_p.h" -#include "agendautil.h" +#include +#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(); @@ -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,6 +424,7 @@ */ void NotesNoteEditor::markNoteAsFavourite() { + OstTraceFunctionEntry0( NOTESNOTEEDITOR_MARKNOTEASFAVOURITE_ENTRY ); if (mOwner->mModifiedNote.favourite()) { mOwner->mModifiedNote.setFavourite(0); @@ -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; @@ -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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/src/notestodoeditor.cpp --- a/notes/notesui/noteseditor/src/notestodoeditor.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/src/notestodoeditor.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -45,7 +45,12 @@ #include "noteseditor_p.h" #include "noteseditorcommon.h" #include "noteseditordocloader.h" -#include "agendaentry.h" +#include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "notestodoeditorTraces.h" +#endif + /*! \class NotesTodoEditor @@ -69,6 +74,7 @@ mDescriptionItemIndex(5), mDiscardChangesActive(false) { + OstTraceFunctionEntry0( NOTESTODOEDITOR_NOTESTODOEDITOR_ENTRY ); mDocLoader = new NotesEditorDocLoader; Q_ASSERT(mDocLoader); @@ -101,6 +107,7 @@ QList prototypes = mDataForm->itemPrototypes(); prototypes.append(customItem); mDataForm->setItemPrototypes(prototypes); + OstTraceFunctionExit0( NOTESTODOEDITOR_NOTESTODOEDITOR_EXIT ); } /*! @@ -108,12 +115,14 @@ */ NotesTodoEditor::~NotesTodoEditor() { + OstTraceFunctionEntry0( DUP1_NOTESTODOEDITOR_NOTESTODOEDITOR_ENTRY ); if (mFormModel) { delete mFormModel; } mDocLoader->reset(); delete mDocLoader; + OstTraceFunctionExit0( DUP1_NOTESTODOEDITOR_NOTESTODOEDITOR_EXIT ); } /*! @@ -121,8 +130,10 @@ */ void NotesTodoEditor::updateSummaryText(const QString &text) { + OstTraceFunctionEntry0( NOTESTODOEDITOR_UPDATESUMMARYTEXT_ENTRY ); mOwner->mModifiedNote.setSummary(text); addDiscardChangesAction(); + OstTraceFunctionExit0( NOTESTODOEDITOR_UPDATESUMMARYTEXT_EXIT ); } /*! @@ -132,8 +143,10 @@ */ void NotesTodoEditor::updatePriority(int index) { + OstTraceFunctionEntry0( NOTESTODOEDITOR_UPDATEPRIORITY_ENTRY ); mOwner->mModifiedNote.setPriority(index + 1); addDiscardChangesAction(); + OstTraceFunctionExit0( NOTESTODOEDITOR_UPDATEPRIORITY_EXIT ); } /*! @@ -143,8 +156,10 @@ */ void NotesTodoEditor::updateDescription(const QString &text) { + OstTraceFunctionEntry0( NOTESTODOEDITOR_UPDATEDESCRIPTION_ENTRY ); mOwner->mModifiedNote.setDescription(text); addDiscardChangesAction(); + OstTraceFunctionExit0( NOTESTODOEDITOR_UPDATEDESCRIPTION_EXIT ); } /*! @@ -155,6 +170,7 @@ */ bool NotesTodoEditor::validAlarmSet() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_VALIDALARMSET_ENTRY ); bool alarmSet(true); // Sanity Check. @@ -179,6 +195,7 @@ }else { HbNotificationDialog::launchDialog(tr("Alarm time is not valid")); alarmSet = false; + OstTraceFunctionExit0( NOTESTODOEDITOR_VALIDALARMSET_EXIT ); return alarmSet; } @@ -198,6 +215,7 @@ }else { HbNotificationDialog::launchDialog(tr("Alarm date is not valid")); alarmSet = false; + OstTraceFunctionExit0( DUP1_NOTESTODOEDITOR_VALIDALARMSET_EXIT ); return alarmSet; } @@ -229,8 +247,10 @@ } else { AgendaAlarm dummyAlarm; mOwner->mModifiedNote.setAlarm(dummyAlarm); + OstTraceFunctionExit0( DUP2_NOTESTODOEDITOR_VALIDALARMSET_EXIT ); return alarmSet; } + OstTraceFunctionExit0( DUP3_NOTESTODOEDITOR_VALIDALARMSET_EXIT ); return alarmSet; } @@ -239,6 +259,7 @@ */ void NotesTodoEditor::addDiscardChangesAction() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_ADDDISCARDCHANGESACTION_ENTRY ); if(!mDiscardChangesActive) { mDiscardAction = new HbAction(hbTrId("txt_notes_opt_discard_changes")); @@ -250,6 +271,7 @@ mDiscardChangesActive = true; } + OstTraceFunctionExit0( NOTESTODOEDITOR_ADDDISCARDCHANGESACTION_EXIT ); } /*! @@ -259,7 +281,8 @@ */ void NotesTodoEditor::execute(AgendaEntry entry) { - Q_UNUSED(entry) + OstTraceFunctionEntry0( NOTESTODOEDITOR_EXECUTE_ENTRY ); + HbMenu *viewMenu = mEditor->menu(); if (!mDescriptionAction) { @@ -302,6 +325,7 @@ this, SLOT(saveTodo())); window->addView(mEditor); window->setCurrentView(mEditor); + OstTraceFunctionExit0( NOTESTODOEDITOR_EXECUTE_EXIT ); } /*! @@ -311,14 +335,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 +367,7 @@ // Set the model to the form. mDataForm->setModel(mFormModel); + OstTraceFunctionExit0( NOTESTODOEDITOR_INITFORMMODEL_EXIT ); } /*! @@ -347,6 +375,7 @@ */ void NotesTodoEditor::insertSubjectItem() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTSUBJECTITEM_ENTRY ); mSubjectItem = mFormModel->appendDataFormItem( HbDataFormModelItem::TextItem, QString(""), mFormModel->invisibleRootItem()); @@ -357,6 +386,7 @@ mDataForm->addConnection( mSubjectItem , SIGNAL(textChanged(const QString &)), this, SLOT(updateSummaryText(const QString &))); + OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTSUBJECTITEM_EXIT ); } /*! @@ -364,6 +394,7 @@ */ void NotesTodoEditor::insertDueDateItem() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTDUEDATEITEM_ENTRY ); HbDataFormModelItem::DataItemType itemType = static_cast (HbDataFormModelItem::CustomItemBase + DueDateItemOffset); @@ -386,12 +417,14 @@ } 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()); @@ -408,6 +441,7 @@ mDataForm->addConnection( mReminderEnabler, SIGNAL(stateChanged(int)), this, SLOT(handleReminderItem(int))); + OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTREMINDERTOGGLE_EXIT ); } /*! @@ -415,6 +449,7 @@ */ void NotesTodoEditor::handleReminderItem(int checked) { + OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEREMINDERITEM_ENTRY ); if (Qt::Checked == checked) { HbDataFormModelItem::DataItemType itemType = static_cast @@ -484,6 +519,7 @@ mReminderItem = 0; } } + OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEREMINDERITEM_EXIT ); } /*! @@ -491,6 +527,7 @@ */ void NotesTodoEditor::insertPriorityItem() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTPRIORITYITEM_ENTRY ); mPriorityItem = mFormModel->appendDataFormItem( HbDataFormModelItem::ComboBoxItem, hbTrId("txt_notes_setlabel_priority"), @@ -513,6 +550,7 @@ mDataForm->addConnection( mPriorityItem, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePriority(int))); + OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTPRIORITYITEM_EXIT ); } /*! @@ -520,6 +558,7 @@ */ void NotesTodoEditor::insertDescriptionItem() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_INSERTDESCRIPTIONITEM_ENTRY ); mDescriptionItem = mFormModel->appendDataFormItem( HbDataFormModelItem::TextItem, hbTrId("txt_notes_formlabel_val_description"), @@ -534,6 +573,7 @@ mDataForm->addConnection( mDescriptionItem, SIGNAL(textChanged(const QString)), this, SLOT(updateDescription(const QString))); + OstTraceFunctionExit0( NOTESTODOEDITOR_INSERTDESCRIPTIONITEM_EXIT ); } /*! @@ -541,10 +581,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 ); } /*! @@ -552,6 +594,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. @@ -571,6 +614,7 @@ mOwner->editingCompleted(status); } + OstTraceFunctionExit0( NOTESTODOEDITOR_SAVETODO_EXIT ); } /*! @@ -579,10 +623,12 @@ */ void NotesTodoEditor::close() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_CLOSE_ENTRY ); HbMainWindow *window = hbInstance->allMainWindows().first(); // Now close the editor. window->removeView(mEditor); + OstTraceFunctionExit0( NOTESTODOEDITOR_CLOSE_EXIT ); } /*! @@ -591,6 +637,7 @@ */ void NotesTodoEditor::handleAddDescriptionAction() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEADDDESCRIPTIONACTION_ENTRY ); // Now we add the description item here. insertDescriptionItem(); @@ -604,6 +651,7 @@ connect( mDescriptionAction, SIGNAL(triggered()), this, SLOT(handleRemoveDescriptionAction())); + OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEADDDESCRIPTIONACTION_EXIT ); } /*! @@ -612,6 +660,7 @@ */ void NotesTodoEditor::handleRemoveDescriptionAction() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEREMOVEDESCRIPTIONACTION_ENTRY ); // Here we firstset the description text in the entry to empty. mOwner->mModifiedNote.setDescription(""); @@ -629,6 +678,7 @@ mDescriptionAction, SIGNAL(triggered()), this, SLOT(handleAddDescriptionAction())); + OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEREMOVEDESCRIPTIONACTION_EXIT ); } /*! @@ -636,6 +686,7 @@ */ void NotesTodoEditor::handleDeleteAction() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEDELETEACTION_ENTRY ); HbMessageBox *confirmationQuery = new HbMessageBox( HbMessageBox::MessageTypeQuestion); confirmationQuery->setDismissPolicy(HbDialog::NoDismiss); @@ -663,6 +714,7 @@ confirmationQuery->addAction((mCancelDeleteAction)); confirmationQuery->open(this, SLOT(selectedAction(HbAction*))); + OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEDELETEACTION_EXIT ); } /*! @@ -670,8 +722,10 @@ */ void NotesTodoEditor::handleDiscardChangesAction() { + OstTraceFunctionEntry0( NOTESTODOEDITOR_HANDLEDISCARDCHANGESACTION_ENTRY ); // Close the to-do editor close(); + OstTraceFunctionExit0( NOTESTODOEDITOR_HANDLEDISCARDCHANGESACTION_EXIT ); } /*! @@ -679,6 +733,7 @@ */ void NotesTodoEditor::selectedAction(HbAction *action) { + OstTraceFunctionEntry0( NOTESTODOEDITOR_SELECTEDACTION_ENTRY ); if (action==mDeleteTodoAction) { // Delete the to-do entry. mOwner->deleteNote(); @@ -686,6 +741,7 @@ // Close the to-do editor. close(); } + OstTraceFunctionExit0( NOTESTODOEDITOR_SELECTEDACTION_EXIT ); } // End of file --Don't remove this. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/src/notestodoeditorcustomitem.cpp --- a/notes/notesui/noteseditor/src/notestodoeditorcustomitem.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/noteseditor/src/notestodoeditorcustomitem.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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(modelIndex() .data(HbDataFormModelItem::ItemTypeRole).toInt()); @@ -91,6 +102,7 @@ connect( mDueDateItem, SIGNAL(clicked()), this, SLOT(selectDueDate())); + OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT ); return mDueDateItem; } @@ -114,6 +126,7 @@ connect( mDateWidget, SIGNAL(clicked()), this, SLOT(launchDatePicker())); + OstTraceFunctionExit0( DUP1_NOTESTODOEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT ); return widget; } case HbDataFormModelItem::CustomItemBase + ItemOffsetUnKnown: @@ -127,14 +140,17 @@ */ bool NotesTodoEditorCustomItem::canSetModelIndex(const QModelIndex &index) const { + OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_CANSETMODELINDEX_ENTRY ); HbDataFormModelItem::DataItemType itemType = static_cast( 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; } } @@ -145,6 +161,7 @@ */ void NotesTodoEditorCustomItem::restore() { + OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_RESTORE_ENTRY ); HbDataFormModelItem::DataItemType itemType = static_cast( modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt()); @@ -169,6 +186,7 @@ default: break; } + OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_RESTORE_EXIT ); } /*! @@ -176,6 +194,7 @@ */ void NotesTodoEditorCustomItem::launchTimePicker() { + OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY ); if (mTimePickerDialog) { delete mTimePickerDialog; } @@ -210,6 +229,7 @@ mTimePickerDialog->addAction(mCancelAction); mTimePickerDialog->open(this, SLOT(selectedAction(HbAction *))); + OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_LAUNCHTIMEPICKER_EXIT ); } /*! @@ -217,6 +237,7 @@ */ void NotesTodoEditorCustomItem::launchDatePicker() { + OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_LAUNCHDATEPICKER_ENTRY ); if (mDatePickerDialog) { delete mDatePickerDialog; } @@ -257,6 +278,7 @@ mDatePickerDialog->addAction(mCancelAction); mDatePickerDialog->open(this, SLOT(selectedAction(HbAction *))); + OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_LAUNCHDATEPICKER_EXIT ); } /* @@ -264,8 +286,10 @@ */ void NotesTodoEditorCustomItem::selectDueDate() { + OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_ENTRY ); if( mDueDateItem->isDown()) { mDueDateItem->setDown(false); + OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_EXIT ); return; } @@ -310,6 +334,7 @@ mDatePickerDialog->addAction(mCancelAction); mDatePickerDialog->open(this, SLOT(selectedAction(HbAction *))); + OstTraceFunctionExit0( DUP1_NOTESTODOEDITORCUSTOMITEM_SELECTDUEDATE_EXIT ); } /*! @@ -317,9 +342,11 @@ */ void NotesTodoEditorCustomItem::selectedAction(HbAction *action) { + OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_SELECTEDACTION_ENTRY ); if (action == mOkAction) { handleOkAction(); } + OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_SELECTEDACTION_EXIT ); } /*! @@ -327,6 +354,7 @@ */ void NotesTodoEditorCustomItem::handleOkAction() { + OstTraceFunctionEntry0( NOTESTODOEDITORCUSTOMITEM_HANDLEOKACTION_ENTRY ); HbExtendedLocale locale = HbExtendedLocale::system(); HbDataFormModelItem *modelItem = @@ -397,6 +425,7 @@ alarmDateItem->setContentWidgetData("alarmDate",dueDateText); } } + OstTraceFunctionExit0( NOTESTODOEDITORCUSTOMITEM_HANDLEOKACTION_EXIT ); } // End of file --Don't delete. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/noteseditor/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/noteseditor/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,180 @@ +#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_EDIT_EXIT=0x1e +[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]_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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/traces/noteseditorTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/noteseditor/traces/noteseditorTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/traces/noteseditor_pTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/noteseditor/traces/noteseditor_pTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -0,0 +1,66 @@ +// 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 DUP4_NOTESEDITORPRIVATE_EDIT_EXIT 0x8a001e +#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 + + +#endif + +// End of file + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/traces/noteseditordocloaderTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/noteseditor/traces/noteseditordocloaderTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/traces/notesnoteeditorTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/noteseditor/traces/notesnoteeditorTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/traces/notestodoeditorTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/noteseditor/traces/notestodoeditorTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/noteseditor/traces/notestodoeditorcustomitemTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/noteseditor/traces/notestodoeditorcustomitemTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodel/inc/notessortfilterproxymodel.h --- a/notes/notesui/notesmodel/inc/notessortfilterproxymodel.h Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesmodel/inc/notessortfilterproxymodel.h Mon Jul 26 13:54:38 2010 +0530 @@ -24,7 +24,7 @@ // User includes #include "notesmodeldefines.h" -#include "agendautil.h" +#include class NOTESMODEL_EXPORT NotesSortFilterProxyModel : public QSortFilterProxyModel { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodel/notesmodel.pro --- a/notes/notesui/notesmodel/notesmodel.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesmodel/notesmodel.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodel/src/notesmodel.cpp --- a/notes/notesui/notesmodel/src/notesmodel.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesmodel/src/notesmodel.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -26,9 +26,14 @@ // User includes #include "notesmodel.h" -#include "agendautil.h" -#include "agendaentry.h" +#include +#include #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 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 &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 &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 &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; } @@ -996,6 +1038,7 @@ } } + OstTraceFunctionExit0( DUP1_NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT ); return success; } @@ -1006,6 +1049,7 @@ */ QString NotesModel::dateFormatString() { + OstTraceFunctionEntry0( NOTESMODEL_DATEFORMATSTRING_ENTRY ); HbExtendedLocale locale = HbExtendedLocale::system(); QString dateFormat; @@ -1035,6 +1079,7 @@ break; } + OstTraceFunctionExit0( NOTESMODEL_DATEFORMATSTRING_EXIT ); return dateFormat; } @@ -1045,6 +1090,7 @@ */ QString NotesModel::timeFormatString() { + OstTraceFunctionEntry0( NOTESMODEL_TIMEFORMATSTRING_ENTRY ); QString timeFormat; HbExtendedLocale locale = HbExtendedLocale::system(); @@ -1060,6 +1106,7 @@ timeFormat.append("mm"); } + OstTraceFunctionExit0( NOTESMODEL_TIMEFORMATSTRING_EXIT ); return timeFormat; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodel/src/notessortfilterproxymodel.cpp --- a/notes/notesui/notesmodel/src/notessortfilterproxymodel.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesmodel/src/notessortfilterproxymodel.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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()); 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; } } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodel/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesmodel/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodel/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesmodel/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodel/traces/notesmodelTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesmodel/traces/notesmodelTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodel/traces/notessortfilterproxymodelTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesmodel/traces/notessortfilterproxymodelTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodelhandler/notesmodelhandler.pro --- a/notes/notesui/notesmodelhandler/notesmodelhandler.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesmodelhandler/notesmodelhandler.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodelhandler/src/notesmodelhandler.cpp --- a/notes/notesui/notesmodelhandler/src/notesmodelhandler.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesmodelhandler/src/notesmodelhandler.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -19,8 +19,13 @@ #include // User includes #include "notesmodelhandler.h" -#include "agendautil.h" +#include #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; } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodelhandler/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesmodelhandler/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodelhandler/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesmodelhandler/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesmodelhandler/traces/notesmodelhandlerTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesmodelhandler/traces/notesmodelhandlerTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesplugins/noteseditorplugin/noteseditorplugin.pro --- a/notes/notesui/notesplugins/noteseditorplugin/noteseditorplugin.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesplugins/noteseditorplugin/noteseditorplugin.pro Mon Jul 26 13:54:38 2010 +0530 @@ -23,7 +23,8 @@ . \ ./src \ ./inc \ - ../../../inc + ../../../inc \ + ./traces DEPENDPATH += \ . \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesplugins/noteseditorplugin/src/noteseditorplugin.cpp --- a/notes/notesui/notesplugins/noteseditorplugin/src/noteseditorplugin.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesplugins/noteseditorplugin/src/noteseditorplugin.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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(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. - diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesplugins/noteseditorplugin/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesplugins/noteseditorplugin/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesplugins/noteseditorplugin/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesplugins/noteseditorplugin/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesplugins/noteseditorplugin/traces/noteseditorpluginTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesplugins/noteseditorplugin/traces/noteseditorpluginTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviewmanager/inc/notesviewmanager.h --- a/notes/notesui/notesviewmanager/inc/notesviewmanager.h Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviewmanager/inc/notesviewmanager.h Mon Jul 26 13:54:38 2010 +0530 @@ -49,6 +49,9 @@ NOTESVIEWMANAGER_EXPORT void switchToView( NotesNamespace::NotesViewIds viewId); +signals: + void appReady(); + private: void loadNotesMainView(); void loadNotesCollectionView(); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviewmanager/notesviewmanager.pro --- a/notes/notesui/notesviewmanager/notesviewmanager.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviewmanager/notesviewmanager.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviewmanager/src/notesdocloader.cpp --- a/notes/notesui/notesviewmanager/src/notesdocloader.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviewmanager/src/notesdocloader.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviewmanager/src/notesviewmanager.cpp --- a/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#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(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(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(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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviewmanager/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviewmanager/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviewmanager/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviewmanager/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviewmanager/traces/notesdocloaderTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviewmanager/traces/notesdocloaderTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviewmanager/traces/notesviewmanagerTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviewmanager/traces/notesviewmanagerTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/notesviews.pro --- a/notes/notesui/notesviews/notesviews.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviews/notesviews.pro Mon Jul 26 13:54:38 2010 +0530 @@ -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 \ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/src/notescollectionview.cpp --- a/notes/notesui/notesviews/src/notescollectionview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviews/src/notescollectionview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -32,13 +32,18 @@ #include // User includes +#include #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 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 entries = mAgendaUtil->entryIds( (AgendaUtil::FilterFlags) (AgendaUtil::IncludeCompletedTodos @@ -380,6 +412,7 @@ */ int NotesCollectionView::recentNotesCount() { + OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_RECENTNOTESCOUNT_ENTRY ); QList entries = mAgendaUtil->entryIds(AgendaUtil::IncludeNotes); return entries.count(); } diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/src/notesfavoriteview.cpp --- a/notes/notesui/notesviews/src/notesfavoriteview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviews/src/notesfavoriteview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -33,13 +33,18 @@ #include // User includes +#include #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(); 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(); 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 (); 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(); 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. - diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/src/notesmainview.cpp --- a/notes/notesui/notesviews/src/notesmainview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviews/src/notesmainview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -34,15 +34,20 @@ #include // hbactivitymanager // User includes +#include #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(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(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(qApp), SIGNAL(aboutToQuit()), + this, SLOT(saveActivity())); - // connect main view for the first time to recieve aboutToQuit signal - connect(qobject_cast(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 ( 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(); 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(); 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(); 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(); 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(); 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 (); 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(); 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(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(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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/src/notesnoteview.cpp --- a/notes/notesui/notesviews/src/notesnoteview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviews/src/notesnoteview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -30,13 +30,18 @@ #include // User includes +#include #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(); 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(); 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(); 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(); 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(); @@ -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. - diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/src/notestodoview.cpp --- a/notes/notesui/notesviews/src/notestodoview.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/notesui/notesviews/src/notestodoview.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -32,14 +32,19 @@ #include // User includes +#include #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(); 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(); 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,6 +481,7 @@ */ void NotesTodoView::updateSubTitle(ulong id) { + OstTraceFunctionEntry0( NOTESTODOVIEW_UPDATESUBTITLE_ENTRY ); Q_UNUSED(id) // Get the number of notes and to-do entries. @@ -450,6 +497,7 @@ 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(); 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviews/traces/OstTraceDefinitions.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 +#endif diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviews/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530 @@ -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 diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/traces/notescollectionviewTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviews/traces/notescollectionviewTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/traces/notesfavoriteviewTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviews/traces/notesfavoriteviewTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/traces/notesmainviewTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviews/traces/notesmainviewTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/traces/notesnoteviewTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviews/traces/notesnoteviewTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/notesui/notesviews/traces/notestodoviewTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/notes/notesui/notesviews/traces/notestodoviewTraces.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 + diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/rom/notesresources.iby --- a/notes/rom/notesresources.iby Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/rom/notesresources.iby Mon Jul 26 13:54:38 2010 +0530 @@ -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__ diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/tsrc/unittest_noteseditor/src/unittest_noteseditor.cpp --- a/notes/tsrc/unittest_noteseditor/src/unittest_noteseditor.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/tsrc/unittest_noteseditor/src/unittest_noteseditor.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -18,12 +18,12 @@ // System include #include #include -#include #include #include // 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); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/tsrc/unittest_noteseditor/unittest_noteseditor.pro --- a/notes/tsrc/unittest_noteseditor/unittest_noteseditor.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/tsrc/unittest_noteseditor/unittest_noteseditor.pro Mon Jul 26 13:54:38 2010 +0530 @@ -26,7 +26,8 @@ . \ ./src -INCLUDEPATH += . +INCLUDEPATH += . \ + ..\..\notesui\noteseditor\inc symbian: { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/tsrc/unittest_notesmodel/src/unittest_notesmodel.cpp --- a/notes/tsrc/unittest_notesmodel/src/unittest_notesmodel.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/tsrc/unittest_notesmodel/src/unittest_notesmodel.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -23,8 +23,8 @@ #include // User includes +#include #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); diff -r 0b38fc5b94c6 -r 2c54b51f39c4 notes/tsrc/unittest_notesmodel/unittest_notesmodel.pro --- a/notes/tsrc/unittest_notesmodel/unittest_notesmodel.pro Mon Jul 12 02:32:28 2010 +0530 +++ b/notes/tsrc/unittest_notesmodel/unittest_notesmodel.pro Mon Jul 26 13:54:38 2010 +0530 @@ -25,7 +25,6 @@ INCLUDEPATH += \ . \ ../../notesui/notesmodel/inc \ - ../../../agendainterface/agendautil/inc \ ../../inc symbian: { diff -r 0b38fc5b94c6 -r 2c54b51f39c4 organizer_plat/agenda_interface_api/inc/agendautil.h --- a/organizer_plat/agenda_interface_api/inc/agendautil.h Mon Jul 12 02:32:28 2010 +0530 +++ b/organizer_plat/agenda_interface_api/inc/agendautil.h Mon Jul 26 13:54:38 2010 +0530 @@ -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 entryIds( AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll); QList 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, diff -r 0b38fc5b94c6 -r 2c54b51f39c4 organizer_plat/agenda_interface_api/tsrc/unittest_agendautil/src/unittest_agendautil.cpp --- a/organizer_plat/agenda_interface_api/tsrc/unittest_agendautil/src/unittest_agendautil.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/organizer_plat/agenda_interface_api/tsrc/unittest_agendautil/src/unittest_agendautil.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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 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. diff -r 0b38fc5b94c6 -r 2c54b51f39c4 organizer_plat/notes_editor_api/tsrc/unittest_noteseditorplugin/src/unittest_noteseditorplugin.cpp --- a/organizer_plat/notes_editor_api/tsrc/unittest_noteseditorplugin/src/unittest_noteseditorplugin.cpp Mon Jul 12 02:32:28 2010 +0530 +++ b/organizer_plat/notes_editor_api/tsrc/unittest_noteseditorplugin/src/unittest_noteseditorplugin.cpp Mon Jul 26 13:54:38 2010 +0530 @@ -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);