--- a/agendainterface/agendautil/src/agendautil_p.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/agendainterface/agendautil/src/agendautil_p.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -1031,8 +1031,8 @@
iCalInstanceView->FindInstanceL(instanceList, filters, dayRange);
}
- // In this list, check if any all day events are there
- // As all day events end at 12.00AM of next day, we should not show it again on next day
+ // In this list, check if any events are there that end at the start of the day
+ // we should not show it again on next day
TCalTime calTime;
TDateTime dateTime(
day.date().year(),
@@ -1041,9 +1041,8 @@
day.time().minute(), 0, 0);
TTime time(dateTime);
for (int i(0); i < instanceList.Count(); i++) {
- if ((endsAtStartOfDay(instanceList[i], time)) &&
- instanceList[i]->Entry().EntryTypeL() == CCalEntry::EEvent) {
- // Previous day all-day event has been found, we are not supposed to
+ if ((endsAtStartOfDay(instanceList[i], time))) {
+ // Previous day event has been found, we are not supposed to
// show it on current day, hence remove it from the instance list
CCalInstance *instance = instanceList[i];
instanceList.Remove(i);
@@ -1318,8 +1317,15 @@
TTime instStartTime(instStartDateTime);
TTime instEndTime(instEndDateTime);
- instanceStartCalTime.SetTimeLocalL(instStartTime);
- instanceEndCalTime.SetTimeLocalL(instEndTime);
+ // For nontimed entries set the floating time
+ if(entry.isTimedEntry()) {
+ instanceStartCalTime.SetTimeLocalL(instStartTime);
+ instanceEndCalTime.SetTimeLocalL(instEndTime);
+ }else {
+ instanceStartCalTime.SetTimeLocalFloatingL(instStartTime);
+ instanceEndCalTime.SetTimeLocalFloatingL(instEndTime);
+ }
+
calEntry->SetStartAndEndTimeL(instanceStartCalTime,instanceEndCalTime);
// Get the parent entry of this instance
@@ -1519,8 +1525,14 @@
TTime instStartTime(instStartDateTime);
TTime instEndTime(instEndDateTime);
- instanceStartCalTime.SetTimeLocalL(instStartTime);
- instanceEndCalTime.SetTimeLocalL(instEndTime);
+ // For nontimed entries set the floating time
+ if (entry.isTimedEntry()) {
+ instanceStartCalTime.SetTimeLocalL(instStartTime);
+ instanceEndCalTime.SetTimeLocalL(instEndTime);
+ }else {
+ instanceStartCalTime.SetTimeLocalFloatingL(instStartTime);
+ instanceEndCalTime.SetTimeLocalFloatingL(instEndTime);
+ }
calEntry->SetStartAndEndTimeL(instanceStartCalTime,instanceEndCalTime);
// Get the parent entry of this instance
@@ -2374,7 +2386,13 @@
getDayRange(entry.startTime(), entry.startTime(), dayRange);
RPointerArray<CCalInstance> instances;
CleanupResetAndDestroyPushL(instances);
- iCalInstanceView->FindInstanceL(instances, CalCommon::EIncludeAll, dayRange);
+ CalCommon::TCalViewFilter filter =
+ CalCommon::TCalViewFilter(CalCommon::EIncludeAnnivs |
+ CalCommon::EIncludeAppts |
+ CalCommon::EIncludeEvents |
+ CalCommon::EIncludeReminder |
+ CalCommon::EIncludeIncompletedTodos);
+ iCalInstanceView->FindInstanceL(instances, filter, dayRange);
TTime entryStartTime(dayRange.StartTime().TimeLocalL());
CCalInstance* result = 0;
--- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -376,7 +376,7 @@
if (!stopAction) {
qFatal("Unable to load the stopAction softkey");
}
- stopAction->setText(hbTrId("txt_calendar_button_alarm_dialog_snooze"));
+ stopAction->setText(hbTrId("txt_calendar_button_alarm_stop"));
disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close()));
connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed()));
@@ -496,7 +496,7 @@
if (!stopAction) {
qFatal("Unable to find the stopAction softkey");
}
- stopAction->setText(hbTrId("txt_calendar_button_alarm_dialog_snooze"));
+ stopAction->setText(hbTrId("txt_calendar_button_alarm_stop"));
disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close()));
connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed()));
OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_EXIT );
@@ -558,7 +558,7 @@
if (!stopAction) {
qFatal("Unable to load the stopAction softkey");
}
- stopAction->setText(hbTrId("txt_calendar_button_alarm_dialog_snooze"));
+ stopAction->setText(hbTrId("txt_calendar_button_alarm_stop"));
disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close()));
connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed()));
OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_EXIT );
--- a/alarmui/src/alarmutils.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/alarmui/src/alarmutils.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -15,14 +15,10 @@
*
*/
-
-
-// INCLUDE FILES
+// User includes.
#include "alarmutils.h"
-
#include "AlmAlertVariant.hrh"
#include "pim_trace.h"
-
#include "AlmAlarmPlayer.h"
#include "AlmAlarmControl.h"
#include "AlmAlarmInfo.h"
@@ -31,9 +27,9 @@
#ifdef RD_ALMALERT__SENSOR_SUPPORT
#include "alarmcontextfwsupport.h"
#endif // RD_ALMALERT__SENSOR_SUPPORT
-
#include "alarmalertwrapper.h"
+// System includes.
// #include <almconst.h>
#include <eikenv.h>
#include <AknCapServer.h>
@@ -45,12 +41,9 @@
#include <ProfileEngineDomainConstants.h>
#include <sbdefs.h>
#include <coreapplicationuisdomainpskeys.h>
-// #include <clockdomaincrkeys.h>
-// #include <CalendarInternalCRKeys.h>
#include <wakeupalarm.h>
#include <calalarm.h> // KUidAgendaModelAlarmCategory - the alarm category id for calendar alarms
#include <AknUtils.h>
-
#ifndef SYMBIAN_CALENDAR_V2
#include <agmalarm.h> // deprecated, use CalAlarm.h when SYMBIAN_CALENDAR_V2 flag is enabled
#endif // SYMBIAN_CALENDAR_V2
@@ -58,37 +51,31 @@
#include <calentryview.h>
#include <clockdomaincrkeys.h>
#include <calendardomaincrkeys.h>
-// #include <calenlauncher.h> // for launching calendar entry view
-
-
-// CONSTANTS AND MACROS
+// Constants
const TInt KAlmAlertMinSnooze( 100 );
const TInt KAlmAlertMaxSnooze( 104 );
-
-const TInt KDefaultSnoozeTime( 5 ); // 5 minutes
-
-const TUint KAlarmAutoHide( 60000000 ); // 60 s
-const TUint KAlarmAutoHideCalendar( 30000000 ); // 30 s
-const TUint KKeyBlockTime( 500000 ); // 0.5 s
-const TUint KShutdownTime( 1500000 ); // 1.5 s
-const TUint KAlarmDelayTime( 1000000 ); // 1.0 s
-const TUint KInactivityResetInterval( 1000000 ); // 1.0 s
-
+const TInt KDefaultSnoozeTime( 5 );
+const TUint KAlarmAutoHide( 60000000 );
+const TUint KAlarmAutoHideCalendar( 30000000 );
+const TUint KKeyBlockTime( 500000 );
+const TUint KShutdownTime( 1500000 );
+const TUint KAlarmDelayTime( 1000000 );
+const TUint KInactivityResetInterval( 1000000 );
const TInt KMaxProfileVolume( 10 );
-const TInt KVolumeRampPeriod( 3000000 ); // 3 seconds
-_LIT( KRngMimeType, "application/vnd.nokia.ringing-tone" );
-//const TUint32 KCalendarSoundFile = 0x00000004;
-//const TUint32 KClockAppSoundFile = 0x00000000;
+const TInt KNoVolume(0);
+const TInt KVolumeRampPeriod( 3000000 );
const TUid KAlarmClockOne = { 0x101F793A };
-
const TUid KCRUidProfileEngine = {0x101F8798};
//const TUint32 KProEngActiveReminderTone = 0x7E00001C;
-//const TUint32 KProEngActiveClockAlarmTone = 0x7E00001D;
+const TUint32 KProEngActiveClockAlarmTone = 0x7E00001D;
//const TUint32 KProEngActiveAlertVibra = 0x7E00001E;
-const TUint32 KProEngActiveRingingType = 0x7E000002;
-const TUint32 KProEngActiveRingingVolume = 0x7E000008;
+const TUint32 KProEngSilenceMode = {0x80000202};
+const TUint32 KProEngActiveRingingType = {0x7E000002};
+const TUint32 KProEngActiveRingingVolume = {0x7E000008};
+// Literals
+_LIT( KRngMimeType, "application/vnd.nokia.ringing-tone" );
// ==========================================================
// ================= MEMBER FUNCTIONS =======================
@@ -467,10 +454,7 @@
}
if( profileRepository )
{
- // TODO: Need to use KProEngActiveReminderTone once its released
- //PIM_ASSERT( profileRepository->Get( KProEngActiveReminderTone, iAlarmData.iAlarmTone ); )
- PIM_ASSERT( repository->Get( KCalendarDefaultSoundFile,
- iAlarmData.iAlarmTone ); )
+ PIM_ASSERT( profileRepository->Get( KProEngActiveClockAlarmTone, iAlarmData.iAlarmTone ); )
}
}
delete repository;
@@ -533,8 +517,20 @@
repository->Get( KProEngActiveRingingType , ringType);
iAlarmData.iRingType = static_cast< TProfileRingingType >( ringType );
+ TBool silentMode;
TInt ringingVolume;
- repository->Get( KProEngActiveRingingVolume , ringingVolume);
+ repository->Get( KProEngSilenceMode, silentMode);
+ if(silentMode)
+ {
+ ringingVolume = KNoVolume;
+ }
+ else
+ {
+ // It seems the wrong key has been associated with calendar alarm tone
+ // settings. It would be changed once it's rectified by profile team.
+ repository->Get( KProEngActiveRingingVolume , ringingVolume );
+ }
+
iAlarmData.iVolume = ringingVolume;
iAlarmData.iVolumeRampTime = 0;
@@ -542,7 +538,7 @@
TInt volumeOn = iAlarmData.iAlarm.ClientData2();
if (!volumeOn) {
iAlarmData.iRingType = EProfileRingingTypeSilent;
- iAlarmData.iVolume = 0;
+ iAlarmData.iVolume = KNoVolume;
}
}
TRACE_EXIT_POINT;
--- a/calendarui/agendaeventviewer/inc/agendaeventview.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/agendaeventviewer/inc/agendaeventview.h Mon Aug 09 18:30:52 2010 +0530
@@ -69,13 +69,15 @@
QString repeatRule();
QString alarmTimeText() const;
void removeWidget();
- void updateCompletedReminderData();
+ void updateFieldsforTodoStatus();
void removeAllWidgets();
void addAllWidgets();
void showDeleteOccurencePopup();
void showDeleteConfirmationQuery();
void getSubjectIcon(AgendaEntry::Type type, QString &subjectIcon);
- void getProgressIndicatorstatus(QString &progressIcon);
+ void getProgressIndicatorstatus(QString &progressIcon);
+ void updateSubjectandPriorityData();
+
private slots:
void markTodoStatus();
void edit();
@@ -98,7 +100,7 @@
QPointer<AgendaEventViewerItem> mSubjectWidget;
QPointer<AgendaEventViewerItem> mDateTimeWidget;
QPointer<AgendaEventViewerItem> mLocationWidget;
- HbLabel *mMaptileLabel ;
+ HbLabel *mMaptileLabel ;
QPointer<AgendaEventViewerItem> mReminderWidget;
QPointer<AgendaEventViewerItem> mRepeatWidget;
QPointer<AgendaEventViewerItem> mDescriptionWidget;
@@ -119,11 +121,11 @@
bool mLocationFeatureEnabled;
QString mMaptilePath;
- MapTileService *mMaptileService;
- QTimer *mProgressTimer;
- int mProgressIconCount;
- bool mMaptileStatusReceived;
- int mMaptileStatus;
+ MapTileService *mMaptileService;
+ QTimer *mProgressTimer;
+ int mProgressIconCount;
+ bool mMaptileStatusReceived;
+ int mMaptileStatus;
bool mNotesPluginLoaded;
private:
--- a/calendarui/agendaeventviewer/src/agendaeventview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -45,7 +45,9 @@
#include <maptileservice.h>//maptile service
#include <agendautil.h>
#include <NotesEditorInterface>
-#include <caleneditor.h>
+#include <CalenEditor>
+
+#include "calenagendautils.h"
#include "agendaeventview.h"
#include "agendaeventviewerdocloader.h"
#include "agendaeventviewercommon.h"
@@ -309,7 +311,7 @@
*/
void AgendaEventView::addMenuItem()
{
- OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDMENUITEM_ENTRY );
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDMENUITEM_ENTRY );
if (mAgendaEntry.type() == AgendaEntry::TypeTodo) {
@@ -382,11 +384,11 @@
AgendaEntry::Type entryType = mAgendaEntry.type();
if (entryType == AgendaEntry::TypeTodo) {
groupBox->setHeading(hbTrId("txt_calendar_subhead_to_do"));
+ } else if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+ groupBox->setHeading(hbTrId("txt_calendar_subhead_all_day_event"));
} else if (entryType == AgendaEntry::TypeAppoinment) {
groupBox->setHeading(hbTrId("txt_calendar_subhead_meeting"));
- }else if (entryType == AgendaEntry::TypeEvent) {
- groupBox->setHeading(hbTrId("txt_calendar_subhead_all_day_event"));
- }
+ }
OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDGROUPBOXDATA_EXIT );
}
@@ -439,7 +441,7 @@
itemData.append(QString::null);
itemData.append("qtg_small_calendar");
- mDateTimeWidget->setProperty(primaryLeftIconItem, false);
+ mDateTimeWidget->setProperty(primaryLeftIconItem, false);
mDateTimeWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
@@ -452,37 +454,55 @@
QString data;
// Add agenda entry specific fields to the viewer
+
switch (mAgendaEntry.type()) {
case AgendaEntry::TypeAppoinment:
-
- startTimeText.append(systemLocale.format(
- startDateTime.time(), r_qtn_time_usual_with_zero));
-
- endTimeText.append(systemLocale.format(endDateTime.time(),
- r_qtn_time_usual_with_zero));
- startDateText.append(
- systemLocale.format(startDateTime.date(),
- r_qtn_date_usual_with_zero));
- if (CalenDateUtils::onSameDay(startDateTime, endDateTime)) {
- data.append(startTimeText);
- data.append(CHARACTER_HYPHEN);
- data.append(endTimeText);
- data.append(CHARACTER_SPACE);
- data.append(startDateText);
- } else {
- // If both start and end time of a meeting are on different dates
- data.append(startTimeText);
- data.append(CHARACTER_SPACE);
- data.append(startDateText);
- QString endDateText;
- endDateText.append(
- systemLocale.format(endDateTime.date(),
- r_qtn_date_usual_with_zero));
- data.append(CHARACTER_HYPHEN);
- data.append(endTimeText);
- data.append(CHARACTER_SPACE);
- data.append(endDateText);
- }
+ case AgendaEntry::TypeEvent:
+ // Check if entry is an all-day
+ if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+ dateTimeText.append(systemLocale.format(startDateTime.date(),
+ r_qtn_date_usual_with_zero));
+ if (CalenDateUtils::onSameDay(startDateTime, endDateTime.addSecs(-60))) {
+ data.append(dateTimeText);
+ } else {
+ QString endDate;
+ endDate.append(
+ systemLocale.format(endDateTime.addSecs(-60).date(),
+ r_qtn_date_usual_with_zero));
+ data.append(dateTimeText);
+ data.append(" - ");
+ data.append(endDate);
+ }
+ } else {
+ startTimeText.append(systemLocale.format(
+ startDateTime.time(), r_qtn_time_usual_with_zero));
+
+ endTimeText.append(systemLocale.format(endDateTime.time(),
+ r_qtn_time_usual_with_zero));
+ startDateText.append(
+ systemLocale.format(startDateTime.date(),
+ r_qtn_date_usual_with_zero));
+ if (CalenDateUtils::onSameDay(startDateTime, endDateTime)) {
+ data.append(startTimeText);
+ data.append(CHARACTER_HYPHEN);
+ data.append(endTimeText);
+ data.append(CHARACTER_SPACE);
+ data.append(startDateText);
+ } else {
+ // If both start and end time of a meeting are on different dates
+ data.append(startTimeText);
+ data.append(CHARACTER_SPACE);
+ data.append(startDateText);
+ QString endDateText;
+ endDateText.append(
+ systemLocale.format(endDateTime.date(),
+ r_qtn_date_usual_with_zero));
+ data.append(CHARACTER_HYPHEN);
+ data.append(endTimeText);
+ data.append(CHARACTER_SPACE);
+ data.append(endDateText);
+ }
+ }
break;
case AgendaEntry::TypeAnniversary:
case AgendaEntry::TypeTodo:
@@ -490,22 +510,6 @@
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));
- if (CalenDateUtils::onSameDay(startDateTime, endDateTime.addSecs(-60))) {
- data.append(dateTimeText);
- } else {
- QString endDate;
- endDate.append(
- systemLocale.format(endDateTime.addSecs(-60).date(),
- r_qtn_date_usual_with_zero));
- data.append(dateTimeText);
- data.append(" - ");
- data.append(endDate);
- }
- break;
default:
break;
}
@@ -524,7 +528,7 @@
QStringList itemData;
QString progressIcon(QString::null);
if ( mLocationFeatureEnabled ) {
- getProgressIndicatorstatus(progressIcon);
+ getProgressIndicatorstatus(progressIcon);
}
if( progressIcon.isNull() ) {
itemData.append(QString::null);
@@ -580,8 +584,9 @@
itemData.append(QString::null);
itemData.append(alarmTimeText());
mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
- OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDREMINDERDATA_EXIT );
- }
+ mReminderWidgetAdded = true;
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDREMINDERDATA_EXIT );
+}
/*!
Add completed to-do data to Event viewer
@@ -590,12 +595,12 @@
{
OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_ENTRY );
QStringList itemData;
- QString completedText;
- HbExtendedLocale systemLocale = HbExtendedLocale::system();;
- itemData.append(QString::null);
+ QString completedText;
+ HbExtendedLocale systemLocale = HbExtendedLocale::system();;
itemData.append(QString::null);
itemData.append(QString::null);
- mReminderWidget->setProperty(primaryLeftIconItem, true);
+ itemData.append(QString::null);
+ mReminderWidget->setProperty(primaryLeftIconItem, true);
mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
completedText = systemLocale.format(mAgendaEntry.completedDateTime().date(),
@@ -781,9 +786,9 @@
}
QFile file(mMaptilePath);
- if ( !mLocationFeatureEnabled || !file.exists()
- || mAgendaEntry.location().isEmpty()){
- //code added to hide and remove maptile image
+ if (!mLocationFeatureEnabled || !file.exists()
+ || mAgendaEntry.location().isEmpty()) {
+ //code added to hide and remove maptile image
mMaptileLabel->hide();
mLinearLayout->removeItem(mMaptileLabel);
}
@@ -803,8 +808,16 @@
}
}
+ // Check whether the entry is a completed To-do. if so then remove the
+ // time and date widget.
+ if (mAgendaEntry.type() == AgendaEntry::TypeTodo &&
+ AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
+ mDateTimeWidget->hide();
+ mLinearLayout->removeItem(mDateTimeWidget);
+ }
+
if ((mAgendaEntry.repeatRule().type() == AgendaRepeatRule::InvalidRule) &&
- (mAgendaEntry.recurrenceId().isNull())) {
+ (mAgendaEntry.recurrenceId().isNull())) {
mRepeatWidget->hide();
mLinearLayout->removeItem(mRepeatWidget);
}
@@ -821,14 +834,22 @@
}
/*!
- Update the completed to-do or reminder data to event viewer.
+ Update all the fields according to to-do status change..
*/
-void AgendaEventView::updateCompletedReminderData()
+void AgendaEventView::updateFieldsforTodoStatus()
{
- OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_ENTRY );
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_ENTRY );
if (AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
+
+ // For completed to-do due date and time should be removed.
+ mDateTimeWidget->hide();
+ mLinearLayout->removeItem(mDateTimeWidget);
+
+ // Fill the completed data information.
addCompletedTodoData();
+
+ // Add the completed date to thte viewer.
if (!mReminderWidgetAdded) {
mReminderWidget->show();
mLinearLayout->insertItem(2, mReminderWidget);
@@ -836,6 +857,10 @@
}
} else {
+ // Add the date and time widget to the viewer.
+ mDateTimeWidget->show();
+ mLinearLayout->insertItem(1, mDateTimeWidget);
+
if (!mAgendaEntry.alarm().isNull()) {
addReminderData();
if (!mReminderWidgetAdded) {
@@ -844,6 +869,7 @@
mReminderWidgetAdded = true;
}
} else {
+ // Remove the completed date from the viewer.
if (mReminderWidgetAdded) {
mReminderWidget->hide();
mLinearLayout->removeItem(mReminderWidget);
@@ -852,10 +878,12 @@
}
}
+ // The To-do icon changes according to the To-do status change.
+ updateSubjectandPriorityData();
mLinearLayout->invalidate();
mLinearLayout->activate();
- OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_EXIT );
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT );
}
/*!
@@ -957,9 +985,15 @@
switch (mAgendaEntry.type()) {
case AgendaEntry::TypeAppoinment:
case AgendaEntry::TypeEvent: {
- text.append(hbTrId("txt_calendar_info_delete_meeting"));
- break;
- }
+ // Check for all-day
+ if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+ text.append(hbTrId("txt_calendar_info_delete_allday_event"));
+ } else {
+ text.append(hbTrId("txt_calendar_info_delete_meeting"));
+ }
+
+ break;
+ }
case AgendaEntry::TypeAnniversary: {
text.append(hbTrId("txt_calendar_info_delete_anniversary"));
break;
@@ -1030,7 +1064,7 @@
mOwner->mAgendaUtil->setCompleted(mAgendaEntry, false, currentDateTime);
}
- updateCompletedReminderData();
+ updateFieldsforTodoStatus();
OstTraceFunctionExit0( AGENDAEVENTVIEW_MARKTODOSTATUS_EXIT );
}
@@ -1284,8 +1318,14 @@
OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETSUBJECTICON_ENTRY );
switch(type) {
case AgendaEntry::TypeAppoinment:
+ case AgendaEntry::TypeEvent:
{
- subjectIcon.append("qtg_small_meeting");
+ // Check for all-day
+ if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+ subjectIcon.append("qtg_small_day");
+ } else {
+ subjectIcon.append("qtg_small_meeting");
+ }
}
break;
case AgendaEntry::TypeTodo:
@@ -1297,11 +1337,6 @@
}
}
break;
- case AgendaEntry::TypeEvent:
- {
- subjectIcon.append("qtg_small_day");
- }
- break;
case AgendaEntry::TypeAnniversary:
{
subjectIcon.append("qtg_small_anniversary");
@@ -1424,6 +1459,26 @@
}
OstTraceFunctionExit0( AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_EXIT );
}
+
+/*!
+ Updates the To-do icon for the changes in to-do status.
+ */
+void AgendaEventView::updateSubjectandPriorityData()
+{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY );
+ QStringList itemList;
+ QString priorityIcon(QString::null);
+ QString subjectIcon(QString::null);
+ getPriorityIcon(mAgendaEntry.priority(), priorityIcon);
+ getSubjectIcon(mAgendaEntry.type(),subjectIcon);
+ itemList.append(subjectIcon);
+ itemList.append(priorityIcon);
+ itemList.append(QString::null);
+
+ mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
+ OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT );
+}
+
/*!
Reload the maptile image on system orientation change.
*/
--- a/calendarui/agendaeventviewer/traces/agendaeventviewTraces.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -44,8 +44,6 @@
#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
@@ -86,6 +84,10 @@
#define AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_EXIT 0x8a004e
#define AGENDAEVENTVIEW_CHANGEDORIENTATION_ENTRY 0x8a004f
#define AGENDAEVENTVIEW_CHANGEDORIENTATION_EXIT 0x8a0050
+#define AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_ENTRY 0x8a007e
+#define AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT 0x8a007f
+#define AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY 0x8a0080
+#define AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT 0x8a0081
#endif
--- a/calendarui/agendaeventviewer/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/agendaeventviewer/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -100,10 +100,12 @@
[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_UPDATEFIELDSFORTODOSTATUS_ENTRY=0x7e
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT=0x7f
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_ENTRY=0x49
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY=0x80
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT=0x81
[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_EXIT=0x77
[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY=0x7a
[TRACE]TRACE_FLOW[0x8A]_DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT=0x7b
@@ -125,3 +127,5 @@
[TRACE]TRACE_FLOW[0x8A]_DUP2_AGENDAEVENTVIEWER_VIEW_EXIT=0x5c
[TRACE]TRACE_FLOW[0x8A]_DUP3_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT=0x67
[TRACE]TRACE_FLOW[0x8A]_DUP4_AGENDAEVENTVIEWERPRIVATE_VIEW_EXIT=0x68
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_ENTRY=0x27
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_UPDATECOMPLETEDREMINDERDATA_EXIT=0x28
--- a/calendarui/application/application.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/application/application.pro Mon Aug 09 18:30:52 2010 +0530
@@ -37,7 +37,13 @@
"../conf/calendarUI.confml APP_LAYER_CONFML(calendarUI.confml)" \
"../conf/calendarUI_101F874B.crml APP_LAYER_CRML(calendarUI_101F874B.crml)" \
# stubsis is added to provide IAD
- "../stubsis/calendar_stub.sis /epoc32/data/z/system/install/calendar_stub.sis"
+ "../stubsis/calendar_stub.sis /epoc32/data/z/system/install/calendar_stub.sis" \
+ # backup_registration.xml
+ "data/backup_registration.xml /epoc32/data/z/private/10005901/backup_registration.xml" \
+ "data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10005901/backup_registration.xml" \
+ "data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10005901/backup_registration.xml"
+
+
LIBS += -lcalencontroller \
--- a/calendarui/application/inc/calenapplication.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/application/inc/calenapplication.h Mon Aug 09 18:30:52 2010 +0530
@@ -21,6 +21,7 @@
// Forward Declarations.
class CCalenController;
+class CalenServiceProvider;
class CalenApplication : public HbApplication
{
@@ -44,6 +45,7 @@
private:
QPointer<CCalenController> mController;
+ QPointer<CalenServiceProvider> mService;
};
// End of file --Don't remove this.
--- a/calendarui/application/src/calenapplication.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/application/src/calenapplication.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -16,8 +16,8 @@
*/
#include "calencontroller.h"
+#include "calenapplication.h"
#include "calenserviceprovider.h"
-#include "calenapplication.h"
/*!
CalenApplication
@@ -54,7 +54,7 @@
mController->constructController();
connect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
// Create the Calendar service provider
- CalenServiceProvider service(mController);
+ mService = new CalenServiceProvider(mController, this);
}
}
--- a/calendarui/application/src/calenserviceprovider.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/application/src/calenserviceprovider.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -18,9 +18,9 @@
#include <hbmainwindow.h>
#include <CalenLauncher>
+#include <CalenEditor>
#include "calencontroller.h"
-#include "caleneditor.h"
#include "calenserviceprovider.h"
CalenServiceProvider::CalenServiceProvider(CCalenController *controller, QObject* parent) :
--- a/calendarui/application/src/main.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/application/src/main.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -38,6 +38,12 @@
// Main window for providing the scene context
HbMainWindow window;
+ // Flags to gain some optimizations from the framework
+ // TODO: Check if orbit itself is setting these flags in mainwindow
+ // If yes, then we need not set here
+ window.setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
+ window.setRenderHint(QPainter::TextAntialiasing, false);
+
//For translation, loading and installing translator
HbTranslator translator("calendar");
--- a/calendarui/caleneditor/caleneditor.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/caleneditor.pro Mon Aug 09 18:30:52 2010 +0530
@@ -28,10 +28,7 @@
./data
symbian: {
- BLD_INF_RULES.prj_exports += \
- "./inc/caleneditor.h |../inc/caleneditor.h"
-
-
+
TARGET.UID3 = 0x10207198
TARGET.CAPABILITY += ALL -TCB
TARGET.EPOCALLOWDLLDATA = 1
@@ -52,7 +49,7 @@
caleneditorrepeatfield.cpp \
caleneditordatahandler.cpp
-HEADERS += caleneditor.h \
+HEADERS += ../../organizer_plat/calendar_editor_api/inc/caleneditor.h \
caleneditorcustomitem.h \
caleneditorcommon.h \
caleneditordocloader.h \
--- a/calendarui/caleneditor/inc/caleneditor.h Mon Jul 26 13:54:38 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* The header file for CalenEditor class.
-*
-*/
-
-#ifndef CALENEDITOR_H
-#define CALENEDITOR_H
-
-// System includes
-#include <QObject>
-#include <qglobal.h>
-#include <hbview.h>
-
-// Forward declarations
-class QFile;
-class QString;
-class QDateTime;
-class AgendaUtil;
-class AgendaEntry;
-class CalenEditorPrivate;
-
-#ifdef CALENEDITOR_LIB
-# define CALENEDITOR_EXPORT Q_DECL_EXPORT
-#else
-# define CALENEDITOR_EXPORT Q_DECL_IMPORT
-#endif
-
-class CalenEditor : public QObject //HbView
-{
- Q_OBJECT
-
-public:
- enum CreateType{
- TypeAppointment = 0,
- // TODO: Need to add more types
- TypeUnKnown = -1
- };
-
- 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);
- 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();
- void dialogClosed();
- void calendarLaunchFailed(int error);
-
-private:
-#ifdef TESTCALENEDITOR
- friend class TestCalenEditor;
-#endif
- CalenEditorPrivate *d_ptr;
- Q_DECLARE_PRIVATE_D(d_ptr, CalenEditor)
- Q_DISABLE_COPY(CalenEditor)
-};
-
-#endif // CALENEDITOR_H
-
-// End of file --Don't remove this.
--- a/calendarui/caleneditor/inc/caleneditor_p.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/inc/caleneditor_p.h Mon Aug 09 18:30:52 2010 +0530
@@ -27,8 +27,8 @@
//user includes
#include <AgendaEntry>
+#include <caleneditor.h>
-#include "caleneditor.h"
#include "caleneditorcommon.h"
//forward declarations
@@ -154,7 +154,7 @@
void deleteEntry(bool close = false);
bool handleAllDayToSave();
void enableFromTotimeFileds(bool, QDateTime, QDateTime);
- QTime defaultTimeSameDay();
+ QDateTime defaultTimeSameDay( );
void refreshTimeForUncheckAllDay();
private slots:
--- a/calendarui/caleneditor/inc/caleneditorcommon.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/inc/caleneditorcommon.h Mon Aug 09 18:30:52 2010 +0530
@@ -31,6 +31,11 @@
#define CALEN_EDITOR_ADD_DESCRIPTION_ACTION "addDescriptionAction"
#define CALEN_EDITOR_DELETE_EVENT_ACTION "deleteEventAction"
+// Constants
+const int SecsInOneHour( 3600 );
+const int MaxRowsInTextItem(10);
+const int MaxCharacterLimit(255);
+
enum CustomItemOffset {
CustomWidgetFrom = HbDataFormModelItem::CustomItemBase + 1,
CustomWidgetTo,
--- a/calendarui/caleneditor/inc/caleneditorcustomitem.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/inc/caleneditorcustomitem.h Mon Aug 09 18:30:52 2010 +0530
@@ -25,6 +25,9 @@
#include <hbextendedlocale.h>
#include <hblineedit.h>
+class XQApplicationManager;
+class XQAiwRequest;
+
class HbDateTimePicker;
class HbPushButton;
class HbDataFomViewer;
@@ -53,9 +56,6 @@
protected:
virtual HbWidget* createCustomWidget();
-private:
- void setSelectedLocation( QVariant &aValue );
-
protected slots:
void handleDate();
void handleTime();
@@ -64,6 +64,7 @@
void handleLocationTextChange(QString location);
void launchLocationPicker();
void handleEditingFinished();
+ void setSelectedLocation( const QVariant &aValue );
Q_SIGNALS:
void dateTimeUpdated(QDateTime& fromDateTime);
@@ -78,7 +79,10 @@
QTime mTime;
QTime mMaxTime;
QTime mMinTime;
-
+
+ XQApplicationManager *mAppManager;
+ XQAiwRequest* mRequest;
+
HbPushButton* mPushButtonTime;
HbPushButton* mPushButtonDate;
HbPushButton *mRepeatUntilWidget;
@@ -92,6 +96,7 @@
HbLineEdit *mLocationLineEdit;
HbPushButton* mLocationPushButton;
bool mIsFromItem;
+ bool mRequestPending;
};
--- a/calendarui/caleneditor/inc/caleneditorreminderfield.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/inc/caleneditorreminderfield.h Mon Aug 09 18:30:52 2010 +0530
@@ -38,6 +38,14 @@
Q_OBJECT
public:
+ enum AllDayReminderIndex
+ {
+ ReminderOff = 0,
+ ReminderOnEventDay,
+ ReminderOneDayBefore,
+ ReminderTwoDaysBefore
+ };
+public:
CalenEditorReminderField(CalenEditorPrivate* calenEditor,
HbDataForm* form, HbDataFormModel* model,
QObject *parent = NULL);
--- a/calendarui/caleneditor/inc/caleneditorrepeatfield.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/inc/caleneditorrepeatfield.h Mon Aug 09 18:30:52 2010 +0530
@@ -57,6 +57,7 @@
private:
void insertRepeatUntilItem();
+ void removeRepeatUntilItem();
private slots:
void handleRepeatIndexChanged(int index);
@@ -90,6 +91,7 @@
HbDateTimePicker* mDatePicker;
QDate mRepeatUntilDate;
AgendaRepeatRule::RuleType mRepeatRuleType;
+ int mRepeatRoleValue;
bool mIsBiWeekly;
bool mIsWorkdays;
bool mRepeatUntilItemAdded;
--- a/calendarui/caleneditor/src/caleneditor.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/src/caleneditor.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -22,8 +22,8 @@
// User includes
#include <agendaentry.h>
#include <agendautil.h>
+#include <caleneditor.h>
-#include "caleneditor.h"
#include "caleneditor_p.h"
#include "OstTraceDefinitions.h"
#ifdef OST_TRACE_COMPILER_IN_USE
--- a/calendarui/caleneditor/src/caleneditor_p.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/src/caleneditor_p.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -50,15 +50,15 @@
#include <CalenLauncher>
#include <agendaentry.h>
#include <agendautil.h>
+#include <caleneditor.h>
#include "caleneditor_p.h"
-#include "caleneditor.h"
-#include "caleneditor_p.h"
#include "caleneditorcustomitem.h"
#include "calendateutils.h"
#include "caleneditordocloader.h"
#include "caleneditorcommon.h"
#include "calendateutils.h"
+#include "calenagendautils.h"
#include "caleneditordatahandler.h"
#include "caleneditorreminderfield.h"
#include "caleneditorrepeatfield.h"
@@ -67,10 +67,6 @@
#include "caleneditor_pTraces.h"
#endif
-// Constants
-const int SecsInOneYear( 3600 );
-
-
/*!
\class CalenEditorPrivate
This object loads the calendar editor view. The view is added to the top
@@ -580,7 +576,7 @@
AgendaEntry::Type entryType = mEditedEntry->type();
if( entryType == AgendaEntry::TypeAppoinment) {
headingWidget->setHeading(hbTrId("txt_calendar_subhead_meeting"));
- }else if(entryType == AgendaEntry::TypeEvent) {
+ }else if(CalenAgendaUtils::isAlldayEvent(*mEditedEntry)) {
headingWidget->setHeading(hbTrId("txt_calendar_subhead_all_day_event"));
}else if (entryType == AgendaEntry::TypeTodo) {
headingWidget->setHeading(hbTrId("txt_calendar_subhead_to_do"));
@@ -822,8 +818,8 @@
{
OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATESUBJECTITEM_ENTRY );
mSubjectItem->setContentWidgetData("text", mEditedEntry->summary());
- mSubjectItem->setContentWidgetData("minRows", 2);
- mSubjectItem->setContentWidgetData("maxRows", 4);
+ mSubjectItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
+ mSubjectItem->setContentWidgetData("maxLength", MaxCharacterLimit);
mSubjectItem->setContentWidgetData("objectName", "subjectItem");
mCalenEditorForm->addConnection(mSubjectItem,
SIGNAL(textChanged(const QString)), this,
@@ -839,7 +835,7 @@
OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATEALLDAYITEM_ENTRY );
mAllDayCheckBoxItem->setContentWidgetData("text",
hbTrId("txt_calendar_list_all_day_event"));
- if (AgendaEntry::TypeEvent == mEditedEntry->type()) {
+ if (CalenAgendaUtils::isAlldayEvent(*mEditedEntry)) {
//If All day is enabled.
mAllDayCheckBoxItem->setContentWidgetData("checkState", Qt::Checked);
}
@@ -854,15 +850,15 @@
/*!
Calculates default time when Event is on same day.
*/
-QTime CalenEditorPrivate::defaultTimeSameDay()
+QDateTime CalenEditorPrivate::defaultTimeSameDay( )
{
- QTime currentTime = QTime::currentTime();
+ QDateTime currentDateTime = QDateTime::currentDateTime();
//Start time should be one hour more than current time.
- currentTime = currentTime.addSecs(SecsInOneYear);
+ currentDateTime = currentDateTime.addSecs(SecsInOneHour);
- int hour = currentTime.hour();
- int minutes = currentTime.minute();
+ int hour = currentDateTime.time().hour();
+ int minutes = currentDateTime.time().minute();
bool addHour = 0;
//If the current time is within 15 mins after adding one hour, minutes will be rounded off to 0.
@@ -877,11 +873,20 @@
minutes = 0;
addHour = 1;
}
- currentTime.setHMS(hour, minutes, 0, 0);
+ QTime tempTime;
+ tempTime.setHMS(hour, minutes, 0, 0);
+ currentDateTime.setTime(tempTime);
+
if (addHour) {
- currentTime = currentTime.addSecs(SecsInOneYear);
+ currentDateTime = currentDateTime.addSecs(SecsInOneHour);
}
- return currentTime;
+
+ // After adding one hour and rounding off the minutes to current time,
+ // if midnight crossover happens return default time(8:00 am) for next day
+ if(CalenDateUtils::isOnToday(currentDateTime))
+ return currentDateTime;
+ else
+ return CalenDateUtils::defaultTime(currentDateTime);
}
/*!
@@ -897,11 +902,13 @@
// else the time is calculated accordingly
bool isSameDay = CalenDateUtils::isOnToday(fromDateTime);
if (isSameDay) {
- fromDateTime.setDate(fromDateTime.date());
- fromDateTime.setTime(defaultTimeSameDay());
+ fromDateTime = defaultTimeSameDay();
}
+ mViewFromItem->populateDateTime(fromDateTime, true);
mNewEntryDateTime = fromDateTime;
- toDateTime = fromDateTime.addSecs(SecsInOneYear);
+
+ toDateTime = fromDateTime.addSecs(SecsInOneHour);
+ mViewToItem->populateDateTime(toDateTime, false);
// Set the default start time to the event.
mEditedEntry->setStartAndEndTime(fromDateTime, toDateTime);
@@ -951,8 +958,7 @@
// Check if it is on same day and set the default time and date accordingly.
bool isSameDay = CalenDateUtils::isOnToday(fromDateTime);
if (isSameDay) {
- fromDateTime.setDate(fromDateTime.date());
- fromDateTime.setTime(defaultTimeSameDay());
+ fromDateTime = defaultTimeSameDay();
}
}
mViewFromItem->populateDateTime(fromDateTime, true);
@@ -1022,7 +1028,7 @@
}
}
} else {
- toDateTime = fromDateTime.addSecs(SecsInOneYear);
+ toDateTime = fromDateTime.addSecs(SecsInOneHour);
}
mViewToItem->populateDateTime(toDateTime, false);
@@ -1032,10 +1038,7 @@
if (mNewEntry) {
mOriginalEntry->setStartAndEndTime(fromDateTime, toDateTime);
}
- if ((mAllDayCheckBoxItem &&
- (mAllDayCheckBoxItem->contentWidgetData("checkState") == Qt::Checked))
- || (!mNewEntry && mEditedEntry->type() == AgendaEntry::TypeEvent)) {
-
+ if (isAllDayEvent()) {
// For all-day, we need to substratc 1 minute to get the actual end time
// as we store all-day as 12.00AM to 12.00 AM next day
QDateTime actualEndTime = mEditedEntry->endTime().addSecs(-60);
@@ -1096,7 +1099,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(SecsInOneYear);
+ endTime = fromDateTime.addSecs(SecsInOneHour);
} else { // for existing entry
// we need to see if user has moved start time beyond the end time
// then add the duration of the meeting that was saved earlier to the
@@ -1130,6 +1133,8 @@
// Start date or repeat until date will be the reference to decide
// whether the event is in past or future.
if (mRepeatField && mRepeatField->isRepeatUntilItemAdded()) {
+ // For repeating entries reminder options will be provided only
+ // when the repeatuntil date is in future
referenceDate = mRepeatField->repeatUntilDate();
} else {
referenceDate = mEditedEntry->startTime().date();
@@ -1137,18 +1142,8 @@
// Check if all day event or not.
if (isAllDayEvent()) {
- int currentIndex = mReminderField->currentReminderIndex();
mReminderField->updateReminderChoicesForAllDay(referenceDate);
- int numberOfReminderChoices = mReminderField->reminderItemsCount();
- if (currentIndex >= numberOfReminderChoices) {
- currentIndex = 0;
- mReminderField->disableReminderTimeField();
- }
- mReminderField->setCurrentIndex(currentIndex);
- if(currentIndex == 0 && mReminderField->isReminderTimeForAllDayAdded()) {
- mReminderField->removeReminderTimeField();
- }
- } else {
+ } else {
if ((referenceDate < QDate::currentDate())
|| (referenceDate == QDate::currentDate()
&& (mEditedEntry->startTime().time() < QTime::currentTime())))
@@ -1159,6 +1154,8 @@
// do anything.
if (!mReminderField->isReminderFieldEnabled()) {
mReminderField->setReminderChoices();
+ // Set the default alarm time 15 minutes before
+ mReminderField->setCurrentIndex(2);
}
}
}
@@ -1176,7 +1173,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(-SecsInOneYear);
+ startTime = toDateTime.addSecs(-SecsInOneHour);
fromDateChanged = true;
} else {
// for exisitng entry
@@ -1257,8 +1254,7 @@
"txt_calendar_formlabel_val_description")),
mCalenEditorModel->invisibleRootItem());
mDescriptionItem->setContentWidgetData("text", mEditedEntry->description());
- mDescriptionItem->setContentWidgetData("minRows", 2);
- mDescriptionItem->setContentWidgetData("maxRows", 4);
+ mDescriptionItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
mDescriptionItem->setContentWidgetData("objectName", "descriptionItem");
mCalenEditorForm->addConnection(
mDescriptionItem,
@@ -1355,6 +1351,11 @@
} else {
referenceDate = mEditedEntry->startTime().date();
}
+ // For the transition from normal entry to all day - set reminder off
+ // This is to avoid conflict in the reminder time as
+ // the index set for the normal meeting may not be valid for an allday
+ // Set it off before doing the reminder updation for all day
+ mReminderField->setCurrentIndex(0);
mReminderField->updateReminderChoicesForAllDay(referenceDate);
// If the reminder field is enabled and it is not off
// it implies default alarm day and time is being displayed.
@@ -1376,6 +1377,8 @@
mEditedEntry->endTime());
mReminderField->removeReminderTimeField();
mReminderField->setReminderChoices();
+ // Set the default alarm time 15 minutes before
+ mReminderField->setCurrentIndex(2);
updateReminderChoices();
}
@@ -1642,17 +1645,21 @@
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);
- }
+ // Set the all-day endtime back
+ if(isAllDayEvent()) {
+ // Set the all-day end time to 12:00AM to next day here only
+ // In case if user doesnt change/edit anything then,
+ // we shall not show "Entry updated" popup
+ QDateTime actualStartTime =
+ CalenDateUtils::beginningOfDay(mEditedEntry->startTime());
+
+ // Set EndTime of AllDay event to 00:00:00 of next day
+ QDateTime actualEndTime = mEditedEntry->endTime().addDays(1);
+ QTime tempEndQTime = actualEndTime.time();
+ tempEndQTime.setHMS(0, 0, 0);
+ actualEndTime.setTime(tempEndQTime);
+ // Set the start and end time properly
+ mEditedEntry->setStartAndEndTime(actualStartTime, actualEndTime);
}
// TODO: Need to check entry status here. EntryStillExistsL
@@ -1696,13 +1703,13 @@
if (mNewEntry) {
if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) {
HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_new_meeting_saved"));
- } else if(mEditedEntry->type() == AgendaEntry::TypeEvent) {
+ } else if(isAllDayEvent()) {
HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_new_all_day_event_saved"));
}
} else {
if(mEditedEntry->type() == AgendaEntry::TypeAppoinment) {
HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_meeting_updated"));
- } else if(mEditedEntry->type() == AgendaEntry::TypeEvent) {
+ } else if(isAllDayEvent()) {
HbNotificationDialog::launchDialog(hbTrId("txt_calendar_dpopinfo_all_day_event_updated"));
}
}
@@ -1747,83 +1754,93 @@
{
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)) {
-
+ // Check the state of AllDay checkBox
+ // If the all day item was not added, definitely its an instance of a
+ // repeating entry(TypeAppoinment or TypeEvent)
+ // In this case the parent entry type should not be changed
+ // so return false
+ if (!mIsAllDayItemAdded) {
// All day item was not added, return false
- mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
return false;
}
+ // If the entry type is getting changed say TypeEvent to TypeAppoinment
+ // or TypeAppoinment to TypeEvent then,
+ // Clone the entry to the new type and Delete old entry from Database
+ // So checking all the possible type conversions and other cases
+
// If Creating new Entry and AllDay Box is checked.
- // Clone the entry to AllDay
+ // Just return false to save it.
if (mNewEntry && (mAllDayCheckBoxItem->contentWidgetData("checkState")
- == Qt::Checked)) {
- // changes Start/End times of entry to Beginning ot the day
- mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
+ == Qt::Checked)) {
mEditedEntry->setType(AgendaEntry::TypeEvent);
OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
return false;
} else if ((mAllDayCheckBoxItem->contentWidgetData("checkState")
- == Qt::Checked) && (mEditedEntry->type() !=
- AgendaEntry::TypeEvent)) {
- // Editing existing Meetingentry, and Alldat Box is Checked
- // changes Start/End times of entry to Beginning ot the day
- mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
-
- // Clone the entry to AllDayEntry, Delete old entry from Database
- mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
- // For later reference for the notification popup
- mEditedEntry->setType(AgendaEntry::TypeEvent);
+ == Qt::Checked)) {
+ bool isAllDayEvent = CalenAgendaUtils::isAlldayEvent(*mOriginalEntry);
+ // Editing existing Meeting entry, and Allday Box is Checked
+ if (!isAllDayEvent) {
+ // Clone the entry to AllDayEntry, Delete old entry from Database
+ mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
+ // For later reference for the notification popup
+ mEditedEntry->setType(AgendaEntry::TypeEvent);
+ OstTraceFunctionExit0( DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ return true;
+ }
OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
- return true;
+ // Return false since the entry is already an all day entry
+ // so cloning not required. Just save it.
+ return false;
} else if (mAllDayCheckBoxItem->contentWidgetData("checkState")
- != Qt::Checked) {
- if (mEditedEntry->type() != AgendaEntry::TypeAppoinment) {
- // Editing existing AllDayentry, and Alldat Box is Not-Checked
- // Clone the entry to MeetingEntry, Delete old entry from Database
- mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeAppoinment);
- // For later reference for the notification popup
- mEditedEntry->setType(AgendaEntry::TypeAppoinment);
- OstTraceFunctionExit0( DUP3_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
- return true;
- }
- // Check if the duration of the meeting is matching the all-day criteria
- // if yes, then we need to store it as all-day instead of normal meeting
- else if (mEditedEntry->startTime() == CalenDateUtils::beginningOfDay(mEditedEntry->startTime())) {
- // Get the end time and see if it is at the beginning of the end date day
- if (mEditedEntry->endTime() == CalenDateUtils::beginningOfDay(mEditedEntry->endTime())) {
- // Store it as all-day
- mEditedEntry->setType(AgendaEntry::TypeEvent);
- // Check if this was an all-day earlier and now user has changed it like that
- // or it is a new entry
- if (mOriginalEntry->type() == AgendaEntry::TypeEvent ||
- mNewEntry) {
- OstTraceFunctionExit0( DUP4_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
- return false;
- } else {
- // It was a meeting
- // Clone the entry to AllDayEntry, Delete old entry from Database
- mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
- mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
- // For later reference for the notification popup
- mEditedEntry->setType(AgendaEntry::TypeEvent);
- OstTraceFunctionExit0( DUP5_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
- return true;
- }
- }
- }
+ != Qt::Checked) {
+ if (mEditedEntry->type() != AgendaEntry::TypeAppoinment) {
+ // Editing existing AllDayentry, and Allday Box is Not-Checked
+ // Clone the entry to MeetingEntry, Delete old entry from Database
+ mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeAppoinment);
+ // For later reference for the notification popup
+ mEditedEntry->setType(AgendaEntry::TypeAppoinment);
+ OstTraceFunctionExit0( DUP3_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ return true;
+ } else if (CalenAgendaUtils::isAlldayEvent(*mOriginalEntry)) {
+ // This else case will be executed when the original entry is
+ // an all day and the entry type is still TypeAppoinment.
+ // eg: Outlook synced all day entry type will be still TypeAppoinment
+ // In this case cloning is not required but entry has to be saved.
+ // So return false
+ OstTraceFunctionExit0( DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ // save it
+ return false;
+ }
+ // Check if the duration of the meeting is matching the all-day criteria
+ // if yes, then we need to store it as all-day instead of normal meeting
+ else if (mEditedEntry->startTime() ==
+ CalenDateUtils::beginningOfDay(mEditedEntry->startTime())) {
+ // Get the end time and see if it is at the beginning of the end date day
+ if (mEditedEntry->endTime() ==
+ CalenDateUtils::beginningOfDay(mEditedEntry->endTime())) {
+ // Since the start and end time matches the all day criteria
+ // Store it as all-day
+ mEditedEntry->setType(AgendaEntry::TypeEvent);
+ // Check if this was an all-day earlier and now user
+ // has changed it like that or it is a new entry
+ if (mOriginalEntry->type() == AgendaEntry::TypeEvent ||
+ mNewEntry) {
+ OstTraceFunctionExit0( DUP4_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ return false;
+ } else {
+ // It was a meeting
+ // Clone the entry to AllDayEntry,
+ // And Delete old entry from Database
+ mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
+ // For later reference for the notification popup
+ mEditedEntry->setType(AgendaEntry::TypeEvent);
+ OstTraceFunctionExit0( DUP5_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+ return true;
+ }
+ }
+ }
}
OstTraceFunctionExit0( DUP6_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
return false;
@@ -1904,9 +1921,12 @@
if (mAllDayCheckBoxItem) {
return (mAllDayCheckBoxItem->contentWidgetData("checkState")
== Qt::Checked)? true:false;
- } else if (!mNewEntry && mEditedEntry->type() == AgendaEntry::TypeEvent) {
- // If editing single occurence then all day item not shown but still it
- // is an all day event..
+ } else if (!mNewEntry && CalenAgendaUtils::isAlldayEvent(*mOriginalEntry)) {
+ // This else is for exceptional entries
+ // While editing a single occurence, the type of the entry
+ // should not be changed so the allday item won't be shown in editor
+ // even if its of TypeEvent or TypeAppoinment
+ // So checking for the original entry type
OstTraceFunctionExit0( CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT );
return true;;
} else {
--- a/calendarui/caleneditor/src/caleneditorcustomitem.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/src/caleneditorcustomitem.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -33,11 +33,11 @@
#include <QGraphicsLinearLayout>
#include <QDate>
#include <QTime>
+#include <xqaiwrequest.h>
+#include <xqappmgr.h>
//LI related headers
#include "qlocationpickeritem.h"
-#include <xqaiwrequest.h>
-#include <xqappmgr.h>
// User includes
#include "caleneditorcustomitem.h"
@@ -61,12 +61,15 @@
*/
CalenEditorCustomItem::CalenEditorCustomItem(QGraphicsItem *parent)
:HbDataFormViewItem(parent),
+ mAppManager(0),
+ mRequest(0),
mPushButtonTime(0),
mPushButtonDate(0),
mRepeatUntilWidget(0),
mReminderTimeWidget(0),
mDatePicker(0),
- mTimePicker(0)
+ mTimePicker(0),
+ mRequestPending(false)
{
OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY );
mMinDate = CalenDateUtils::minTime().date();
@@ -86,6 +89,9 @@
OstTraceFunctionEntry0( DUP1_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_ENTRY );
// Nothing yet.
OstTraceFunctionExit0( DUP1_CALENEDITORCUSTOMITEM_CALENEDITORCUSTOMITEM_EXIT );
+
+ delete mAppManager;
+ delete mRequest;
}
/*!
Creates a new CalenEditorCustomItem.
@@ -169,7 +175,7 @@
CALEN_EDITOR_LOCATION_LINEEDIT));
mLocationLineEdit->setObjectName("locationLineEdit");
mLocationLineEdit->setMinRows(1);
- mLocationLineEdit->setMaxRows(4);
+ mLocationLineEdit->setMaxRows(MaxRowsInTextItem);
mLocationPushButton = qobject_cast<HbPushButton*>(
editorLocationDocLoader.findWidget(
CALEN_EDITOR_LOCATION_PUSHBUTTON));
@@ -214,27 +220,34 @@
void CalenEditorCustomItem::launchLocationPicker()
{
- OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY );
- XQApplicationManager *appManager = new XQApplicationManager();
-
- XQAiwRequest *request = appManager->create("com.nokia.symbian", "ILocationPick", "pick()", true);
- if( request )
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY );
+ if(!mAppManager)
+ {
+ mAppManager = new XQApplicationManager();
+ }
+ if(!mRequest)
+ {
+ mRequest = mAppManager->create("com.nokia.symbian", "ILocationPick", "pick()", true);
+ mRequest->setSynchronous(false);
+ connect(mRequest, SIGNAL(requestOk(const QVariant&)), this, SLOT(setSelectedLocation(const QVariant&)));
+ }
+ if(!mRequestPending)
{
- QVariant retValue;
- if( request->send( retValue ) )
- {
- setSelectedLocation(retValue);
- }
- }
+ if( mRequest->send() )
+ {
+ mRequestPending = true;
+ }
+ }
OstTraceFunctionExit0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_EXIT );
}
/*!
set the selected location from the picker to the line edit widget
and notify the other observers.
*/
-void CalenEditorCustomItem::setSelectedLocation( QVariant &aValue )
+void CalenEditorCustomItem::setSelectedLocation( const QVariant &aValue )
{
OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_SETSELECTEDLOCATION_ENTRY );
+ mRequestPending = false;
QLocationPickerItem selectedLocation = aValue.value<QLocationPickerItem>();
if( selectedLocation.mIsValid )
{
--- a/calendarui/caleneditor/src/caleneditordatahandler.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/src/caleneditordatahandler.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -23,6 +23,7 @@
// User Includes
#include "caleneditordatahandler.h"
#include "calendateutils.h"
+#include "calenagendautils.h"
#include <agendaentry.h>
#include "OstTraceDefinitions.h"
#ifdef OST_TRACE_COMPILER_IN_USE
@@ -170,7 +171,7 @@
OstTraceFunctionEntry0( CALENEDITORDATAHANDLER_ISALLDAYEDITED_ENTRY );
HbDataFormModelItem* alldayItem = mCalenEditor->allDayCheckBoxItem();
if (alldayItem) {
- if (mOriginalEntry->type() == AgendaEntry::TypeEvent) {
+ if (CalenAgendaUtils::isAlldayEvent(*mOriginalEntry)) {
if (alldayItem->contentWidgetData("checkState")
== Qt::Checked) {
OstTraceFunctionExit0( CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT );
--- a/calendarui/caleneditor/src/caleneditorreminderfield.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/src/caleneditorreminderfield.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -31,6 +31,7 @@
#include <hbaction.h>
// User Includes
+#include "calenagendautils.h"
#include "caleneditorreminderfield.h"
#include "OstTraceDefinitions.h"
#ifdef OST_TRACE_COMPILER_IN_USE
@@ -183,12 +184,11 @@
// Check if all day event or not and then set the choices accordingly.
if (mCalenEditor->editedEntry()->alarm().isNull()) {
// Alarm is set off
- mReminderItem->setContentWidgetData("currentIndex", 0);
+ mReminderItem->setContentWidgetData("currentIndex", ReminderOff);
if(mReminderTimeAdded) {
removeReminderTimeField();
}
- } else if (mCalenEditor->editedEntry()->type()
- != AgendaEntry::TypeEvent) {
+ } else if (!mCalenEditor->isAllDayEvent()) {
// Get the reminder offset value.
int reminderOffset =
mCalenEditor->editedEntry()->alarm().timeOffset();
@@ -201,9 +201,9 @@
// If past then disable the field.
if (!mReminderTimeAdded) {
insertReminderTimeField();
- if (pastEvent) {
- mCustomReminderTimeItem->setEnabled(false);
- }
+ }
+ if (pastEvent && mReminderTimeAdded) {
+ mCustomReminderTimeItem->setEnabled(false);
}
QStringList reminderChoicesForAllDay;
reminderChoicesForAllDay << hbTrId("txt_calendar_setlabel_reminder_val_off")
@@ -217,15 +217,15 @@
reminder = mCalenEditor->editedEntry()->alarm();
int offsetInMins = reminder.timeOffset();
if (offsetInMins < 0 || offsetInMins == 0) {
- mReminderItem->setContentWidgetData("currentIndex", 1);
+ mReminderItem->setContentWidgetData("currentIndex", ReminderOnEventDay);
mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
* 60));
} else if (offsetInMins < numberOfMinutesInADay) {
- mReminderItem->setContentWidgetData("currentIndex", 2);
+ mReminderItem->setContentWidgetData("currentIndex", ReminderOneDayBefore);
mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
* 60));
} else {
- mReminderItem->setContentWidgetData("currentIndex", 3);
+ mReminderItem->setContentWidgetData("currentIndex", ReminderTwoDaysBefore);
offsetInMins %= (24 * 60);
mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
* 60));
@@ -274,14 +274,14 @@
startDateTimeForAllDay(
mCalenEditor->editedEntry()->startTime().date(),
QTime(0, 0, 0));
- if (mReminderItem->contentWidgetData("currentIndex") == 0) {
+ if (mReminderItem->contentWidgetData("currentIndex") == ReminderOff) {
reminder = AgendaAlarm();
- mCustomReminderTimeItem->setEnabled(false);
+ removeReminderTimeField();
} else {
int offset = 0;
- if (mReminderItem->contentWidgetData("currentIndex") == 2) {
+ if (mReminderItem->contentWidgetData("currentIndex") == ReminderOneDayBefore) {
offset = 1;
- } else if (mReminderItem->contentWidgetData("currentIndex") == 3) {
+ } else if (mReminderItem->contentWidgetData("currentIndex") == ReminderTwoDaysBefore) {
offset = 2;
}
if(!mReminderTimeAdded) {
@@ -301,9 +301,9 @@
reminderDateTimeForAllDay.setTime(mReminderTimeForAllDay);
int seconds =
reminderDateTimeForAllDay.secsTo(startDateTimeForAllDay);
- int timeOffest = seconds / 60;
+ int timeOffset = seconds / 60;
mCustomReminderTimeItem->setEnabled(true);
- reminder.setTimeOffset(timeOffest);
+ reminder.setTimeOffset(timeOffset);
reminder.setAlarmSoundName(QString(" "));
}
}
@@ -383,16 +383,48 @@
QDate tomorrow = QDate::currentDate().addDays(1);
QDate theDayAfterTomorrow = QDate::currentDate().addDays(2);
+ // Get the previous index to retain if the alarm is valid
+ QVariant countVariant = mReminderItem->contentWidgetData("currentIndex");
+ int previousIndex = countVariant.toInt();
+ AgendaAlarm previousAlarm = mCalenEditor->editedEntry()->alarm();
+
+ // Update the reminder choices only if the alarm set is not valid
+ // Get the alarm offset to check for the validity
+ int offset = mCalenEditor->editedEntry()->alarm().timeOffset();
+ bool update = true;
+
+ // Calculate the alarm time
+ QDateTime refDateTime;
+ refDateTime.setDate(referenceDate);
+ refDateTime.setTime(mCalenEditor->editedEntry()->startTime().time());
+ QTime checkTime = refDateTime.time().addSecs(-(offset * 60));
+ refDateTime.setTime(checkTime);
+ // Check for valid alarm offset
+ if(offset >= 0) {
+ // If the alarm which was already set is valid,
+ // then dont update the reminder choices
+ if ((refDateTime > QDateTime::currentDateTime()) ||
+ (refDateTime.date() == QDate::currentDate() && (
+ refDateTime.time() > QTime::currentTime()))) {
+ update = false;
+ }
+ }
+ // If the event is on a past date the default alarm will be off.
if (referenceDate < QDate::currentDate() ||
referenceDate == QDate::currentDate()) {
// Set reminder off for past event.
reminderChoicesForAllDay << hbTrId("txt_calendar_setlabel_reminder_val_off");
mReminderItem->setContentWidgetData(QString("items"),
reminderChoicesForAllDay);
- mReminderItem->setEnabled(false);
- removeReminderTimeField();
+ mReminderItem->setEnabled(false);
+ // Remove the reminder field if it was added
+ if(mReminderTimeAdded) {
+ removeReminderTimeField();
+ }
} else if (theDayAfterTomorrow < referenceDate ||
theDayAfterTomorrow == referenceDate) {
+ // If the event is on a future date which is two days after the current date
+ // The options are off, on event day, 1 day before and 2 days before
reminderChoicesForAllDay
<< hbTrId("txt_calendar_setlabel_reminder_val_off")
<< hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
@@ -400,18 +432,67 @@
<< hbTrId("txt_calendar_setlabel_reminder_val_2_days_before");
mReminderItem->setEnabled(true);
mCustomReminderTimeItem->setEnabled(true);
- } else {
+ mReminderItem->setContentWidgetData(QString("items"),
+ reminderChoicesForAllDay);
+ } else if (QTime::currentTime() < QTime(18, 0, 0, 0)) {
+ // If the event is on a future date which is one day after the current date
+ // and current time is before 6.00 pm.
+ // The options are off, on event day and 1 day before
reminderChoicesForAllDay
- << hbTrId("txt_calendar_setlabel_reminder_val_off")
- << hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
- << hbTrId("txt_calendar_setlabel_reminder_val_1_day_before");
+ << hbTrId("txt_calendar_setlabel_reminder_val_off")
+ << hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
+ << hbTrId("txt_calendar_setlabel_reminder_val_1_day_before");
+ mReminderItem->setEnabled(true);
+ mCustomReminderTimeItem->setEnabled(true);
+ mReminderItem->setContentWidgetData(QString("items"),
+ reminderChoicesForAllDay);
+ }else {
+ // If the event is on a future date which is one day after the current date
+ // and current time is after 6.00 pm.
+ // The options are off and on event day
+ reminderChoicesForAllDay
+ << hbTrId("txt_calendar_setlabel_reminder_val_off")
+ << hbTrId("txt_calendar_setlabel_reminder_val_on_event_day");
mReminderItem->setEnabled(true);
mCustomReminderTimeItem->setEnabled(true);
+ mReminderItem->setContentWidgetData(QString("items"),
+ reminderChoicesForAllDay);
}
- if (mReminderItem->isEnabled()) {
- mReminderItem->setContentWidgetData(QString("items"),
- reminderChoicesForAllDay);
+ // Set the proper index based on the validity of the previous index
+ int count = reminderItemsCount();
+ // By default, in case of reminder updation, its been agreed to set
+ // ReminderOneDayBefore even though ReminderTwoDaysBefore holds good
+ // If the ReminderOneDayBefore option is available set it or
+ // else set it to ReminderOff
+ if(count > ReminderOneDayBefore) {
+ // Don't make the reminder off since
+ // the valid reminder options are there in the combobox
+ // So check for ReminderOff is needed
+ if (update &&
+ (previousIndex == ReminderOff || previousIndex >= ReminderOneDayBefore)) {
+ // If the index has to be updated check the previous index value
+ // And set the default reminder as 1 day before.
+ mReminderItem->setContentWidgetData("currentIndex",
+ ReminderOneDayBefore);
+ }else {
+ // Set the previous index since the alarm is valid
+ mReminderItem->setContentWidgetData("currentIndex", previousIndex);
+ // Set the previous alarm also as the value will be changed to default value
+ // when the current index is been changed
+ mCalenEditor->editedEntry()->setAlarm(previousAlarm);
+ // Get the alarm time from the offset
+ QTime alarmTime = refDateTime.time();
+ // Set the alarm time and display it on the button
+ mReminderTimeForAllDay.setHMS(
+ alarmTime.hour(),alarmTime.minute(),alarmTime.second());
+ setDisplayTime();
+ }
+ }else {
+ // Enters this condition if the previous index set is not valid or
+ // the index is ReminderOff
+ mReminderItem->setContentWidgetData("currentIndex", ReminderOff);
}
+
OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_EXIT );
}
@@ -485,18 +566,27 @@
void CalenEditorReminderField::launchReminderTimePicker()
{
OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_ENTRY );
- mTimePicker = new HbDateTimePicker(mReminderTimeForAllDay);
- mTimePicker->setTime(mReminderTimeForAllDay);
+
HbDialog *popUp = new HbDialog();
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
- popUp->setContentWidget(mTimePicker);
+ popUp->setAttribute( Qt::WA_DeleteOnClose, true );
popUp->setHeadingWidget( new HbLabel(
- hbTrId("Reminder Time")));
- HbAction *okAction = new HbAction(hbTrId("txt_common_button_ok"));
+ hbTrId("Reminder Time")));
+
+ HbExtendedLocale locale = HbExtendedLocale::system();
+ mTimePicker = new HbDateTimePicker(mReminderTimeForAllDay);
+ if(locale.timeStyle() == HbExtendedLocale::Time12) {
+ mTimePicker->setDisplayFormat("hh:mm ap");
+ }else {
+ mTimePicker->setDisplayFormat("hh:mm");
+ }
+ mTimePicker->setTime(mReminderTimeForAllDay);
+ popUp->setContentWidget(mTimePicker);
+
+ HbAction *okAction = new HbAction(hbTrId("txt_common_button_ok"), popUp);
popUp->addAction(okAction);
connect(okAction, SIGNAL(triggered()), this, SLOT(setReminderTimeForAllDay()));
- connect(okAction, SIGNAL(triggered()), popUp, SLOT(close()));
popUp->addAction(new HbAction(hbTrId("txt_common_button_cancel"),
popUp));
popUp->open();
--- a/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -95,6 +95,7 @@
mRepeatItem(0),
mRepeatComboBox(0),
mCustomRepeatUntilItem(0),
+ mRepeatRoleValue(0),
mIsBiWeekly(false),
mIsWorkdays(false),
mRepeatUntilItemAdded(false)
@@ -230,15 +231,35 @@
AgendaRepeatRule(
AgendaRepeatRule::InvalidRule));
}
-
+ // Connect the slot once the updation of mRepeatComboBox is done
+ connect(mRepeatComboBox, SIGNAL(currentIndexChanged(int)), this,
+ SLOT(handleRepeatIndexChanged(int)));
// Update the repeat choices depending upon the duration
updateRepeatChoices();
- connect(mRepeatComboBox, SIGNAL(currentIndexChanged(int)), this,
- SLOT(handleRepeatIndexChanged(int)));
OstTraceFunctionExit0( CALENEDITORREPEATFIELD_POPULATEREPEATITEM_EXIT );
}
/*!
+ Removes the repeat until item from the model
+ and removed the connection for date picker launch too.
+ */
+void CalenEditorRepeatField::removeRepeatUntilItem()
+{
+ mRepeatRuleType = AgendaRepeatRule::InvalidRule;
+ if (mRepeatUntilItemAdded) {
+ mEditorForm->removeConnection(mCustomRepeatUntilItem, SIGNAL(clicked()),
+ this, SLOT(launchRepeatUntilDatePicker()));
+ QModelIndex repeatIndex =
+ mCalenEditorModel->indexFromItem(mRepeatItem);
+ mCalenEditorModel->removeItem(
+ mCalenEditorModel->index(
+ repeatIndex.row()+ 1, 0));
+ mRepeatUntilItemAdded = false;
+ mCustomRepeatUntilItem = 0;
+ }
+}
+
+/*!
Triggerd from tapping on reminder item.
Handles the reminder time change and updates the same in the event.
\param index The new index chosen in the reminder list.
@@ -253,7 +274,27 @@
// Get the user role we have set for this index
QVariant role = mRepeatComboBox->itemData(index, userRole);
int value = role.toInt();
- switch (value) {
+
+ // Boolean to check if the repeating property of the entry is changed.
+ // based on the value and mRepeatUntilItemAdded
+ // ie. From repeating to non repeating OR vice versa OR No change
+ bool repeatPropertyChange = false;
+ if (value > 0 && value <= 6 && !mRepeatUntilItemAdded) {
+ // Non repeating to repeating
+ repeatPropertyChange = true;
+ }else if(mRepeatUntilItemAdded && value == 0) {
+ // Repeating to non repeating
+ repeatPropertyChange = true;
+ }else {
+ // No change in repeat value
+ repeatPropertyChange = false;
+ }
+ QDate repeatUntilDate = mRepeatUntilDate;
+
+ if (value != mRepeatRoleValue)
+ {
+ mRepeatRoleValue = value;
+ switch (value) {
case DailyRole: {
if (!mRepeatUntilItemAdded) {
insertRepeatUntilItem();
@@ -293,7 +334,6 @@
mCustomRepeatUntilItem->setContentWidgetData( "text",
locale.format( mRepeatUntilDate,
r_qtn_date_usual_with_zero));
-
}
mRepeatRuleType = AgendaRepeatRule::WeeklyRule;
}
@@ -342,23 +382,19 @@
}
break;
default: {
- mRepeatRuleType = AgendaRepeatRule::InvalidRule;
- if (mRepeatUntilItemAdded) {
- QModelIndex repeatIndex =
- mCalenEditorModel->indexFromItem(mRepeatItem);
- mCalenEditorModel->removeItem(
- mCalenEditorModel->index(
- repeatIndex.row()+ 1, 0));
- mRepeatUntilItemAdded = false;
- mCustomRepeatUntilItem = 0;
- }
+ removeRepeatUntilItem();
}
break;
}
+ }
if(!mCalenEditor->isNewEntry()) {
mCalenEditor->addDiscardAction();
}
- mCalenEditor->updateReminderChoices();
+ // Depending on repeatPropertyChange value and the repeatuntil date change
+ // the reminder choices are updated
+ if(repeatPropertyChange || repeatUntilDate != mRepeatUntilDate) {
+ mCalenEditor->updateReminderChoices();
+ }
OstTraceFunctionExit0( CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_EXIT );
}
@@ -512,11 +548,20 @@
OstTraceFunctionExit0( CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT );
return;
}
+ // Disconnect the slot and connect it back again at end to avoid unnecessary
+ // calls to handleRepeatIndexChanged slot. Or else the slot gets called
+ // when we add all of items to the repeat combobox.
+ disconnect(mRepeatComboBox, SIGNAL(currentIndexChanged(int)), this,
+ SLOT(handleRepeatIndexChanged(int)));
// Clear all the choices and add it again. If we dont do it
// as user would have changed the end times many times and we would have
// deleted repeat options depending upon that
// Get the current choice
int choice = mRepeatComboBox->currentIndex();
+
+ QVariant role = mRepeatComboBox->itemData(choice, userRole);
+ mRepeatRoleValue = role.toInt();
+
int previousCount = mRepeatComboBox->count();
mRepeatComboBox->clear();
QStringList repeatChoices;
@@ -571,6 +616,8 @@
mRepeatComboBox->removeItem(RepeatWeekly);
mRepeatComboBox->removeItem(RepeatWorkdays);
mRepeatComboBox->removeItem(RepeatDaily);
+ //Remove the repeat until item too.
+ removeRepeatUntilItem();
} else if (mCalenEditor->editedEntry()->endTime()
>= (mCalenEditor->editedEntry()->startTime().addMonths(1))) {
isRemovedItem = true;
@@ -617,6 +664,10 @@
if (choice >= count) {
choice = count - 1;
}
+
+ //Connecting back the slot for repeat index change before setting index.
+ connect(mRepeatComboBox, SIGNAL(currentIndexChanged(int)), this,
+ SLOT(handleRepeatIndexChanged(int)));
// Set the previous user's choice
mRepeatComboBox->setCurrentIndex(choice);
OstTraceFunctionExit0( DUP1_CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT );
--- a/calendarui/caleneditor/traces/caleneditor_pTraces.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/traces/caleneditor_pTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -146,6 +146,8 @@
#define CALENEDITORPRIVATE_ISEDITRANGETHISONLY_EXIT 0x8a009c
#define CALENEDITORPRIVATE_ISALLDAYFIELDADDED_ENTRY 0x8a009d
#define CALENEDITORPRIVATE_ISALLDAYFIELDADDED_EXIT 0x8a009e
+#define DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a014e
+#define DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a014f
#endif
--- a/calendarui/caleneditor/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/caleneditor/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -333,3 +333,5 @@
[TRACE]TRACE_FLOW[0x8A]_DUP4_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x85
[TRACE]TRACE_FLOW[0x8A]_DUP5_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x86
[TRACE]TRACE_FLOW[0x8A]_DUP6_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x87
+[TRACE]TRACE_FLOW[0x8A]_DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x14e
+[TRACE]TRACE_FLOW[0x8A]_DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x14f
\ No newline at end of file
--- a/calendarui/calenlauncher/calenlauncher.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/calenlauncher/calenlauncher.pro Mon Aug 09 18:30:52 2010 +0530
@@ -25,20 +25,19 @@
./inc
-symbian: {
- BLD_INF_RULES.prj_exports += \
- "./inc/calenlauncher.h |../inc/calenlauncher.h"
-
+symbian: {
TARGET.UID3 = 0x10282DCD
TARGET.CAPABILITY += ALL -TCB
TARGET.EPOCALLOWDLLDATA = 1
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
LIBS += -lxqservice \
-lxqserviceutil
}
SOURCES += calenlauncher.cpp
-HEADERS += calenlauncher.h
+HEADERS += ../../organizer_plat/calendar_launcher_api/inc/calenlauncher.h
# End of file --Don't remove this.
--- a/calendarui/calenlauncher/inc/calenlauncher.h Mon Jul 26 13:54:38 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Calendar Launcher
-*
-*/
-#include <QObject>
-#include <qdatetime.h>
-
-#ifdef CALENLAUNCHER_LIB
-# define CALENLAUNCHER_EXPORT Q_DECL_EXPORT
-#else
-# define CALENLAUNCHER_EXPORT Q_DECL_IMPORT
-#endif
-class CALENLAUNCHER_EXPORT CalenLauncher : public QObject
-{
-Q_OBJECT
-
-public:
- enum CalenView{
- MonthView = 0,
- AgendaView
- };
- CalenLauncher(QObject* parent = 0);
- ~CalenLauncher();
-
- void launchCalendarApp(CalenView view, QDateTime& dateTime,
- bool synchronousLaunch = true);
-
-signals:
- void calendarLaunchFailed(int error);
-
-public slots:
- void handleError(int error);
-};
-
-// End of file --Don't remove this.
--- a/calendarui/calenlauncher/src/calenlauncher.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/calenlauncher/src/calenlauncher.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -18,7 +18,7 @@
#include <xqservicerequest.h>
// User includes
-#include "calenlauncher.h"
+#include <calenlauncher.h>
/*!
\class CalenLauncher
--- a/calendarui/commonutils/bwins/calencommonutilsu.def Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/commonutils/bwins/calencommonutilsu.def Mon Aug 09 18:30:52 2010 +0530
@@ -17,4 +17,5 @@
?defaultTime@CalenDateUtils@@SA?AVQDateTime@@ABV2@@Z @ 16 NONAME ; class QDateTime CalenDateUtils::defaultTime(class QDateTime const &)
?futureOf@CalenDateUtils@@SA?AVQDateTime@@ABV2@H@Z @ 17 NONAME ; class QDateTime CalenDateUtils::futureOf(class QDateTime const &, int)
?now@CalenDateUtils@@SA?AVQDateTime@@XZ @ 18 NONAME ; class QDateTime CalenDateUtils::now(void)
+ ?isAlldayEvent@CalenAgendaUtils@@SA_NABVAgendaEntry@@@Z @ 19 NONAME ; bool CalenAgendaUtils::isAlldayEvent(class AgendaEntry const &)
--- a/calendarui/commonutils/eabi/calencommonutilsu.def Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/commonutils/eabi/calencommonutilsu.def Mon Aug 09 18:30:52 2010 +0530
@@ -17,4 +17,5 @@
_ZN14CalenDateUtils9onSameDayERK9QDateTimeS2_ @ 16 NONAME
_ZN14CalenDateUtils9timeOfDayERK9QDateTime @ 17 NONAME
_ZN16CalenAgendaUtils16endsAtStartOfDayER11AgendaEntryRK9QDateTime @ 18 NONAME
+ _ZN16CalenAgendaUtils13isAlldayEventERK11AgendaEntry @ 19 NONAME
--- a/calendarui/commonutils/inc/calenagendautils.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/commonutils/inc/calenagendautils.h Mon Aug 09 18:30:52 2010 +0530
@@ -52,6 +52,14 @@
**/
static bool endsAtStartOfDay( AgendaEntry& entry,
const QDateTime& day );
+
+ /**
+ * Checks if the given entry is an all-day
+ * Need to call this API only for entry types other than EEvent
+ * @param entry Entry for which all-day attribute is being queried
+ * @returns True, If entry is an all-day else False
+ */
+ static bool CalenAgendaUtils::isAlldayEvent( const AgendaEntry& entry );
};
--- a/calendarui/commonutils/src/calenagendautils.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/commonutils/src/calenagendautils.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -50,4 +50,38 @@
return result;
}
+ // ---------------------------------------------------------------------------
+ // CalenAgendaUtils::IsAllDayEvent
+ // Allday event is an event with a duration of n*24h.
+ // ---------------------------------------------------------------------------
+ //
+ bool CalenAgendaUtils::isAlldayEvent( const AgendaEntry& entry )
+ {
+
+ TRACE_ENTRY_POINT;
+
+ bool allDayEvent( false );
+ if (AgendaEntry::TypeAppoinment == entry.type() ||
+ AgendaEntry::TypeEvent == entry.type()) {
+ QDateTime startTime = entry.startTime();
+ QDateTime stopTime = entry.endTime();
+
+ int differenceInDays = startTime.daysTo(stopTime);
+ if( startTime != stopTime &&
+ startTime == CalenDateUtils::beginningOfDay( startTime ) &&
+ stopTime == CalenDateUtils::beginningOfDay( stopTime ) &&
+ differenceInDays >= 1 )
+ {
+ allDayEvent = true;
+ }
+ else
+ {
+ allDayEvent = false;
+ }
+ }
+
+ TRACE_EXIT_POINT;
+ return allDayEvent;
+ }
+
// End of File
--- a/calendarui/controller/data/xml/calenmonthview.docml Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/controller/data/xml/calenmonthview.docml Mon Aug 09 18:30:52 2010 +0530
@@ -190,6 +190,7 @@
</widget>
<widget name="NoEntriesLabelPrev" type="HbLabel">
<string locid="txt_calendar_preview_no_entries" name="plainText"/>
+ <bool name="visible" value="FALSE"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -247,6 +248,7 @@
</widget>
<widget name="NoEntriesLabelCurr" type="HbLabel">
<string locid="txt_calendar_preview_no_entries" name="plainText"/>
+ <bool name="visible" value="FALSE"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -304,6 +306,7 @@
</widget>
<widget name="NoEntriesLabelNext" type="HbLabel">
<string locid="txt_calendar_preview_no_entries" name="plainText"/>
+ <bool name="visible" value="FALSE"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
--- a/calendarui/controller/inc/calendeleteui.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/controller/inc/calendeleteui.h Mon Aug 09 18:30:52 2010 +0530
@@ -40,7 +40,8 @@
EDeleteEntry = 1,
EDeleteToDo,
EDeleteToDos,
- EDeleteAll
+ EDeleteAll,
+ EDeleteEvent
};
// CLASS DECLARATION
--- a/calendarui/controller/inc/calenviewmanager.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/controller/inc/calenviewmanager.h Mon Aug 09 18:30:52 2010 +0530
@@ -178,6 +178,7 @@
int mCurrentViewId;
int mPreviousViewsId;
int mFirstView;
+ bool mInstanceViewCreated;
};
#endif // CALENVIEWMANAGER_H
--- a/calendarui/controller/src/calenactionuiutils.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/controller/src/calenactionuiutils.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -48,8 +48,14 @@
{
OstTraceFunctionEntry0( CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_ENTRY );
- QList<AgendaEntry> instances = agendaUtil->createEntryIdListForDay(id.mInstanceTime,
- AgendaUtil::FilterFlags(AgendaUtil::IncludeAll));
+ AgendaUtil::FilterFlags filter =
+ AgendaUtil::FilterFlags(AgendaUtil::IncludeAnniversaries |
+ AgendaUtil::IncludeAppointments |
+ AgendaUtil::IncludeEvents |
+ AgendaUtil::IncludeReminders |
+ AgendaUtil::IncludeIncompletedTodos);
+ QList<AgendaEntry> instances =
+ agendaUtil->createEntryIdListForDay(id.mInstanceTime, filter);
AgendaEntry result;
// For instances finishing the next day (now possible with unified DateTime editor),
--- a/calendarui/controller/src/calendeleteui.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/controller/src/calendeleteui.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -322,6 +322,8 @@
// Show a confirmation note whether the user
// wants to delete the single instance or all of them
showRepeatingEntryDeleteQuery();
+ } else if (CalenAgendaUtils::isAlldayEvent(entry)) {
+ showDeleteQuery(EDeleteEvent);
} else {
// If the entry is not a repeating entry,
// delete it directly
@@ -545,6 +547,8 @@
instance, AgendaUtil::ThisAndAll);
break;
}
+ }else {
+ iController.BroadcastNotification(ECalenNotifyDeleteFailed);
}
OstTraceFunctionExit0( CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_EXIT );
}
@@ -590,6 +594,11 @@
text.append(hbTrId("txt_calendar_info_delete_all_calendar_entries"));
break;
}
+ case EDeleteEvent:
+ {
+ text.append(hbTrId("txt_calendar_info_delete_allday_event"));
+ break;
+ }
default:
break;
}
@@ -657,6 +666,8 @@
iController.Services().agendaInterface()->deleteRepeatedEntry(
instance, mRecurrenceRange );
}
+ }else {
+ iController.BroadcastNotification(ECalenNotifyDeleteFailed);
}
}
break;
@@ -672,11 +683,12 @@
break;
}
+ } else {
+ // If the user presses cancel button the notification will be
+ // ECalenNotifyDeleteFailed as default.
+ // Notify the status
+ iController.BroadcastNotification(notification);
}
- // If the user presses cancel button the notification will be
- // ECalenNotifyDeleteFailed as default.
- // Notify the status
- iController.BroadcastNotification(notification);
// Reset the member variables
mDeleteAction = NULL;
--- a/calendarui/controller/src/caleneditui.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/controller/src/caleneditui.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -25,7 +25,7 @@
#include "hb_calencommands.hrh"
#include "calenservicesimpl.h"
#include <agendaentry.h>
-#include "caleneditor.h"
+#include <caleneditor.h>
#include "calendateutils.h"
#include "OstTraceDefinitions.h"
#ifdef OST_TRACE_COMPILER_IN_USE
--- a/calendarui/controller/src/calenviewmanager.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/controller/src/calenviewmanager.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -66,6 +66,7 @@
mCalenAgendaViewAlt = NULL;
mSettingsView = NULL;
mCalenDayView = NULL;
+ mInstanceViewCreated = false;
// Connect to instance view and entry view creation signals from agenda
// interface
@@ -219,6 +220,7 @@
// Add agenda view to mainwindow.
mController.MainWindow().addView(mCalenAgendaView);
mController.MainWindow().setCurrentView(mCalenAgendaView);
+ mController.MainWindow().addView(mCalenAgendaViewAlt);
}
OstTraceFunctionExit0( CALENVIEWMANAGER_CONSTRUCTANDACTIVATEVIEW_EXIT );
}
@@ -340,8 +342,17 @@
OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEMAINVIEWREADY_ENTRY );
// Construct the month view part that is kept for lazy loading
- if (mCalenMonthView) {
+ if (mCalenMonthView) {
mCalenMonthView->doLazyLoading();
+
+ if (mInstanceViewCreated) {
+ // populate entries for the month view if the month view is launched
+ // from the service APIs. Otherwise the month view is not populated with
+ // the entries as CalenViewManager::handleInstanceViewCreation is called
+ // before the month view creation so the model array is not populated.
+ mCalenMonthView->fetchEntriesAndUpdateModel();
+ }
+
}
// Construct other views
@@ -919,6 +930,13 @@
OstTraceFunctionEntry0( CALENVIEWMANAGER_HANDLEINSTANCEVIEWCREATION_ENTRY );
Q_UNUSED(status);
+
+ // This flag is needed if mCalenMonthView and mCalenAgendaview is not created
+ // and before that this slot is getting called.
+ // if we launch views through services then this slot is getting called
+ // before the view construction.
+ mInstanceViewCreated = true;
+
// handleInstanceViewCreation function is called only once. Now that the instance
// view creation is successfull. Events need to be populated on screen
// Ideal colution should be to call a uniform function, e.g. PopulateEvents
@@ -966,8 +984,12 @@
void CalenViewManager::handleEntriesChanged(QList<ulong> ids)
{
Q_UNUSED(ids);
- // Update and refresh the view.
- activateCurrentView();
+ HbView *currentview = mController.MainWindow().currentView();
+ if((mCalenMonthView == currentview)||(mCalenDayView == currentview)||
+ (mCalenAgendaView == currentview ))
+ {
+ activateCurrentView();
+ }
}
// ----------------------------------------------------------------------------
--- a/calendarui/inc/calenagendautils.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/inc/calenagendautils.h Mon Aug 09 18:30:52 2010 +0530
@@ -52,6 +52,14 @@
**/
static bool endsAtStartOfDay( AgendaEntry& entry,
const QDateTime& day );
+
+ /**
+ * Checks if the given entry is an all-day
+ * Need to call this API only for entry types other than EEvent
+ * @param entry Entry for which all-day attribute is being queried
+ * @returns True, If entry is an all-day else False
+ */
+ static bool CalenAgendaUtils::isAlldayEvent( const AgendaEntry& entry );
};
--- a/calendarui/views/dayview/inc/calendaycommonheaders.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendaycommonheaders.h Mon Aug 09 18:30:52 2010 +0530
@@ -11,47 +11,92 @@
*
* Contributors:
*
-* Description: CalenDay commons.
+* Description: CalenDay commons. All UI specified constants and enums shared
+* beetwen many files should be moved here.
*
*/
#ifndef CALENDAYCOMMONHEADERS_H_
#define CALENDAYCOMMONHEADERS_H_
-// Constants
+// Constants defined by UI spec.
+
+/*!
+ Number of hours in day (UI spec)
+ */
+const int KCalenHoursInDay = 24;
+
+/*!
+ Number of time slots in hour (half of hour is defined as time slot) (UI spec)
+ */
+const int KCalenSlotsInHour = 2;
/*!
- Default timeout for scrolling between days [ms]
+ Content area (1/4 of screen) dedicated for All day events in Day View (UI spec)
+ */
+const qreal KCalenAllDayEventArea = 0.25;
+
+/*!
+ The width [un] of empty right column in Day View (UI spec)
*/
-const int KCalenScrollDaysTimeout = 600;
+const qreal KCalenEmptyRightColumnWidth = 6.0;
+
+/*!
+ The minimum width [un] of touchable event bubble (UI spec)
+ */
+const qreal KCalenMinTouchableEventWidth = 8.2;
+
+/*!
+ The minimum width [un] of event bubble (UI spec)
+ */
+const qreal KCalenMinBubbleWidth = 3.0;
/*!
- Value [%] defines how long (depending on content area width) should horizontal
- pan gesture be to change day to previous/next.
- If the gesture is shorter - current view is not changed.
+ The width [un] of time strip (indicator) in event bubble (UI spec)
+ */
+const qreal KCalenTimeStripWidth = 1.5;
+
+/*!
+ The width [un] of space beetwen event buubles in Day View (UI spec)
*/
-const int KCalenHScrollMoveParam = 30; //!< Percentage
+const qreal KCalenSpaceBeetwenEvents = 1.5;
+
+/*!
+ Number of All day events displayed in single day that remains touchable
+ in portrait orientation (UI spec)
+ */
+const int KCalenTouchableAllDayEventsCountPortrait = 1;
/*!
- Value [degree] defines the max. angle of swipe gesture which should change day.
+ Number of All day events displayed in single day that remains touchable
+ in landscape orientation (UI spec)
+ */
+const int KCalenTouchableAllDayEventsCountLandscape = 2;
+
+/*!
+ Thickness [un] of hour line (UI spec)
*/
-const qreal KCalenSwipeAngle = 30;
+const qreal KCalenHourLineThickness = 0.15;
+
+/*!
+ Thickness [un] of time line (UI spec)
+ */
+const qreal KCalenTimeLineThickness = 0.75;
+
+/*!
+ Color scheme for hour line (UI spec)
+ */
+const QString KCalenHourLineColor = "qtc_cal_day_hour_lines";
+
+/*!
+ Color scheme for current time line (UI spec)
+ */
+const QString KCalenTimeLineColor = "qtc_cal_month_current_day";
// Enumerations
/*!
- \enum CalenPanDirection
- \brief Enumeration identifies pan gesture directions.
- */
-enum CalenPanDirection
-{
- ECalenPanNotSet = 0,
- ECalenPanVertical,
- ECalenPanHorizontal
-};
-
-/*!
\enum CalenScrollDirection
\brief Enumeration identifies horizontal scroll directions of scroll area.
--- a/calendarui/views/dayview/inc/calendaycontainer.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendaycontainer.h Mon Aug 09 18:30:52 2010 +0530
@@ -1,34 +1,34 @@
/*
-* 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.
-*
-*/
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Day view container - parent widget for events (CalenDayItem) and
+ * hours area widgets (CalenDayEventsPane)
+ * Responsible for positioning and resizing events widgets.
+ *
+ */
#ifndef CALENDAYCONTAINER_H
#define CALENDAYCONTAINER_H
-//System includes
+// System includes
#include <QDateTime>
#include "../../../../../mw/hb/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h"
-
-//Forward declarations
+// Forward declarations
class CalenDayInfo;
class TouchEventAbsorber;
+// Class declaration
class CalenDayContainer : public HbAbstractItemContainer
{
Q_OBJECT
@@ -37,27 +37,29 @@
CalenDayContainer(QGraphicsItem *parent = 0);
~CalenDayContainer();
- void itemAdded (int index, HbAbstractViewItem *item, bool animate);
- void itemRemoved (HbAbstractViewItem *item, bool animate);
+ void itemAdded(int index, HbAbstractViewItem *item, bool animate);
+ void itemRemoved(HbAbstractViewItem *item, bool animate);
void reset();
- void viewResized (const QSizeF &size);
-
- void setDayInfo( CalenDayInfo* dayInfo );
+ void viewResized(const QSizeF &size);
- void setDate( const QDate &date );
+ void setDayInfo(CalenDayInfo* dayInfo);
+ CalenDayInfo* dayInfo();
+ void setDate(const QDate &date);
const QDate &date() const;
-
+
public slots:
void orientationChanged(Qt::Orientation orientation);
-
+
protected:
HbAbstractViewItem * createDefaultPrototype() const;
void setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index);
-
- void updateTimedEventGeometry(HbAbstractViewItem *item,
- const QModelIndex &index);
- void updateAllDayEventGeometry(HbAbstractViewItem *item,
- const QModelIndex &index);
+
+ void updateTimedEventGeometry(
+ HbAbstractViewItem *item,
+ const QModelIndex &index);
+ void updateAllDayEventGeometry(
+ HbAbstractViewItem *item,
+ const QModelIndex &index);
/*!
\class LayoutValues
@@ -69,37 +71,37 @@
slotHeight Half hour slot's height.
unitInPixels No. of pixels in 1un
maxColumns Max. no. of touchable overlapping timed events
-
*/
- class LayoutValues {
- public:
- LayoutValues()
- :eventAreaX(0),
- eventAreaWidth(0),
- eventMargin(0),
- slotHeight(0),
- unitInPixels(0),
- maxColumns(0)
- {}
- qreal eventAreaX;
- qreal eventAreaWidth;
- qreal eventMargin;
- qreal slotHeight;
- qreal unitInPixels;
- int maxColumns;
+ class LayoutValues
+ {
+ public:
+ LayoutValues() :
+ eventAreaX(0), eventAreaWidth(0), eventMargin(0), slotHeight(0),
+ unitInPixels(0), maxColumns(0)
+ {
+ }
+
+ qreal eventAreaX;
+ qreal eventAreaWidth;
+ qreal eventMargin;
+ qreal slotHeight;
+ qreal unitInPixels;
+ int maxColumns;
};
-
+
void getTimedEventLayoutValues(LayoutValues& layoutValues);
void createTouchEventAbsorbers();
- TouchEventAbsorber* crateAbsorberBetweenSlots(int startSlot, int endSlot, bool forAllDayEvents);
-
+ TouchEventAbsorber* crateAbsorberBetweenSlots(
+ int startSlot,
+ int endSlot,
+ bool forAllDayEvents);
+
private:
- bool mGeometryUpdated;
-
- CalenDayInfo* mInfo; //!<Day event info. Not owned.
- LayoutValues mLayoutValues; //!<Keeps layout values, see LayoutValues class
- QList<TouchEventAbsorber*> mAbsorbers; //!<Keeps needed touch absorbers.
- QDate mDate; //!<Keeps date currently associated with this container.
+ bool mGeometryUpdated; //!< Indicates if geometry needs to be updated
+ CalenDayInfo* mInfo; //!< Day event info. Not owned.
+ LayoutValues mLayoutValues; //!< Keeps layout values, see LayoutValues class
+ QList<TouchEventAbsorber*> mAbsorbers; //!< Keeps needed touch absorbers
+ QDate mDate; //!< Keeps date currently associated with this container
};
@@ -110,19 +112,23 @@
\brief Used when event widgets are to small (see UI spec.)
*/
class TouchEventAbsorber : public HbWidget
- {
- Q_OBJECT
- public:
- TouchEventAbsorber(QGraphicsItem *parent=0);
- ~TouchEventAbsorber();
- protected:
- void gestureEvent(QGestureEvent *event);
-
+{
+ Q_OBJECT
+
+public:
+ TouchEventAbsorber(QGraphicsItem *parent = 0);
+ ~TouchEventAbsorber();
+
+protected:
+ void gestureEvent(QGestureEvent *event);
+
#ifdef _DEBUG
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
- QWidget *widget);
+ void paint(
+ QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget);
#endif
- };
+};
#endif // CALENDAYCONTAINER_H
// End of File
--- a/calendarui/views/dayview/inc/calendaycontentscrollarea.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendaycontentscrollarea.h Mon Aug 09 18:30:52 2010 +0530
@@ -38,6 +38,18 @@
public:
CalenDayContentScrollArea(QGraphicsItem *parent = 0);
virtual ~CalenDayContentScrollArea();
+
+public:
+ /*!
+ \enum CalenPanDirection
+ \brief Enumeration identifies pan gesture directions.
+ */
+ enum CalenPanDirection
+ {
+ ECalenPanNotSet = 0,
+ ECalenPanVertical,
+ ECalenPanHorizontal
+ };
signals:
void scrollAreaMoveStarted(CalenScrollDirection scrollTo);
@@ -56,6 +68,7 @@
private: // private functions
void checkPanDirection(QPanGesture *panGesture);
void moveTo(const QPointF &newPosition, int time = 0);
+ bool isHorizontalSwipe(qreal angle) const;
private slots:
void moveFinished();
--- a/calendarui/views/dayview/inc/calendayhourelement.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayhourelement.h Mon Aug 09 18:30:52 2010 +0530
@@ -1,32 +1,32 @@
/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Day view control of calendar
-*
-*/
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Day view control of calendar
+ *
+ */
#ifndef CALENDAYHOURELEMENT_H
#define CALENDAYHOURELEMENT_H
-//System includes
+// System includes
#include <QTime>
#include <QPen>
-#include <hbwidget.h>
+#include <HbWidget>
-//User includes
+// User includes
-//Forward declarations
+// Forward declarations
class CalenDayHourScrollArea;
class CalenDayHourElement : public HbWidget
@@ -34,29 +34,19 @@
Q_OBJECT
public:
-
- /**
- * Constructor.
- */
- CalenDayHourElement(const QTime &time, QGraphicsItem *parent=0);
-
- /**
- * Destructor.
- */
+
+ CalenDayHourElement(const QTime &time, QGraphicsItem *parent = 0);
virtual ~CalenDayHourElement();
void setTime(const QTime &time);
-
QTime time() const;
-
- /**
- *
- */
- void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget);
+
+ void paint(QPainter * painter, const QStyleOptionGraphicsItem * option,
+ QWidget * widget);
private:
-
- CalenDayHourScrollArea *mContainer;
+
+ const CalenDayHourScrollArea *mContainer;
QTime mHour;
QColor mHourLineColor;
qreal mUnitInPixels;
--- a/calendarui/views/dayview/inc/calendayhourscrollarea.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayhourscrollarea.h Mon Aug 09 18:30:52 2010 +0530
@@ -19,16 +19,16 @@
#define CALENDAYHOURSCROLLAREA_H_
// System includes
-#include <hbscrollarea.h>
#include <QDateTime>
+#include <HbScrollArea>
// User includes
#include "calendaycommonheaders.h"
-//forward declarations
+// Forward declarations
class CalenDayHourElement;
-#ifdef CALENVIEWS_DLL
+#ifdef CALENVIEWS_DLL
#define CALENDAYHOURSCROLLAREA_EXPORT Q_DECL_EXPORT
#else
#define CALENDAYHOURSCROLLAREA_EXPORT Q_DECL_IMPORT
@@ -37,11 +37,12 @@
// Class declaration
class CALENDAYHOURSCROLLAREA_EXPORT CalenDayHourScrollArea : public HbScrollArea
{
-Q_OBJECT
+ Q_OBJECT
public:
CalenDayHourScrollArea(QGraphicsItem *parent = 0);
virtual ~CalenDayHourScrollArea();
+
void setDateTime(const QDateTime &dateTime);
QDateTime dateTime() const;
--- a/calendarui/views/dayview/inc/calendayitem.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayitem.h Mon Aug 09 18:30:52 2010 +0530
@@ -54,11 +54,13 @@
void setStatusStrip(const AgendaEntry &entry, bool allDayEvent);
bool mUpdated;
+ qreal mEventDescMinWidth;
+ qreal mFrameMinWidth;
+
HbFrameItem *mBg;
HbTextItem *mEventDesc;
+
CalenDayStatusStrip *mColorStripe;
- qreal mEventDescMinWidth;
- qreal mFrameMinWidth;
const CalenDayContainer *mContainer;
};
--- a/calendarui/views/dayview/inc/calendaymodelmanager.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendaymodelmanager.h Mon Aug 09 18:30:52 2010 +0530
@@ -17,12 +17,15 @@
#ifndef CALENDAYMODELMANAGER_H
#define CALENDAYMODELMANAGER_H
+// System includes
#include <QObject>
#include <QMap>
#include <QDateTime>
+// User includes
#include "calendaycommonheaders.h"
+// Forward declarations
class QAbstractItemModel;
class MCalenServices;
class CalenDayModel;
@@ -58,7 +61,7 @@
private:
void createAllModels();
void moveBackward();
- void moveForeward();
+ void moveForward();
private:
QMap<ModelDay, CalenDayModel*> mModels;
--- a/calendarui/views/dayview/inc/calendaystatusstrip.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendaystatusstrip.h Mon Aug 09 18:30:52 2010 +0530
@@ -77,16 +77,16 @@
qreal calculateMinuteHeight(const QTime &start, const QTime &end);
private:
- qreal mRange; //!<Distanse beatween lines
+ qreal mRange; //!<Distance between lines
QColor mColor;//!<Color of status stripe
CalenDayStatusStrip::DrawingStyle mDrawingStyle;//!<Specify style of drawing
/*!
- Orginal start and end time of event
+ Original start and end time of event
*/
QPair<QTime,QTime> mStartEndEventTime;
- static const qreal mMinute;//!<It keep info how much seconds are in minute
- static const qreal mMinimumTime;//!<It keep info about minimum timeline in minutes
+ static const qreal mMinute;//!<It keeps info how much seconds are in minute
+ static const qreal mMinimumTime;//!<It keeps info about minimum timeline in minutes
};
Q_DECLARE_METATYPE(CalenDayStatusStrip::DrawingStyle)
--- a/calendarui/views/dayview/inc/calendayutils.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayutils.h Mon Aug 09 18:30:52 2010 +0530
@@ -38,8 +38,6 @@
HbMainWindow* mainWindow();
- bool isHorizontalSwipe(qreal angle) const;
-
/**
* Get event's start/end time fromm agenda entry.
* Start/end time are validated to be within the current day (the case of
--- a/calendarui/views/dayview/inc/calendayview.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/inc/calendayview.h Mon Aug 09 18:30:52 2010 +0530
@@ -144,7 +144,8 @@
public slots:
void changeView(TCalenCommandId viewId);
-
+
+private slots:
/**
* Scrolls content to correct position after view repopulation
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/resources/calendayhourscrollarea.css Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,4 @@
+CalenDayHourScrollArea {
+ pref-width: expr(2*var(hb-param-margin-gene-middle-horizontal) + 8.04un);
+ size-policy-horizontal: fixed;
+}
--- a/calendarui/views/dayview/resources/calendaywidgets.qrc Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/resources/calendaywidgets.qrc Mon Aug 09 18:30:52 2010 +0530
@@ -5,6 +5,7 @@
<file>calendayitem.css</file>
<file>calendayitem.widgetml</file>
<file>calendayeventspane.css</file>
+ <file>calendayhourscrollarea.css</file>
<file>fade_out.fxml</file>
<file>fade_in.fxml</file>
</qresource>
--- a/calendarui/views/dayview/src/calendaycontainer.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendaycontainer.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -1,20 +1,20 @@
/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Day view container - parent widget for events (CalenDayItem) and
-* hours area widgets (CalenDayEventsPane)
-* Responsible for positioning and resizing events widgets.
-*/
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Day view container - parent widget for events (CalenDayItem)
+ * and hours area widgets (CalenDayEventsPane)
+ * Responsible for positioning and resizing events widgets.
+ */
//System includes
#include <QTime>
@@ -25,10 +25,10 @@
#include <QPainter>
#endif
-#include <hbabstractitemview.h>
-#include <hbtextitem.h>
-#include <hbmodeliterator.h>
-#include <hbinstance.h>
+#include <HbAbstractItemView>
+#include <HbTextItem>
+#include <HbModelIterator>
+#include <HbInstance>
//User includes
#include "calendaycontainer.h"
@@ -38,22 +38,31 @@
#include "calendaymodel.h"
#include "calendayinfo.h"
#include "calendayview.h"
+#include "calenagendautils.h"
+#include "calendaycommonheaders.h"
+
+/*!
+ \class CalenDayContainer
+
+ \brief CalenDayContainer Item container class associated with model.
+ */
/*!
\brief Constructor
Sets container initial geometry, creates hours area widgets.
+ \param parent Parent object
*/
CalenDayContainer::CalenDayContainer(QGraphicsItem *parent) :
HbAbstractItemContainer(parent), mGeometryUpdated(false), mInfo(0)
{
getTimedEventLayoutValues(mLayoutValues);
-
+
QGraphicsLinearLayout* timeLinesLayout = new QGraphicsLinearLayout(
Qt::Vertical, this);
- for (int i = 0; i < 24; i++) {
+ for (int i = 0; i < KCalenHoursInDay; i++) {
CalenDayEventsPane* element = new CalenDayEventsPane(this);
- // Draw top line at midnight
+ // Draw top line at midnight
if (i == 0) {
element->setDrawTopLine(true);
}
@@ -65,20 +74,25 @@
setLayout(timeLinesLayout);
}
-
/*!
\brief Destructor
*/
CalenDayContainer::~CalenDayContainer()
{
+ // Remove absorbers if exist
+ if (mAbsorbers.count()) {
+ qDeleteAll(mAbsorbers);
+ mAbsorbers.clear();
+ }
}
-
/*
- \reimp
+ \reimp
*/
-void CalenDayContainer::itemAdded( int index, HbAbstractViewItem *item,
- bool animate )
+void CalenDayContainer::itemAdded(
+ int index,
+ HbAbstractViewItem *item,
+ bool animate)
{
Q_UNUSED( index )
Q_UNUSED( item )
@@ -87,41 +101,40 @@
/*
- \reimp
+ \brief Resets the state of container.
+
+ Removes absorbers, gets layout values and maintains current position.
*/
void CalenDayContainer::reset()
{
- // remove absorbers if exist
- if (mAbsorbers.count())
- {
- qDeleteAll(mAbsorbers);
- mAbsorbers.clear();
- }
-
- // shrink event area when all-day events available after reset
- getTimedEventLayoutValues(mLayoutValues);
-
- // position need to be maintained while changing model
+ // Remove absorbers if exist
+ if (mAbsorbers.count()) {
+ qDeleteAll(mAbsorbers);
+ mAbsorbers.clear();
+ }
+
+ // Shrink event area when all-day events available after reset
+ getTimedEventLayoutValues(mLayoutValues);
+
+ // Position need to be maintained while changing model
QPointF position(pos());
HbAbstractItemContainer::reset();
- setPos( position );
+ setPos(position);
}
-
/*
- \reimp
+ \reimp
*/
-void CalenDayContainer::itemRemoved( HbAbstractViewItem *item, bool animate )
+void CalenDayContainer::itemRemoved(HbAbstractViewItem *item, bool animate)
{
Q_UNUSED( item )
Q_UNUSED( animate )
}
-
/*
- \reimp
+ \reimp
*/
-void CalenDayContainer::viewResized (const QSizeF &size)
+void CalenDayContainer::viewResized(const QSizeF &size)
{
resize(size);
if (!mGeometryUpdated) {
@@ -130,9 +143,8 @@
}
}
-
/*
- \reimp
+ \reimp
*/
HbAbstractViewItem * CalenDayContainer::createDefaultPrototype() const
{
@@ -140,117 +152,117 @@
return calendarViewItem;
}
-
/*
- \reimp
+ \reimp
*/
-void CalenDayContainer::setItemModelIndex(HbAbstractViewItem *item,
- const QModelIndex &index)
+void CalenDayContainer::setItemModelIndex(
+ HbAbstractViewItem *item,
+ const QModelIndex &index)
{
- QVariant variant = index.data( CalenDayEntry );
- AgendaEntry entry = variant.value<AgendaEntry>();
-
- if (entry.isTimedEntry()) {
- updateTimedEventGeometry( item, index );
+ QVariant variant = index.data(CalenDayEntry);
+ AgendaEntry entry = variant.value<AgendaEntry> ();
+
+ // Check for All Day Events and Timed entries
+ if (CalenAgendaUtils::isAlldayEvent(entry)) {
+ updateAllDayEventGeometry(item, index);
item->setParentItem(this);
- }
- else if( entry.type() == AgendaEntry::TypeEvent ){
- updateAllDayEventGeometry( item, index );
- item->setParentItem(this);
- }
- else {
- item->setVisible(false);
}
-
- // last item
+ else
+ if (entry.isTimedEntry()) {
+ updateTimedEventGeometry(item, index);
+ item->setParentItem(this);
+ }
+ else {
+ item->setVisible(false);
+ }
+
+ // Create touch event absorbers after last item
if (index.row() == index.model()->rowCount() - 1) {
- createTouchEventAbsorbers();
+ createTouchEventAbsorbers();
}
HbAbstractItemContainer::setItemModelIndex(item, index);
}
-// 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
+ \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)
+void CalenDayContainer::updateTimedEventGeometry(
+ HbAbstractViewItem *item,
+ const QModelIndex &index)
{
-//safety check
- if ( !mInfo ) {
+ // Safety check
+ if (!mInfo) {
return;
}
-
- QVariant variant = index.data( CalenDayEntry );
- AgendaEntry entry = variant.value<AgendaEntry>();
-
-//1. get 'virtual' event position from DayInfo
-//TODO: k.g.: Day Info should store model index instead of keeping redundant data
+
+ QVariant variant = index.data(CalenDayEntry);
+ AgendaEntry entry = variant.value<AgendaEntry> ();
+
+ // 1. Get 'virtual' event position from DayInfo
SCalenApptInfo apptInfo;
apptInfo.iIndex = index;
-
+
QDateTime start;
QDateTime end;
QDateTime currentDate;
- currentDate = static_cast<const CalenDayModel*>(index.model())->modelDate();
- CalenDayUtils::instance()->getEventValidStartEndTime( start, end, entry,
- currentDate );
+ currentDate
+ = static_cast<const CalenDayModel*> (index.model())->modelDate();
+ CalenDayUtils::instance()->getEventValidStartEndTime(start, end, entry,
+ currentDate);
apptInfo.iStartTime = start;
apptInfo.iEndTime = end;
-
+
TCalenInstanceId id = TCalenInstanceId::nullInstanceId();
id.mEntryLocalUid = index.row(); //index.row() - temporary ID
- id.mInstanceTime = apptInfo.iStartTime;
+ id.mInstanceTime = apptInfo.iStartTime;
apptInfo.iId = id;
apptInfo.iAllDay = 0;
apptInfo.iColor = 0xffff;
-
+
int startSlot, endSlot, columnIdx, columns;
- mInfo->GetLocation( apptInfo, startSlot, endSlot, columnIdx, columns );
-
+ mInfo->GetLocation(apptInfo, startSlot, endSlot, columnIdx, columns);
-//2. set timed event's geometry
- qreal eventStartX(mLayoutValues.eventAreaX );
+ // 2. Set timed event's geometry
+ qreal eventStartX(mLayoutValues.eventAreaX);
qreal eventStartY(0.0);
qreal eventWidth(mLayoutValues.eventAreaWidth);
qreal eventHeight(0.0);
-
- //event's startY/height
+
+ // Event's startY/height
eventStartY = startSlot * mLayoutValues.slotHeight;
eventHeight = (endSlot - startSlot) * mLayoutValues.slotHeight;
- //event's startX/width
+ // Event's startX/width
eventWidth /= columns;
-
- //In case when eventWidth will be smaller then 3.0un we need to
- //make spacings between events smaller.
- //Check whether it's possible to shring them so the bubbles
- //width can stay at 3.0un (time stripe + frame margins).
- qreal minWidth = 3.0 * mLayoutValues.unitInPixels;
- if(eventWidth - mLayoutValues.eventMargin < minWidth){
-
- //Calculate new margin value
- //from totalMarginSpace we need to subtract
- //mLayoutValues.eventMargin because first margin is always 1.5un
- qreal totalMarginSpace = mLayoutValues.eventAreaWidth - minWidth * columns - mLayoutValues.eventMargin;
+
+ // In case when eventWidth will be smaller then KCalenMinBubbleWidth [un]
+ // spacings between events should be smaller.
+ // Check whether it's possible to shrink them so the bubbles width
+ // can stay at KCalenMinBubbleWidth [un] (time stripe + frame margins).
+ qreal minWidth = KCalenMinBubbleWidth * mLayoutValues.unitInPixels;
+ if (eventWidth - mLayoutValues.eventMargin < minWidth) {
+
+ // Calculate new margin value
+ // from totalMarginSpace we need to subtract
+ // mLayoutValues.eventMargin because first margin is always 1.5un
+ qreal totalMarginSpace = mLayoutValues.eventAreaWidth - minWidth
+ * columns - mLayoutValues.eventMargin;
qreal newMarginValue = totalMarginSpace / (columns - 1);
-
- //check if we managed to pack all the events into space we have
- if(newMarginValue > 0){
-
+
+ // Check if we managed to pack all the events into space we have
+ if (newMarginValue > 0) {
eventWidth = minWidth;
}
- else{
- //there's not enough space
- //new minWidth it's 1.5un (time stripe only)
- minWidth = 1.5 * mLayoutValues.unitInPixels;
- totalMarginSpace = mLayoutValues.eventAreaWidth - minWidth * columns - mLayoutValues.eventMargin;
+ else {
+ // There's not enough space
+ // New minWidth is KCalenTimeStripWidth [un] (time stripe only)
+ minWidth = KCalenTimeStripWidth * mLayoutValues.unitInPixels;
+ totalMarginSpace = mLayoutValues.eventAreaWidth - minWidth * columns
+ - mLayoutValues.eventMargin;
newMarginValue = totalMarginSpace / (columns - 1);
eventWidth = minWidth;
}
@@ -258,140 +270,150 @@
//First column margin should be always 1.5un (mLayoutValues.eventMargin)
eventStartX += columnIdx * (eventWidth + newMarginValue) + mLayoutValues.eventMargin;
}
- else{
- //add margins between the event
+ else {
+ // Add margins between the event
eventStartX += columnIdx * eventWidth + mLayoutValues.eventMargin;
eventWidth -= mLayoutValues.eventMargin;
}
-
- QRectF eventGeometry( eventStartX, eventStartY, eventWidth, eventHeight );
+
+ QRectF eventGeometry(eventStartX, eventStartY, eventWidth, eventHeight);
item->setGeometry(eventGeometry);
}
-// 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
+ \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)
+void CalenDayContainer::updateAllDayEventGeometry(
+ HbAbstractViewItem *item,
+ const QModelIndex &index)
{
- //safety check
- if ( !mInfo ) {
- return;
- }
-
- QVariant variant = index.data( CalenDayEntry );
- AgendaEntry entry = variant.value<AgendaEntry>();
-
- //1. get 'virtual' event position from DayInfo
- //TODO: k.g.: Day Info should store model index instead of keeping redundant data
- SCalenApptInfo apptInfo;
- apptInfo.iIndex = index;
-
-
- QDateTime start;
+ // Safety check
+ if (!mInfo) {
+ return;
+ }
+
+ QVariant variant = index.data(CalenDayEntry);
+ AgendaEntry entry = variant.value<AgendaEntry> ();
+
+ // 1. Get 'virtual' event position from DayInfo
+ SCalenApptInfo apptInfo;
+ apptInfo.iIndex = index;
+
+ QDateTime start;
QDateTime end;
QDateTime currentDate;
- currentDate = static_cast<const CalenDayModel*>(index.model())->modelDate();
- CalenDayUtils::instance()->getEventValidStartEndTime( start, end, entry,
- currentDate );
+ currentDate
+ = static_cast<const CalenDayModel*> (index.model())->modelDate();
+ CalenDayUtils::instance()->getEventValidStartEndTime(start, end, entry,
+ currentDate);
apptInfo.iStartTime = start;
apptInfo.iEndTime = end;
-
- TCalenInstanceId id = TCalenInstanceId::nullInstanceId();
- id.mEntryLocalUid = index.row(); //index.row() - temporary ID
- id.mInstanceTime = apptInfo.iStartTime;
- apptInfo.iId = id;
- apptInfo.iAllDay = true;
- apptInfo.iColor = 0xffff;
-
- int startSlot, endSlot, columnIdx, columns;
- mInfo->GetLocation( apptInfo, startSlot, endSlot, columnIdx, columns );
-
- //2. set timed event's geometry
- qreal eventStartX(0.0);
- qreal eventStartY(0.0);
- qreal eventWidth(mLayoutValues.eventAreaX);
- qreal eventHeight = (endSlot - startSlot) * mLayoutValues.slotHeight;
+
+ TCalenInstanceId id = TCalenInstanceId::nullInstanceId();
+ id.mEntryLocalUid = index.row(); //index.row() - temporary ID
+ id.mInstanceTime = apptInfo.iStartTime;
+ apptInfo.iId = id;
+ apptInfo.iAllDay = true;
+ apptInfo.iColor = 0xffff;
+
+ int startSlot, endSlot, columnIdx, columns;
+ mInfo->GetLocation(apptInfo, startSlot, endSlot, columnIdx, columns);
-
- //event's startX/width
- if ( columns > 1 ) {
- eventWidth /= columns;
- eventStartX += columnIdx * eventWidth + mLayoutValues.eventMargin;
- //add margins between the event
- eventWidth -= mLayoutValues.eventMargin;
- } else {
- eventStartX += mLayoutValues.eventMargin;
- eventWidth -= mLayoutValues.eventMargin;
- }
-
- QRectF eventGeometry( eventStartX, eventStartY, eventWidth, eventHeight );
- item->setGeometry(eventGeometry);
-
+ // 2. Set timed event's geometry
+ qreal eventStartX(0.0);
+ qreal eventStartY(0.0);
+ qreal eventWidth(mLayoutValues.eventAreaX);
+ qreal eventHeight = (endSlot - startSlot) * mLayoutValues.slotHeight;
+
+ // Event's startX/width
+ if (columns > 1) {
+ eventWidth /= columns;
+ eventStartX += columnIdx * eventWidth + mLayoutValues.eventMargin;
+ // Add margins between the event
+ eventWidth -= mLayoutValues.eventMargin;
+ }
+ else {
+ eventStartX += mLayoutValues.eventMargin;
+ eventWidth -= mLayoutValues.eventMargin;
+ }
+
+ QRectF eventGeometry(eventStartX, eventStartY, eventWidth, eventHeight);
+ item->setGeometry(eventGeometry);
}
/*!
- \brief Gets event layout values
- \a layoutValues structure to be filled with layout data
+ \brief Gets event layout values
+ \a layoutValues structure to be filled with layout data
*/
void CalenDayContainer::getTimedEventLayoutValues(LayoutValues& layoutValues)
{
- // get the width of content area
+ // Get the width of content area
qreal contentWidth = CalenDayUtils::instance()->contentWidth();
-//1.time column width -> eventAreaX[out]
+
+ // 1. Time column width -> eventAreaX[out]
HbStyle style;
HbDeviceProfile deviceProfile;
layoutValues.unitInPixels = deviceProfile.unitValue();
-
- if ( mInfo && mInfo->AlldayCount())
- {
- // adccoriding to ui spec all-day event area should take
- // 1/4 of content area
- layoutValues.eventAreaX = contentWidth / 4;
- }
- else
- {
- layoutValues.eventAreaX = 0;
- }
-
-//2. event area width -> eventAreaWidth[out]
+
+ if (mInfo && mInfo->AlldayCount()) {
+ layoutValues.eventAreaX = KCalenAllDayEventArea * contentWidth;
+ }
+ else {
+ layoutValues.eventAreaX = 0;
+ }
+
+ // 2. event area width -> eventAreaWidth[out]
qreal emptyRightColumnWidth(0.0);
- emptyRightColumnWidth = 6.0 * layoutValues.unitInPixels; //pix (according to UI spec)
- layoutValues.eventAreaWidth = contentWidth - emptyRightColumnWidth - layoutValues.eventAreaX ;
-//3. margins between the overlapping events -> eventMargin[out]
- layoutValues.eventMargin = 1.5 * layoutValues.unitInPixels;
-//4. half-hour slot'h height -> slotHeight[out]
- //curent slot height corresponds to half an hour
- layoutValues.slotHeight =
- CalenDayUtils::instance()->hourElementHeight() / 2;
-
- // 8.2 un (min. touchable event) from layout guide
- // used to check should we create absorber over some overlapping region
- layoutValues.maxColumns = layoutValues.eventAreaWidth / (8.2 * layoutValues.unitInPixels);
+ emptyRightColumnWidth = KCalenEmptyRightColumnWidth
+ * layoutValues.unitInPixels;
+ layoutValues.eventAreaWidth = contentWidth - emptyRightColumnWidth
+ - layoutValues.eventAreaX;
+
+ // 3. margins between the overlapping events -> eventMargin[out]
+ layoutValues.eventMargin = KCalenSpaceBeetwenEvents
+ * layoutValues.unitInPixels;
+
+ // 4. half-hour slot'h height -> slotHeight[out]
+ layoutValues.slotHeight = CalenDayUtils::instance()->hourElementHeight()
+ / KCalenSlotsInHour;
+
+ // check if we should create absorber over some overlapping region
+ layoutValues.maxColumns = layoutValues.eventAreaWidth
+ / (KCalenMinTouchableEventWidth * layoutValues.unitInPixels);
}
/*!
- \brief Sets day's info structer to the container.
- \a dayInfo day's info data
+ \brief Sets day's info structure to the container.
+ \a dayInfo day's info data
+
+ \sa CalenDayInfo, CalenDayContainer::dayInfo
*/
-void CalenDayContainer::setDayInfo( CalenDayInfo* dayInfo )
+void CalenDayContainer::setDayInfo(CalenDayInfo* dayInfo)
{
mInfo = dayInfo;
}
-// -----------------------------------------------------------------------------
-// setDate()
-// Sets date to the container. Changes according to model which is connected to given view.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief It return pointer to info structure of container.
+
+ \sa CalenDayInfo, CalenDayContainer::setDayInfo
+ */
+CalenDayInfo* CalenDayContainer::dayInfo()
+{
+ return mInfo;
+}
+
+/*!
+ \brief Sets date to the container.
+ Changes according to model which is connected to given view.
+
+ \a date Date of container
+ */
void CalenDayContainer::setDate(const QDate &date)
{
mDate = date;
@@ -402,19 +424,24 @@
// Returns date of the container.
// -----------------------------------------------------------------------------
//
+/*!
+ \brief Returns date of the container.
+
+ \sa date Date of container
+ */
const QDate &CalenDayContainer::date() const
{
return mDate;
}
/*!
- \brief Slot handles layout switch.
- \a orientation current device orientation
+ \brief Slot handles layout switch.
+ \a orientation current device orientation
*/
void CalenDayContainer::orientationChanged(Qt::Orientation orientation)
{
- getTimedEventLayoutValues(mLayoutValues);
-
+ getTimedEventLayoutValues(mLayoutValues);
+
Q_UNUSED( orientation )
QList<HbAbstractViewItem *> items = this->items();
int count(items.count());
@@ -423,115 +450,114 @@
if (modelIndex.isValid()) {
QVariant variant = modelIndex.data(CalenDayEntry);
AgendaEntry entry = variant.value<AgendaEntry> ();
- if (entry.isTimedEntry()) {
+ if (entry.isTimedEntry() && !CalenAgendaUtils::isAlldayEvent(entry)) {
updateTimedEventGeometry(items[i], modelIndex);
}
+ else
+ if (CalenAgendaUtils::isAlldayEvent(entry)) {
+ updateAllDayEventGeometry(items[i], modelIndex);
+ }
}
}
-
+
createTouchEventAbsorbers();
}
/*!
- \brief Creates absorbers which prevent touching to small items
- According to UI spec items smaller than 8.2 un are untouchable
+ \brief Creates absorbers which prevent touching to small items
+ According to UI spec items smaller than 8.2 un are untouchable
*/
void CalenDayContainer::createTouchEventAbsorbers()
{
- // remove absorbers if exist
- if (mAbsorbers.count())
- {
- qDeleteAll(mAbsorbers);
- mAbsorbers.clear();
- }
-
- //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<CalenTimeRegion>& regionList = mInfo->RegionList();
-
- for(int i=0; i < regionList.count(); i++)
- {
- if(regionList[i].iColumns.count() > mLayoutValues.maxColumns )
- {
- TouchEventAbsorber* absorber =
- crateAbsorberBetweenSlots(regionList[i].iStartSlot, regionList[i].iEndSlot, false);
-
- mAbsorbers.append(absorber);
- }
- }
-
+ // remove absorbers if exist
+ if (mAbsorbers.count()) {
+ qDeleteAll(mAbsorbers);
+ mAbsorbers.clear();
+ }
+
+ // Create absorber for all-day events
+ Qt::Orientation orientation = CalenDayUtils::instance()->orientation();
+ int allDayCount = mInfo->AlldayCount();
+
+ if ((orientation == Qt::Vertical
+ && allDayCount > KCalenTouchableAllDayEventsCountPortrait)
+ || (orientation == Qt::Horizontal
+ && allDayCount > KCalenTouchableAllDayEventsCountLandscape)) {
+ TouchEventAbsorber* absorber = crateAbsorberBetweenSlots(0, 0, true);
+ mAbsorbers.append(absorber);
+ }
+
+ // Create absorbers for timed events
+ const QList<CalenTimeRegion>& regionList = mInfo->RegionList();
+ for (int i = 0; i < regionList.count(); i++) {
+ if (regionList[i].iColumns.count() > mLayoutValues.maxColumns) {
+ TouchEventAbsorber* absorber = crateAbsorberBetweenSlots(
+ regionList[i].iStartSlot, regionList[i].iEndSlot, false);
+
+ mAbsorbers.append(absorber);
+ }
+ }
}
/*!
- \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
+ \brief Creates single absorber in given location
+ \a startSlot absorber area starts from there
+ \a endSlot absobrber area ends here
+ \a forAllDayEvents if true absorber in all-day events area is created
*/
-TouchEventAbsorber *CalenDayContainer::crateAbsorberBetweenSlots
- (int startSlot, int endSlot, bool forAllDayEvents)
+TouchEventAbsorber *CalenDayContainer::crateAbsorberBetweenSlots(
+ int startSlot,
+ int endSlot,
+ bool forAllDayEvents)
{
TouchEventAbsorber *absorber = new TouchEventAbsorber(this);
absorber->setZValue(1000);
absorber->setVisible(true);
- 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);
- }
-
+ if (!forAllDayEvents) {
+ absorber->setGeometry(mLayoutValues.eventAreaX, // x
+ startSlot * mLayoutValues.slotHeight, // y
+ mLayoutValues.eventAreaWidth, // w
+ (endSlot - startSlot) * mLayoutValues.slotHeight); // h
+ }
+ else {
+ absorber->setGeometry(0, 0, mLayoutValues.eventAreaX,
+ KCalenHoursInDay * KCalenSlotsInHour * mLayoutValues.slotHeight);
+ }
+
return absorber;
}
/*!
- \brief Handles tap event on overlapping area
- Currently it leads to Agenda View - as described in UI spec
- \a event qt gesture event
+ \brief Handles tap event on overlapping area
+ Currently it leads to Agenda View - as described in UI spec
+ \a event qt gesture event
*/
void TouchEventAbsorber::gestureEvent(QGestureEvent *event)
{
QTapGesture *tapGesture = qobject_cast<QTapGesture*> (event->gesture(
Qt::TapGesture));
- if (tapGesture && tapGesture->state() == Qt::GestureFinished)
- {
+ if (tapGesture && tapGesture->state() == Qt::GestureFinished) {
CalenDayView* dayView = static_cast<CalenDayView*>
(CalenDayUtils::instance()->mainWindow()->currentView());
dayView->changeView(ECalenAgendaView);
- }
+ }
}
/*!
- \brief Constructor
+ \brief Constructor
*/
-TouchEventAbsorber::TouchEventAbsorber(QGraphicsItem *parent) : HbWidget(parent)
+TouchEventAbsorber::TouchEventAbsorber(QGraphicsItem *parent) :
+ HbWidget(parent)
{
#ifdef _DEBUG
setFlag(QGraphicsItem::ItemHasNoContents, false);
#endif
- grabGesture(Qt::TapGesture);
+ grabGesture(Qt::TapGesture);
}
@@ -547,24 +573,26 @@
/*!
- \brief Used for debugging purposes to see absorbers areas
- Not active in release builds!
+ \brief Used for debugging purposes to see absorbers areas
+ Not active in release builds!
*/
#ifdef _DEBUG
-void TouchEventAbsorber::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
- QWidget *widget)
+void TouchEventAbsorber::paint(
+ QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget)
{
- Q_UNUSED(option)
- Q_UNUSED(widget)
-
- painter->save();
- QPen pen;
- pen.setWidth(2);
- pen.setColor(Qt::red);
- painter->setPen(pen);
- painter->drawRect(boundingRect());
- painter->restore();
+ Q_UNUSED(option)
+ Q_UNUSED(widget)
+
+ painter->save();
+ QPen pen;
+ pen.setWidth(2);
+ pen.setColor(Qt::red);
+ painter->setPen(pen);
+ painter->drawRect(boundingRect());
+ painter->restore();
}
#endif
// End of File
--- a/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -26,6 +26,25 @@
#include "calendaycontentscrollarea.h"
#include "calendayutils.h"
+// Constants
+/*!
+ Default timeout for scrolling between days [ms]
+ */
+const int KCalenScrollDaysTimeout = 600;
+
+/*!
+ Value [%] defines how long (depending on content area width) should horizontal
+ pan gesture be to change day to previous/next.
+ If the gesture is shorter - current view is not changed.
+ */
+const int KCalenHScrollMoveParam = 30; //!< Percentage
+
+/*!
+ Value [degree] defines the max. angle of swipe gesture which should change day.
+ */
+const qreal KCalenSwipeAngle = 30;
+
+
/*!
\class CalenDayContentScrollArea
\brief Scrollable container class for content widgets.
@@ -213,7 +232,7 @@
mStartPosition = contentWidget()->pos();
qreal swipeAngle = swipeGesture->sceneSwipeAngle();
- if (CalenDayUtils::instance()->isHorizontalSwipe(swipeAngle)) {
+ if (isHorizontalSwipe(swipeAngle)) {
if (QSwipeGesture::Left ==
swipeGesture->sceneHorizontalDirection()) {
mMoveDirection = ECalenScrollToNext;
@@ -372,6 +391,23 @@
}
/*!
+ \brief isHorizontalSwipe
+
+ \return TRUE if horizontal swipe was recognized (angle in specific range)
+ */
+bool CalenDayContentScrollArea::isHorizontalSwipe(qreal angle) const
+{
+ bool isHSwipe = false;
+ if ((angle < KCalenSwipeAngle) ||
+ ((angle > 180 - KCalenSwipeAngle) && (angle < 180 + KCalenSwipeAngle)) ||
+ (angle > 360 - KCalenSwipeAngle)) {
+ isHSwipe = true;
+ }
+
+ return isHSwipe;
+}
+
+/*!
\brief Slot which is called when moving of scroll area is finished.
Resets internal isMoving flag.
--- a/calendarui/views/dayview/src/calendayhourelement.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendayhourelement.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -1,62 +1,76 @@
/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Day view control of calendar
-*
-*/
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Day view control of calendar
+ *
+ */
-//System includes
+// System includes
#include <QGraphicsLinearLayout>
#include <QPainter>
-#include <hbtextitem.h>
-#include <hbstyle.h>
-#include <hbcolorscheme.h>
-#include <hbfontspec.h>
-#include <hbextendedlocale.h>
+#include <HbTextItem>
+#include <HbStyle>
+#include <HbColorScheme>
+#include <HbFontSpec>
+#include <HbExtendedLocale>
-//User includes
+// User includes
#include "calendayhourelement.h"
#include "calendaycontainer.h"
#include "calendayhourscrollarea.h"
// Constants
+/*!
+ \brief Time format is: [0-9][0-9]:[0-9][0-9]
+ */
+const int KCalenTimeFormatLength = 5;
/*!
- \brief CalenDayHourElement()
- Constructor
-*/
-CalenDayHourElement::CalenDayHourElement(const QTime &time, QGraphicsItem *parent) :
+ \class CalenDayHourElement
+ \brief Hour element widget for Calendar's Day View
+ */
+
+/*!
+ \brief Constructor
+
+ \param time Time assigned to widget
+ \param parent Widget's parent
+ */
+CalenDayHourElement::CalenDayHourElement(
+ const QTime &time,
+ QGraphicsItem *parent) :
HbWidget(parent), mHour(time)
{
// Necessary when widget implements own paint method
- setFlag(QGraphicsItem::ItemHasNoContents, false);
+ setFlag(QGraphicsItem::ItemHasNoContents, false);
HbDeviceProfile deviceProfile;
mUnitInPixels = deviceProfile.unitValue();
-
- mHourLineColor = HbColorScheme::color("qtc_cal_day_hour_lines");
- //Create text items
+ // Initialize hour line color
+ mHourLineColor = HbColorScheme::color(KCalenHourLineColor);
+
+ // Create text items
HbExtendedLocale systemLocale = HbExtendedLocale::system();
- //Get current time format and (if there's a need) separate time from am/pm text
+ // Get current time format and (if there's a need) separate time from am/pm text
QChar timeSeparator = ' ';
- QStringList timeTextList = systemLocale.format(time, r_qtn_time_usual_with_zero).split(
- timeSeparator);
+ QStringList timeTextList = systemLocale.format(time,
+ r_qtn_time_usual_with_zero).split(timeSeparator);
- //prepend 0 if needed to achieve format - 01:00
+ // If needed, prepend '0' to get proper time format: [0-9][0-9]:[0-9][0-9]
QString timeString = timeTextList[0];
- if (timeString.length() < 5) {
+ if (timeString.length() < KCalenTimeFormatLength) {
timeString.prepend('0');
}
@@ -71,78 +85,77 @@
HbStyle::setItemName(timeTextItem, QLatin1String("time"));
HbStyle::setItemName(ampmTextItem, QLatin1String("ampm"));
+ // Parent container is needed to update widget's time
mContainer = static_cast<CalenDayHourScrollArea*> (parent);
-
}
/*!
- \brief CalenDayHourElement()
- Destructor
-*/
+ \brief Destructor
+ */
CalenDayHourElement::~CalenDayHourElement()
{
}
/*!
- \brief CalenDayHourElement()
- paint
-*/
+ \brief Customized paint() function
+
+ \param painter Painter
+ \param option Style option
+ \param widget
+ */
void CalenDayHourElement::paint(
- QPainter * painter,
- const QStyleOptionGraphicsItem * option,
- QWidget * widget)
+ QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget)
{
Q_UNUSED(widget);
+
+ painter->save();
QRectF drawArea = option->rect;
- const qreal hourLineThickness = 0.15; //un (according to UI spec)
- const qreal timeLineThickness = 0.75; //un (according to UI spec)
-
- painter->save();
-
- //Draw full hour line
- QPen linePen = QPen(mHourLineColor, hourLineThickness * mUnitInPixels);
+ // Draw full hour line
+ QPen linePen = QPen(mHourLineColor, KCalenHourLineThickness * mUnitInPixels);
painter->setPen(linePen);
+
QLineF fullHourLine(drawArea.bottomLeft(), drawArea.bottomRight());
-
painter->drawLine(fullHourLine);
- //Draw extra line on top for midnight
+ // Draw extra line on top for midnight
if (mHour.hour() == 0) {
fullHourLine = QLineF(drawArea.topLeft(), drawArea.topRight());
painter->drawLine(fullHourLine);
- }
-
+ }
+
QDateTime currentDateTime = QDateTime::currentDateTime();
- //Draw the time line in theme color
+ // Draw the time line in theme color
if (mContainer) {
QDateTime containersDateTime = mContainer->dateTime();
-
- if (currentDateTime.date() == containersDateTime.date() && currentDateTime.time().hour()
- == mHour.hour()) {
+
+ if (currentDateTime.date() == containersDateTime.date()
+ && currentDateTime.time().hour() == mHour.hour()) {
+
+ qreal currentTimeY = drawArea.height()
+ * currentDateTime.time().minute() / 60;
- qreal currentTimeY = drawArea.height() * currentDateTime.time().minute() / 60;
-
- QColor color = HbColorScheme::color("qtc_cal_month_current_day");
-
- painter->setPen(QPen(color, timeLineThickness * mUnitInPixels, Qt::SolidLine,
- Qt::FlatCap));
- QLineF currentTimeline(drawArea.left(), drawArea.top() + currentTimeY, drawArea.right(), drawArea.top()
- + currentTimeY);
+ QColor color = HbColorScheme::color(KCalenTimeLineColor);
+ painter->setPen(QPen(color, KCalenTimeLineThickness * mUnitInPixels,
+ Qt::SolidLine, Qt::FlatCap));
+ QLineF currentTimeline(drawArea.left(), drawArea.top() + currentTimeY,
+ drawArea.right(), drawArea.top() + currentTimeY);
painter->drawLine(currentTimeline);
-
}
}
-
painter->restore();
}
/*!
- \brief It set time for hour element.
+ \brief Sets time for hour element.
+
+ \param time Time to be set for hour element
*/
void CalenDayHourElement::setTime(const QTime &time)
{
@@ -150,7 +163,9 @@
}
/*!
- \brief It return time of hour element.
+ \brief Returns time of hour element.
+
+ \return Time of hour element
*/
QTime CalenDayHourElement::time() const
{
--- a/calendarui/views/dayview/src/calendayhourscrollarea.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendayhourscrollarea.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -39,13 +39,10 @@
\param parent The parent of scroll area widget
*/
CalenDayHourScrollArea::CalenDayHourScrollArea(QGraphicsItem *parent) :
- HbScrollArea(parent),
- mDateTime(QDateTime())
+ HbScrollArea(parent), mDateTime(QDateTime())
{
+ // Grab pan gestures
grabGesture(Qt::PanGesture);
-
- // Get width of hour elements and fix its size
- qreal hourElementWidth = CalenDayUtils::instance()->hourElementWidth();
// Create widget for hour elements
HbWidget *hourWidget = new HbWidget();
@@ -53,7 +50,7 @@
// Create and insert hour elements into vertical layout
QGraphicsLinearLayout* hourLayout = new QGraphicsLinearLayout(Qt::Vertical,
NULL);
- for (int i = 0; i < 24; i++) {
+ for (int i = 0; i < KCalenHoursInDay; i++) {
CalenDayHourElement* element = new CalenDayHourElement(QTime(i, 0),
this);
hourLayout->addItem(element);
@@ -61,10 +58,6 @@
}
hourLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
hourLayout->setSpacing(0.0);
-
- // Fix the size of scroll area
- setMinimumWidth(hourElementWidth);
- setMaximumWidth(hourElementWidth);
// Apply hour layout for new widget and set content widget to scroll area
hourWidget->setLayout(hourLayout);
@@ -113,21 +106,23 @@
/*!
\brief Scroll view to given hour.
- \param An hour In 24 hour format (0 - 23)
+ \param An hour in 24 hour format (0 - 23)
*/
void CalenDayHourScrollArea::scrollToHour(int hour)
{
+ Q_ASSERT((hour > -1) && (hour < KCalenHoursInDay));
+
CalenDayHourElement *hourElement = mHourElements.at(hour);
QRectF hourElementRect = hourElement->rect();
hourElementRect = hourElement->mapRectToParent(hourElementRect);
QPointF newPos = hourElementRect.topLeft();
- //Ensure that we won't scroll out of bound
+ // Ensure that we won't scroll out of bound
CalenDayHourElement *lastElement = mHourElements.last();
qreal bottomEdge = lastElement->mapRectToParent(lastElement->rect()).bottom();
qreal viewHeight = rect().height();
- if(bottomEdge - newPos.y() < viewHeight){
+ if (bottomEdge - newPos.y() < viewHeight) {
newPos.setY(bottomEdge - viewHeight);
}
--- a/calendarui/views/dayview/src/calendayitem.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendayitem.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -29,28 +29,25 @@
#include "calendaystatusstrip.h"
#include "calendaymodel.h"
#include "calendayutils.h"
+#include "calenagendautils.h"
#include "calendaycontainer.h"
-// -----------------------------------------------------------------------------
-// CalenDayItem()
-// Constructor.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Constructor.
+*/
CalenDayItem::CalenDayItem(const CalenDayContainer *container):
mContainer(container), mUpdated(false), mBg(0), mEventDesc(0), mColorStripe(0),
mEventDescMinWidth(0.0), mFrameMinWidth(0.0)
{
}
-// -----------------------------------------------------------------------------
-// CalenBCDayView()
-// Copy constructor.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Constructor.
+*/
CalenDayItem::CalenDayItem(const CalenDayItem & source) :
HbAbstractViewItem(source), mContainer(source.container()), mUpdated(false), mBg(0), mEventDesc(0),
mColorStripe(0), mEventDescMinWidth(0.0), mFrameMinWidth(0.0)
-{
+{
// TODO: "qtg_fr_btn_pressed" need to replaced with qtg_fr_cal_meeting_bg
// when available
mBg = new HbFrameItem("qtg_fr_btn_pressed", HbFrameDrawer::NinePieces, this);
@@ -87,19 +84,18 @@
}
-// -----------------------------------------------------------------------------
-// ~CalenDayItem()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Destructor.
+*/
CalenDayItem::~CalenDayItem()
{
}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Creates new instance of day item.
+
+ \return New instance of day item.
+*/
HbAbstractViewItem * CalenDayItem::createItem()
{
CalenDayItem* newItem = new CalenDayItem(*this);
@@ -107,36 +103,36 @@
}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Sets data to be displayed on item.
+*/
void CalenDayItem::updateChildItems()
{
- // there is no need to update items after creation
- if (!mUpdated)
- {
- AgendaEntry entry;
- entry = modelIndex().data( CalenDayEntry ).value<AgendaEntry>();
-
- bool isAllDayEvent = (entry.type() == AgendaEntry::TypeEvent)
- && !entry.isTimedEntry();
-
- setDescription(entry, isAllDayEvent);
- setStatusStrip(entry, isAllDayEvent);
-
- mUpdated = true;
- }
-
- //TODO: check if needed
- //repolish();
- //HbAbstractViewItem::updateChildItems();
+ // there is no need to update items after creation
+ if (!mUpdated) {
+ AgendaEntry entry;
+ entry = modelIndex().data(CalenDayEntry).value<AgendaEntry>();
+
+ bool isAllDayEvent = CalenAgendaUtils::isAlldayEvent(entry);
+
+ setDescription(entry, isAllDayEvent);
+ setStatusStrip(entry, isAllDayEvent);
+
+ mUpdated = true;
+ }
+
+ //TODO: check if needed
+ //repolish();
+ //HbAbstractViewItem::updateChildItems();
}
-// -----------------------------------------------------------------------------
-// setDescription()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Adds event description for the item.
+
+ \param entry An for which description needs to be displayed.
+ \param allDayEvent Flag that indicates whether an item is all day event
+*/
void CalenDayItem::setDescription(const AgendaEntry &entry, bool allDayEvent)
{
QString description(entry.summary());
@@ -182,7 +178,7 @@
\brief It set all needed things for status strip from Agenda Entry.
\param entry Status Strip is created from Agenda Entry
- */
+*/
void CalenDayItem::setStatusStrip(const AgendaEntry &entry, bool allDayEvent)
{
QColor color = HbColorScheme::color("qtc_cal_month_current_day");
@@ -225,6 +221,11 @@
}
}
+/*!
+ \brief Reimplemented from HbWidget. Handles resize event.
+
+ \param event Instance of an event to be handled.
+*/
void CalenDayItem::resizeEvent(QGraphicsSceneResizeEvent *event)
{
Q_UNUSED(event)
--- a/calendarui/views/dayview/src/calendayitemview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendayitemview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -30,14 +30,13 @@
#include "calendaymodel.h"
#include "calenservices.h"
#include "calencontext.h"
+#include "calenagendautils.h"
#include "CalenUid.h"
-// -----------------------------------------------------------------------------
-// CalenDayItemView()
-// Constructor
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Constructor
+*/
CalenDayItemView::CalenDayItemView( MCalenServices &services, HbModelIterator *iterator, QGraphicsItem *parent )
: HbAbstractItemView(mContainer = new CalenDayContainer(), iterator, parent),
mServices( services )
@@ -71,53 +70,44 @@
setupContextMenu();
}
-// -----------------------------------------------------------------------------
-// ~CalenDayItemView()
-// Destructor
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Destructor
+*/
CalenDayItemView::~CalenDayItemView()
{
delete mInfo;
}
-// -----------------------------------------------------------------------------
-// scrollTo()
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Scrolls to given index
+*/
void CalenDayItemView::scrollTo(const QModelIndex &index, HbAbstractItemView::ScrollHint hint)
{
HbAbstractItemView::scrollTo(index, hint);
}
-// -----------------------------------------------------------------------------
-// reset()
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Currently empty implementation.
+*/
void CalenDayItemView::reset()
{
-// CalenDayItemView::reset();
+
}
-// -----------------------------------------------------------------------------
-// modelAboutToBeReset()
-// Handles signal that is emitted when reset() is called, before the model's
-// internal state (e.g. persistent model indexes) has been invalidated.
-// -----------------------------------------------------------------------------
-//
+
+/*!
+ \brief Handles signal that is emitted when reset() is called, before the model's
+ internal state (e.g. persistent model indexes) has been invalidated.
+*/
void CalenDayItemView::modelAboutToBeReset()
{
}
-// -----------------------------------------------------------------------------
-// modelReset()
-// Handles signal that is emitted when reset() is called, after the model's
-// internal state (e.g. persistent model indexes) has been invalidated.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Handles signal that is emitted when reset() is called, before the model's
+ internal state (e.g. persistent model indexes) has been invalidated.
+*/
void CalenDayItemView::modelReset()
{
if ( !mInfo ) {
@@ -156,12 +146,12 @@
apptInfo.iId = id;
apptInfo.iColor = 0xffff;
- if ( entry.isTimedEntry() )
+ if ( entry.isTimedEntry() && !CalenAgendaUtils::isAlldayEvent(entry))
{
apptInfo.iAllDay = false;
mInfo->InsertTimedEvent( apptInfo );
}
- else if( entry.type() == AgendaEntry::TypeEvent) //all-day event
+ else if(CalenAgendaUtils::isAlldayEvent(entry)) //all-day event
{
apptInfo.iAllDay = true;
mInfo->InsertAlldayEvent( apptInfo );
@@ -171,11 +161,11 @@
HbAbstractItemView::reset();
}
-// -----------------------------------------------------------------------------
-// scrollVertically()
-//
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Scrolls view vertically to the given position.
+
+ \param newPosition position to scroll to.
+*/
void CalenDayItemView::scrollVertically( const QPointF &newPosition )
{
QPointF currentPos = contentWidget()->pos();
@@ -185,31 +175,31 @@
}
}
-// -----------------------------------------------------------------------------
-// itemPressed()
-// This function is called when a touch down event is received within Abstract view item that is representing index.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This function is called when a touch press event is received
+ within Abstract view item that is representing index.
+ Currently it does nothing.
+*/
void CalenDayItemView::itemPressed( const QPointF &position )
{
Q_UNUSED( position )
}
-// -----------------------------------------------------------------------------
-// itemReleased()
-// This function is called when a touch release event is received within Abstract view item that is representing index.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This function is called when a touch release event is received
+ within Abstract view item that is representing index.
+ Currently it does nothing.
+*/
void CalenDayItemView::itemReleased( const QPointF &position )
{
Q_UNUSED( position )
}
-// -----------------------------------------------------------------------------
-// itemActivated()
-// This function is called when the item specified by index is activated by the user.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This function is called when the item specified by index is activated by the user.
+
+ \param position Not used.
+*/
void CalenDayItemView::itemActivated( const QPointF &position )
{
Q_UNUSED( position )
@@ -222,11 +212,12 @@
}
}
-// -----------------------------------------------------------------------------
-// itemLongPressed()
-// This function is called when long press event is received within Abstract view item viewItem.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This function is called when long press event is received within Abstract view item viewItem.
+
+ \param item Pointer to pressed item.
+ \param coord Position where item was pressed.
+*/
void CalenDayItemView::itemLongPressed(HbAbstractViewItem* item, QPointF coords)
{
QModelIndex index = item->modelIndex();
@@ -238,11 +229,11 @@
}
}
-// -----------------------------------------------------------------------------
-// orientationChanged()
-// Slot which is called whenever the orientation of the device changes.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Slot which is called whenever the orientation of the device changes.
+
+ \param orientation New orientation.
+*/
void CalenDayItemView::orientationChanged( Qt::Orientation orientation )
{
// Update the width of screen
@@ -254,41 +245,33 @@
}
}
-// -----------------------------------------------------------------------------
-// openSelectedItem()
-// Opens currently selected model item.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Opens currently selected model item.
+*/
void CalenDayItemView::openSelectedItem()
{
issueCommandOnSelectedItem( ECalenEventView );
}
-// -----------------------------------------------------------------------------
-// editSelectedItem()
-// Edits currently selected model item.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Edits currently selected model item.
+*/
void CalenDayItemView::editSelectedItem()
{
issueCommandOnSelectedItem( ECalenEditCurrentEntry );
}
-// -----------------------------------------------------------------------------
-// deleteSelectedIten()
-// Deletes currently selected model item.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Deletes currently selected model item.
+*/
void CalenDayItemView::deleteSelectedItem()
{
issueCommandOnSelectedItem( ECalenDeleteCurrentEntry );
}
-// -----------------------------------------------------------------------------
-// setupSlots()
-// Connects item view's slots.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Connects item view's slots.
+*/
void CalenDayItemView::setupSlots()
{
// Connect to main window's orientationChanged signal to handle orientation
@@ -319,11 +302,9 @@
this, SLOT(itemLongPressed(HbAbstractViewItem*, QPointF)));
}
-// -----------------------------------------------------------------------------
-// setupSlots()
-// Creates Context menu.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Creates context menu.
+*/
void CalenDayItemView::setupContextMenu()
{
mContextMenu = new HbMenu();
@@ -342,11 +323,11 @@
}
}
-// -----------------------------------------------------------------------------
-// issueCommandOnSelectedItem()
-// Sets context to currently selected model item and issues calendar command.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Sets context to currently selected model item and issues calendar command.
+
+ \param command A command to be issued.
+*/
bool CalenDayItemView::issueCommandOnSelectedItem( int command )
{
bool retVal(false);
@@ -379,11 +360,9 @@
return retVal;
}
-// -----------------------------------------------------------------------------
-// clearSelectionInModel()
-// Clears current selection in Selection Model.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Clears current selection in Selection Model.
+*/
void CalenDayItemView::clearSelectionInModel()
{
QItemSelectionModel* selModel(selectionModel());
--- a/calendarui/views/dayview/src/calendaymodel.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendaymodel.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -15,99 +15,92 @@
*
*/
-
-
+// System includes
#include <calenservices.h>
#include <agendautil.h>
+
+// User includes
#include "calendaymodel.h"
/*!
- BC Day Model constructor
- \a date defined day for which entries will be fetched \a services is handle to
- organizer services \a parent
+ BC Day Model constructor
+ \a date defined day for which entries will be fetched \a services is handle to
+ organizer services \a parent
*/
-CalenDayModel::CalenDayModel(const QDateTime &date, MCalenServices &services,
- QObject *parent)
- : QAbstractListModel(parent), mServices(services)
+CalenDayModel::CalenDayModel(const QDateTime &date, MCalenServices &services, QObject *parent) :
+ QAbstractListModel(parent), mServices(services)
{
- if (date.isValid())
- {
- loadAndStoreInstances(date);
- }
+ if (date.isValid()) {
+ loadAndStoreInstances(date);
+ }
}
/*
- \reimp
+ \reimp
*/
-int CalenDayModel::rowCount( const QModelIndex &parent ) const
+int CalenDayModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED( parent )
return mEntryList.count();
}
/*
- \reimp
+ \reimp
*/
QVariant CalenDayModel::data(const QModelIndex &index, int role) const
{
- if (!index.isValid())
- {
+ if (!index.isValid()) {
return QVariant();
- }
+ }
- if (index.row() >= mEntryList.count())
- {
+ if (index.row() >= mEntryList.count()) {
return QVariant();
- }
+ }
- if (role == CalenDayEntry)
- {
+ if (role == CalenDayEntry) {
return mEntryList.at(index.row());
- }
- else
- {
+ }
+ else {
return QVariant();
- }
+ }
}
/*!
- Resets model. Old events are removed. Evenets for given day are fetched.
- \a date defined day for which entries will be fetched
+ Resets model. Old events are removed. Evenets for given day are fetched.
+ \a date defined day for which entries will be fetched
*/
void CalenDayModel::refreshModel(const QDateTime &date)
{
- beginResetModel();
- loadAndStoreInstances(date);
- endResetModel();
-}
-
-
-/*!
- Fetches entries via. organizer API and stores it in member container
- */
-void CalenDayModel::loadAndStoreInstances(const QDateTime &date)
-{
- mDateTime = date;
- //Filter flags
- AgendaUtil::FilterFlags filter = AgendaUtil::FilterFlags(
- AgendaUtil::IncludeAppointments | AgendaUtil::IncludeEvents);
- QList<AgendaEntry> list;
- // Fetch the instance list from the agenda interface
- list = mServices.agendaInterface()->createEntryIdListForDay(date, filter);
-
- mEntryList.clear();
-
- foreach(AgendaEntry entry, list)
- {
- mEntryList.append(QVariant::fromValue(entry));
- }
+ beginResetModel();
+ loadAndStoreInstances(date);
+ endResetModel();
}
/*!
- Retruns date (day). Model holds events for this day.
+ Fetches entries via. organizer API and stores it in member container
+ */
+void CalenDayModel::loadAndStoreInstances(const QDateTime &date)
+{
+ mDateTime = date;
+ //Filter flags
+ AgendaUtil::FilterFlags filter = AgendaUtil::FilterFlags(AgendaUtil::IncludeAppointments
+ | AgendaUtil::IncludeEvents);
+ QList<AgendaEntry> list;
+ // Fetch the instance list from the agenda interface
+ list = mServices.agendaInterface()->createEntryIdListForDay(date, filter);
+
+ mEntryList.clear();
+
+ foreach(AgendaEntry entry, list){
+ mEntryList.append(QVariant::fromValue(entry));
+ }
+}
+
+/*!
+ Retruns date (day). Model holds events for this day.
*/
QDateTime CalenDayModel::modelDate() const
{
- return mDateTime;
+ return mDateTime;
}
--- a/calendarui/views/dayview/src/calendaymodelmanager.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendaymodelmanager.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -22,146 +22,136 @@
#include "calendaymodel.h"
/*!
- BC Model Manager constructor. Model manager use calendar context to
- populate models with proper events.
- \a services is handle to organizer services \a emptyModels if true created models
- are not populated with events \a parent
+ BC Model Manager constructor. Model manager use calendar context to
+ populate models with proper events.
+ \a services is handle to organizer services \a emptyModels if true created models
+ are not populated with events \a parent
*/
-CalenDayModelManager::CalenDayModelManager(MCalenServices &services, bool emptyModels,
- QObject *parent)
- : QObject(parent), mServices (services)
+CalenDayModelManager::CalenDayModelManager(
+ MCalenServices &services,
+ bool emptyModels,
+ QObject *parent) :
+ QObject(parent), mServices(services)
{
- if (emptyModels)
- {
- mCurrentDayTime = QDateTime();
- }
- else
- {
- mCurrentDayTime = mServices.Context().focusDateAndTime();
- }
- createAllModels();
+ if (emptyModels) {
+ mCurrentDayTime = QDateTime();
+ }
+ else {
+ mCurrentDayTime = mServices.Context().focusDateAndTime();
+ }
+ createAllModels();
}
CalenDayModelManager::~CalenDayModelManager()
{
- // not needed now
+ // not needed now
}
-
void CalenDayModelManager::viewsScrollingFinished(CalenScrollDirection scrollTo)
- {
- if (scrollTo == ECalenScrollToNext)
- {
- moveForeward();
- }
- else
- {
- moveBackward();
- }
- }
-
+{
+ if (scrollTo == ECalenScrollToNext) {
+ moveForward();
+ }
+ else {
+ moveBackward();
+ }
+}
/*!
- Reorganize models after move to previous day.
+ Reorganize models after move to previous day.
*/
void CalenDayModelManager::moveBackward()
{
- mCurrentDayTime = mServices.Context().focusDateAndTime();
+ mCurrentDayTime = mServices.Context().focusDateAndTime();
- CalenDayModel* tmp = mModels[NextDay];
- tmp->refreshModel( mCurrentDayTime.addDays(-1));
-
- mModels[NextDay] = mModels[CurrentDay];
- mModels[CurrentDay] = mModels[PreviousDay];
- mModels[PreviousDay] = tmp;
+ CalenDayModel* tmp = mModels[NextDay];
+ tmp->refreshModel(mCurrentDayTime.addDays(-1));
+
+ mModels[NextDay] = mModels[CurrentDay];
+ mModels[CurrentDay] = mModels[PreviousDay];
+ mModels[PreviousDay] = tmp;
}
/*!
- Reorganize models after move to next day.
+ Reorganize models after move to next day.
*/
-void CalenDayModelManager::moveForeward()
+void CalenDayModelManager::moveForward()
{
- mCurrentDayTime = mServices.Context().focusDateAndTime();
-
- CalenDayModel* tmp = mModels[PreviousDay];
- tmp->refreshModel( mCurrentDayTime.addDays(1));
-
- mModels[PreviousDay] = mModels[CurrentDay];
- mModels[CurrentDay] = mModels[NextDay];
- mModels[NextDay] = tmp;
+ mCurrentDayTime = mServices.Context().focusDateAndTime();
+
+ CalenDayModel* tmp = mModels[PreviousDay];
+ tmp->refreshModel(mCurrentDayTime.addDays(1));
+
+ mModels[PreviousDay] = mModels[CurrentDay];
+ mModels[CurrentDay] = mModels[NextDay];
+ mModels[NextDay] = tmp;
}
/*!
- Returns given model
- /a day defines model, can be (PreviousDay, CurrentDay, NextDay) only.
+ Returns given model
+ /a day defines model, can be (PreviousDay, CurrentDay, NextDay) only.
*/
QAbstractItemModel &CalenDayModelManager::getModel(ModelDay day)
{
- return *(mModels[day]);
+ return *(mModels[day]);
}
/*!
- Creates all models objects durring construction.
+ Creates all models objects durring construction.
*/
void CalenDayModelManager::createAllModels()
{
-
- mModels[CurrentDay] = new CalenDayModel(mCurrentDayTime, mServices, this);
-
- QDateTime previousDayTime;
- QDateTime nextDayTime;
-
- if (mCurrentDayTime.isValid())
- {
- previousDayTime = mCurrentDayTime.addDays(-1);
- nextDayTime = mCurrentDayTime.addDays(1);
- }
-
- mModels[PreviousDay] = new CalenDayModel(previousDayTime, mServices, this);
- mModels[NextDay] = new CalenDayModel(nextDayTime, mServices, this);
+
+ mModels[CurrentDay] = new CalenDayModel(mCurrentDayTime, mServices, this);
+
+ QDateTime previousDayTime;
+ QDateTime nextDayTime;
+
+ if (mCurrentDayTime.isValid()) {
+ previousDayTime = mCurrentDayTime.addDays(-1);
+ nextDayTime = mCurrentDayTime.addDays(1);
+ }
+
+ mModels[PreviousDay] = new CalenDayModel(previousDayTime, mServices, this);
+ mModels[NextDay] = new CalenDayModel(nextDayTime, mServices, this);
}
-
/*!
- Refetch data for all models. Context calendar is used to fill models
- with correct events. Should be used for full (three days) repopulation.
+ Refetch data for all models. Context calendar is used to fill models
+ with correct events. Should be used for full (three days) repopulation.
*/
void CalenDayModelManager::refreshAllModels()
- {
- mCurrentDayTime = mServices.Context().focusDateAndTime();
+{
+ mCurrentDayTime = mServices.Context().focusDateAndTime();
- mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(-1));
- mModels[CurrentDay]->refreshModel(mCurrentDayTime);
- mModels[NextDay]->refreshModel(mCurrentDayTime.addDays(1));
- }
+ mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(-1));
+ mModels[CurrentDay]->refreshModel(mCurrentDayTime);
+ mModels[NextDay]->refreshModel(mCurrentDayTime.addDays(1));
+}
/*!
- Refetch data given day model. Context calendar is used to fill model
- with correct events.
- /a day defines model, can be (PreviousDay, CurrentDay, NextDay) only.
+ Refetch data given day model. Context calendar is used to fill model
+ with correct events.
+ /a day defines model, can be (PreviousDay, CurrentDay, NextDay) only.
*/
void CalenDayModelManager::refreshSingleModel(CalenDayModelManager::ModelDay day)
- {
- switch (day)
- {
- case PreviousDay:
- {
- mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(-1));
- }
- break;
- case CurrentDay:
- {
- mModels[CurrentDay]->refreshModel(mCurrentDayTime);
- }
- break;
- case NextDay:
- {
- mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(1));
- }
- break;
- default:
- break;
- }
- }
+{
+ switch (day) {
+ case PreviousDay: {
+ mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(-1));
+ }
+ break;
+ case CurrentDay: {
+ mModels[CurrentDay]->refreshModel(mCurrentDayTime);
+ }
+ break;
+ case NextDay: {
+ mModels[PreviousDay]->refreshModel(mCurrentDayTime.addDays(1));
+ }
+ break;
+ default:
+ break;
+ }
+}
// End of File
--- a/calendarui/views/dayview/src/calendaystatusstrip.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendaystatusstrip.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -43,7 +43,7 @@
}
/*!
- \brief Return range beatween two filled lines in StripWithLines drawing
+ \brief Returns range between two filled lines in StripWithLines drawing
styles.
\sa CalenDayStatusStrip::DrawingStyle, setRange
@@ -54,7 +54,7 @@
}
/*!
- \brief Return color drawing
+ \brief Returns color drawing
\sa setColor
*/
@@ -64,7 +64,7 @@
}
/*!
- \brief Return style of drawing.
+ \brief Returns style of drawing.
\sa CalenDayStatusStrip::DrawingStyle, setDrawingStyle
*/
@@ -74,7 +74,7 @@
}
/*!
- \brief Return orginal start and entime fo event
+ \brief Returns original start and entime fo event
\sa setStartEndTime
*/
@@ -84,10 +84,10 @@
}
/*!
- \brief It set range beatween two filled lines in StripWithLines drawing
+ \brief It sets range between two filled lines in StripWithLines drawing
styles.
- \param range Range beatween two filled lines
+ \param range Range between two filled lines
\sa CalenDayStatusStrip::DrawingStyle, range
*/
@@ -97,7 +97,7 @@
}
/*!
- \brief It set color drawing
+ \brief It sets color drawing
\param stripColor Color of drawing
@@ -109,7 +109,7 @@
}
/*!
- \brief It set drawing style of strip
+ \brief It sets drawing style of strip
\param drawingStyle Style of strip drawing.
@@ -122,7 +122,7 @@
}
/*!
- It set start and end time of event
+ It sets start and end time of event
\param startTime Start of event
\param endTime End of event
@@ -223,7 +223,7 @@
}
/*!
- \brief It preapre points to draw filled polygon when StripWithLines style is
+ \brief It preapres points to draw filled polygon when StripWithLines style is
on.
*/
QPolygonF
@@ -238,7 +238,7 @@
}
/*!
- Return time for position 0 and height in widget
+ Returns time for position 0 and height in widget
\param startTime Start of event
\param endTime End of event
@@ -277,7 +277,7 @@
}
/*!
- Calculate height of one minute from widget height, and start/end time.
+ Calculates height of one minute from widget height, and start/end time.
*/
qreal CalenDayStatusStrip::calculateMinuteHeight(const QTime &start,
const QTime &end)
--- a/calendarui/views/dayview/src/calendayutils.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendayutils.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -131,23 +131,6 @@
}
/*!
- \brief isHorizontalSwipe
-
- \return TRUE if horizontal swipe was recognized (angle in specific range)
- */
-bool CalenDayUtils::isHorizontalSwipe(qreal angle) const
-{
- bool isHSwipe = false;
- if ((angle < KCalenSwipeAngle) ||
- ((angle > 180 - KCalenSwipeAngle) && (angle < 180 + KCalenSwipeAngle)) ||
- (angle > 360 - KCalenSwipeAngle)) {
- isHSwipe = true;
- }
-
- return isHSwipe;
-}
-
-/*!
\brief getEventValidStartEndTime
\brief Get event's valid start/end time from agenda entry.
*/
--- a/calendarui/views/dayview/src/calendayview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/src/calendayview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -47,11 +47,10 @@
//constants
-// -----------------------------------------------------------------------------
-// CalenDayView()
-// Constructor.
-// -----------------------------------------------------------------------------
-//
+
+/*!
+ \brief Constructor
+*/
CalenDayView::CalenDayView(MCalenServices &services) :
CalenNativeView(services), mContentScrollArea(NULL), mContentWidget(NULL),
mHourScrollArea(NULL), mVLayout(NULL), mDocLoader(NULL), mIsLaunching(
@@ -80,13 +79,12 @@
HbStyleLoader::registerFilePath(":/calendayitem.css");
HbStyleLoader::registerFilePath(":/calendayitem.widgetml");
HbStyleLoader::registerFilePath(":/calendayeventspane.css");
+ HbStyleLoader::registerFilePath(":/calendayhourscrollarea.css");
}
-// -----------------------------------------------------------------------------
-// ~CalenDayView()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Destructor
+*/
CalenDayView::~CalenDayView()
{
mSettingsManager->stopMonitoring(mRegionalInfo);
@@ -96,22 +94,19 @@
}
}
-// -----------------------------------------------------------------------------
-// onLocaleChanged()
-// Handles locale change.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Handles locale change.
+
+ \param reason the reason of a change
+*/
void CalenDayView::onLocaleChanged(int reason)
{
Q_UNUSED( reason )
}
-// -----------------------------------------------------------------------------
-// From CalenView
-// doPopulation()
-// Handles view (re)population.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Reimplemented from CalenView. Handles view (re)population
+*/
void CalenDayView::doPopulation()
{
// Triggers fading effect for heading label
@@ -143,33 +138,30 @@
populationComplete();
}
-// -----------------------------------------------------------------------------
-// From CalenView
-// populationComplete()
-// Informs the organizer that the view's population is complete.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Reimplemented from CalenView. Informs the organizer that the view's population is complete.
+*/
void CalenDayView::populationComplete()
{
CalenNativeView::populationComplete();
}
-// -----------------------------------------------------------------------------
-// From MCalenNotificationHandler
-// HandleNotification()
-// The function handles calendar notifications.
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Reimplemented from MCalenNotificationHandler. The function handles calendar notifications
+
+ \param notification notification type
+*/
void CalenDayView::HandleNotification(const TCalenNotification notification)
{
Q_UNUSED( notification )
}
-// -----------------------------------------------------------------------------
-// setupView()
-// Sets up the view accroding to the 'xml'
-// -----------------------------------------------------------------------------
-//
+
+/*!
+ \brief Sets up the view accroding to the 'xml'
+
+ \param docLoader Pointer to document loader
+*/
void CalenDayView::setupView(CalenDocLoader* docLoader)
{
// Store document loader for further use
@@ -204,20 +196,19 @@
//private slots
-// -----------------------------------------------------------------------------
-// onBack()
-// Handles 'back' functionality;
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Handles 'back' functionality
+*/
void CalenDayView::onBack()
{
TRAP_IGNORE(mServices.IssueCommandL(ECalenMonthView));
}
-// -----------------------------------------------------------------------------
-// dayChange()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Slot that handles first phase of day change
+
+ \param direction indicates to which day view needs to be scrolled (previous or next day)
+*/
void CalenDayView::dayChangeStarted(CalenScrollDirection direction)
{
if (direction == ECalenScrollToNext) {
@@ -243,29 +234,28 @@
mServices.Context().setFocusDate(mDate);
}
-// -----------------------------------------------------------------------------
-// dayChanged()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Slot that is triggered when operation of day change is completed
+
+ \param direction ndicates to which day view was scrolled (previous or next day)
+*/
void CalenDayView::dayChanged(CalenScrollDirection direction)
{
mModelManager->viewsScrollingFinished(direction);
mHourScrollArea->setDateTime(mDate);
}
-// -----------------------------------------------------------------------------
-// getCurrentDate()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Gets current date from context
+*/
void CalenDayView::getCurrentDate()
{
mDate = CalenNativeView::mServices.Context().focusDateAndTime();
}
-// -----------------------------------------------------------------------------
-// setupMenu()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief Sets the menu for day view
+*/
void CalenDayView::setupMenu()
{
menu()->addAction(hbTrId("txt_calendar_opt_new_event"), this, SLOT(runNewMeeting()));
@@ -285,7 +275,7 @@
}
/*!
- \brief Ot change Day view to Agenda View
+ \brief To change Day view to Agenda View
*/
void CalenDayView::runChangeToAgendaView()
{
@@ -300,10 +290,9 @@
TRAP_IGNORE(mServices.IssueCommandL(ECalenRegionalPluginTapEvent));
}
-// -----------------------------------------------------------------------------
-// setupSlots()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This is a helper function to established connections between signals and slots
+*/
void CalenDayView::setupSlots()
{
// Connecting other view-related signals/slots
@@ -333,10 +322,9 @@
this, SLOT(showHideRegionalInformationChanged(XQSettingsKey, QVariant)));
}
-// -----------------------------------------------------------------------------
-// runNewMeeting()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This slot triggers new meeting creation view
+*/
void CalenDayView::runNewMeeting()
{
QDateTime dateTime(mDate);
@@ -347,10 +335,9 @@
);
}
-// -----------------------------------------------------------------------------
-// runGoToToday()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This slot switches current view to today
+*/
void CalenDayView::runGoToToday()
{
mServices.Context().setFocusDateAndTime(CalenDateUtils::today());
@@ -359,21 +346,23 @@
}
-// -----------------------------------------------------------------------------
-// changeView()
-// -----------------------------------------------------------------------------
-//
+/*!
+ \brief This slot switches current view to the given by id
+
+ \param viewId id of the view that needs to be displayed
+*/
void CalenDayView::changeView(TCalenCommandId viewId)
{
TRAP_IGNORE(mServices.IssueCommandL(viewId));
}
-// ----------------------------------------------------------------------------
-// CalenDayView::setHeadingText
-// Sets heading text according to date from model and locale.
-// It's connected to modelReset signal
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief Sets heading text according to date from model and locale.
+ It's connected to modelReset signal.
+
+ \param status Parameter required in order to call this slot autmatically
+ when an effect is complete.
+*/
void CalenDayView::setHeadingText(const HbEffect::EffectStatus &status)
{
Q_UNUSED(status)
@@ -394,33 +383,30 @@
HbEffect::start(mHeadingLabel, "fadeIn");
}
-// ----------------------------------------------------------------------------
-// CalenDayView::showHideRegionalInformation
-// To run effect on lunar data label
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief Displays regional information
+
+ \param status Parameter required in order to call this slot autmatically
+ when an effect is complete.
+*/
void CalenDayView::showRegionalInformation(const HbEffect::EffectStatus &status)
{
Q_UNUSED(status);
showRegionalInformationFadeIn();
}
-// ----------------------------------------------------------------------------
-// CalenDayView::showRegionalInformationFadeIn
-// To run effect on lunar data label and change text according to date change
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief Runs effect on lunar data label and change text according to date change.
+*/
void CalenDayView::showRegionalInformationFadeIn()
- {
+{
showHideRegionalInformationChanged(mRegionalInfo, 3);
HbEffect::start(mRegionalInfoGroupBox, "fadeIn");
- }
+}
-// ----------------------------------------------------------------------------
-// CalenDayView::showHideRegionalInformationChanged
-// To Show and hide regional plugin label depends upon settings
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief To Show and hide regional plugin label depends upon settings.
+*/
void CalenDayView::showHideRegionalInformationChanged(
const XQSettingsKey& key,
const QVariant&)
@@ -464,11 +450,9 @@
}
}
-// ----------------------------------------------------------------------------
-// CalenDayView::setupViewport
-// Scrolls view according to current day and events
-// ----------------------------------------------------------------------------
-//
+/*!
+ \brief Scrolls view according to current day and events.
+*/
void CalenDayView::setupViewport()
{
QDateTime currentTime = QDateTime::currentDateTime();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/calendaycontainertest.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Class inherit CalenDayContainer needed to test
+*
+*/
+
+#ifndef CALENDAYCONTAINERTEST_H
+#define CALENDAYCONTAINERTEST_H
+
+#include <QObject>
+#include "calendaycontainer.h"
+
+class CalenDayContainerTest : public CalenDayContainer
+{
+ Q_OBJECT
+
+public:
+ CalenDayContainerTest(QGraphicsItem *parent = 0)
+ : CalenDayContainer(parent)
+ {
+
+ }
+
+
+ friend class TestCalenDayContainer;
+};
+
+#endif
+
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/calendayinfo.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/calendayinfo.h Mon Aug 09 18:30:52 2010 +0530
@@ -86,13 +86,18 @@
public:
- CalenDayInfo(TSlotsInHour aSlotsInHour) {
+ CalenDayInfo(TSlotsInHour aSlotsInHour)
+ {
Q_UNUSED(aSlotsInHour)
}
- virtual ~CalenDayInfo();
+ virtual ~CalenDayInfo()
+ {
+
+ }
void GetLocation( const SCalenApptInfo& aItemInfo, int& aStartSlot,
- int& aEndSlot, int& aColumnIndex, int& aColumns ) {
+ int& aEndSlot, int& aColumnIndex, int& aColumns )
+ {
Q_UNUSED(aItemInfo)
Q_UNUSED(aStartSlot)
Q_UNUSED(aEndSlot)
@@ -100,14 +105,29 @@
Q_UNUSED(aColumns)
}
- int AlldayCount() {
+ int AlldayCount()
+ {
return 0;
}
- const QList<CalenTimeRegion>& RegionList() const {
+ const QList<CalenTimeRegion>& RegionList() const
+ {
return mList;
}
+ void InsertAlldayEvent( const SCalenApptInfo& aItemInfo )
+ {
+ Q_UNUSED(aItemInfo)
+
+ CalenTimeRegion region;
+
+ region.iStartSlot = 10;
+ region.iEndSlot = 13;
+ region.iColumns << CalenTimeColumn();
+
+ mList << region;
+ }
+
public:
QList<CalenTimeRegion> mList;
};
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/caleninstanceid.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/caleninstanceid.h Mon Aug 09 18:30:52 2010 +0530
@@ -18,6 +18,8 @@
#ifndef CALENINSTANCEID_H
#define CALENINSTANCEID_H
+#include <agendaentry.h>
+
/*!
Mocked class TCalenInstanceId
*/
@@ -32,6 +34,15 @@
return TCalenInstanceId();
}
+ static TCalenInstanceId create( const AgendaEntry& entry )
+ {
+ TCalenInstanceId id;
+ id.mEntryLocalUid = entry.id();
+ id.mInstanceTime = entry.startTime();
+ id.mType = entry.type();
+ return id;
+ }
+
public: // data members
ulong mEntryLocalUid;
QDateTime mInstanceTime;
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -11,16 +11,29 @@
*
* Contributors:
*
- * Description: Test class for CalenDayContainerWidget
+ * Description: Test class for CalenDayContainer
*
*/
#include <QtTest/QtTest>
-#include "calendaycontainer.h"
+#include <HbEffect>
+#include <HbWidget>
+#include <HbAbstractViewItem>
+
+#include "calendayinfo.h"
+#include "calendaymodel.h"
+
+#define private public
+
+
+#include "calendaycontainertest.h"
+
+QVariantList MOCK_EVENTS_LIST;
+QDateTime MOCK_EVENTS_DATE;
// Test variables
QRectF gTestWindowRect = QRectF(0, 0, 10, 20);
-Qt::Orientation gTestOrientation = Qt::Horizontal;
+Qt::Orientation gTestOrientation = Qt::Vertical;
class TestCalenDayContainer : public QObject
{
@@ -37,16 +50,28 @@
void cleanup();
void testConstructors();
+ void testSetGetDayInfo();
+ void testItemAdded();
+ void testItemRemoved();
+ void testReset();
+ void testViewResized();
+ void testOrientationChanged();
+ void testCreateDefaultPrototype();
+ void testGetTimedEventLayoutValues();
+ void testCreateTouchEventAbsorbers();
+ void testCrateAbsorberBetweenSlots();
+
private:
- CalenDayContainer *mContainer;
+ CalenDayContainerTest *mContainer;
+ CalenDayInfo *mInfo;
};
/*!
Constructor
*/
TestCalenDayContainer::TestCalenDayContainer() :
- mContainer(NULL)
+ mContainer(NULL), mInfo(NULL)
{
}
@@ -79,7 +104,36 @@
*/
void TestCalenDayContainer::init()
{
- mContainer = new CalenDayContainer();
+ mContainer = new CalenDayContainerTest();
+ mInfo = new CalenDayInfo(CalenDayInfo::EOne);
+
+
+ MOCK_EVENTS_DATE = QDateTime(QDate(12,07,2010),QTime(6,0));
+
+ QDateTime dateTimeStart1(QDate(12,07,2010),QTime(7,0));
+ QDateTime dateTimeEnd1(QDate(12,07,2010),QTime(10,0));
+ QDateTime dateTimeStart2(QDate(12,07,2010),QTime(11,0));
+ QDateTime dateTimeEnd2(QDate(12,07,2010),QTime(12,0));
+ QDateTime dateTimeStart3(QDate(12,07,2010),QTime(12,45));
+ QDateTime dateTimeEnd3(QDate(12,07,2010),QTime(18,45));
+
+ AgendaEntry entry1;
+ AgendaEntry entry2;
+ AgendaEntry entry3;
+
+ entry1.setStartAndEndTime(dateTimeStart1,dateTimeEnd1);
+ entry2.setStartAndEndTime(dateTimeStart2,dateTimeEnd2);
+ entry3.setStartAndEndTime(dateTimeStart3,dateTimeEnd3);
+
+ SCalenApptInfo calenInfo;
+ calenInfo.iStatus = AgendaEntry::Confirmed;
+ calenInfo.iId = TCalenInstanceId::create(entry1);
+ mInfo->InsertAlldayEvent(calenInfo);
+ mInfo->InsertAlldayEvent(calenInfo);
+
+ MOCK_EVENTS_LIST << QVariant::fromValue(entry1);
+ MOCK_EVENTS_LIST << QVariant::fromValue(entry2);
+ MOCK_EVENTS_LIST << QVariant::fromValue(entry3);
}
/*!
@@ -91,6 +145,10 @@
delete mContainer;
mContainer = NULL;
}
+ if (mInfo) {
+ delete mInfo;
+ mInfo = NULL;
+ }
}
/*!
@@ -101,15 +159,148 @@
void TestCalenDayContainer::testConstructors()
{
//1)
- CalenDayContainer *testContainer = 0;
+ CalenDayContainerTest *testContainer = 0;
QVERIFY(!testContainer);
//2)
- testContainer = new CalenDayContainer();
+ testContainer = new CalenDayContainerTest();
QVERIFY(testContainer);
delete testContainer;
}
+/*!
+ Test function to check set and get day info
+ Test after set if info day is good
+ */
+void TestCalenDayContainer::testSetGetDayInfo()
+{
+ QVERIFY(mContainer->dayInfo() ==0);
+ mContainer->setDayInfo(mInfo);
+
+ QVERIFY(mContainer->dayInfo()!=0);
+}
+
+/*!
+ Function not implemented
+ */
+void TestCalenDayContainer::testItemAdded()
+{
+ //function dosen't do nothing. It will be updated after code changes
+}
+
+/*!
+ Function not implemented
+ */
+void TestCalenDayContainer::testItemRemoved()
+{
+ //function dosen't do nothing. It will be updated after code changes
+}
+
+/*!
+ Test reset of caontainer based on absorders
+ */
+void TestCalenDayContainer::testReset()
+{
+ QVERIFY(mContainer->mAbsorbers.count() == 0);
+ mContainer->mAbsorbers << mContainer->crateAbsorberBetweenSlots(0,1,false);
+ QVERIFY(mContainer->mAbsorbers.count() == 1);
+ mContainer->reset();
+ QVERIFY(mContainer->mAbsorbers.count() == 0);
+}
+
+/*!
+ Test is view of container is good resized.
+ 1)test if size is changed
+ 2)test if new size is good set
+ */
+void TestCalenDayContainer::testViewResized()
+{
+ QSizeF size = mContainer->size();
+ //set new size
+ QSizeF newSize(size.width()+100,size.height()+100);
+ mContainer->viewResized(newSize);
+ //1)
+ QVERIFY(size != mContainer->size());
+ //2)
+ QCOMPARE(mContainer->size(),newSize);
+}
+
+/*!
+ It test change of orientation based on count of absorbers
+ */
+void TestCalenDayContainer::testOrientationChanged()
+{
+ mContainer->setDayInfo(mInfo);
+ QVERIFY(mContainer->mAbsorbers.count() == 0);
+
+ mContainer->orientationChanged(Qt::Vertical);
+
+ QVERIFY(mContainer->mAbsorbers.count() != 0);
+}
+
+/*!
+ Test creating item prototype
+ */
+void TestCalenDayContainer::testCreateDefaultPrototype()
+{
+ HbAbstractViewItem *testItem = 0;
+ QVERIFY(!testItem);
+
+ testItem = mContainer->createDefaultPrototype();
+
+ QVERIFY(testItem);
+
+ delete testItem;
+}
+
+/*!
+ Test geting timed layouts.
+ */
+void TestCalenDayContainer::testGetTimedEventLayoutValues()
+{
+ CalenDayContainer::LayoutValues layoutValues;
+
+ QVERIFY(layoutValues.eventAreaWidth == 0);
+ QVERIFY(layoutValues.eventAreaX == 0);
+ QVERIFY(layoutValues.eventMargin == 0);
+ QVERIFY(layoutValues.maxColumns == 0);
+ QVERIFY(layoutValues.slotHeight == 0);
+ QVERIFY(layoutValues.unitInPixels == 0);
+
+ mContainer->getTimedEventLayoutValues(layoutValues);
+
+ QVERIFY(layoutValues.eventAreaWidth != 0);
+ QVERIFY(layoutValues.eventAreaX == 0);
+ QVERIFY(layoutValues.eventMargin != 0);
+ QVERIFY(layoutValues.maxColumns != 0);
+ QVERIFY(layoutValues.slotHeight != 0);
+ QVERIFY(layoutValues.unitInPixels != 0);
+}
+
+/*!
+ Test creating touch event absorbers.
+ */
+void TestCalenDayContainer::testCreateTouchEventAbsorbers()
+{
+ mContainer->setDayInfo(mInfo);
+ QVERIFY(mContainer->mAbsorbers.count() == 0);
+ mContainer->createTouchEventAbsorbers();
+ QVERIFY(mContainer->mAbsorbers.count() != 0);
+}
+
+/*!
+ test creating touch absorber beatween slots.
+ */
+void TestCalenDayContainer::testCrateAbsorberBetweenSlots()
+{
+ TouchEventAbsorber* testValue = 0;
+ QVERIFY(!testValue);
+ testValue = mContainer->crateAbsorberBetweenSlots(0,1,false);
+ QVERIFY(testValue);
+ delete testValue;
+}
+
+
QTEST_MAIN(TestCalenDayContainer);
#include "unittest_calendaycontainer.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro Mon Aug 09 18:30:52 2010 +0530
@@ -35,7 +35,8 @@
./../../../../../inc/
# Input
-HEADERS += calendaycontainer.h \
+HEADERS += calendaycontainertest.h \
+ calendaycontainer.h \
calendayutils.h \
calendayeventspane.h \
calendayitem.h \
@@ -53,11 +54,6 @@
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
MMP_RULES += "USERINCLUDE ."
-
- INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-
- LIBS += -lagendainterface \
- -lxqsettingsmanager
BLD_INF_RULES.prj_testexports += \
"./rom/unittest_calendaycontainer.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendaycontainer.iby)"
@@ -65,7 +61,8 @@
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
LIBS += -lagendainterface \
- -lcalencommonutils
+ -lcalencommonutils \
+ -lxqsettingsmanager
}
# End of file --Don't remove this.
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourelement/unittest_calendayhourelement.pro Mon Aug 09 18:30:52 2010 +0530
@@ -27,6 +27,7 @@
#it need folder in c:/unittest path
#DEFINES += SAVE_IMAGES
+DEFINES += CALENVIEWS_DLL
INCLUDEPATH += . \
../../../inc/ \
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayhourscrollarea/unittest_calendayhourscrollarea.pro Mon Aug 09 18:30:52 2010 +0530
@@ -21,6 +21,8 @@
#it need folder in c:/unittest path
#DEFINES += SAVE_IMAGES
+DEFINES += CALENVIEWS_DLL
+
MOC_DIR = moc
CONFIG += qtestlib
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -16,12 +16,16 @@
*/
#include <QGraphicsItem>
#include <QtTest/QtTest>
+#include <QDebug>
#include <HbMainWindow>
+#include "calendaycommonheaders.h"
+#include "calendayutils.h"
+
+#define private public
#include "calendayinfo.h"
-#include "calendaycommonheaders.h"
class TestCalenDayInfo : public QObject
{
@@ -37,6 +41,21 @@
void init();
void cleanup();
+ void testReset();
+ void testInsertTimedEvent();
+ void testInsertUntimedEvent();
+ void testInsertAlldayEvent();
+ void testSuggestedUntimedSlotPos();
+ void testNeededUntimedSlotCount();
+ void testFirstOccupiedSlot();
+ void testLastOccupiedSlot();
+ void testEarliestEndSlot();
+ void testLastStartSlot();
+ void testSlotIndexForStartTime();
+ void testSlotIndexForEndTime();
+ void testAlldayCount();
+ void testTodoCount();
+
void testConstructors();
private:
@@ -49,7 +68,7 @@
TestCalenDayInfo::TestCalenDayInfo() :
mInfo(NULL)
{
-
+ qDebug() << "test start";
}
/*!
@@ -57,7 +76,7 @@
*/
TestCalenDayInfo::~TestCalenDayInfo()
{
-
+
}
/*!
@@ -94,6 +113,259 @@
}
}
+void TestCalenDayInfo::testReset()
+ {
+ SCalenApptInfo info;
+ mInfo->InsertAlldayEvent(info);
+ mInfo->InsertTimedEvent(info);
+
+ mInfo->Reset();
+
+ QCOMPARE (mInfo->iAlldayEvents.length(), 0);
+ QCOMPARE (mInfo->iRegionList.length(), 0);
+ }
+
+void TestCalenDayInfo::testInsertTimedEvent()
+ {
+ SCalenApptInfo info;
+ info.iStartTime = QDateTime(QDate(2010, 7, 10), QTime(23, 45, 45));
+
+ info.iEndTime = QDateTime(QDate(2010, 7, 10), QTime(23, 49, 45));
+ mInfo->InsertTimedEvent(info);
+
+ QCOMPARE (mInfo->iRegionList.count(), 1);
+ }
+
+void TestCalenDayInfo::testInsertUntimedEvent()
+ {
+
+ }
+
+void TestCalenDayInfo::testInsertAlldayEvent()
+ {
+ SCalenApptInfo info;
+ info.iId = TCalenInstanceId::nullInstanceId();
+ info.iStatus = AgendaEntry::StatusUnknown;
+
+ mInfo->InsertAlldayEvent(info);
+
+ QCOMPARE(mInfo->iAlldayEvents.length(), 1);
+ }
+
+void TestCalenDayInfo::testSuggestedUntimedSlotPos()
+ {
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ //iregionlist.length = 0
+ mInfo->iRegionList.clear();
+ QCOMPARE(mInfo->SuggestedUntimedSlotPos(), 16);
+
+ //iregionlist.length <> 0
+ CalenTimeRegion region;
+ region.iStartSlot = 10;
+ mInfo->iRegionList.append(region);
+
+ QCOMPARE(mInfo->SuggestedUntimedSlotPos(), 10);
+ }
+
+void TestCalenDayInfo::testNeededUntimedSlotCount()
+ {
+ mInfo->iUntimedEvents.append(TCalenInstanceId());
+ QCOMPARE(mInfo->iUntimedEvents.count(), mInfo->NeededUntimedSlotCount());
+
+ mInfo->iTodoEvents.append(TCalenInstanceId());
+ QCOMPARE(mInfo->iUntimedEvents.count() + 1, mInfo->NeededUntimedSlotCount());
+ }
+
+void TestCalenDayInfo::testFirstOccupiedSlot()
+ {
+ mInfo->iUntimedSlotCount = 0;
+ QCOMPARE(mInfo->FirstOccupiedSlot(), -1);
+
+ mInfo->iUntimedSlotCount = 1;
+ mInfo->iFirstUntimedSlot = 8;
+ QCOMPARE(mInfo->FirstOccupiedSlot(), 8);
+
+ mInfo->iUntimedSlotCount = 0;
+ CalenTimeRegion region;
+ region.iStartSlot = 16;
+
+ mInfo->iRegionList.append(region);
+ QCOMPARE(mInfo->FirstOccupiedSlot(), 16);
+ }
+
+void TestCalenDayInfo::testLastOccupiedSlot()
+ {
+ mInfo->iUntimedSlotCount = 0;
+ QCOMPARE(mInfo->LastOccupiedSlot(), -1);
+
+ mInfo->iUntimedSlotCount = 1;
+ mInfo->iFirstUntimedSlot = 8;
+ QCOMPARE(mInfo->LastOccupiedSlot(), 8);
+
+ CalenTimeRegion region;
+ region.iEndSlot = 16;
+ mInfo->iRegionList.append(region);
+ QCOMPARE(mInfo->LastOccupiedSlot(), 16);
+ }
+
+void TestCalenDayInfo::testEarliestEndSlot()
+ {
+ mInfo->iUntimedSlotCount = 10;
+ mInfo->iEmptyUntimedSlots = 10;
+ mInfo->iEarliestEndSlot = 2;
+
+ QCOMPARE(mInfo->EarliestEndSlot(), -1);
+
+ CalenTimeRegion region;
+ region.iEndSlot = 16;
+ mInfo->iRegionList.append(region);
+ QCOMPARE(mInfo->EarliestEndSlot(), 12);
+
+ mInfo->iUntimedSlotCount = 15;
+ mInfo->iEmptyUntimedSlots = 10;
+ mInfo->iFirstUntimedSlot = 2;
+
+ QCOMPARE(mInfo->EarliestEndSlot(), 13);
+ }
+
+void TestCalenDayInfo::testLastStartSlot()
+ {
+
+ mInfo->iUntimedSlotCount = 5;
+ mInfo->iEmptyUntimedSlots = 5;
+ QCOMPARE(mInfo->LastStartSlot(), -1);
+
+ mInfo->iUntimedSlotCount = 8;
+ mInfo->iEmptyUntimedSlots = 5;
+ mInfo->iFirstUntimedSlot = 10;
+ QCOMPARE(mInfo->LastStartSlot(), 17);
+
+ CalenTimeRegion region;
+ region.iEndSlot = 16;
+ mInfo->iRegionList.append(region);
+ mInfo->iLastStartSlot = 5;
+ mInfo->iUntimedSlotCount = 8;
+ QCOMPARE(mInfo->LastStartSlot(), 13);
+ }
+
+void TestCalenDayInfo::testSlotIndexForStartTime()
+ {
+ QDateTime dt;
+ dt.setTime(QTime(10, 5, 0));
+ mInfo->iSlotsInHour = CalenDayInfo::EOne;
+ mInfo->iUntimedSlotCount = 0;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 10);
+
+ qDebug() << dt.time().hour() << ":" << dt.time().minute();
+
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 20);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EThree;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 30);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EFour;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 40);
+ //---------
+
+ dt.setTime(QTime(10, 20, 0));
+
+ mInfo->iSlotsInHour = CalenDayInfo::EOne;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 10);
+
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 20);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EThree;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 31);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EFour;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 41);
+
+ //---------
+
+ dt.setTime(QTime(10, 35, 0));
+
+ mInfo->iSlotsInHour = CalenDayInfo::EOne;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 10);
+
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 21);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EThree;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 31);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EFour;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 42);
+
+ //---------
+ dt.setTime(QTime(10, 45, 0));
+
+ mInfo->iSlotsInHour = CalenDayInfo::EOne;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 10);
+
+ mInfo->iSlotsInHour = CalenDayInfo::ETwo;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 21);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EThree;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 32);
+
+ mInfo->iSlotsInHour = CalenDayInfo::EFour;
+ mInfo->SlotIndexForStartTime(dt);
+
+ QCOMPARE(mInfo->SlotIndexForStartTime(dt), 43);
+
+ }
+
+void TestCalenDayInfo::testSlotIndexForEndTime()
+ {
+
+ }
+
+void TestCalenDayInfo::testAlldayCount()
+ {
+ QCOMPARE(mInfo->AlldayCount(), 0);
+ mInfo->iAlldayEvents.append(CalenTimedEventInfo());
+ QCOMPARE(mInfo->AlldayCount(), 1);
+ }
+
+void TestCalenDayInfo::testTodoCount()
+ {
+ QCOMPARE(mInfo->TodoCount(), 0);
+ mInfo->iTodoEvents.append(TCalenInstanceId());
+ QCOMPARE(mInfo->TodoCount(), 1);
+ }
+
/*!
Test function for constructors
1. Test if CalenDayInfo is not initialized
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayinfo/unittest_calendayinfo.pro Mon Aug 09 18:30:52 2010 +0530
@@ -46,7 +46,8 @@
SOURCES += unittest_calendayinfo.cpp \
- calendayinfo.cpp
+ calendayinfo.cpp \
+ calendayutils.cpp
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
@@ -54,6 +55,9 @@
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+ LIBS += -lcalencommonutils \
+ -lagendainterface
+
BLD_INF_RULES.prj_testexports += \
"./rom/unittest_calendayinfo.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendayinfo.iby)"
}
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendaycontainer.h Mon Jul 26 13:54:38 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +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: 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayinfo.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,137 @@
+/*
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Mocked classes for testing CalenDayItem class
+*
+*/
+
+#ifndef CALENDAYINFO_H
+#define CALENDAYINFO_H
+
+#include <calinstance.h>
+#include "caleninstanceid.h"
+
+const int KFSCalMaxDescriptionLength = 100;
+
+/*!
+ Mocked struct SCalenApptInfo
+ */
+struct SCalenApptInfo
+{
+ QModelIndex iIndex;
+ QDateTime iStartTime;
+ QDateTime iEndTime;
+ bool iAllDay;
+ TCalenInstanceId iId;
+ AgendaEntry::Status iStatus;
+ TBufC<KFSCalMaxDescriptionLength> iSummary;
+ TUint32 iColor;
+};
+
+/*!
+ Mocked class CalenTimeColumn
+ */
+class CalenTimeColumn
+{
+public:
+ CalenTimeColumn() {
+
+ }
+
+ ~CalenTimeColumn() {
+
+ }
+};
+
+/*!
+ Mocked class CalenTimeRegion
+ */
+class CalenTimeRegion
+{
+public:
+ CalenTimeRegion() {
+
+ }
+
+ ~CalenTimeRegion() {
+
+ }
+
+ QList<CalenTimeColumn> iColumns;
+
+ int iStartSlot;
+ int iEndSlot;
+};
+
+/*!
+ Mocked class CalenDayInfo
+ */
+class CalenDayInfo
+{
+public:
+ enum TSlotsInHour
+ {
+ EOne = 1, ETwo, EThree, EFour
+ };
+
+public:
+
+ CalenDayInfo(TSlotsInHour aSlotsInHour)
+ {
+ Q_UNUSED(aSlotsInHour)
+ }
+ virtual ~CalenDayInfo()
+ {
+
+ }
+
+ void GetLocation( const SCalenApptInfo& aItemInfo, int& aStartSlot,
+ int& aEndSlot, int& aColumnIndex, int& aColumns )
+ {
+ Q_UNUSED(aItemInfo)
+ Q_UNUSED(aStartSlot)
+ Q_UNUSED(aEndSlot)
+ Q_UNUSED(aColumnIndex)
+ Q_UNUSED(aColumns)
+ }
+
+ int AlldayCount()
+ {
+ return 0;
+ }
+
+ const QList<CalenTimeRegion>& RegionList() const
+ {
+ return mList;
+ }
+
+ void InsertAlldayEvent( const SCalenApptInfo& aItemInfo )
+ {
+ Q_UNUSED(aItemInfo)
+
+ CalenTimeRegion region;
+
+ region.iStartSlot = 10;
+ region.iEndSlot = 13;
+ region.iColumns << CalenTimeColumn();
+
+ mList << region;
+ }
+
+public:
+ QList<CalenTimeRegion> mList;
+};
+
+#endif // CALENDAYINFO_H
+
+// End of File
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayutils.h Mon Jul 26 13:54:38 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +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: 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_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayview.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,73 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Mocked classes for testing CalenDayItem class
+*
+*/
+
+#ifndef CALENSERVICES_H
+#define CALENSERVICES_H
+
+/*!
+ Mocked class MCalenServices
+ */
+class MCalenServices
+{
+public:
+ MCalenServices() {
+
+ }
+
+ ~MCalenServices() {
+
+ }
+};
+
+#endif // CALENSERVICES_H
+
+#ifndef CALEDAYVIEW_H
+#define CALEDAYVIEW_H
+
+#include <HbView>
+
+enum TCalenCommandId
+{
+ ECalenMonthView = 0,
+ ECalenWeekView,
+ ECalenAgendaView
+};
+
+/*!
+ Mocked class CalenDayView
+ */
+class CalenDayView : public HbView
+{
+public:
+
+ CalenDayView(MCalenServices &services) {
+ Q_UNUSED(services)
+ }
+
+ virtual ~CalenDayView() {
+
+ }
+
+ void changeView(TCalenCommandId viewId) {
+ Q_UNUSED(viewId)
+ }
+};
+
+#endif // CALEDAYVIEW_H
+
+//End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/caleninstanceid.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,55 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Mocked classes for testing CalenDayItem class
+*
+*/
+
+#ifndef CALENINSTANCEID_H
+#define CALENINSTANCEID_H
+
+#include <agendaentry.h>
+
+/*!
+ Mocked class TCalenInstanceId
+ */
+class TCalenInstanceId
+{
+public:
+ TCalenInstanceId() {
+
+ }
+
+ static TCalenInstanceId nullInstanceId() {
+ return TCalenInstanceId();
+ }
+
+ static TCalenInstanceId create( const AgendaEntry& entry )
+ {
+ TCalenInstanceId id;
+ id.mEntryLocalUid = entry.id();
+ id.mInstanceTime = entry.startTime();
+ id.mType = entry.type();
+ return id;
+ }
+
+public: // data members
+ ulong mEntryLocalUid;
+ QDateTime mInstanceTime;
+ AgendaEntry::Type mType;
+ bool mInstanceViewed;
+};
+
+#endif // CALENINSTANCEID_H
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/hbinstance.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,98 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Mocked classes for testing CalenDayItem class
+*
+*/
+
+#ifndef HBMAINWINDOW_H
+#define HBMAINWINDOW_H
+
+#include <HbView>
+
+// Test variables
+extern QRectF gTestWindowRect;
+extern Qt::Orientation gTestOrientation;
+
+/*!
+ Mocked class HbMainWindow (simulating window in unittests)
+ */
+class HbMainWindow
+{
+public:
+ HbMainWindow() {
+ mView = new HbView();
+ }
+
+ ~HbMainWindow() {
+ if (mView) {
+ delete mView;
+ mView = 0;
+ }
+ }
+
+ QRectF layoutRect() const {
+ return gTestWindowRect;
+ }
+
+ Qt::Orientation orientation() const {
+ return gTestOrientation;
+ }
+
+ HbView *HbMainWindow::currentView() const {
+ return mView;
+ }
+
+ HbView *mView;
+};
+
+#endif // HBMAINWINDOW_H
+
+#ifndef HBINSTANCE_H
+#define HBINSTANCE_H
+
+#include <QList>
+
+/*!
+ Mocked class HbInstance (simulating hbinstance in unittests)
+ */
+class HbInstance
+{
+public:
+
+ static HbInstance *instance() {
+ return new HbInstance();
+ }
+
+ QList<HbMainWindow *> allMainWindows() const {
+ return mMainWindows;
+ }
+
+ HbInstance() {
+ HbMainWindow* window = new HbMainWindow();
+ mMainWindows.append(window);
+ }
+
+ ~HbInstance() {
+ for (int i = 0; i < mMainWindows.count(); i++) {
+ delete mMainWindows[i];
+ }
+ mMainWindows.clear();
+ }
+
+ QList<HbMainWindow *> mMainWindows;
+};
+
+#endif // HBINSTANCE_H
+
+// End of File
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -11,15 +11,26 @@
*
* Contributors:
*
- * Description: Test class for CalenDayContentWidget
+ * Description: Test class for CalenDayItem
*
*/
#include <QGraphicsItem>
#include <QtTest/QtTest>
+#include <QGraphicsSceneEvent>
+#include <QDebug>
+#include "agendaentry.h"
+#include "calendaycontainer.h"
+
+#define private public
+#define protected public
+
#include "calendayitem.h"
-#include "calendaycontainer.h"
+
+
+QRectF gTestWindowRect;
+Qt::Orientation gTestOrientation;
class TestCalenDayItem : public QObject
{
@@ -35,9 +46,12 @@
void init();
void cleanup();
+ void testCreateItem();
+ void testUpdateChildItems();
+ void testHasEventDescription();
+ void testHasBackgroundFrame();
+
void testConstructors();
- void testCreateItem();
-
private:
CalenDayItem *mItem;
CalenDayContainer *mContainer;
@@ -47,7 +61,7 @@
Constructor
*/
TestCalenDayItem::TestCalenDayItem() :
- mItem(NULL)
+ mItem(NULL), mContainer(NULL)
{
}
@@ -82,6 +96,9 @@
{
mContainer = new CalenDayContainer();
mItem = new CalenDayItem(mContainer);
+
+ mItem->mBg = new HbFrameItem();
+ mItem->mEventDesc = new HbTextItem(0);
}
/*!
@@ -95,8 +112,8 @@
}
if (mContainer) {
- delete mContainer;
- mContainer = NULL;
+ delete mContainer;
+ mContainer = NULL;
}
}
@@ -118,17 +135,64 @@
}
/*!
- Test function for creating new abstract items.
- 1. Test if item is created
- 2. Test if is the same as orginal.
+ Test function for creating new abstract items.
+ 1. Test if item is created
+ 2. Test if is the same as orginal.
*/
void TestCalenDayItem::testCreateItem()
-{
- HbAbstractViewItem *testItem = mItem->createItem();
- QVERIFY(testItem);
-
- delete testItem;
-}
+ {
+ HbAbstractViewItem *testItem = mItem->createItem();
+ QVERIFY(testItem);
+ delete testItem;
+ }
+
+void TestCalenDayItem::testUpdateChildItems()
+ {
+
+ }
+
+void TestCalenDayItem::testHasEventDescription()
+ {
+ QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent();
+ qreal width = mItem->rect().width();
+
+ qDebug() << "inited";
+
+ mItem->mEventDescMinWidth = width - 4;
+
+ qDebug() << "before resize";
+
+ mItem->resizeEvent(event);
+
+ qDebug() << "resize called";
+
+ QVERIFY(mItem->hasEventDescription() == true);
+
+
+ mItem->mEventDescMinWidth = width + 8;
+ mItem->resizeEvent(event);
+
+ qDebug() << "resize 2 called";
+
+ QVERIFY(mItem->hasEventDescription() == false);
+ }
+
+void TestCalenDayItem::testHasBackgroundFrame()
+ {
+ QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent();
+ qreal width = mItem->rect().width();
+
+
+ mItem->mFrameMinWidth = width - 4;
+ mItem->resizeEvent(event);
+
+ QVERIFY(mItem->hasBackgroundFrame() == true);
+
+ mItem->mFrameMinWidth = width + 8;
+ mItem->resizeEvent(event);
+
+ QVERIFY(mItem->hasBackgroundFrame() == false);
+ }
QTEST_MAIN(TestCalenDayItem);
#include "unittest_calendayitem.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Mon Aug 09 18:30:52 2010 +0530
@@ -11,7 +11,7 @@
#
# Contributors:
#
-# Description: calendaycontentwidget test project file
+# Description: calendayitem test project file
#
TEMPLATE = app
@@ -25,22 +25,32 @@
INCLUDEPATH += . \
../../../inc/ \
- ../../../../inc/
+ ./../../../../inc/ \
+ ./../../../../../inc/
DEPENDPATH += . \
../../../inc/ \
- ../../../src/
+ ../../../src/ \
+ ./../../../../inc/ \
+ ./../../../../../inc/
# Input
HEADERS += calendayitem.h \
calendaystatusstrip.h \
- calendaycontainer.h \
- calendayutils.h
+ calendaycontainer.h \
+ calendayutils.h \
+ calendayeventspane.h \
+ calendaymodel.h \
+ calendaycommonheaders.h
SOURCES += unittest_calendayitem.cpp \
calendayitem.cpp \
- calendaystatusstrip.cpp
+ calendaystatusstrip.cpp \
+ calendaycontainer.cpp \
+ calendayutils.cpp \
+ calendayeventspane.cpp \
+ calendaymodel.cpp
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
@@ -48,7 +58,9 @@
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
- LIBS += -lagendainterface
+ LIBS += -lagendainterface \
+ -lcalencommonutils \
+ -lxqsettingsmanager
BLD_INF_RULES.prj_testexports += \
"./rom/unittest_calendayitem.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendayitem.iby)"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendaycontainer.h Mon Jul 26 13:54:38 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#ifndef CALENDAYCONTAINER_H
-#define CALENDAYCONTAINER_H
-
-//System includes
-#include <QDateTime>
-
-#include "../../../../../mw/hb/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h"
-
-//User includes
-
-//Forward declarations
-#include "calendayinfo.h"
-
-class CalenDayContainer : public HbAbstractItemContainer
-{
- Q_OBJECT
-
-public:
-
- /**
- * Constructor.
- */
- CalenDayContainer(QGraphicsItem *parent = 0)
- {
- Q_UNUSED(parent);
- }
-
- /**
- * Destructor.
- */
- ~CalenDayContainer(){}
-
- /**
- *
- */
- void itemAdded (int index, HbAbstractViewItem *item, bool animate)
- {
- Q_UNUSED(index);
- Q_UNUSED(item);
- Q_UNUSED(animate);
- }
-
- /**
- *
- */
- void itemRemoved (HbAbstractViewItem *item, bool animate)
- {
- Q_UNUSED(item);
- Q_UNUSED(animate);
- }
-
- /**
- *
- */
- //void reset();
-
- /**
- *
- */
- void viewResized (const QSizeF &size)
- {
- Q_UNUSED(size);
- }
-
- /**
- * Sets day's info structer to the container.
- *
- * @param dayInfo Day info.
- */
- void setDayInfo( CalenDayInfo* dayInfo )
- {
- Q_UNUSED(dayInfo);
- }
-
- void setDate( const QDate &date )
- {
- Q_UNUSED(date);
- }
-
- const QDate &date() const
- {
- return QDate();
- }
-
-public slots:
-
- /**
- * Slot handles layout switch.
- * @param orientation Current device orientation
- */
- void orientationChanged(Qt::Orientation orientation)
- {
- Q_UNUSED(orientation);
- }
-
-protected:
-
- /**
- *
- */
- HbAbstractViewItem * createDefaultPrototype() const{ return 0;}
-
- /**
- *
- */
- // void setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index);
-
- /**
- * Updates geometry of a timed event.
- */
- // void updateTimedEventGeometry(HbAbstractViewItem *item,
- // const QModelIndex &index);
-
- /**
- * Updates geometry of a all-day events
- */
- // void updateAllDayEventGeometry(HbAbstractViewItem *item,
- // const QModelIndex &index);
-
- /**
- * Structure with event layout values.
- *
- * eventAreaX X value for event area start.
- * eventAreaWidth The width of event area.
- * eventMargin Margins between the multiple events.
- * slotHeight Half hour slot's height.
- * unitInPixels no. of pixels in 1un
- */
-
- /*struct LayoutValues {
- LayoutValues()
- :eventAreaX(0),
- eventAreaWidth(0),
- eventMargin(0),
- slotHeight(0),
- unitInPixels(0),
- maxColumns(0)
- {}
-
- qreal eventAreaX;
- qreal eventAreaWidth;
- qreal eventMargin;
- qreal slotHeight;
- qreal unitInPixels;
- int maxColumns;
- };
- */
- /**
- * Gets event layout values.
- *
- * @param layoutValues structure to be filled with layout data
- */
- //void getTimedEventLayoutValues(LayoutValues& layoutValues);
-
-
- /**
- * creates absorbers which prevent touching to small items
- * (according to UI spec items smaller than ... are untouchable)
- */
- //void createTouchEventAbsorbers();
-
- /**
- *
- */
- //TouchEventAbsorber* crateAbsorberBetweenSlots(int startSlot, int endSlot);
-
-private:
-
- //bool mGeometryUpdated;
-
- //QDateTime mDateTime;
-
- /**
- * Day event info.
- * Not own.
- */
- //CalenDayInfo* mInfo;
-
- // LayoutValues mLayoutValues;
- //QList<TouchEventAbsorber*> mAbsorbers;
-};
-
-
-
-class TouchEventAbsorber : public HbWidget
- {
- Q_OBJECT
- public:
- TouchEventAbsorber(QGraphicsItem *parent=0);
- ~TouchEventAbsorber();
-
- protected:
- void gestureEvent(QGestureEvent *event);
-
-#ifdef _DEBUG
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
- QWidget *widget);
-#endif
-
- };
-
-#endif // CALENDAYCONTAINER_H
-
-// End of File
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendayinfo.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendayinfo.h Mon Aug 09 18:30:52 2010 +0530
@@ -1,214 +1,143 @@
/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Mocked classes for testing CalenDayItemView class
+*
+*/
#ifndef CALENDAYINFO_H
#define CALENDAYINFO_H
-#include <QtGlobal>
+#include <calinstance.h>
#include "caleninstanceid.h"
-#include <QtGui>
+#include <hb_calencommands.hrh>
-//from hb_calencommands.hrh
+const int KFSCalMaxDescriptionLength = 100;
-enum TCalenCommandId
- {
- ECalenMonthView,
- ECalenWeekView,
- ECalenAgendaView,
- ECalenDayView,
- ECalenTodoEditor,
- ECalenTodoEditorDone,
- ECalenForwardsToDayView,
- ECalenNextView,
- ECalenPrevView,
- ECalenSwitchView,
- ECalenShowToolbar,
- ECalenHideToolbar,
- ECalenUpdateToolbar,
- ECalenHidePreview,
- ECalenShowPreview,
- ECalenStartActiveStep,
- ECalenGotoToday,
- ECalenGotoDate,
- ECalenEventView,
- ECalenCmdPromptThenEdit,
- ECalenFasterAppExit,
- ECalenShowNextDay,
- ECalenShowPrevDay,
- ECalenNewMeeting,
- ECalenNewAnniv,
- ECalenNewDayNote,
- ECalenNewReminder,
- ECalenNewMeetingRequest,
- ECalenNewEntry,
- ECalenEditCurrentEntry,
- ECalenEditSeries,
- ECalenEditOccurrence,
- ECalenEditEntryFromViewer,
- ECalenViewCurrentEntry,
- ECalenNotifyFocusChange,
- ECalenCompleteTodo,
- ECalenRestoreTodo,
- ECalenSend,
- ECalenDeleteCurrentEntry,
- ECalenDeleteEntryWithoutQuery,
- ECalenDeleteSeries,
- ECalenDeleteCurrentOccurrence,
- ECalenDeleteAllEntries,
- ECalenDeleteEntriesBeforeDate,
- ECalenCancelDelete,
- ECalenDeleteEntryFromViewer,
- ECalenShowSettings,
- ECalenGetLocation,
- ECalenShowLocation,
- ECalenGetLocationAndSave,
- ECalenMissedAlarmsView,
- ECalenMissedEventView,
- ECalenCmdClear,
- ECalenCmdClearAll,
- ECalenCmdGotoCalendar,
- ECalenMissedAlarmsViewFromIdle,
- ECalenMissedEventViewFromIdle,
- ECalenLastCommand,
- ECalenRegionalPluginTapEvent
- };
-
-//////////////////end of hb_calencommands.hrh
-
+/*!
+ Mocked struct SCalenApptInfo
+ */
struct SCalenApptInfo
- {
+{
QModelIndex iIndex;
QDateTime iStartTime;
QDateTime iEndTime;
bool iAllDay;
TCalenInstanceId iId;
-// AgendaEntry::Status iStatus;
-// AgendaEntry::TReplicationStatus iReplicationStatus;
- // TBufC<KFSCalMaxDescriptionLength> iSummary;
+ AgendaEntry::Status iStatus;
+ TBufC<KFSCalMaxDescriptionLength> iSummary;
TUint32 iColor;
- };
+};
+
+/*!
+ Mocked class CalenTimeColumn
+ */
+class CalenTimeColumn
+{
+public:
+ CalenTimeColumn() {
+
+ }
+
+ ~CalenTimeColumn() {
+
+ }
+};
+/*!
+ Mocked class CalenTimeRegion
+ */
+class CalenTimeRegion
+{
+public:
+ CalenTimeRegion() {
+
+ }
+
+ ~CalenTimeRegion() {
+
+ }
+
+ QList<CalenTimeColumn> iColumns;
+
+ int iStartSlot;
+ int iEndSlot;
+};
+
+/*!
+ Mocked class CalenDayInfo
+ */
class CalenDayInfo
{
public:
+ enum TSlotsInHour
+ {
+ EOne = 1, ETwo, EThree, EFour
+ };
- enum TSlotsInHour
- {
- EOne = 1,
- ETwo,
- EThree,
- EFour
- };
+public:
-public: // Constructors and destructor
-
- /**
- * C++ default constructor.
- */
- CalenDayInfo( TSlotsInHour aSlotsInHour ) {Q_UNUSED(aSlotsInHour);}
-
-public:
+ CalenDayInfo(TSlotsInHour aSlotsInHour)
+ {
+ Q_UNUSED(aSlotsInHour)
+ }
+ virtual ~CalenDayInfo()
+ {
+
+ }
void Reset() {}
void InsertTimedEvent( const SCalenApptInfo& aItemInfo ) {Q_UNUSED(aItemInfo);}
-
- //void InsertUntimedEvent( AgendaEntry::Type aType,
- // const TCalenInstanceId& aId );
-
- void InsertAlldayEvent( const SCalenApptInfo& aItemInfo ){Q_UNUSED(aItemInfo);}
-
- //static bool IsAlldayEvent( QDateTime aStart, QDateTime aEnd );
-
-
- //int SuggestedUntimedSlotPos();
-
- //int NeededUntimedSlotCount();
-
- //int UpdateUntimedPos( int aSlot = -1, int aUntimedCount = 0 );
-
- //int FirstOccupiedSlot();
-
- //int LastOccupiedSlot();
-
- //int EarliestEndSlot();
- //int LastStartSlot();
-
-
- //int SlotIndexForStartTime( QDateTime aStartTime );
-
- //int SlotIndexForEndTime( QDateTime aStartTime );
-
- //void GetLocation( const SCalenApptInfo& aItemInfo,
- // int& aStartSlot,
- // int& aEndSlot,
- // int& aColumnIndex,
- // int& aColumns );
-
- //int AlldayCount();
-
- //int TodoCount();
-
- //bool IsHourStartSlot( const int& aSlotIndex ) const;
-
- //bool IsExtraSlot( const int& aSlotIndex ) const;
-
- //int HourFromSlotIndex( const int& aSlotIndex ) const;
-
- //int SlotIndexFromHour( int aHour );
-
- //int RoundHourUp( int aSlot );
-
- //int RoundHourDown( int aSlot );
-
- //void GetSelectedSlot( int& aSlot, int& aRegion, int& aColumnIndex, int& aColumns );
-
- //bool MoveSelection( TScrollDirection aDirection );
-
- //void MoveSelectionInEvent( TScrollDirection aDirection );
-
- //void UpdateSelectionInEvent();
-
- //bool IsEventSelected() const;
-
- // bool IsMultipleEventsSelected() const;
-
- //bool IsAlldayEventSelected() const;
-
- //TCalenInstanceId SelectedEvent();
-
- //int SelectEvent( const TCalenInstanceId& aId );
-
- //TCalenInstanceId UntimedEvent( int aIndex );
-
- //const CalenTimedEventInfo& AlldayEvent( int aIndex );
-
- //void SelectSlot( int aSlot );
-
-
- //const QList<CalenTimeRegion>& RegionList() const;
-
-
- //void GetEventIntervals( QList<CalenEventInterval>& aArray ) const;
-
-
- // CalenSlotInterval SelectedInterval();
+
+
+ void GetLocation( const SCalenApptInfo& aItemInfo, int& aStartSlot,
+ int& aEndSlot, int& aColumnIndex, int& aColumns )
+ {
+ Q_UNUSED(aItemInfo)
+ Q_UNUSED(aStartSlot)
+ Q_UNUSED(aEndSlot)
+ Q_UNUSED(aColumnIndex)
+ Q_UNUSED(aColumns)
+ }
+
+ int AlldayCount()
+ {
+ return 0;
+ }
- // bool SetSelectionInRegion( int aRegion, int aColumn, int aSlot );
+ const QList<CalenTimeRegion>& RegionList() const
+ {
+ return mList;
+ }
+
+ void InsertAlldayEvent( const SCalenApptInfo& aItemInfo )
+ {
+ Q_UNUSED(aItemInfo)
+
+ CalenTimeRegion region;
+
+ region.iStartSlot = 10;
+ region.iEndSlot = 13;
+ region.iColumns << CalenTimeColumn();
+
+ mList << region;
+ }
+
+public:
+ QList<CalenTimeRegion> mList;
};
-#endif
+#endif // CALENDAYINFO_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calendayview.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,74 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Mocked classes for testing CalenDayContainer class
+*
+*/
+
+#ifndef CALENSERVICES_H
+#define CALENSERVICES_H
+
+/*!
+ Mocked class MCalenServices
+ */
+class MCalenServices
+{
+public:
+ MCalenServices() {
+
+ }
+
+ ~MCalenServices() {
+
+ }
+};
+
+#endif // CALENSERVICES_H
+
+#ifndef CALEDAYVIEW_H
+#define CALEDAYVIEW_H
+
+#include <HbView>
+
+/*
+enum TCalenCommandId
+{
+ ECalenMonthView = 0,
+ ECalenWeekView,
+ ECalenAgendaView
+};
+*/
+/*!
+ Mocked class CalenDayView
+ */
+class CalenDayView : public HbView
+{
+public:
+
+ CalenDayView(MCalenServices &services) {
+ Q_UNUSED(services)
+ }
+
+ virtual ~CalenDayView() {
+
+ }
+
+ void changeView(TCalenCommandId viewId) {
+ Q_UNUSED(viewId)
+ }
+};
+
+#endif // CALEDAYVIEW_H
+
+//End of file
+
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calenservices.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/calenservices.h Mon Aug 09 18:30:52 2010 +0530
@@ -20,6 +20,8 @@
#include "calencontext.h"
+extern quint32 SELECTED_COMMAND;
+
/*!
Mocked class MCalenServices
*/
@@ -36,7 +38,12 @@
MCalenContext Context() {return MCalenContext();}
- bool IssueCommandL( quint32 aCommand ) {Q_UNUSED(aCommand); return true;}
+ bool IssueCommandL( quint32 aCommand )
+ {
+ SELECTED_COMMAND = aCommand;
+
+ return true;
+ }
};
#endif // CALENSERVICES_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/hbinstance.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/hbinstance.h Mon Aug 09 18:30:52 2010 +0530
@@ -18,29 +18,28 @@
#ifndef HBMAINWINDOW_H
#define HBMAINWINDOW_H
-#include <QObject>
-#include <QtGlobal>
-#include <QRectF>
+#include <HbView>
// Test variables
extern QRectF gTestWindowRect;
extern Qt::Orientation gTestOrientation;
-
-
/*!
Mocked class HbMainWindow (simulating window in unittests)
*/
-class HbMainWindow
-: public QObject
-{
+class HbMainWindow : public QObject
+{
Q_OBJECT
public:
- HbMainWindow(QObject *parent = 0) : QObject(parent){
- Q_UNUSED(parent);
+ HbMainWindow() {
+ mView = new HbView();
}
~HbMainWindow() {
+ if (mView) {
+ delete mView;
+ mView = 0;
+ }
}
QRectF layoutRect() const {
@@ -50,8 +49,12 @@
Qt::Orientation orientation() const {
return gTestOrientation;
}
-signals:
- void orientationChanged(Qt::Orientation);
+
+ HbView *HbMainWindow::currentView() const {
+ return mView;
+ }
+
+ HbView *mView;
};
#endif // HBMAINWINDOW_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -19,11 +19,19 @@
#include <QtTest/QtTest>
#include "calenservices.h"
+
+#include <hbabstractitemview.h>
+#include <hbmenu.h>
+
+#define private public
+
#include "calendayitemview.h"
+
// Test variables
QRectF gTestWindowRect = QRectF(0, 0, 10, 20);
Qt::Orientation gTestOrientation = Qt::Horizontal;
+quint32 SELECTED_COMMAND = 0;
class TestCalenItemView : public QObject
{
@@ -40,8 +48,13 @@
void cleanup();
void testConstructors();
+ void testIssueCommandOnSelectedItem();
+ void testOpenSelectedItem();
+ void testEditSelectedItem();
+ void testDeleteSelectedItem();
private:
MCalenServices mMCalenServices;
+ CalenDayItemView *mCalenDayItemView;
};
@@ -66,6 +79,7 @@
*/
void TestCalenItemView::initTestCase()
{
+
}
/*!
@@ -81,7 +95,9 @@
*/
void TestCalenItemView::init()
{
-
+ HbModelIterator *iterator = new HbModelIterator();
+ mCalenDayItemView = new CalenDayItemView(mMCalenServices,iterator,0);
+ SELECTED_COMMAND = 0;
}
/*!
@@ -89,7 +105,10 @@
*/
void TestCalenItemView::cleanup()
{
-
+ if(mCalenDayItemView){
+ delete mCalenDayItemView;
+ mCalenDayItemView = NULL;
+ }
}
/*!
@@ -110,5 +129,37 @@
delete testItemView;
}
+void TestCalenItemView::testIssueCommandOnSelectedItem()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->issueCommandOnSelectedItem((quint32)ECalenEventView);
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEventView);
+#endif
+}
+
+void TestCalenItemView::testOpenSelectedItem()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->openSelectedItem();
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEventView);
+#endif
+}
+
+void TestCalenItemView::testEditSelectedItem()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->editSelectedItem();
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenEditCurrentEntry);
+#endif
+}
+
+void TestCalenItemView::testDeleteSelectedItem()
+{
+#ifndef __WINSCW__
+ mCalenDayItemView->deleteSelectedItem();
+ QCOMPARE(SELECTED_COMMAND,(quint32)ECalenDeleteCurrentEntry);
+#endif
+}
+
QTEST_MAIN(TestCalenItemView);
#include "unittest_calendayitemview.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/unittest_calendayitemview.pro Mon Aug 09 18:30:52 2010 +0530
@@ -45,13 +45,20 @@
calendaycontainer.h \
calendayutils.h \
hbinstance.h \
- calendaymodel.h
-
+ calendaymodel.h \
+ calendayeventspane.h \
+ calendayitem.h \
+ calendayview.h \
+ calendaystatusstrip.h
SOURCES += unittest_calendayitemview.cpp \
calendayitemview.cpp \
- calendayutils.cpp
-
+ calendayutils.cpp \
+ calendaycontainer.cpp \
+ calendayeventspane.cpp \
+ calendayitem.cpp \
+ calendaystatusstrip.cpp
+
symbian : {
TARGET.CAPABILITY = CAP_APPLICATION
MMP_RULES += "USERINCLUDE ."
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbstyle.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/hbstyle.h Mon Aug 09 18:30:52 2010 +0530
@@ -33,21 +33,14 @@
#include <hbicon.h>
#include <hbdeviceprofile.h>
-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() {}
+ ~HbStyle() {}
// HbStyle::Primitive enums are DEPRECATED
enum Primitive
@@ -221,14 +214,14 @@
P_CustomBase = 0x0f000000
};
- virtual QGraphicsItem *createPrimitive(HbStyle::Primitive primitive,
+ QGraphicsItem *createPrimitive(HbStyle::Primitive primitive,
QGraphicsItem *parent = 0) const
{
Q_UNUSED(primitive);
Q_UNUSED(parent);
return 0;
}
- virtual void updatePrimitive(QGraphicsItem *item,
+ void updatePrimitive(QGraphicsItem *item,
HbStyle::Primitive primitive, const QStyleOption *option) const
{
Q_UNUSED(item);
@@ -266,7 +259,7 @@
value = param_value;
return false;
}
- void parameters(HbStyleParameters ¶ms,
+/* void parameters(HbStyleParameters ¶ms,
const HbDeviceProfile &profile = HbDeviceProfile()) const
{
Q_UNUSED(params);
@@ -278,30 +271,7 @@
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
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -17,6 +17,7 @@
#include <QGraphicsItem>
#include <QtTest/QtTest>
+#include "hbstyle.h"
#include "calendayutils.h"
#include "hbdeviceprofile.h"
#include "calendaycommonheaders.h"
@@ -25,6 +26,7 @@
QRectF gTestWindowRect = QRectF(0, 0, 10, 20);
Qt::Orientation gTestOrientation = Qt::Horizontal;
qreal param_value = 10;
+qreal unitInPix = 1;
class TestCalenDayUtils : public QObject
{
@@ -47,7 +49,6 @@
void testContentWidth();
void testConstructors();
- void testHorizontalSwipe();
void testOrientation();
private:
@@ -158,21 +159,6 @@
QVERIFY(testUtils);
}
-/*!
- Test function for checking if swipe is horizontal or not
- 1)test Horizontal swipe
- 2)test no horizontal swipe
- */
-void TestCalenDayUtils::testHorizontalSwipe()
- {
- //1)
- QCOMPARE(CalenDayUtils::instance()->isHorizontalSwipe(KCalenSwipeAngle-5),
- true);
-
- //2)
- QCOMPARE(CalenDayUtils::instance()->isHorizontalSwipe(KCalenSwipeAngle+5),
- false);
- }
/*!
Test function for getting main window's orientation
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.pro Mon Aug 09 18:30:52 2010 +0530
@@ -35,7 +35,8 @@
./../../../../../inc/
# Input
-HEADERS += hbdeviceprofile.h \
+HEADERS += hbstyle.h \
+ hbdeviceprofile.h \
hbinstance.h \
calendayutils.h \
calendaycommonheaders.h
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calendaymodelmanager.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/calendaymodelmanager.h Mon Aug 09 18:30:52 2010 +0530
@@ -106,7 +106,7 @@
void moveBackward()
{
}
- void moveForeward()
+ void moveForward()
{
}
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -103,27 +103,6 @@
delete testView;
}
-int main(int argc, char ** argv)
-
-{
-
-argc++;
-
-argc++;
-
-char * argvNew[3];
-
-argvNew[0]= argv[0];
+QTEST_MAIN(TestCalenDayView);
-argvNew[1]= const_cast<char*>("-o");
-
-argvNew[2]= const_cast<char*>("c:\\unittest\\TestCalenDayView.txt");//set place where //output chould be
-
-QApplication app(argc, argvNew);
-
-TestCalenDayView testFile;//file with class containing unit tests
-
-QTest::qExec(&testFile,argc,argvNew);
-
-}
#include "unittest_calendayview.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayview/unittest_calendayview.pro Mon Aug 09 18:30:52 2010 +0530
@@ -25,10 +25,12 @@
INCLUDEPATH += . \
../../../inc/ \
+ ../../../../../inc/
DEPENDPATH += . \
../../../inc/ \
../../../src/ \
+ ../../../../../inc/
# Input
HEADERS += hbeffect.h \
@@ -49,7 +51,8 @@
calendayhourscrollarea.h \
calendayutils.h \
calendateutils.h \
- calendayview.h
+ calendayview.h \
+ calencommon.h
SOURCES += unittest_calendayview.cpp \
calendayview.cpp
--- a/calendarui/views/inc/calenagendaviewwidget.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/inc/calenagendaviewwidget.h Mon Aug 09 18:30:52 2010 +0530
@@ -103,13 +103,26 @@
*/
void createNewEvent();
-
+ /**
+ * @brief check if property has to set
+ */
bool hasAllDayIcon();
+
+ /**
+ * @brief check if all day icon is present
+ */
void checkEntryIcons();
+
+ /**
+ * @brief return true if all day icon is present
+ */
bool isAllDayIcon();
- bool isExceptionIcon();
- bool isAlarmIcon();
- bool isRepeatingIcon();
+
+ /**
+ * @brief return true if location is present
+ */
+ bool isLocationData();
+
@@ -367,11 +380,8 @@
int mIndex;
bool mIconCheck;
bool mNextEntry;
- bool mAllDayLeftIcon;
- bool mRightAlarmIcon;
- bool mRightRepeatIcon;
- bool mRightExceptionIcon;
bool mLeftAllDayIcon;
+ bool mLocationData;
};
--- a/calendarui/views/inc/caleneventlistviewitem.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/inc/caleneventlistviewitem.h Mon Aug 09 18:30:52 2010 +0530
@@ -26,30 +26,53 @@
{
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)
+ Q_PROPERTY(bool locationEntry READ locationEntryLayout WRITE setLocationEntry)
+
public:
+ /**
+ * @brief Constructor
+ * @param CalenAgendaViewWidget
+ */
CalenEventListViewItem(CalenAgendaViewWidget *parent = 0);
+
+ /**
+ * @brief Destructor
+ */
~CalenEventListViewItem();
+ /**
+ * @brief creates the instance of the class
+ */
HbAbstractViewItem * createItem();
+
+ /**
+ * @brief crestes the item of the list
+ */
void updateChildItems();
+
+ /**
+ * @brief check if all day icon is present
+ */
bool hasAllDayIcon();
+
+ /**
+ * @brief sets teh all day icon
+ */
void setAllDayLeftIcon(bool icon = false);
- bool hasRepeatingIcon();
- void setRepeatingIcon(bool icon = false);
- bool hasAlarmIcon();
- void setAlarmIcon(bool icon = false);
- bool hasExceptionIcon();
- void setExceptionIcon(bool icon = false);
+
+ /**
+ * @brief sets location entry status
+ */
+ void setLocationEntry(bool icon);
+
+ /**
+ * @brief check if location is present
+ */
+ bool locationEntryLayout();
private:
-
+ CalenAgendaViewWidget* mParent;
bool mAllDayIcon ;
- bool mExceptionIcon ;
- bool mAlarmIcon ;
- bool mRepeatingIcon ;
- CalenAgendaViewWidget* mParent;
+ bool mLocationEntry;
};
#endif // __CALEN_EVENT_LIST_VIEW_ITEM_H__
--- a/calendarui/views/inc/calenpreviewpane.h Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/inc/calenpreviewpane.h Mon Aug 09 18:30:52 2010 +0530
@@ -51,6 +51,8 @@
void startAutoScroll();
void setView(CalenMonthView* view);
void stopScrolling();
+ void effectStarted();
+ void effectFinished();
protected:
void gestureEvent(QGestureEvent *event);
--- a/calendarui/views/resources/caleneventlistviewitem.css Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/resources/caleneventlistviewitem.css Mon Aug 09 18:30:52 2010 +0530
@@ -1,183 +1,100 @@
-CalenEventListViewItem[layoutName="custom"]:portrait{
+CalenEventListViewItem[leftAllDayIcon="false"]:portrait{
layout: custom;
}
-CalenEventListViewItem[layoutName="custom"][modelItemType="StandardItem"][stretchItem="true"]:landscape{
- layout: custom-stretch;
+CalenEventListViewItem[leftAllDayIcon="false"]:landscape{
+ layout: custom;
+}
+
+CalenEventListViewItem[leftAllDayIcon="true"]:portrait{
+ layout: custom-subjecticon;
+}
+
+CalenEventListViewItem[leftAllDayIcon="true"]:landscape{
+ layout: custom-subjecticon;
}
-CalenEventListViewItem::icon-1[layoutName="custom"]{
- top: -var(hb-param-margin-gene-top);
+
+CalenEventListViewItem[locationEntry="true"]:portrait{
+ layout: custom-locationentry;
+}
+
+CalenEventListViewItem[locationEntry="true"]:landscape{
+ layout: custom-locationentry;
+}
+
+
+CalenEventListViewItem::icon-1{
left: -var(hb-param-margin-gene-left);
- right: var(hb-param-margin-gene-middle-horizontal);
fixed-width: var(hb-param-graphic-size-primary-small);
fixed-height: var(hb-param-graphic-size-primary-small);
}
CalenEventListViewItem::icon-2{
- top: -var(hb-param-margin-gene-top);
right: var(hb-param-margin-gene-middle-horizontal);
fixed-width: var(hb-param-graphic-size-secondary);
fixed-height: var(hb-param-graphic-size-secondary);
}
CalenEventListViewItem::icon-3{
- top: -var(hb-param-margin-gene-top);
right: var(hb-param-margin-gene-right);
fixed-width: var(hb-param-graphic-size-secondary);
fixed-height: var(hb-param-graphic-size-secondary);
}
CalenEventListViewItem::icon-4{
- top: -var(hb-param-margin-gene-top);
right: var(hb-param-margin-gene-right);
+ bottom: var(hb-param-margin-gene-bottom);
fixed-width: var(hb-param-graphic-size-secondary);
fixed-height: var(hb-param-graphic-size-secondary);
}
CalenEventListViewItem::text-1{
- left: -var(hb-param-margin-gene-left);
- top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-left);
font-variant: secondary;
- text-height: var(hb-param-text-height-secondary);
+ text-height: var(hb-param-text-height-secondary);
+ size-policy: maximum;
+
}
-CalenEventListViewItem[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);
+CalenEventListViewItem::text-2{
+ top: -var(hb-param-margin-gene-top);
+ right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-middle-horizontal);
font-variant: primary;
text-height: var(hb-param-text-height-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);
+CalenEventListViewItem::text-2[locationEntry="true"]{
+ top: -var(hb-param-margin-gene-top);
+ bottom: var(hb-param-margin-gene-bottom);
+ right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-middle-horizontal);
font-variant: primary;
text-height: var(hb-param-text-height-primary);
text-align: left;
- 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);
+ right: var(hb-param-margin-gene-middle-horizontal);
bottom: var(hb-param-margin-gene-bottom);
font-variant: secondary;
text-height: var(hb-param-text-height-secondary);
text-align: left;
- fixed-width: 35un;
}
CalenEventListViewItem::text-4{
+ bottom: var(hb-param-margin-gene-bottom);
font-variant: secondary;
text-height: var(hb-param-text-height-secondary);
-}
-
-CalenEventListViewItem::text-2:landscape[stretchItem="false"]{
- fixed-width: 70un;
+ size-policy: maximum;
}
-CalenEventListViewItem::text-3:landscape[stretchItem="false"]{
- fixed-width: 70un;
-}
-CalenEventListViewItem::text-2:landscape[stretchItem="true"]{
- fixed-width: 35un;
- bottom: var(hb-param-margin-gene-bottom);
-}
-
-CalenEventListViewItem::text-3:landscape[stretchItem="true"]{
- fixed-width: 40un;
- top: -var(hb-param-margin-gene-top);
-}
--- a/calendarui/views/resources/caleneventlistviewitem.widgetml Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/resources/caleneventlistviewitem.widgetml Mon Aug 09 18:30:52 2010 +0530
@@ -1,54 +1,77 @@
-<hbwidget type="CalenEventListViewItem" version="0.1">
+<hbwidget version="0.1" type="CalenEventListViewItem">
<layout name="custom" type="mesh">
-
- <meshitem src="text-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
- <meshitem src="text-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="text-1" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
-
- <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="text-2" srcEdge="BOTTOM" dst="text-3" dstEdge="TOP"/>
-
- <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+ <meshitem src="text-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="text-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+
+ <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="LEFT" dst="text-1" dstEdge="RIGHT"/>
+ <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+
+ <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
+ <meshitem src="text-3" srcEdge="TOP" dst="text-2" dstEdge="BOTTOM"/>
+ <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+ <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
+
<meshitem src="text-4" srcEdge="TOP" dst="text-3" dstEdge="TOP"/>
<meshitem src="text-4" srcEdge="LEFT" dst="text-1" dstEdge="LEFT"/>
- <meshitem src="text-4" srcEdge="RIGHT" dst="text-1" dstEdge="RIGHT"/>
- <meshitem src="text-4" srcEdge="BOTTOM" dst="text-3" dstEdge="BOTTOM"/>
+ <meshitem src="text-4" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+
- <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
- <meshitem src="icon-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="icon-1" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
+ <meshitem src="icon-3" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
- <meshitem src="icon-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="icon-2" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
<meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
- <meshitem src="icon-3" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-
<meshitem src="icon-4" srcEdge="TOP" dst="text-3" dstEdge="TOP"/>
<meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+
</layout>
- <layout name="custom-stretch" type="mesh">
+ <layout name="custom-subjecticon" type="mesh">
+
<meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
- <meshitem src="icon-1" srcEdge="RIGHT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="icon-1" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
+ <meshitem src="icon-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+
+ <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT"/>
+ <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+
+
+ <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
+ <meshitem src="text-3" srcEdge="TOP" dst="text-2" dstEdge="BOTTOM"/>
+ <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
+ <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
- <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="text-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
-
+ <meshitem src="icon-3" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+
+ <meshitem src="icon-2" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
<meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
- <meshitem src="icon-2" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
- <meshitem src="icon-3" srcEdge="RIGHT" dst="text-3" dstEdge="LEFT"/>
- <meshitem src="icon-3" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
-
- <meshitem src="text-3" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
- <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
+ <meshitem src="icon-4" srcEdge="TOP" dst="text-3" dstEdge="TOP"/>
+ <meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+
+ </layout>
+
+
+ <layout name="custom-locationentry" type="mesh">
+
+ <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+ <meshitem src="icon-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+
+ <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT"/>
+ <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+ <meshitem src="text-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
- <meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
- <meshitem src="icon-4" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
+ <meshitem src="icon-3" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
- </layout>
-</hbwidget>
+ <meshitem src="icon-2" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
+
+
+ </layout>
+ </hbwidget>
\ No newline at end of file
--- a/calendarui/views/resources/caleneventlistviewitem_color.css Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/resources/caleneventlistviewitem_color.css Mon Aug 09 18:30:52 2010 +0530
@@ -1,3 +1,40 @@
+CalenEventListViewItem::text-1{
+ color: var(qtc_list_item_content_normal);
+}
+
+CalenEventListViewItem::text-1[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CalenEventListViewItem::text-1[state="disabled"]{
+ color: var(qtc_list_item_disabled);
+}
+
+CalenEventListViewItem::text-2{
+ color: var(qtc_list_item_title_normal);
+}
+
+CalenEventListViewItem::text-2[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CalenEventListViewItem::text-2[state="disabled"]{
+ color: var(qtc_list_item_disabled);
+}
+
+
+CalenEventListViewItem::text-3{
+ color: var(qtc_list_item_content_normal);
+}
+
+CalenEventListViewItem::text-3[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CalenEventListViewItem::text-3[state="disabled"]{
+ color: var(qtc_list_item_disabled);
+}
+
CalenEventListViewItem::text-4{
color: var(qtc_list_item_content_normal);
}
@@ -10,8 +47,20 @@
color: var(qtc_list_item_disabled);
}
+CalenEventListViewItem::icon-2{
+ color: var(qtc_list_item_title_normal);
+}
+
+CalenEventListViewItem::icon-2[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CalenEventListViewItem::icon-2[state="disabled"]{
+ color: var(qtc_list_item_disabled);
+}
+
CalenEventListViewItem::icon-3{
- color: var(qtc_list_item_content_normal);
+ color: var(qtc_list_item_title_normal);
}
CalenEventListViewItem::icon-3[state="pressed"]{
--- a/calendarui/views/resources/calengriditemprototype.css Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/resources/calengriditemprototype.css Mon Aug 09 18:30:52 2010 +0530
@@ -1,16 +1,4 @@
-CalenGridItemPrototype:portrait {
- layout: calendarCustomGridItem;
-}
-
-CalenGridItemPrototype:landscape {
- layout: calendarCustomGridItem;
-}
-
-CalenGridItemPrototype[layoutName="calendarCustomGridItem"]:portrait{
- layout:calendarCustomGridItem;
-}
-
-CalenGridItemPrototype[layoutName="calendarCustomGridItem"]:landscape{
+CalenGridItemPrototype[layoutName="calendarCustomGridItem"] {
layout:calendarCustomGridItem;
}
--- a/calendarui/views/src/calenagendaviewwidget.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/src/calenagendaviewwidget.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -41,6 +41,7 @@
#include "calenservices.h"
#include "calencontext.h"
#include "calendateutils.h"
+#include "calenagendautils.h"
#include "CalenUid.h"
#include "caleneventlistviewitem.h"
#include "calenpluginlabel.h"
@@ -373,7 +374,9 @@
// of items in the list. Remove the extra rows
mListModel->removeRows(0, mListModel->rowCount() - mInstanceArray.count());
}
+ //to set the index to first item of the list , when view refresh
mIndex = 0;
+ //status reset for not setting any property
mIconCheck = false;
mListModel->setColumnCount(singleColumn);
mIconCheck = true;
@@ -466,10 +469,9 @@
OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CREATELISTITEM_EXIT );
return;
}
- // Check if the entry is a timed entry
- // TODO: Right now, only appointment/meeting type is being handled
- // Handle other timed entry types like reminder etc
- if (entry.isTimedEntry()) {
+ // Check if the entry is a timed entry and not all day event
+ // an all-day event when it is synched from OUTLOOK then entry type will be EAppt
+ if (!CalenAgendaUtils::isAlldayEvent(entry) && entry.isTimedEntry()) {
// Get the text and icon data for the entry
addTimedEventToList(index, entry);
} else {
@@ -615,7 +617,7 @@
iconData << HbIcon(locationIcon);
}
else {
- iconData << HbIcon();
+ iconData << QVariant();
}
textData << entry.location();
}
@@ -691,7 +693,7 @@
// Nothing to do as of now as anniversary events
// cannot be created
// TODO: To be handled in case of sync
- } else if (entryType == AgendaEntry::TypeEvent) {
+ } else if (CalenAgendaUtils::isAlldayEvent(entry)) {
// This is an all day event
// Append the all-day icon
iconData << HbIcon(allDayIcon);
@@ -699,12 +701,12 @@
// Check if alarm is enabled for the entry
if (entry.alarm().isNull()) {
// Insert a blank icon. Else next text item will get shifted to left
- iconData << HbIcon();
+ iconData << QVariant();
} else {
// if entry is not repeating in place of reminder icon put a blank
// icon and move reminder icon to the place of repeating icon
if (!entry.isRepeating()) {
- iconData << HbIcon();
+ iconData << QVariant();
}
iconData << HbIcon(reminderIcon);
}
@@ -719,7 +721,7 @@
// put the blank icon only when both reminder and repeating icons
// are not there
if (entry.alarm().isNull()) {
- iconData << HbIcon();
+ iconData << QVariant();
}
}
@@ -731,7 +733,8 @@
if (!entry.geoValue().isNull()){
iconData << HbIcon(locationIcon);
}else {
- iconData << HbIcon();
+ iconData << QVariant();
+
}
} else {
textData << QVariant();
@@ -771,12 +774,12 @@
// Check if alarm is enabled for the entry
if (entry.alarm().isNull()) {
// Insert a blank icon. Else next text item will get shifted to left
- iconData << HbIcon();
+ iconData << QVariant();
} else {
// if entry is not repeating in place of reminder icon put a blank
// icon and move reminder icon to the place of repeating icon
if (!entry.isRepeating()) {
- iconData << HbIcon();
+ iconData << QVariant();
}
iconData << HbIcon(reminderIcon);
}
@@ -788,7 +791,7 @@
// Insert the blank icon only when both reminder and repeating icons
// are not there
if (entry.alarm().isNull()) {
- iconData << HbIcon();
+ iconData << QVariant();
}
}
}
@@ -834,6 +837,13 @@
AgendaEntry entry = mInstanceArray[index];
if (!entry.isNull()) {
AgendaEntry::Type eventType = entry.type();
+ // Need to check explicitly for Appt that got synched from OUTLOOK
+ // that can be an all-day event
+ if (AgendaEntry::TypeAppoinment == eventType) {
+ if (CalenAgendaUtils::isAlldayEvent(entry)) {
+ eventType = AgendaEntry::TypeEvent;
+ }
+ }
switch(eventType) {
// Apply the stretching to only to-do's,
// anniversary and all-day event types
@@ -1023,7 +1033,8 @@
// Set the context
setContextFromHighlight(entry);
-
+
+ //for not setting any property again
mIconCheck = false;
// Launch the event viewer.
mServices.IssueCommandL(ECalenEventView);
@@ -1268,16 +1279,24 @@
OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_EXIT );
}
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::hasAllDayIcon
+// return true if property for all day icon to set
+// ----------------------------------------------------------------------------
+//
bool CalenAgendaViewWidget::hasAllDayIcon()
{
return mIconCheck;
}
-
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::checkEntryIcons
+// check if all day icon is present
+// ----------------------------------------------------------------------------
+//
void CalenAgendaViewWidget::checkEntryIcons()
{
- // return allDayLeftIcon;
int index = 0;
//check the number of entries
index = mInstanceArray.count();
@@ -1286,49 +1305,40 @@
if(mIndex < index )
entry = mInstanceArray[mIndex];
- mRightAlarmIcon = false;
- mRightRepeatIcon = false;
- mRightExceptionIcon = false;
mLeftAllDayIcon = false;
+ mLocationData = false;
- if(!entry.alarm().isNull()){
- mRightAlarmIcon = true;
- }
- if (entry.isRepeating()){
- mRightRepeatIcon = true;
- }
- if (!entry.recurrenceId().isNull()){
- mRightExceptionIcon = true;
- }
-
- if(!entry.isTimedEntry()){
+ if(!entry.isTimedEntry() || CalenAgendaUtils::isAlldayEvent(entry)){
//all day icon is not there if its a timed entry
mLeftAllDayIcon = true;
- }
+ }
+
+ if (!entry.location().isEmpty()) {
+ mLocationData = true ;
+ }
//check if shift to next entry
if(mNextEntry)
mIndex++;
}
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::isAllDayIcon
+// retirn true if all day icon is present
+// ----------------------------------------------------------------------------
+//
bool CalenAgendaViewWidget::isAllDayIcon()
{
return mLeftAllDayIcon;
}
-bool CalenAgendaViewWidget::isExceptionIcon()
- {
- return mRightExceptionIcon;
- }
-
-bool CalenAgendaViewWidget::isAlarmIcon()
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::isLocationData
+// return true if location entry is present
+// ----------------------------------------------------------------------------
+//
+bool CalenAgendaViewWidget::isLocationData()
{
- return mRightAlarmIcon;
+ return mLocationData;
}
-
-bool CalenAgendaViewWidget::isRepeatingIcon()
- {
- return mRightRepeatIcon;
- }
-
// End of file --Don't remove this.
--- a/calendarui/views/src/caleneventlistviewitem.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/src/caleneventlistviewitem.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -25,15 +25,24 @@
#include "caleneventlistviewitemTraces.h"
#endif
-
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::CalenEventListViewItem
+// constructor
+// ----------------------------------------------------------------------------
+//
CalenEventListViewItem::CalenEventListViewItem(CalenAgendaViewWidget *parent) :
-HbListViewItem(parent),mAllDayIcon(false),mParent(parent)
+HbListViewItem(parent),mAllDayIcon(false),mLocationEntry(false),mParent(parent)
{
OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY );
OstTraceFunctionExit0( CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_EXIT );
}
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::~CalenEventListViewItem
+// constructor
+// ----------------------------------------------------------------------------
+//
CalenEventListViewItem::~CalenEventListViewItem()
{
OstTraceFunctionEntry0( DUP1_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY );
@@ -42,6 +51,11 @@
OstTraceFunctionExit0( DUP1_CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_EXIT );
}
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::createItem
+// creates the instance of class
+// ----------------------------------------------------------------------------
+//
HbAbstractViewItem* CalenEventListViewItem::createItem()
{
OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_CREATEITEM_ENTRY );
@@ -50,6 +64,11 @@
return new CalenEventListViewItem(*this);
}
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::updateChildItems
+// creates the child items
+// ----------------------------------------------------------------------------
+//
void CalenEventListViewItem::updateChildItems()
{
OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_ENTRY );
@@ -57,9 +76,7 @@
{
mParent->checkEntryIcons();
mAllDayIcon = mParent->isAllDayIcon();
- mExceptionIcon = mParent->isExceptionIcon();
- mAlarmIcon = mParent->isAlarmIcon();
- mRepeatingIcon = mParent->isRepeatingIcon();
+ mLocationEntry = mParent->isLocationData();
}
HbListViewItem::updateChildItems();
@@ -67,38 +84,47 @@
OstTraceFunctionExit0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_EXIT );
}
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::hasAllDayIcon
+// check if all day icon is there in item
+// ----------------------------------------------------------------------------
+//
bool CalenEventListViewItem::hasAllDayIcon()
{
return mAllDayIcon ;
}
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::setAllDayLeftIcon
+// set the all day icon
+// ----------------------------------------------------------------------------
+//
void CalenEventListViewItem::setAllDayLeftIcon(bool icon)
{
mAllDayIcon = icon;
}
-bool CalenEventListViewItem::hasRepeatingIcon()
+
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::hasAllDayIcon
+// check if location entry is there in item
+// ----------------------------------------------------------------------------
+//
+bool CalenEventListViewItem::locationEntryLayout()
{
- return mRepeatingIcon;
+ if(mAllDayIcon && !mLocationEntry)
+ return true;
+ else
+ return false;
}
-void CalenEventListViewItem::setRepeatingIcon(bool icon)
- {
- mRepeatingIcon = icon;
- }
-bool CalenEventListViewItem::hasAlarmIcon()
- {
- return mAlarmIcon;
- }
-void CalenEventListViewItem::setAlarmIcon(bool icon )
+// ----------------------------------------------------------------------------
+// CalenEventListViewItem::setAllDayLeftIcon
+// set the location entry status
+// ----------------------------------------------------------------------------
+//
+void CalenEventListViewItem::setLocationEntry(bool icon)
{
- mAlarmIcon = icon ;
- }
-bool CalenEventListViewItem::hasExceptionIcon()
- {
- return mExceptionIcon;
+ mLocationEntry = icon;
}
-void CalenEventListViewItem::setExceptionIcon(bool icon )
- {
- mExceptionIcon = icon ;
- }
+
// End of file
--- a/calendarui/views/src/calenmonthgrid.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/src/calenmonthgrid.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -1207,8 +1207,10 @@
// Painter draws the line for first two points in the list and then second
// line for next two points in the list like that. Hence, list should
// contain even number of points
+ // Dont draw the first horizontal line as we have thick line seperator
+ // coming between day names and the month grid
QVector<QPointF> pointList;
- for (int i = 0; i < numOfRows; i++) {
+ for (int i = 1; i < numOfRows; i++) {
pointList.append(QPointF(startPoint.x(),
startPoint.y() + (i * rowWidth)));
pointList.append(QPointF(endPoint.x(), endPoint.y() + (i * rowWidth)));
--- a/calendarui/views/src/calenmonthview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/src/calenmonthview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -319,11 +319,6 @@
// in all views
mServices.OfferMenu(menu());
- // populate entries for the month view if the month view is launched
- // from the service APIs. Otherwise the month view is not populated with
- // the entries as CalenViewManager::handleInstanceViewCreation is called
- // before the month view creation so the model array is not populated.
- fetchEntriesAndUpdateModel();
OstTraceFunctionExit0( CALENMONTHVIEW_DOLAZYLOADING_EXIT );
}
@@ -1520,6 +1515,12 @@
QGraphicsLinearLayout* viewLayout = static_cast<QGraphicsLinearLayout *>
(widget()->layout());
+
+ // Set the effect in progress flags for next and previous panes
+ // For current pane, we would have set it in gestureEvent() function
+ mPrevPreviewPane->effectStarted();
+ mNextPreviewPane->effectStarted();
+
if(rightGesture) {
// Need to bring up the previous day preview pane
// Create the effect on mCurrPreviewPane to slide to right side
@@ -1636,6 +1637,11 @@
mPrevPaneParent = paneParent;
mPrevPaneLayoutWidget = paneLayoutWidget;
+ // Reset the effect in progress flag
+ mCurrPreviewPane->effectFinished();
+ mPrevPreviewPane->effectFinished();
+ mNextPreviewPane->effectFinished();
+
// Set the focus to proper date
setCurrGridIndex(index);
// Start the auto scroll on current preview pane
@@ -1674,6 +1680,11 @@
mNextPaneParent = paneParent;
mNextPaneLayoutWidget = paneLayoutWidget;
+ // Reset the effect in progress flag
+ mCurrPreviewPane->effectFinished();
+ mNextPreviewPane->effectFinished();
+ mPrevPreviewPane->effectFinished();
+
// Set the focus to proper date
setCurrGridIndex(index);
// Start the auto scroll on current preview pane
--- a/calendarui/views/src/calennativeview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/src/calennativeview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -50,8 +50,9 @@
Default constructor.
*/
CalenNativeView::CalenNativeView(MCalenServices &services) :
- mServices(services), mIsCapturedScreenShotValid(false),
- mEntriesInDataBase(false)
+ mServices(services),
+ mEntriesInDataBase(false),
+ mIsCapturedScreenShotValid(false)
{
OstTraceFunctionEntry0( CALENNATIVEVIEW_CALENNATIVEVIEW_ENTRY );
--- a/calendarui/views/src/calenpreviewpane.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/src/calenpreviewpane.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -189,7 +189,7 @@
QString start;
if(mInstanceArray[i].type() != AgendaEntry::TypeTodo &&
mInstanceArray[i].type() != AgendaEntry::TypeAnniversary &&
- mInstanceArray[i].type() != AgendaEntry::TypeEvent) {
+ !CalenAgendaUtils::isAlldayEvent(mInstanceArray[i])) {
QDateTime startTime = mInstanceArray[i].startTime();
// Check if event starts in past
checkStartTimeOfEvent(startTime);
@@ -370,6 +370,11 @@
if(HbPanGesture *gesture = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))) {
if (gesture->state() == Qt::GestureUpdated) {
+ // Check if effect is not yet completed, ignore the current gesture if it is
+ if (mIsGestureHandled) {
+ OstTraceFunctionExit0( CALENPREVIEWPANE_GESTUREEVENT_EXIT );
+ return;
+ }
// TODO: This work around till framework provides an api
// to know the direciton of the pan, until then we need
// calculate the direction explicitly
@@ -400,7 +405,7 @@
event->accept(Qt::PanGesture);
} else {
event->accept(Qt::PanGesture);
- OstTraceFunctionExit0( CALENPREVIEWPANE_GESTUREEVENT_EXIT );
+ OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
return;
}
} else if (abs(verticalDiff) < MAX_PAN_DIRECTION_THRESHOLD) {
@@ -416,7 +421,7 @@
event->accept(Qt::PanGesture);
}else {
event->accept(Qt::PanGesture);
- OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
+ OstTraceFunctionExit0( DUP2_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
return;
}
}
@@ -478,4 +483,20 @@
}
}
+/*!
+ Sets the effect beign handled flag to true
+ */
+void CalenPreviewPane::effectStarted()
+{
+ mIsGestureHandled = true;
+}
+
+/*!
+ Resets the effect beign handled flag to true
+ */
+void CalenPreviewPane::effectFinished()
+{
+ mIsGestureHandled = false;
+}
+
// End of file --Don't remove this.
--- a/calendarui/views/src/calenthicklinesdrawer.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/calendarui/views/src/calenthicklinesdrawer.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -99,6 +99,8 @@
// Calculate the seperation to be added so that line coincides with
// top border of the grid
qreal seperation = CALENDAYNAMEANDGRIDSEPERATOR * unitValue;
+ // Adjust the seperation with the thickness of the line
+ seperation = seperation - widthInPixels;
// Get the start point and end point to draw the line
QPointF startPoint(controlRect.bottomLeft().x(), controlRect.bottomLeft().y() + seperation);
QPointF endPoint(controlRect.bottomRight().x(), controlRect.bottomRight().y() + seperation);
--- a/clock/clockmw/clockalarms/clockalarms.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clockalarms/clockalarms.pro Mon Aug 09 18:30:52 2010 +0530
@@ -18,7 +18,8 @@
TARGET = clockalarmclient
DEFINES += ALARMCLIENT_LIBRARY
-INCLUDEPATH += ../../inc
+INCLUDEPATH += ../../inc \
+ ./traces
DEPENDPATH += . \
./inc \
--- a/clock/clockmw/clockalarms/src/alarmclient.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clockalarms/src/alarmclient.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -21,6 +21,11 @@
// User includes
#include "alarmclient.h"
#include "alarmlistener.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmclientTraces.h"
+#endif
+
/*!
\class AlarmClient
@@ -33,10 +38,12 @@
:QObject(parent),
mListener(0)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_ALARMCLIENT_ENTRY );
// Connect to the alarm server.
User::LeaveIfError(mAlarmSrvSession.Connect());
// Construct the listener, but do not start it.
mListener = new AlarmListener(this, mAlarmSrvSession);
+OstTraceFunctionExit0( ALARMCLIENT_ALARMCLIENT_EXIT );
}
/*!
@@ -44,6 +51,7 @@
*/
AlarmClient::~AlarmClient()
{
+OstTraceFunctionEntry0( DUP1_ALARMCLIENT_ALARMCLIENT_ENTRY );
if (mListener) {
mListener->stop();
@@ -51,6 +59,7 @@
mListener = 0;
}
mAlarmSrvSession.Close();
+OstTraceFunctionExit0( DUP1_ALARMCLIENT_ALARMCLIENT_EXIT );
}
/*!
@@ -60,6 +69,7 @@
*/
void AlarmClient::getAlarmList(QList<AlarmInfo>& alarmList)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_GETALARMLIST_ENTRY );
// This will hold the alarm ids returned from alarm server.
RArray<TAlarmId> alarmIdArray;
AlarmInfo alarmInfo;
@@ -121,6 +131,7 @@
}
// Cleanup.
alarmIdArray.Close();
+OstTraceFunctionExit0( ALARMCLIENT_GETALARMLIST_EXIT );
}
/*!
@@ -128,6 +139,7 @@
*/
void AlarmClient::setAlarm(AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_SETALARM_ENTRY );
// Get the current home time
TTime homeTime;
homeTime.HomeTime();
@@ -204,10 +216,12 @@
alarmInfo.alarmDateTime = alarmDate;
}
+OstTraceFunctionExit0( ALARMCLIENT_SETALARM_EXIT );
}
void AlarmClient::setAlarmState(TAlarmState state, AlarmState& alarmState)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_SETALARMSTATE_ENTRY );
switch (state) {
case EAlarmStateInPreparation:
alarmState = InPreparation;
@@ -231,10 +245,12 @@
break;
}
+OstTraceFunctionExit0( ALARMCLIENT_SETALARMSTATE_EXIT );
}
void AlarmClient::setAlarmState(AlarmState state, TAlarmState& alarmState)
{
+ OstTraceFunctionEntry0( DUP1_ALARMCLIENT_SETALARMSTATE_ENTRY );
switch (state) {
case InPreparation:
alarmState = EAlarmStateInPreparation;
@@ -257,11 +273,13 @@
default:
break;
}
+OstTraceFunctionExit0( DUP1_ALARMCLIENT_SETALARMSTATE_EXIT );
}
void AlarmClient::setAlarmRepeatType(
TAlarmRepeatDefinition repeat, AlarmRepeatType& repeatType)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_SETALARMREPEATTYPE_ENTRY );
switch (repeat) {
case EAlarmRepeatDefintionRepeatOnce:
repeatType = Once;
@@ -278,11 +296,13 @@
default:
break;
}
+OstTraceFunctionExit0( ALARMCLIENT_SETALARMREPEATTYPE_EXIT );
}
void AlarmClient::setAlarmRepeatType(
AlarmRepeatType repeat, TAlarmRepeatDefinition& repeatType)
{
+ OstTraceFunctionEntry0( DUP1_ALARMCLIENT_SETALARMREPEATTYPE_ENTRY );
switch (repeat) {
case Once:
repeatType = EAlarmRepeatDefintionRepeatOnce;
@@ -299,12 +319,15 @@
default:
break;
}
+OstTraceFunctionExit0( DUP1_ALARMCLIENT_SETALARMREPEATTYPE_EXIT );
}
void AlarmClient::deleteAlarm(int alarmId)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_DELETEALARM_ENTRY );
// Request the alarmserver to delete the alarm.
mAlarmSrvSession.AlarmDelete(alarmId);
+OstTraceFunctionExit0( ALARMCLIENT_DELETEALARM_EXIT );
}
/*!
@@ -315,25 +338,30 @@
*/
int AlarmClient::deleteSnoozedAlarm(int alarmId)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_DELETESNOOZEDALARM_ENTRY );
AlarmInfo alarmInfo;
int retVal(KErrNone);
int returnVal = getAlarmInfo(alarmId, alarmInfo);
if (KErrNone != retVal) {
+ OstTraceFunctionExit0( ALARMCLIENT_DELETESNOOZEDALARM_EXIT );
return retVal;
}
returnVal = mAlarmSrvSession.AlarmDelete(alarmId);
if (KErrNone != retVal) {
+ OstTraceFunctionExit0( DUP1_ALARMCLIENT_DELETESNOOZEDALARM_EXIT );
return retVal;
}
alarmInfo.alarmState = InPreparation;
alarmInfo.nextDueTime = alarmInfo.origAlarmTime;
setAlarm(alarmInfo);
+ OstTraceFunctionExit0( DUP2_ALARMCLIENT_DELETESNOOZEDALARM_EXIT );
return retVal;
}
int AlarmClient::getAlarmInfo(int alarmId, AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_GETALARMINFO_ENTRY );
TASShdAlarm tempSharedAlarm;
// Get the requested alarm info from the alarm server.
@@ -392,31 +420,40 @@
alarmInfo.volumeStatus = AlarmVolumeOff;
}
}
+ OstTraceFunctionExit0( ALARMCLIENT_GETALARMINFO_EXIT );
return error;
}
void AlarmClient::toggleAlarmStatus(int alarmId, int alarmStatus)
{
+OstTraceFunctionEntry0( ALARMCLIENT_TOGGLEALARMSTATUS_ENTRY );
mAlarmSrvSession.SetAlarmStatus(alarmId, (TAlarmStatus)alarmStatus);
+OstTraceFunctionExit0( ALARMCLIENT_TOGGLEALARMSTATUS_EXIT );
}
void AlarmClient::startListener()
{
+ OstTraceFunctionEntry0( ALARMCLIENT_STARTLISTENER_ENTRY );
mListener->start();
+OstTraceFunctionExit0( ALARMCLIENT_STARTLISTENER_EXIT );
}
void AlarmClient::stopListener()
{
+ OstTraceFunctionEntry0( ALARMCLIENT_STOPLISTENER_ENTRY );
mListener->stop();
+OstTraceFunctionExit0( ALARMCLIENT_STOPLISTENER_EXIT );
}
void AlarmClient::notifyChange(int alarmId)
{
+ OstTraceFunctionEntry0( ALARMCLIENT_NOTIFYCHANGE_ENTRY );
emit alarmStateChanged(alarmId);
+OstTraceFunctionExit0( ALARMCLIENT_NOTIFYCHANGE_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockmw/clockalarms/src/alarmlistener.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clockalarms/src/alarmlistener.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -19,25 +19,35 @@
// User includes
#include "alarmlistener.h"
#include "alarmclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "alarmlistenerTraces.h"
+#endif
+
AlarmListener::AlarmListener(AlarmClient* client, RASCliSession& session)
:CActive(EPriorityStandard),
mClient(client),
mSession(session)
{
+ OstTraceFunctionEntry0( ALARMLISTENER_ALARMLISTENER_ENTRY );
// Nothing to do.
+OstTraceFunctionExit0( ALARMLISTENER_ALARMLISTENER_EXIT );
}
AlarmListener::~AlarmListener()
{
+ OstTraceFunctionEntry0( DUP1_ALARMLISTENER_ALARMLISTENER_ENTRY );
if (IsActive()) {
Cancel();
}
+OstTraceFunctionExit0( DUP1_ALARMLISTENER_ALARMLISTENER_EXIT );
}
void AlarmListener::start()
{
+ OstTraceFunctionEntry0( ALARMLISTENER_START_ENTRY );
// Add the AO to the scheduler.
CActiveScheduler::Add(this);
@@ -47,17 +57,21 @@
// Set the AO active.
SetActive();
+OstTraceFunctionExit0( ALARMLISTENER_START_EXIT );
}
void AlarmListener::stop()
{
+ OstTraceFunctionEntry0( ALARMLISTENER_STOP_ENTRY );
if (IsActive()) {
Cancel();
}
+OstTraceFunctionExit0( ALARMLISTENER_STOP_EXIT );
}
void AlarmListener::RunL()
{
+ OstTraceFunctionEntry0( ALARMLISTENER_RUNL_ENTRY );
if (iStatus != KRequestPending) {
// We get notification for various changes with the alarm server.
// Only the required Events are used to emit a signal.
@@ -77,13 +91,16 @@
SetActive();
}
+OstTraceFunctionExit0( ALARMLISTENER_RUNL_EXIT );
}
void AlarmListener::DoCancel()
{
+ OstTraceFunctionEntry0( ALARMLISTENER_DOCANCEL_ENTRY );
// Cancel async request.
mSession.NotifyChangeCancel();
+OstTraceFunctionExit0( ALARMLISTENER_DOCANCEL_EXIT );
}
// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clockalarms/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clockalarms/traces/alarmclientTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,46 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMCLIENTTRACES_H__
+#define __ALARMCLIENTTRACES_H__
+
+#define KOstTraceComponentID 0x2002dd0e
+
+#define ALARMCLIENT_ALARMCLIENT_ENTRY 0x8a0001
+#define ALARMCLIENT_ALARMCLIENT_EXIT 0x8a0002
+#define DUP1_ALARMCLIENT_ALARMCLIENT_ENTRY 0x8a0003
+#define DUP1_ALARMCLIENT_ALARMCLIENT_EXIT 0x8a0004
+#define ALARMCLIENT_GETALARMLIST_ENTRY 0x8a0005
+#define ALARMCLIENT_GETALARMLIST_EXIT 0x8a0006
+#define ALARMCLIENT_SETALARM_ENTRY 0x8a0007
+#define ALARMCLIENT_SETALARM_EXIT 0x8a0008
+#define ALARMCLIENT_SETALARMSTATE_ENTRY 0x8a0009
+#define ALARMCLIENT_SETALARMSTATE_EXIT 0x8a000a
+#define DUP1_ALARMCLIENT_SETALARMSTATE_ENTRY 0x8a000b
+#define DUP1_ALARMCLIENT_SETALARMSTATE_EXIT 0x8a000c
+#define ALARMCLIENT_SETALARMREPEATTYPE_ENTRY 0x8a000d
+#define ALARMCLIENT_SETALARMREPEATTYPE_EXIT 0x8a000e
+#define DUP1_ALARMCLIENT_SETALARMREPEATTYPE_ENTRY 0x8a000f
+#define DUP1_ALARMCLIENT_SETALARMREPEATTYPE_EXIT 0x8a0010
+#define ALARMCLIENT_DELETEALARM_ENTRY 0x8a0011
+#define ALARMCLIENT_DELETEALARM_EXIT 0x8a0012
+#define ALARMCLIENT_DELETESNOOZEDALARM_ENTRY 0x8a0013
+#define ALARMCLIENT_DELETESNOOZEDALARM_EXIT 0x8a0014
+#define DUP1_ALARMCLIENT_DELETESNOOZEDALARM_EXIT 0x8a0015
+#define DUP2_ALARMCLIENT_DELETESNOOZEDALARM_EXIT 0x8a0016
+#define ALARMCLIENT_GETALARMINFO_ENTRY 0x8a0017
+#define ALARMCLIENT_GETALARMINFO_EXIT 0x8a0018
+#define ALARMCLIENT_TOGGLEALARMSTATUS_ENTRY 0x8a0019
+#define ALARMCLIENT_TOGGLEALARMSTATUS_EXIT 0x8a001a
+#define ALARMCLIENT_STARTLISTENER_ENTRY 0x8a001b
+#define ALARMCLIENT_STARTLISTENER_EXIT 0x8a001c
+#define ALARMCLIENT_STOPLISTENER_ENTRY 0x8a001d
+#define ALARMCLIENT_STOPLISTENER_EXIT 0x8a001e
+#define ALARMCLIENT_NOTIFYCHANGE_ENTRY 0x8a001f
+#define ALARMCLIENT_NOTIFYCHANGE_EXIT 0x8a0020
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clockalarms/traces/alarmlistenerTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ALARMLISTENERTRACES_H__
+#define __ALARMLISTENERTRACES_H__
+
+#define KOstTraceComponentID 0x2002dd0e
+
+#define ALARMLISTENER_ALARMLISTENER_ENTRY 0x8a0021
+#define ALARMLISTENER_ALARMLISTENER_EXIT 0x8a0022
+#define DUP1_ALARMLISTENER_ALARMLISTENER_ENTRY 0x8a0023
+#define DUP1_ALARMLISTENER_ALARMLISTENER_EXIT 0x8a0024
+#define ALARMLISTENER_START_ENTRY 0x8a0025
+#define ALARMLISTENER_START_EXIT 0x8a0026
+#define ALARMLISTENER_STOP_ENTRY 0x8a0027
+#define ALARMLISTENER_STOP_EXIT 0x8a0028
+#define ALARMLISTENER_RUNL_ENTRY 0x8a0029
+#define ALARMLISTENER_RUNL_EXIT 0x8a002a
+#define ALARMLISTENER_DOCANCEL_ENTRY 0x8a002b
+#define ALARMLISTENER_DOCANCEL_EXIT 0x8a002c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clockalarms/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,46 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_ALARMCLIENT_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_ALARMCLIENT_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_DELETEALARM_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_DELETEALARM_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_DELETESNOOZEDALARM_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_DELETESNOOZEDALARM_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_GETALARMINFO_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_GETALARMINFO_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_GETALARMLIST_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_GETALARMLIST_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_NOTIFYCHANGE_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_NOTIFYCHANGE_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARMREPEATTYPE_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARMREPEATTYPE_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARMSTATE_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARMSTATE_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARM_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_SETALARM_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_STARTLISTENER_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_STARTLISTENER_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_STOPLISTENER_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_STOPLISTENER_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_TOGGLEALARMSTATUS_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_ALARMCLIENT_TOGGLEALARMSTATUS_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_ALARMLISTENER_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_ALARMLISTENER_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_DOCANCEL_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_DOCANCEL_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_RUNL_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_RUNL_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_START_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_START_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_STOP_ENTRY=0x27
+[TRACE]TRACE_FLOW[0x8A]_ALARMLISTENER_STOP_EXIT=0x28
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_ALARMCLIENT_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_ALARMCLIENT_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_DELETESNOOZEDALARM_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_SETALARMREPEATTYPE_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_SETALARMREPEATTYPE_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_SETALARMSTATE_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMCLIENT_SETALARMSTATE_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMLISTENER_ALARMLISTENER_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMLISTENER_ALARMLISTENER_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_DUP2_ALARMCLIENT_DELETESNOOZEDALARM_EXIT=0x16
--- a/clock/clockmw/clocksettingsutility/clocksettingsutility.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clocksettingsutility/clocksettingsutility.pro Mon Aug 09 18:30:52 2010 +0530
@@ -21,7 +21,9 @@
CONFIG += hb
INCLUDEPATH += ../../inc \
- ../clocktimezone/inc
+ ../clocktimezone/inc \
+ ./traces
+
DEPENDPATH += . \
./inc \
./src
--- a/clock/clockmw/clocksettingsutility/src/settingsutility.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clocksettingsutility/src/settingsutility.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -26,6 +26,11 @@
#include "settingsutility.h"
#include "timezoneclient.h"
#include "clockdatatypes.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "settingsutilityTraces.h"
+#endif
+
/*!
\class SettingsUtility.
@@ -37,6 +42,7 @@
SettingsUtility::SettingsUtility(QObject *parent)
:QObject(parent)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETTINGSUTILITY_ENTRY );
mTimeSeparatorList << tr(".") << tr(":");
mClockTypeList << hbTrId("txt_clock_button_digital") << hbTrId("txt_clock_button_analog");
mTimeFormatList << hbTrId("txt_clk_setlabel_val_24_hour") << hbTrId("txt_clk_setlabel_val_12_hour");
@@ -44,6 +50,7 @@
mDateSeparatorList << tr(".") << tr(":") << tr("/") << tr("-");
mAutoUpdateValueList << tr("ON") << tr("OFF");
mSnoozeValueList << tr("5 minutes") << tr("15 minutes") << tr(" 30 minutes") << tr("1 hour");
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETTINGSUTILITY_EXIT );
}
/*!
@@ -51,7 +58,9 @@
*/
SettingsUtility::~SettingsUtility()
{
+ OstTraceFunctionEntry0( DUP1_SETTINGSUTILITY_SETTINGSUTILITY_ENTRY );
// Nothing.
+ OstTraceFunctionExit0( DUP1_SETTINGSUTILITY_SETTINGSUTILITY_EXIT );
}
/*!
@@ -59,6 +68,7 @@
*/
QString SettingsUtility::time()
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_TIME_ENTRY );
return QTime::currentTime().toString(timeFormatString());
}
@@ -67,6 +77,7 @@
*/
void SettingsUtility::setTimeFormat(const QString& format)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETTIMEFORMAT_ENTRY );
TLocale locale;
if (format == mTimeFormatList.at(0)) {
@@ -77,6 +88,7 @@
// Nothing to do.
}
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETTIMEFORMAT_EXIT );
}
/*!
@@ -84,6 +96,7 @@
*/
int SettingsUtility::timeFormat(QStringList &format)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_TIMEFORMAT_ENTRY );
TLocale locale;
int value = -1;
@@ -95,6 +108,7 @@
format = mTimeFormatList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_TIMEFORMAT_EXIT );
return value;
}
@@ -103,6 +117,7 @@
*/
void SettingsUtility::setClockType(const QString &type)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETCLOCKTYPE_ENTRY );
TLocale locale;
if (type == mClockTypeList.at(0)) {
@@ -113,6 +128,7 @@
// Nothing to do.
}
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETCLOCKTYPE_EXIT );
}
/*!
@@ -120,6 +136,7 @@
*/
int SettingsUtility::clockType(QStringList &list)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_CLOCKTYPE_ENTRY );
TLocale locale;
int value = -1;
@@ -133,6 +150,7 @@
list = mClockTypeList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_CLOCKTYPE_EXIT );
return value;
}
@@ -141,6 +159,7 @@
*/
void SettingsUtility::setTimeSeparator(const QString &separator)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETTIMESEPARATOR_ENTRY );
if (mTimeSeparatorList.contains(separator)) {
TLocale locale;
@@ -149,6 +168,7 @@
locale.Set();
}
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETTIMESEPARATOR_EXIT );
}
/*!
@@ -156,6 +176,7 @@
*/
int SettingsUtility::timeSeparator(QStringList &list)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_TIMESEPARATOR_ENTRY );
TLocale locale;
TChar separatorChar = locale.TimeSeparator(1);
int value = -1;
@@ -169,6 +190,7 @@
}
list = mTimeSeparatorList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_TIMESEPARATOR_EXIT );
return value;
}
@@ -177,6 +199,7 @@
*/
QString SettingsUtility::date()
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_DATE_ENTRY );
return QDate::currentDate().toString(dateFormatString());
}
@@ -185,6 +208,7 @@
*/
void SettingsUtility::setDateFormat(const QString &format)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETDATEFORMAT_ENTRY );
TLocale locale;
int index;
@@ -210,6 +234,7 @@
}
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETDATEFORMAT_EXIT );
}
/*!
@@ -217,6 +242,7 @@
*/
int SettingsUtility::dateFormat(QStringList &format)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_DATEFORMAT_ENTRY );
TLocale locale;
int index = -1;
@@ -237,6 +263,7 @@
format = mDateFormatList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_DATEFORMAT_EXIT );
return index;
}
@@ -245,12 +272,14 @@
*/
void SettingsUtility::setDateSeparator(const QString &separator)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETDATESEPARATOR_ENTRY );
TLocale locale;
locale.SetDateSeparator(
TChar(separator.unicode()->unicode()), 1);
locale.SetDateSeparator(
TChar(separator.unicode()->unicode()), 2);
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETDATESEPARATOR_EXIT );
}
/*!
@@ -258,6 +287,7 @@
*/
int SettingsUtility::dateSeparator(QStringList &separator)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_DATESEPARATOR_ENTRY );
TLocale locale;
TChar separatorChar = locale.DateSeparator(1);
@@ -282,6 +312,7 @@
separator = mDateSeparatorList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_DATESEPARATOR_EXIT );
return value;
}
@@ -292,7 +323,9 @@
*/
void SettingsUtility::setWorkdays(const QString &workdays)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETWORKDAYS_ENTRY );
Q_UNUSED(workdays)
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETWORKDAYS_EXIT );
}
/*!
@@ -303,6 +336,7 @@
*/
int SettingsUtility::workdays(QStringList &workdaysList)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_WORKDAYS_ENTRY );
Q_UNUSED(workdaysList)
return 0;
@@ -315,6 +349,7 @@
*/
QString SettingsUtility::timeFormatString()
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_TIMEFORMATSTRING_ENTRY );
QString format;
TLocale locale;
QStringList dummyList;
@@ -329,6 +364,7 @@
format.replace(QString(":"), separator);
+ OstTraceFunctionExit0( SETTINGSUTILITY_TIMEFORMATSTRING_EXIT );
return format;
}
@@ -339,6 +375,7 @@
*/
QString SettingsUtility::dateFormatString()
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_DATEFORMATSTRING_ENTRY );
QStringList dummyList;
QString format(mDateFormatList.at(dateFormat(dummyList)));
QString separator = mDateSeparatorList.at(dateSeparator(dummyList));
@@ -346,6 +383,7 @@
format.replace(QString(" "), separator);
format.replace(QString("mm"), QString("MM"));
+ OstTraceFunctionExit0( SETTINGSUTILITY_DATEFORMATSTRING_EXIT );
return format;
}
@@ -356,7 +394,9 @@
*/
void SettingsUtility::setSnoozeTime(int index)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETSNOOZETIME_ENTRY );
Q_UNUSED(index)
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETSNOOZETIME_EXIT );
}
/*!
@@ -367,9 +407,11 @@
*/
int SettingsUtility::snoozeTime(QStringList &snoozeValueList)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SNOOZETIME_ENTRY );
int index = -1;
snoozeValueList = mSnoozeValueList;
+ OstTraceFunctionExit0( SETTINGSUTILITY_SNOOZETIME_EXIT );
return index;
}
@@ -380,9 +422,11 @@
*/
void SettingsUtility::setStartOfWeek(int index)
{
+ OstTraceFunctionEntry0( SETTINGSUTILITY_SETSTARTOFWEEK_ENTRY );
TLocale locale;
TDay day = (TDay)index;
locale.SetStartOfWeek(day);
locale.Set();
+ OstTraceFunctionExit0( SETTINGSUTILITY_SETSTARTOFWEEK_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocksettingsutility/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocksettingsutility/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,41 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSUTILITY_SETTINGSUTILITY_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSUTILITY_SETTINGSUTILITY_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_CLOCKTYPE_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_CLOCKTYPE_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATEFORMATSTRING_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATEFORMATSTRING_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATEFORMAT_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATEFORMAT_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATESEPARATOR_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATESEPARATOR_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_DATE_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETCLOCKTYPE_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETCLOCKTYPE_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETDATEFORMAT_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETDATEFORMAT_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETDATESEPARATOR_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETDATESEPARATOR_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETSNOOZETIME_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETSNOOZETIME_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETSTARTOFWEEK_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETSTARTOFWEEK_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTIMEFORMAT_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTIMEFORMAT_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTIMESEPARATOR_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTIMESEPARATOR_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTINGSUTILITY_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETTINGSUTILITY_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETWORKDAYS_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SETWORKDAYS_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SNOOZETIME_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_SNOOZETIME_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMEFORMATSTRING_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMEFORMATSTRING_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMEFORMAT_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMEFORMAT_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMESEPARATOR_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIMESEPARATOR_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_TIME_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSUTILITY_WORKDAYS_ENTRY=0x1d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocksettingsutility/traces/settingsutilityTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,53 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __SETTINGSUTILITYTRACES_H__
+#define __SETTINGSUTILITYTRACES_H__
+
+#define KOstTraceComponentID 0x2002e6b3
+
+#define SETTINGSUTILITY_SETTINGSUTILITY_ENTRY 0x8a0001
+#define SETTINGSUTILITY_SETTINGSUTILITY_EXIT 0x8a0002
+#define DUP1_SETTINGSUTILITY_SETTINGSUTILITY_ENTRY 0x8a0003
+#define DUP1_SETTINGSUTILITY_SETTINGSUTILITY_EXIT 0x8a0004
+#define SETTINGSUTILITY_TIME_ENTRY 0x8a0005
+#define SETTINGSUTILITY_SETTIMEFORMAT_ENTRY 0x8a0006
+#define SETTINGSUTILITY_SETTIMEFORMAT_EXIT 0x8a0007
+#define SETTINGSUTILITY_TIMEFORMAT_ENTRY 0x8a0008
+#define SETTINGSUTILITY_TIMEFORMAT_EXIT 0x8a0009
+#define SETTINGSUTILITY_SETCLOCKTYPE_ENTRY 0x8a000a
+#define SETTINGSUTILITY_SETCLOCKTYPE_EXIT 0x8a000b
+#define SETTINGSUTILITY_CLOCKTYPE_ENTRY 0x8a000c
+#define SETTINGSUTILITY_CLOCKTYPE_EXIT 0x8a000d
+#define SETTINGSUTILITY_SETTIMESEPARATOR_ENTRY 0x8a000e
+#define SETTINGSUTILITY_SETTIMESEPARATOR_EXIT 0x8a000f
+#define SETTINGSUTILITY_TIMESEPARATOR_ENTRY 0x8a0010
+#define SETTINGSUTILITY_TIMESEPARATOR_EXIT 0x8a0011
+#define SETTINGSUTILITY_DATE_ENTRY 0x8a0012
+#define SETTINGSUTILITY_SETDATEFORMAT_ENTRY 0x8a0013
+#define SETTINGSUTILITY_SETDATEFORMAT_EXIT 0x8a0014
+#define SETTINGSUTILITY_DATEFORMAT_ENTRY 0x8a0015
+#define SETTINGSUTILITY_DATEFORMAT_EXIT 0x8a0016
+#define SETTINGSUTILITY_SETDATESEPARATOR_ENTRY 0x8a0017
+#define SETTINGSUTILITY_SETDATESEPARATOR_EXIT 0x8a0018
+#define SETTINGSUTILITY_DATESEPARATOR_ENTRY 0x8a0019
+#define SETTINGSUTILITY_DATESEPARATOR_EXIT 0x8a001a
+#define SETTINGSUTILITY_SETWORKDAYS_ENTRY 0x8a001b
+#define SETTINGSUTILITY_SETWORKDAYS_EXIT 0x8a001c
+#define SETTINGSUTILITY_WORKDAYS_ENTRY 0x8a001d
+#define SETTINGSUTILITY_TIMEFORMATSTRING_ENTRY 0x8a001e
+#define SETTINGSUTILITY_TIMEFORMATSTRING_EXIT 0x8a001f
+#define SETTINGSUTILITY_DATEFORMATSTRING_ENTRY 0x8a0020
+#define SETTINGSUTILITY_DATEFORMATSTRING_EXIT 0x8a0021
+#define SETTINGSUTILITY_SETSNOOZETIME_ENTRY 0x8a0022
+#define SETTINGSUTILITY_SETSNOOZETIME_EXIT 0x8a0023
+#define SETTINGSUTILITY_SNOOZETIME_ENTRY 0x8a0024
+#define SETTINGSUTILITY_SNOOZETIME_EXIT 0x8a0025
+#define SETTINGSUTILITY_SETSTARTOFWEEK_ENTRY 0x8a0026
+#define SETTINGSUTILITY_SETSTARTOFWEEK_EXIT 0x8a0027
+
+
+#endif
+
+// End of file
+
--- a/clock/clockmw/clocktimezone/bwins/timezoneclientu.def Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clocktimezone/bwins/timezoneclientu.def Mon Aug 09 18:30:52 2010 +0530
@@ -1,53 +1,19 @@
EXPORTS
- ?deleteInstance@TimezoneClient@@QAEXXZ @ 1 NONAME ; void TimezoneClient::deleteInstance(void)
- ?addCity@TimezoneClient@@QAE?AULocationInfo@@HAAVQString@@H@Z @ 2 NONAME ; struct LocationInfo TimezoneClient::addCity(int, class QString &, int)
- ?isNull@TimezoneClient@@QAE_NXZ @ 3 NONAME ; bool TimezoneClient::isNull(void)
- ??_ETimezoneClient@@UAE@I@Z @ 4 NONAME ; TimezoneClient::~TimezoneClient(unsigned int)
- ?getLocations@TimezoneClient@@QAEAAV?$QList@ULocationInfo@@@@XZ @ 5 NONAME ; class QList<struct LocationInfo> & TimezoneClient::getLocations(void)
- ?getDstRulesL@TimezoneClient@@AAEXAAVQDateTime@@0H@Z @ 6 NONAME ; void TimezoneClient::getDstRulesL(class QDateTime &, class QDateTime &, int)
- ?locationSelectorModel@TimezoneClient@@QAEPAVQStandardItemModel@@XZ @ 7 NONAME ; class QStandardItemModel * TimezoneClient::locationSelectorModel(void)
- ?getUtcDstOffsetL@TimezoneClient@@AAE_NAAHABVCTzId@@@Z @ 8 NONAME ; bool TimezoneClient::getUtcDstOffsetL(int &, class CTzId const &)
- ??0TimezoneClient@@AAE@XZ @ 9 NONAME ; TimezoneClient::TimezoneClient(void)
- ?intToMonth@TimezoneClient@@AAE?AW4TMonth@@H@Z @ 10 NONAME ; enum TMonth TimezoneClient::intToMonth(int)
- ?getDstZoneOffset@TimezoneClient@@AAEHH@Z @ 11 NONAME ; int TimezoneClient::getDstZoneOffset(int)
- ?environmentCallback@TimezoneClient@@SAHPAX@Z @ 12 NONAME ; int TimezoneClient::environmentCallback(void *)
- ?trUtf8@TimezoneClient@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString TimezoneClient::trUtf8(char const *, char const *, int)
- ?getStandardOffset@TimezoneClient@@QAEHH@Z @ 14 NONAME ; int TimezoneClient::getStandardOffset(int)
- ?getCurrentZoneInfoL@TimezoneClient@@QAE?AULocationInfo@@XZ @ 15 NONAME ; struct LocationInfo TimezoneClient::getCurrentZoneInfoL(void)
- ?dstOn@TimezoneClient@@QAE_NH@Z @ 16 NONAME ; bool TimezoneClient::dstOn(int)
- ?createWorldClockModel@TimezoneClient@@QAEXXZ @ 17 NONAME ; void TimezoneClient::createWorldClockModel(void)
- ?tr@TimezoneClient@@SA?AVQString@@PBD0H@Z @ 18 NONAME ; class QString TimezoneClient::tr(char const *, char const *, int)
- ?setAsCurrentLocationL@TimezoneClient@@QAEXAAULocationInfo@@@Z @ 19 NONAME ; void TimezoneClient::setAsCurrentLocationL(struct LocationInfo &)
- ?eventMonitor@TimezoneClient@@AAEXABVXQSettingsKey@@ABVQVariant@@@Z @ 20 NONAME ; void TimezoneClient::eventMonitor(class XQSettingsKey const &, class QVariant const &)
- ?getInstance@TimezoneClient@@SAPAV1@XZ @ 21 NONAME ; class TimezoneClient * TimezoneClient::getInstance(void)
- ?getCityGroupIdByName@TimezoneClient@@AAEHABVQString@@@Z @ 22 NONAME ; int TimezoneClient::getCityGroupIdByName(class QString const &)
- ?getCityOffsetByNameAndId@TimezoneClient@@AAEHABVQString@@H@Z @ 23 NONAME ; int TimezoneClient::getCityOffsetByNameAndId(class QString const &, int)
- ?getAllTimeZoneOffsets@TimezoneClient@@QAE?AV?$QList@H@@XZ @ 24 NONAME ; class QList<int> TimezoneClient::getAllTimeZoneOffsets(void)
- ?getCitiesForCountry@TimezoneClient@@AAEXHAAV?$QMap@VQString@@H@@@Z @ 25 NONAME ; void TimezoneClient::getCitiesForCountry(int, class QMap<class QString, int> &)
- ?getCountriesForUTCOffset@TimezoneClient@@QAE?AV?$QList@ULocationInfo@@@@H@Z @ 26 NONAME ; class QList<struct LocationInfo> TimezoneClient::getCountriesForUTCOffset(int)
- ??1TimezoneClient@@EAE@XZ @ 27 NONAME ; TimezoneClient::~TimezoneClient(void)
- ?timeUpdateOn@TimezoneClient@@QAE_NXZ @ 28 NONAME ; bool TimezoneClient::timeUpdateOn(void)
- ?staticMetaObject@TimezoneClient@@2UQMetaObject@@B @ 29 NONAME ; struct QMetaObject const TimezoneClient::staticMetaObject
- ?qt_metacast@TimezoneClient@@UAEPAXPBD@Z @ 30 NONAME ; void * TimezoneClient::qt_metacast(char const *)
- ?autoTimeUpdateChanged@TimezoneClient@@IAEXH@Z @ 31 NONAME ; void TimezoneClient::autoTimeUpdateChanged(int)
- ?trUtf8@TimezoneClient@@SA?AVQString@@PBD0@Z @ 32 NONAME ; class QString TimezoneClient::trUtf8(char const *, char const *)
- ?listUpdated@TimezoneClient@@IAEXXZ @ 33 NONAME ; void TimezoneClient::listUpdated(void)
- ?getSavedLocations@TimezoneClient@@QAE?AV?$QList@ULocationInfo@@@@XZ @ 34 NONAME ; class QList<struct LocationInfo> TimezoneClient::getSavedLocations(void)
- ?getLocationInfo@TimezoneClient@@AAEXHHAAULocationInfo@@@Z @ 35 NONAME ; void TimezoneClient::getLocationInfo(int, int, struct LocationInfo &)
- ?getAllTimeZoneIds@TimezoneClient@@QAE?AV?$QList@H@@XZ @ 36 NONAME ; class QList<int> TimezoneClient::getAllTimeZoneIds(void)
- ?populateCities@TimezoneClient@@AAEXXZ @ 37 NONAME ; void TimezoneClient::populateCities(void)
- ?tr@TimezoneClient@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString TimezoneClient::tr(char const *, char const *)
- ?setDateTime@TimezoneClient@@QAEXVQDateTime@@@Z @ 39 NONAME ; void TimezoneClient::setDateTime(class QDateTime)
- ?metaObject@TimezoneClient@@UBEPBUQMetaObject@@XZ @ 40 NONAME ; struct QMetaObject const * TimezoneClient::metaObject(void) const
- ?getStaticMetaObject@TimezoneClient@@SAABUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const & TimezoneClient::getStaticMetaObject(void)
- ?mTimezoneClient@TimezoneClient@@0PAV1@A @ 42 NONAME ; class TimezoneClient * TimezoneClient::mTimezoneClient
- ?cityUpdated@TimezoneClient@@IAEXXZ @ 43 NONAME ; void TimezoneClient::cityUpdated(void)
- ?setTimeUpdateOn@TimezoneClient@@QAEX_N@Z @ 44 NONAME ; void TimezoneClient::setTimeUpdateOn(bool)
- ?mReferenceCount@TimezoneClient@@0_NA @ 45 NONAME ; bool TimezoneClient::mReferenceCount
- ?getCountries@TimezoneClient@@QAEXAAV?$QMap@VQString@@H@@@Z @ 46 NONAME ; void TimezoneClient::getCountries(class QMap<class QString, int> &)
- ?checkForDstChange@TimezoneClient@@QAE_NAAUAlarmInfo@@@Z @ 47 NONAME ; bool TimezoneClient::checkForDstChange(struct AlarmInfo &)
- ?isDSTOnL@TimezoneClient@@QAE_NH@Z @ 48 NONAME ; bool TimezoneClient::isDSTOnL(int)
- ?timechanged@TimezoneClient@@IAEXXZ @ 49 NONAME ; void TimezoneClient::timechanged(void)
- ?saveLocations@TimezoneClient@@QAEXABV?$QList@ULocationInfo@@@@@Z @ 50 NONAME ; void TimezoneClient::saveLocations(class QList<struct LocationInfo> const &)
- ?qt_metacall@TimezoneClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 51 NONAME ; int TimezoneClient::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?timeUpdateOn@TimezoneClient@@QAE_NXZ @ 1 NONAME ; bool TimezoneClient::timeUpdateOn(void)
+ ?deleteInstance@TimezoneClient@@QAEXXZ @ 2 NONAME ; void TimezoneClient::deleteInstance(void)
+ ?addCity@TimezoneClient@@QAE?AULocationInfo@@HAAVQString@@H@Z @ 3 NONAME ; struct LocationInfo TimezoneClient::addCity(int, class QString &, int)
+ ?isNull@TimezoneClient@@QAE_NXZ @ 4 NONAME ; bool TimezoneClient::isNull(void)
+ ?setTimeUpdateOn@TimezoneClient@@QAEX_N@Z @ 5 NONAME ; void TimezoneClient::setTimeUpdateOn(bool)
+ ?setAsCurrentLocationL@TimezoneClient@@QAEXAAULocationInfo@@@Z @ 6 NONAME ; void TimezoneClient::setAsCurrentLocationL(struct LocationInfo &)
+ ?getLocations@TimezoneClient@@QAEAAV?$QList@ULocationInfo@@@@XZ @ 7 NONAME ; class QList<struct LocationInfo> & TimezoneClient::getLocations(void)
+ ?getInstance@TimezoneClient@@SAPAV1@XZ @ 8 NONAME ; class TimezoneClient * TimezoneClient::getInstance(void)
+ ?getSavedLocations@TimezoneClient@@QAE?AV?$QList@ULocationInfo@@@@XZ @ 9 NONAME ; class QList<struct LocationInfo> TimezoneClient::getSavedLocations(void)
+ ?getAllTimeZoneOffsets@TimezoneClient@@QAE?AV?$QList@H@@XZ @ 10 NONAME ; class QList<int> TimezoneClient::getAllTimeZoneOffsets(void)
+ ?isDSTOnL@TimezoneClient@@QAE_NH@Z @ 11 NONAME ; bool TimezoneClient::isDSTOnL(int)
+ ?checkForDstChange@TimezoneClient@@QAE_NAAUAlarmInfo@@@Z @ 12 NONAME ; bool TimezoneClient::checkForDstChange(struct AlarmInfo &)
+ ?getCountriesForUTCOffset@TimezoneClient@@QAE?AV?$QList@ULocationInfo@@@@H@Z @ 13 NONAME ; class QList<struct LocationInfo> TimezoneClient::getCountriesForUTCOffset(int)
+ ?saveLocations@TimezoneClient@@QAEXABV?$QList@ULocationInfo@@@@@Z @ 14 NONAME ; void TimezoneClient::saveLocations(class QList<struct LocationInfo> const &)
+ ?getStandardOffset@TimezoneClient@@QAEHH@Z @ 15 NONAME ; int TimezoneClient::getStandardOffset(int)
+ ?getCurrentZoneInfoL@TimezoneClient@@QAE?AULocationInfo@@XZ @ 16 NONAME ; struct LocationInfo TimezoneClient::getCurrentZoneInfoL(void)
+ ?setDateTime@TimezoneClient@@QAEXVQDateTime@@@Z @ 17 NONAME ; void TimezoneClient::setDateTime(class QDateTime)
--- a/clock/clockmw/clocktimezone/clocktimezone.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clocktimezone/clocktimezone.pro Mon Aug 09 18:30:52 2010 +0530
@@ -22,7 +22,9 @@
INCLUDEPATH += ../../inc \
../../data/timezonedata \
../../clockengines/inc \
- ../../clockengines/clockserver/client/inc
+ ../../clockengines/clockserver/client/inc \
+ ./traces
+
DEPENDPATH += . \
../../inc \
./inc \
@@ -99,8 +101,10 @@
}
SOURCES += timezoneclient.cpp \
- debug.cpp
+ debug.cpp \
+ environmentchangenotifier.cpp
HEADERS += timezoneclient.h \
- debug.h
+ debug.h \
+ environmentchangenotifier.h
# End of file --Don't remove this.
--- a/clock/clockmw/clocktimezone/eabi/timezoneclientu.def Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clocktimezone/eabi/timezoneclientu.def Mon Aug 09 18:30:52 2010 +0530
@@ -1,55 +1,19 @@
EXPORTS
- _ZN14TimezoneClient10intToMonthEi @ 1 NONAME
- _ZN14TimezoneClient11cityUpdatedEv @ 2 NONAME
- _ZN14TimezoneClient11getInstanceEv @ 3 NONAME
- _ZN14TimezoneClient11listUpdatedEv @ 4 NONAME
- _ZN14TimezoneClient11qt_metacallEN11QMetaObject4CallEiPPv @ 5 NONAME
- _ZN14TimezoneClient11qt_metacastEPKc @ 6 NONAME
- _ZN14TimezoneClient11setDateTimeE9QDateTime @ 7 NONAME
- _ZN14TimezoneClient11timechangedEv @ 8 NONAME
- _ZN14TimezoneClient12eventMonitorERK13XQSettingsKeyRK8QVariant @ 9 NONAME
- _ZN14TimezoneClient12getCountriesER4QMapI7QStringiE @ 10 NONAME
- _ZN14TimezoneClient12getDstRulesLER9QDateTimeS1_i @ 11 NONAME
- _ZN14TimezoneClient12getLocationsEv @ 12 NONAME
- _ZN14TimezoneClient12timeUpdateOnEv @ 13 NONAME
- _ZN14TimezoneClient13saveLocationsERK5QListI12LocationInfoE @ 14 NONAME
- _ZN14TimezoneClient14deleteInstanceEv @ 15 NONAME
- _ZN14TimezoneClient14populateCitiesEv @ 16 NONAME
- _ZN14TimezoneClient15getLocationInfoEiiR12LocationInfo @ 17 NONAME
- _ZN14TimezoneClient15mReferenceCountE @ 18 NONAME DATA 1
- _ZN14TimezoneClient15mTimezoneClientE @ 19 NONAME DATA 4
- _ZN14TimezoneClient15setTimeUpdateOnEb @ 20 NONAME
- _ZN14TimezoneClient16getDstZoneOffsetEi @ 21 NONAME
- _ZN14TimezoneClient16getUtcDstOffsetLERiRK5CTzId @ 22 NONAME
- _ZN14TimezoneClient16staticMetaObjectE @ 23 NONAME DATA 16
- _ZN14TimezoneClient17checkForDstChangeER9AlarmInfo @ 24 NONAME
- _ZN14TimezoneClient17getAllTimeZoneIdsEv @ 25 NONAME
- _ZN14TimezoneClient17getSavedLocationsEv @ 26 NONAME
- _ZN14TimezoneClient17getStandardOffsetEi @ 27 NONAME
- _ZN14TimezoneClient19environmentCallbackEPv @ 28 NONAME
- _ZN14TimezoneClient19getCitiesForCountryEiR4QMapI7QStringiE @ 29 NONAME
- _ZN14TimezoneClient19getCurrentZoneInfoLEv @ 30 NONAME
- _ZN14TimezoneClient19getStaticMetaObjectEv @ 31 NONAME
- _ZN14TimezoneClient20getCityGroupIdByNameERK7QString @ 32 NONAME
- _ZN14TimezoneClient21autoTimeUpdateChangedEi @ 33 NONAME
- _ZN14TimezoneClient21createWorldClockModelEv @ 34 NONAME
- _ZN14TimezoneClient21getAllTimeZoneOffsetsEv @ 35 NONAME
- _ZN14TimezoneClient21locationSelectorModelEv @ 36 NONAME
- _ZN14TimezoneClient21setAsCurrentLocationLER12LocationInfo @ 37 NONAME
- _ZN14TimezoneClient24getCityOffsetByNameAndIdERK7QStringi @ 38 NONAME
- _ZN14TimezoneClient24getCountriesForUTCOffsetEi @ 39 NONAME
- _ZN14TimezoneClient5dstOnEi @ 40 NONAME
- _ZN14TimezoneClient6isNullEv @ 41 NONAME
- _ZN14TimezoneClient7addCityEiR7QStringi @ 42 NONAME
- _ZN14TimezoneClient8isDSTOnLEi @ 43 NONAME
- _ZN14TimezoneClientC1Ev @ 44 NONAME
- _ZN14TimezoneClientC2Ev @ 45 NONAME
- _ZN14TimezoneClientD0Ev @ 46 NONAME
- _ZN14TimezoneClientD1Ev @ 47 NONAME
- _ZN14TimezoneClientD2Ev @ 48 NONAME
- _ZNK14TimezoneClient10metaObjectEv @ 49 NONAME
- _ZTI14TimezoneClient @ 50 NONAME
- _ZTV14TimezoneClient @ 51 NONAME
- _ZThn8_N14TimezoneClientD0Ev @ 52 NONAME
- _ZThn8_N14TimezoneClientD1Ev @ 53 NONAME
+ _ZN14TimezoneClient11getInstanceEv @ 1 NONAME
+ _ZN14TimezoneClient11setDateTimeE9QDateTime @ 2 NONAME
+ _ZN14TimezoneClient12getLocationsEv @ 3 NONAME
+ _ZN14TimezoneClient12timeUpdateOnEv @ 4 NONAME
+ _ZN14TimezoneClient13saveLocationsERK5QListI12LocationInfoE @ 5 NONAME
+ _ZN14TimezoneClient14deleteInstanceEv @ 6 NONAME
+ _ZN14TimezoneClient15setTimeUpdateOnEb @ 7 NONAME
+ _ZN14TimezoneClient17checkForDstChangeER9AlarmInfo @ 8 NONAME
+ _ZN14TimezoneClient17getSavedLocationsEv @ 9 NONAME
+ _ZN14TimezoneClient17getStandardOffsetEi @ 10 NONAME
+ _ZN14TimezoneClient19getCurrentZoneInfoLEv @ 11 NONAME
+ _ZN14TimezoneClient21getAllTimeZoneOffsetsEv @ 12 NONAME
+ _ZN14TimezoneClient21setAsCurrentLocationLER12LocationInfo @ 13 NONAME
+ _ZN14TimezoneClient24getCountriesForUTCOffsetEi @ 14 NONAME
+ _ZN14TimezoneClient6isNullEv @ 15 NONAME
+ _ZN14TimezoneClient7addCityEiR7QStringi @ 16 NONAME
+ _ZN14TimezoneClient8isDSTOnLEi @ 17 NONAME
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/inc/environmentchangenotifier.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,56 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef ENVIRONMENTCHANGENOTIFIER_H_
+#define ENVIRONMENTCHANGENOTIFIER_H_
+
+// System includes
+#include <e32base.h>
+
+// Forward declaration
+class CEnvironmentChangeNotifier;
+class TimezoneClient;
+
+const int KInitialEvent = (
+ EChangesLocale |
+ EChangesMidnightCrossover |
+ EChangesThreadDeath |
+ EChangesPowerStatus |
+ EChangesSystemTime |
+ EChangesFreeMemory |
+ EChangesOutOfMemory);
+
+class EnvironmentChangeNotifier : public CBase
+{
+public:
+ EnvironmentChangeNotifier(TimezoneClient *client);
+ ~EnvironmentChangeNotifier();
+
+public:
+ static int environmentCallback(TAny* obj);
+
+private:
+ void notifyEnvChange();
+
+private:
+ CEnvironmentChangeNotifier *mNotifier;
+ TimezoneClient *mTzClient;
+};
+
+#endif /* ENVIRONMENTCHANGENOTIFIER_H_ */
+
+// End of file -- Do not remove this.
--- a/clock/clockmw/clocktimezone/inc/timezoneclient.h Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clocktimezone/inc/timezoneclient.h Mon Aug 09 18:30:52 2010 +0530
@@ -27,7 +27,6 @@
#include <QMap>
#include <tz.h>
-#include <bacntf.h>
// User includes
#include "clockdatatypes.h"
@@ -38,72 +37,56 @@
#define TIMEZONECLIENT_EXPORT Q_DECL_IMPORT
#endif
-class CEnvironmentChangeNotifier;
+//class CEnvironmentChangeNotifier;
class QStandardItemModel;
class CTzLocalizer;
class XQSettingsManager;
class XQSettingsKey;
+class EnvironmentChangeNotifier;
-const int KInitialEvent = (
- EChangesLocale |
- EChangesMidnightCrossover |
- EChangesThreadDeath |
- EChangesPowerStatus |
- EChangesSystemTime |
- EChangesFreeMemory |
- EChangesOutOfMemory);
-
-class TIMEZONECLIENT_EXPORT TimezoneClient : public QObject, public CBase
+class TimezoneClient : public QObject
{
Q_OBJECT
public:
- /*TIMEZONECLIENT_EXPORT*/ static TimezoneClient* getInstance();
- /*TIMEZONECLIENT_EXPORT*/ void deleteInstance();
- /*TIMEZONECLIENT_EXPORT*/ bool isNull();
-
-private:
- TimezoneClient();
- ~TimezoneClient();
-
-private:
-
-private:
- static TimezoneClient *mTimezoneClient;
- static bool mReferenceCount;
-
-// TODO: still refatoring
-public:
- /*TIMEZONECLIENT_EXPORT*/ QList<LocationInfo> &getLocations();
- /*TIMEZONECLIENT_EXPORT*/ LocationInfo getCurrentZoneInfoL();
- /*TIMEZONECLIENT_EXPORT*/ void setAsCurrentLocationL(LocationInfo &location);
- /*TIMEZONECLIENT_EXPORT*/ bool isDSTOnL(int timezoneId);
- /*TIMEZONECLIENT_EXPORT*/ int getStandardOffset(int timezoneId);
- QList<LocationInfo> getSavedLocations();
- void saveLocations(const QList<LocationInfo> &locationList);
- void getCountries(QMap<QString, int>& countries);
- bool dstOn(int tzId);
- void setDateTime(QDateTime dateTime);
- void setTimeUpdateOn(bool timeUpdate = true);
- bool timeUpdateOn();
- QStandardItemModel *locationSelectorModel();
- void createWorldClockModel();
- bool checkForDstChange(AlarmInfo& alarmInfo);
- QList<int> getAllTimeZoneIds();
- QList<int> getAllTimeZoneOffsets();
- QList<LocationInfo> getCountriesForUTCOffset(int utcOffset);
- LocationInfo addCity(int timeZoneId, QString &cityName, int cityGroupId);
+ TIMEZONECLIENT_EXPORT static TimezoneClient* getInstance();
+ TIMEZONECLIENT_EXPORT void deleteInstance();
+ TIMEZONECLIENT_EXPORT bool isNull();
public:
- static int environmentCallback(TAny* obj);
+ TIMEZONECLIENT_EXPORT QList<LocationInfo> &getLocations();
+ TIMEZONECLIENT_EXPORT LocationInfo getCurrentZoneInfoL();
+ TIMEZONECLIENT_EXPORT void setAsCurrentLocationL(LocationInfo &location);
+ TIMEZONECLIENT_EXPORT bool isDSTOnL(int timezoneId);
+ TIMEZONECLIENT_EXPORT int getStandardOffset(int timezoneId);
+ TIMEZONECLIENT_EXPORT bool timeUpdateOn();
+ TIMEZONECLIENT_EXPORT void setTimeUpdateOn(bool timeUpdate = true);
+ TIMEZONECLIENT_EXPORT void setDateTime(QDateTime dateTime);
+ TIMEZONECLIENT_EXPORT QList<int> getAllTimeZoneOffsets();
+ TIMEZONECLIENT_EXPORT QList<LocationInfo> getCountriesForUTCOffset(
+ int utcOffset);
+ TIMEZONECLIENT_EXPORT LocationInfo addCity(
+ int timeZoneId, QString &cityName, int cityGroupId);
+ TIMEZONECLIENT_EXPORT bool checkForDstChange(AlarmInfo& alarmInfo);
+ TIMEZONECLIENT_EXPORT QList<LocationInfo> getSavedLocations();
+ TIMEZONECLIENT_EXPORT void saveLocations(
+ const QList<LocationInfo> &locationList);
+
+ void notifyTimeChange();
signals:
void timechanged();
void listUpdated();
void autoTimeUpdateChanged(int value);
void cityUpdated();
+
+private:
+ TimezoneClient();
+ ~TimezoneClient();
private:
+ bool dstOn(int tzId);
+ QList<int> getAllTimeZoneIds();
int getDstZoneOffset(int tzId);
TMonth intToMonth(int month);
bool getUtcDstOffsetL(int &dstOffset, const CTzId &tzId);
@@ -120,20 +103,21 @@
void populateCities();
void eventMonitor(const XQSettingsKey& key, const QVariant& value);
-public:
- CEnvironmentChangeNotifier *mNotifier;
-
private:
+ static TimezoneClient *mTimezoneClient;
+ static bool mReferenceCount;
+
+private:
+ EnvironmentChangeNotifier *mNotifier;
CTzLocalizer *mTzLocalizer;
QMap<QString, int> mAllCountries;
QList<LocationInfo> mAllLocations;
- QStandardItemModel *mWorldClockModel;
+ QPointer<QStandardItemModel> mWorldClockModel;
XQSettingsManager *mSettingsManager;
XQSettingsKey *mAutoTimeUpdateKey;
QList<int> mTimeZoneIds;
-// bool mTimeUpdateOn;
int mCountryCount;
int mAutoTimeUpdateValue;
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/src/environmentchangenotifier.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,102 @@
+/*
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Definition file for the EnvironmentChangeNotifier class.
+*
+*/
+
+// System includes
+#include <bacntf.h>
+
+// User includes
+#include "environmentchangenotifier.h"
+#include "timezoneclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "environmentchangenotifierTraces.h"
+#endif
+
+
+/*!
+ \class EnvironmentChangeNotifier
+
+ This class listens to the enviroment changes and notifies the client.
+ */
+
+/*!
+ The constructor.
+ */
+EnvironmentChangeNotifier::EnvironmentChangeNotifier(TimezoneClient *client)
+{
+ OstTraceFunctionEntry0( ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY );
+ mTzClient = client;
+
+ TCallBack callback(environmentCallback, this);
+
+ mNotifier = CEnvironmentChangeNotifier::NewL(
+ CActive::EPriorityStandard, callback);
+ mNotifier->Start();
+
+ OstTraceFunctionExit0( ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT );
+}
+
+EnvironmentChangeNotifier::~EnvironmentChangeNotifier()
+{
+ OstTraceFunctionEntry0( DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY );
+ if (mNotifier) {
+ mNotifier->Cancel();
+ delete mNotifier;
+ mNotifier = 0;
+ }
+ OstTraceFunctionExit0( DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT );
+}
+
+int EnvironmentChangeNotifier::environmentCallback(TAny* obj)
+{
+ OstTraceFunctionEntry0( ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_ENTRY );
+ EnvironmentChangeNotifier* self =
+ static_cast<EnvironmentChangeNotifier *> (obj);
+
+ int changes = KInitialEvent;
+ if (self->mNotifier) {
+ changes = self->mNotifier->Change();
+ }
+
+ if (KInitialEvent <= changes) {
+ // We're not concerned about handling environment changes in that range.
+ OstTraceFunctionExit0( ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT );
+ return 0;
+ }
+
+ if (changes & (EChangesMidnightCrossover |
+ EChangesLocale |
+ EChangesSystemTime)) {
+// emit self->timechanged(); TODO: notify timezone client.
+//
+ self->notifyEnvChange();
+ } else {
+ // Nothing to do.
+ }
+ OstTraceFunctionExit0( DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT );
+ return 0;
+}
+
+void EnvironmentChangeNotifier::notifyEnvChange()
+{
+ OstTraceFunctionEntry0( ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_ENTRY );
+ mTzClient->notifyTimeChange();
+ OstTraceFunctionExit0( ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_EXIT );
+}
+
+// End of file -- Do not remove this.
--- a/clock/clockmw/clocktimezone/src/timezoneclient.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockmw/clocktimezone/src/timezoneclient.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -32,6 +32,12 @@
#include "clockcommon.h"
#include "clockserverclt.h"
#include "clockprivatecrkeys.h"
+#include "environmentchangenotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "timezoneclientTraces.h"
+#endif
+
const int KDaysInWeek(7);
const int KZerothRule(0);
@@ -52,11 +58,13 @@
*/
TimezoneClient* TimezoneClient::getInstance()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETINSTANCE_ENTRY );
if (!mTimezoneClient) {
mTimezoneClient = new TimezoneClient();
mReferenceCount = true;
}
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETINSTANCE_EXIT );
return mTimezoneClient;
}
@@ -65,11 +73,13 @@
*/
void TimezoneClient::deleteInstance()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_DELETEINSTANCE_ENTRY );
if (mReferenceCount) {
delete mTimezoneClient;
mTimezoneClient = 0;
mReferenceCount = false;
}
+ OstTraceFunctionExit0( TIMEZONECLIENT_DELETEINSTANCE_EXIT );
}
/*!
@@ -77,6 +87,8 @@
*/
bool TimezoneClient::isNull()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_ISNULL_ENTRY );
+ OstTraceFunctionExit0( TIMEZONECLIENT_ISNULL_EXIT );
return !mReferenceCount;
}
@@ -84,12 +96,9 @@
The constructor.
*/
TimezoneClient::TimezoneClient()
-{
- TCallBack callback(environmentCallback, this);
-
- mNotifier = CEnvironmentChangeNotifier::NewL(
- CActive::EPriorityStandard, callback);
- mNotifier->Start();
+{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_TIMEZONECLIENT_ENTRY );
+ mNotifier = new EnvironmentChangeNotifier(this);
mTzLocalizer = CTzLocalizer::NewL();
@@ -112,6 +121,7 @@
connect(
mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
this, SLOT(eventMonitor(XQSettingsKey, QVariant)));
+ OstTraceFunctionExit0( TIMEZONECLIENT_TIMEZONECLIENT_EXIT );
}
/*!
@@ -119,10 +129,9 @@
*/
TimezoneClient::~TimezoneClient()
{
+ OstTraceFunctionEntry0( DUP1_TIMEZONECLIENT_TIMEZONECLIENT_ENTRY );
if (mNotifier) {
- mNotifier->Cancel();
delete mNotifier;
- mNotifier = 0;
}
if (mWorldClockModel) {
mWorldClockModel->clear();
@@ -138,7 +147,7 @@
if (mAllLocations.count()) {
mAllLocations.clear();
}
-
+ OstTraceFunctionExit0( DUP1_TIMEZONECLIENT_TIMEZONECLIENT_EXIT );
}
/*!
@@ -151,6 +160,7 @@
*/
QList<LocationInfo>& TimezoneClient::getLocations()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETLOCATIONS_ENTRY );
if (mAllLocations.count()) {
mAllLocations.clear();
}
@@ -202,11 +212,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(cityArray);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETLOCATIONS_EXIT );
return mAllLocations;
}
bool TimezoneClient::getUtcDstOffsetL(int& dstOffset, const CTzId& timezoneId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETUTCDSTOFFSETL_ENTRY );
RTz tzHandle;
User::LeaveIfError(tzHandle.Connect());
CleanupClosePushL(tzHandle);
@@ -264,6 +276,7 @@
CleanupStack::PopAndDestroy(actualizedRules);
CleanupStack::PopAndDestroy(timezoneRules);
CleanupStack::PopAndDestroy(&tzHandle);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT );
return true;
} else {
dstOffset = initialTimeZoneOffset;
@@ -272,11 +285,13 @@
CleanupStack::PopAndDestroy(actualizedRules);
CleanupStack::PopAndDestroy(timezoneRules);
CleanupStack::PopAndDestroy(&tzHandle);
+ OstTraceFunctionExit0( DUP1_TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT );
return false;
}
LocationInfo TimezoneClient::getCurrentZoneInfoL()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCURRENTZONEINFOL_ENTRY );
// Current zone info.
LocationInfo currentLocation;
int timezoneId(0);
@@ -403,21 +418,17 @@
// Cleanup.
CleanupStack::PopAndDestroy( tzId );
CleanupStack::PopAndDestroy( &tzHandle );
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETCURRENTZONEINFOL_EXIT );
return currentLocation;
}
void TimezoneClient::setAsCurrentLocationL(LocationInfo &location)
{
-/* Debug::writeDebugMsg(
- "In time zone client setAsCurrentLocationL " + location.cityName +
- " " +
- location.countryName +
- " " +
- QString::number(location.zoneOffset));*/
-
+ OstTraceFunctionEntry0( TIMEZONECLIENT_SETASCURRENTLOCATIONL_ENTRY );
LocationInfo prevLocationInfo ;
prevLocationInfo = getCurrentZoneInfoL();
-
+ QTime prevLocationTime = QTime::currentTime();
+
mTzLocalizer->SetTimeZoneL( location.timezoneId );
TPtrC ptrCityName(
@@ -434,10 +445,19 @@
if(prevLocationInfo.timezoneId == location.timezoneId) {
emit cityUpdated();
}
+
+ QTime newTime = QTime::currentTime();
+ if ((prevLocationTime.hour() == newTime.hour())
+ && (prevLocationTime.minute() == newTime.minute())
+ && (prevLocationInfo.timezoneId != location.timezoneId)) {
+ emit cityUpdated();
+ }
+ OstTraceFunctionExit0( TIMEZONECLIENT_SETASCURRENTLOCATIONL_EXIT );
}
bool TimezoneClient::isDSTOnL(int timezoneId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_ISDSTONL_ENTRY );
bool returnVal( false );
CTzId* tzId = CTzId::NewL( timezoneId );
CleanupStack::PushL( tzId );
@@ -452,11 +472,13 @@
CleanupStack::PopAndDestroy( &tzHandle );
CleanupStack::PopAndDestroy( tzId );
+ OstTraceFunctionExit0( TIMEZONECLIENT_ISDSTONL_EXIT );
return returnVal;
}
int TimezoneClient::getStandardOffset(int timezoneId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETSTANDARDOFFSET_ENTRY );
RTz tzHandle;
User::LeaveIfError(tzHandle.Connect());
CleanupClosePushL(tzHandle);
@@ -485,12 +507,14 @@
// Cleanup.
CleanupStack::PopAndDestroy(&tzHandle);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETSTANDARDOFFSET_EXIT );
return stdOffset;
}
void TimezoneClient::getDstRulesL(
QDateTime &startTime, QDateTime &endTime, int timezoneId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETDSTRULESL_ENTRY );
RTz tzHandle;
User::LeaveIfError(tzHandle.Connect());
CleanupClosePushL(tzHandle);
@@ -578,10 +602,12 @@
CleanupStack::PopAndDestroy(timezoneRules);
CleanupStack::PopAndDestroy(tzId);
CleanupStack::PopAndDestroy(&tzHandle);
+OstTraceFunctionExit0( TIMEZONECLIENT_GETDSTRULESL_EXIT );
}
QList<LocationInfo> TimezoneClient::getSavedLocations()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETSAVEDLOCATIONS_ENTRY );
QList<LocationInfo> locationList;
QString fileName(CITY_INFO_DB_PATH);
@@ -593,11 +619,13 @@
writeStream >> locationList;
cityInfoFile.close();
}
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETSAVEDLOCATIONS_EXIT );
return locationList;
}
void TimezoneClient::saveLocations(const QList<LocationInfo> &locationList)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_SAVELOCATIONS_ENTRY );
QDir cityDbDir;
cityDbDir.mkpath(CITY_INFO_DB_PATH);
@@ -607,6 +635,7 @@
QFile cityInfoFile(fileName);
if (!cityInfoFile.open(QIODevice::WriteOnly)) {
// Error opening or creating file.
+ OstTraceFunctionExit0( TIMEZONECLIENT_SAVELOCATIONS_EXIT );
return;
}
QDataStream writeStream(&cityInfoFile);
@@ -614,35 +643,12 @@
cityInfoFile.close();
emit listUpdated();
-}
-
-void TimezoneClient::getCountries(QMap<QString, int>& countries)
-{
- // Get all the city groups(countries).
- QTime t;
- t.start();
- CTzLocalizedCityGroupArray* cityGroupArray =
- mTzLocalizer->GetAllCityGroupsL(CTzLocalizer::ETzAlphaNameAscending);
- CleanupStack::PushL(cityGroupArray);
-
- t.restart();
- // Iterate through each of the city groups.
- for (int i = 0; i < cityGroupArray->Count(); i++) {
- CTzLocalizedCityGroup& cityGroup(cityGroupArray->At(i));
- TPtrC countryName(cityGroup.Name());
-
- // Get the QString of country name
- QString qCountryName = QString::fromUtf16(
- countryName.Ptr(),countryName.Length());
- countries[qCountryName] = cityGroup.Id();
- }
-
- // Cleanup.
- CleanupStack::PopAndDestroy(cityGroupArray);
+OstTraceFunctionExit0( DUP1_TIMEZONECLIENT_SAVELOCATIONS_EXIT );
}
void TimezoneClient::getCitiesForCountry(int id, QMap<QString, int>& cities)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCITIESFORCOUNTRY_ENTRY );
// Get the city group for the given id.
CTzLocalizedCityArray* cityArray = mTzLocalizer->GetCitiesInGroupL(id,
CTzLocalizer::ETzAlphaNameAscending);
@@ -670,11 +676,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(unsortedArray);
CleanupStack::PopAndDestroy(cityArray);
+OstTraceFunctionExit0( TIMEZONECLIENT_GETCITIESFORCOUNTRY_EXIT );
}
void TimezoneClient::getLocationInfo(
int groupId, int cityIndex, LocationInfo& cityInfo)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETLOCATIONINFO_ENTRY );
TRAPD(
error,
@@ -704,58 +712,40 @@
CleanupStack::PopAndDestroy(cityGroup);
)
Q_UNUSED(error)
+OstTraceFunctionExit0( TIMEZONECLIENT_GETLOCATIONINFO_EXIT );
}
QDataStream &operator<<(
QDataStream &writeStream, const LocationInfo& locationInfo)
{
+ OstTraceFunctionEntry0( _OPERATOR_ENTRY );
writeStream << locationInfo.cityName
<< locationInfo.countryName
<< locationInfo.listImageName
<< locationInfo.dstOn
<< locationInfo.timezoneId
<< locationInfo.zoneOffset;
+ OstTraceFunctionExit0( _OPERATOR_EXIT );
return writeStream;
}
QDataStream &operator>>(
QDataStream &readStream, LocationInfo &locationInfo)
{
+ OstTraceFunctionEntry0( DUP1__OPERATOR_ENTRY );
readStream >> locationInfo.cityName
>> locationInfo.countryName
>> locationInfo.listImageName
>> locationInfo.dstOn
>> locationInfo.timezoneId
>> locationInfo.zoneOffset;
+ OstTraceFunctionExit0( DUP1__OPERATOR_EXIT );
return readStream;
}
-int TimezoneClient::environmentCallback(TAny* obj)
-{
- TimezoneClient* self = static_cast<TimezoneClient *> (obj);
-
- int changes = KInitialEvent;
- if (self->mNotifier) {
- changes = self->mNotifier->Change();
- }
-
- if (KInitialEvent <= changes) {
- // We're not concerned about handling environment changes in that range.
- return 0;
- }
-
- if (changes & (EChangesMidnightCrossover |
- EChangesLocale |
- EChangesSystemTime)) {
- emit self->timechanged();
- } else {
- // Nothing to do.
- }
- return 0;
-}
-
int TimezoneClient::getDstZoneOffset(int tzId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETDSTZONEOFFSET_ENTRY );
// Connect to the timezone server.
RTz client;
User::LeaveIfError(client.Connect());
@@ -771,11 +761,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(&client);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETDSTZONEOFFSET_EXIT );
return zoneOffsets[0];
}
bool TimezoneClient::dstOn(int tzId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_DSTON_ENTRY );
// Connect to the timezone server.
RTz client;
User::LeaveIfError(client.Connect());
@@ -790,11 +782,13 @@
CleanupStack::PopAndDestroy(zoneId);
CleanupStack::PopAndDestroy(&client);
+ OstTraceFunctionExit0( TIMEZONECLIENT_DSTON_EXIT );
return returnVal;
}
int TimezoneClient::getCityGroupIdByName(const QString& name)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCITYGROUPIDBYNAME_ENTRY );
TPtrC namePtr;
namePtr.Set(name.utf16(), name.length());
@@ -808,11 +802,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(cityGroup);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETCITYGROUPIDBYNAME_EXIT );
return id;
}
int TimezoneClient::getCityOffsetByNameAndId(const QString& name, int tzId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_ENTRY );
TPtrC namePtr;
namePtr.Set(name.utf16(), name.length());
@@ -833,11 +829,13 @@
// Cleanup.
CleanupStack::PopAndDestroy(cityArray);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_EXIT );
return id;
}
void TimezoneClient::setDateTime(QDateTime dateTime)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_SETDATETIME_ENTRY );
TMonth month = intToMonth(dateTime.date().month());
TTime current(TDateTime(
dateTime.date().year(), month, dateTime.date().day() - 1,
@@ -848,10 +846,12 @@
CleanupClosePushL(tz);
TInt ret(tz.SetHomeTime(current));
CleanupStack::PopAndDestroy(&tz);
+OstTraceFunctionExit0( TIMEZONECLIENT_SETDATETIME_EXIT );
}
void TimezoneClient::setTimeUpdateOn(bool timeUpdate)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_SETTIMEUPDATEON_ENTRY );
RClkSrvInterface clkSrvInterface;
User::LeaveIfError(clkSrvInterface.Connect());
if (timeUpdate) {
@@ -861,28 +861,24 @@
clkSrvInterface.DeActivateAllProtocols();
}
clkSrvInterface.Close();
+OstTraceFunctionExit0( TIMEZONECLIENT_SETTIMEUPDATEON_EXIT );
}
bool TimezoneClient::timeUpdateOn()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_TIMEUPDATEON_ENTRY );
TBool autoTimeUpdateOn;
RClkSrvInterface clkSrvInterface;
User::LeaveIfError(clkSrvInterface.Connect());
clkSrvInterface.IsAutoTimeUpdateOn(autoTimeUpdateOn);
clkSrvInterface.Close();
+ OstTraceFunctionExit0( TIMEZONECLIENT_TIMEUPDATEON_EXIT );
return autoTimeUpdateOn;
}
-QStandardItemModel *TimezoneClient::locationSelectorModel()
-{
- if (!mWorldClockModel) {
- createWorldClockModel();
- }
- return mWorldClockModel;
-}
-
TMonth TimezoneClient::intToMonth(int month)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_INTTOMONTH_ENTRY );
switch (month) {
case 1:
return EJanuary;
@@ -915,23 +911,9 @@
return (TMonth) -1;
}
-void TimezoneClient::createWorldClockModel()
-{
- // Construct the model if its not yet done
- if (!mWorldClockModel) {
- // Create the model
- mWorldClockModel = new QStandardItemModel(this);
-
- getCountries(mAllCountries);
- mCountryCount = mAllCountries.count();
-
- // Construct the model in asynchronously
- QTimer::singleShot(2000, this, SLOT(populateCities()));
- }
-}
-
void TimezoneClient::populateCities()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_POPULATECITIES_ENTRY );
// First iterate over all the counties
QMapIterator<QString, int> countryIter(mAllCountries);
while (countryIter.hasNext()) {
@@ -956,6 +938,7 @@
country->appendRow(city);
}
}
+OstTraceFunctionExit0( TIMEZONECLIENT_POPULATECITIES_EXIT );
}
/*!
@@ -966,6 +949,7 @@
*/
bool TimezoneClient::checkForDstChange(AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_CHECKFORDSTCHANGE_ENTRY );
// User to be notified whether DST rollover happens in a day or
// has happen within a day if he tries to change the time.
bool returnValue( EFalse );
@@ -1093,6 +1077,7 @@
CleanupStack::PopAndDestroy( currentTZId );
CleanupStack::PopAndDestroy( &tzHandle );
+ OstTraceFunctionExit0( TIMEZONECLIENT_CHECKFORDSTCHANGE_EXIT );
return returnValue;
}
@@ -1103,7 +1088,9 @@
*/
QList<int> TimezoneClient::getAllTimeZoneIds()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETALLTIMEZONEIDS_ENTRY );
if (mTimeZoneIds.count()) {
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT );
return mTimeZoneIds;
} else {
// This list will contain the info of the cities fetched from tz server.
@@ -1127,6 +1114,7 @@
}
CleanupStack::PopAndDestroy(cityArray);
+ OstTraceFunctionExit0( DUP1_TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT );
return mTimeZoneIds;
}
}
@@ -1138,6 +1126,7 @@
*/
QList<int> TimezoneClient::getAllTimeZoneOffsets()
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_ENTRY );
QList<int> timeZoneOffsetList;
QList<int> timeZoneIdList;
if (mTimeZoneIds.count()) {
@@ -1173,6 +1162,7 @@
CleanupStack::PopAndDestroy( &tzHandle );
// Sort the offset list
qSort(timeZoneOffsetList.begin(),timeZoneOffsetList.end());
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_EXIT );
return timeZoneOffsetList;
}
@@ -1184,6 +1174,7 @@
*/
QList<LocationInfo> TimezoneClient::getCountriesForUTCOffset(int utcOffset)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_ENTRY );
// This list will contain the info of the countries.
QList<LocationInfo> countryList;
QList<int> cityGroupIdList;
@@ -1218,6 +1209,7 @@
}
cityGroupIdList.clear();
CleanupStack::PopAndDestroy(cityList);
+ OstTraceFunctionExit0( TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_EXIT );
return countryList;
}
@@ -1232,6 +1224,7 @@
LocationInfo TimezoneClient::addCity(
int timeZoneId,QString &cityName,int cityGroupId)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_ADDCITY_ENTRY );
TPtrC namePtr;
namePtr.Set(cityName.utf16(), cityName.length());
@@ -1249,6 +1242,7 @@
CleanupStack::PopAndDestroy(newCity);
+ OstTraceFunctionExit0( TIMEZONECLIENT_ADDCITY_EXIT );
return info;
}
@@ -1260,6 +1254,7 @@
*/
void TimezoneClient::eventMonitor(const XQSettingsKey& key, const QVariant& value)
{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_EVENTMONITOR_ENTRY );
if (key.uid() == KCRUidNitz && key.key() == KActiveProtocol) {
if (mSettingsManager->error() == XQSettingsManager::NoError) {
@@ -1275,5 +1270,13 @@
}
}
}
+OstTraceFunctionExit0( TIMEZONECLIENT_EVENTMONITOR_EXIT );
+}
+
+void TimezoneClient::notifyTimeChange()
+{
+ OstTraceFunctionEntry0( TIMEZONECLIENT_NOTIFYTIMECHANGE_ENTRY );
+ emit timechanged();
+OstTraceFunctionExit0( TIMEZONECLIENT_NOTIFYTIMECHANGE_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/traces/environmentchangenotifierTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,23 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ENVIRONMENTCHANGENOTIFIERTRACES_H__
+#define __ENVIRONMENTCHANGENOTIFIERTRACES_H__
+
+#define KOstTraceComponentID 0x2002dd0f
+
+#define ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY 0x8a0001
+#define ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT 0x8a0002
+#define DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY 0x8a0003
+#define DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT 0x8a0004
+#define ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_ENTRY 0x8a0005
+#define ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT 0x8a0006
+#define DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT 0x8a0007
+#define ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_ENTRY 0x8a0008
+#define ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_EXIT 0x8a0009
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,81 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_SAVELOCATIONS_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_TIMEZONECLIENT_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_DUP1_TIMEZONECLIENT_TIMEZONECLIENT_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_DUP1__OPERATOR_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_DUP1__OPERATOR_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCALLBACK_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_ENVIRONMENTCHANGENOTIFIER_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_ENVIRONMENTCHANGENOTIFIER_NOTIFYENVCHANGE_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ADDCITY_ENTRY=0x4a
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ADDCITY_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_CHECKFORDSTCHANGE_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_CHECKFORDSTCHANGE_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_DELETEINSTANCE_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_DELETEINSTANCE_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_DSTON_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_DSTON_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_EVENTMONITOR_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_EVENTMONITOR_EXIT=0x4d
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETALLTIMEZONEIDS_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_EXIT=0x47
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITIESFORCOUNTRY_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITIESFORCOUNTRY_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITYGROUPIDBYNAME_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITYGROUPIDBYNAME_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_ENTRY=0x48
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCURRENTZONEINFOL_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETCURRENTZONEINFOL_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETDSTRULESL_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETDSTRULESL_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETDSTZONEOFFSET_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETDSTZONEOFFSET_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETINSTANCE_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETINSTANCE_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETLOCATIONINFO_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETLOCATIONINFO_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETLOCATIONS_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETLOCATIONS_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETSAVEDLOCATIONS_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETSAVEDLOCATIONS_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETSTANDARDOFFSET_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETSTANDARDOFFSET_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETUTCDSTOFFSETL_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_INTTOMONTH_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ISDSTONL_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ISDSTONL_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ISNULL_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_ISNULL_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_NOTIFYTIMECHANGE_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_NOTIFYTIMECHANGE_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_POPULATECITIES_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_POPULATECITIES_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SAVELOCATIONS_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SAVELOCATIONS_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETASCURRENTLOCATIONL_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETASCURRENTLOCATIONL_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETDATETIME_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETDATETIME_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETTIMEUPDATEON_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_SETTIMEUPDATEON_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_TIMEUPDATEON_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_TIMEUPDATEON_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_TIMEZONECLIENT_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_TIMEZONECLIENT_TIMEZONECLIENT_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]__OPERATOR_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]__OPERATOR_EXIT=0x2d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockmw/clocktimezone/traces/timezoneclientTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,178 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __TIMEZONECLIENTTRACES_H__
+#define __TIMEZONECLIENTTRACES_H__
+
+#define KOstTraceComponentID 0x2002dd0f
+
+#define TIMEZONECLIENT_GETINSTANCE_ENTRY 0x8a000a
+#define TIMEZONECLIENT_GETINSTANCE_EXIT 0x8a000b
+#define TIMEZONECLIENT_DELETEINSTANCE_ENTRY 0x8a000c
+#define TIMEZONECLIENT_DELETEINSTANCE_EXIT 0x8a000d
+#define TIMEZONECLIENT_ISNULL_ENTRY 0x8a000e
+#define TIMEZONECLIENT_ISNULL_EXIT 0x8a000f
+#define TIMEZONECLIENT_TIMEZONECLIENT_ENTRY 0x8a0010
+#define TIMEZONECLIENT_TIMEZONECLIENT_EXIT 0x8a0011
+#define DUP1_TIMEZONECLIENT_TIMEZONECLIENT_ENTRY 0x8a0012
+#define DUP1_TIMEZONECLIENT_TIMEZONECLIENT_EXIT 0x8a0013
+#define TIMEZONECLIENT_GETLOCATIONS_ENTRY 0x8a0014
+#define TIMEZONECLIENT_GETLOCATIONS_EXIT 0x8a0015
+#define TIMEZONECLIENT_GETUTCDSTOFFSETL_ENTRY 0x8a0016
+#define TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT 0x8a0017
+#define DUP1_TIMEZONECLIENT_GETUTCDSTOFFSETL_EXIT 0x8a0018
+#define TIMEZONECLIENT_GETCURRENTZONEINFOL_ENTRY 0x8a0019
+#define TIMEZONECLIENT_GETCURRENTZONEINFOL_EXIT 0x8a001a
+#define TIMEZONECLIENT_SETASCURRENTLOCATIONL_ENTRY 0x8a001b
+#define TIMEZONECLIENT_SETASCURRENTLOCATIONL_EXIT 0x8a001c
+#define TIMEZONECLIENT_ISDSTONL_ENTRY 0x8a001d
+#define TIMEZONECLIENT_ISDSTONL_EXIT 0x8a001e
+#define TIMEZONECLIENT_GETSTANDARDOFFSET_ENTRY 0x8a001f
+#define TIMEZONECLIENT_GETSTANDARDOFFSET_EXIT 0x8a0020
+#define TIMEZONECLIENT_GETDSTRULESL_ENTRY 0x8a0021
+#define TIMEZONECLIENT_GETDSTRULESL_EXIT 0x8a0022
+#define TIMEZONECLIENT_GETSAVEDLOCATIONS_ENTRY 0x8a0023
+#define TIMEZONECLIENT_GETSAVEDLOCATIONS_EXIT 0x8a0024
+#define TIMEZONECLIENT_SAVELOCATIONS_ENTRY 0x8a0025
+#define TIMEZONECLIENT_SAVELOCATIONS_EXIT 0x8a0026
+#define DUP1_TIMEZONECLIENT_SAVELOCATIONS_EXIT 0x8a0027
+#define TIMEZONECLIENT_GETCITIESFORCOUNTRY_ENTRY 0x8a0028
+#define TIMEZONECLIENT_GETCITIESFORCOUNTRY_EXIT 0x8a0029
+#define TIMEZONECLIENT_GETLOCATIONINFO_ENTRY 0x8a002a
+#define TIMEZONECLIENT_GETLOCATIONINFO_EXIT 0x8a002b
+#define _OPERATOR_ENTRY 0x8a002c
+#define _OPERATOR_EXIT 0x8a002d
+#define DUP1__OPERATOR_ENTRY 0x8a002e
+#define DUP1__OPERATOR_EXIT 0x8a002f
+#define TIMEZONECLIENT_GETDSTZONEOFFSET_ENTRY 0x8a0030
+#define TIMEZONECLIENT_GETDSTZONEOFFSET_EXIT 0x8a0031
+#define TIMEZONECLIENT_DSTON_ENTRY 0x8a0032
+#define TIMEZONECLIENT_DSTON_EXIT 0x8a0033
+#define TIMEZONECLIENT_GETCITYGROUPIDBYNAME_ENTRY 0x8a0034
+#define TIMEZONECLIENT_GETCITYGROUPIDBYNAME_EXIT 0x8a0035
+#define TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_ENTRY 0x8a0036
+#define TIMEZONECLIENT_GETCITYOFFSETBYNAMEANDID_EXIT 0x8a0037
+#define TIMEZONECLIENT_SETDATETIME_ENTRY 0x8a0038
+#define TIMEZONECLIENT_SETDATETIME_EXIT 0x8a0039
+#define TIMEZONECLIENT_SETTIMEUPDATEON_ENTRY 0x8a003a
+#define TIMEZONECLIENT_SETTIMEUPDATEON_EXIT 0x8a003b
+#define TIMEZONECLIENT_TIMEUPDATEON_ENTRY 0x8a003c
+#define TIMEZONECLIENT_TIMEUPDATEON_EXIT 0x8a003d
+#define TIMEZONECLIENT_INTTOMONTH_ENTRY 0x8a003e
+#define TIMEZONECLIENT_POPULATECITIES_ENTRY 0x8a003f
+#define TIMEZONECLIENT_POPULATECITIES_EXIT 0x8a0040
+#define TIMEZONECLIENT_CHECKFORDSTCHANGE_ENTRY 0x8a0041
+#define TIMEZONECLIENT_CHECKFORDSTCHANGE_EXIT 0x8a0042
+#define TIMEZONECLIENT_GETALLTIMEZONEIDS_ENTRY 0x8a0043
+#define TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT 0x8a0044
+#define DUP1_TIMEZONECLIENT_GETALLTIMEZONEIDS_EXIT 0x8a0045
+#define TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_ENTRY 0x8a0046
+#define TIMEZONECLIENT_GETALLTIMEZONEOFFSETS_EXIT 0x8a0047
+#define TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_ENTRY 0x8a0048
+#define TIMEZONECLIENT_GETCOUNTRIESFORUTCOFFSET_EXIT 0x8a0049
+#define TIMEZONECLIENT_ADDCITY_ENTRY 0x8a004a
+#define TIMEZONECLIENT_ADDCITY_EXIT 0x8a004b
+#define TIMEZONECLIENT_EVENTMONITOR_ENTRY 0x8a004c
+#define TIMEZONECLIENT_EVENTMONITOR_EXIT 0x8a004d
+#define TIMEZONECLIENT_NOTIFYTIMECHANGE_ENTRY 0x8a004e
+#define TIMEZONECLIENT_NOTIFYTIMECHANGE_EXIT 0x8a004f
+
+
+#ifndef __OSTTRACEGEN2_TUINT32_TUINT_TUINT__
+#define __OSTTRACEGEN2_TUINT32_TUINT_TUINT__
+
+inline TBool OstTraceGen2( TUint32 aTraceID, TUint aParam1, TUint aParam2 )
+ {
+ TBool retval = BTraceFiltered8( EXTRACT_GROUP_ID(aTraceID), EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
+ if ( retval )
+ {
+ TUint8 data[ 8 ];
+ TUint8* ptr = data;
+ *( ( TUint* )ptr ) = aParam1;
+ ptr += sizeof ( TUint );
+ *( ( TUint* )ptr ) = aParam2;
+ ptr += sizeof ( TUint );
+ ptr -= 8;
+ retval = OstSendNBytes( EXTRACT_GROUP_ID(aTraceID), EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
+ }
+ return retval;
+ }
+
+#endif // __OSTTRACEGEN2_TUINT32_TUINT_TUINT__
+
+
+#ifndef __OSTTRACEGEN2_TUINT32_TUINT32_TUINT32__
+#define __OSTTRACEGEN2_TUINT32_TUINT32_TUINT32__
+
+inline TBool OstTraceGen2( TUint32 aTraceID, TUint32 aParam1, TUint32 aParam2 )
+ {
+ TBool retval = BTraceFiltered8( EXTRACT_GROUP_ID(aTraceID), EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
+ if ( retval )
+ {
+ TUint8 data[ 8 ];
+ TUint8* ptr = data;
+ *( ( TUint* )ptr ) = aParam1;
+ ptr += sizeof ( TUint );
+ *( ( TUint* )ptr ) = aParam2;
+ ptr += sizeof ( TUint );
+ ptr -= 8;
+ retval = OstSendNBytes( EXTRACT_GROUP_ID(aTraceID), EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
+ }
+ return retval;
+ }
+
+#endif // __OSTTRACEGEN2_TUINT32_TUINT32_TUINT32__
+
+
+
+#ifndef __OSTTRACEGEN2_TUINT32_TUINT_TINT__
+#define __OSTTRACEGEN2_TUINT32_TUINT_TINT__
+
+inline TBool OstTraceGen2( TUint32 aTraceID, TUint aParam1, TInt aParam2 )
+ {
+ TBool retval = BTraceFiltered8( EXTRACT_GROUP_ID(aTraceID), EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
+ if ( retval )
+ {
+ TUint8 data[ 8 ];
+ TUint8* ptr = data;
+ *( ( TUint* )ptr ) = aParam1;
+ ptr += sizeof ( TUint );
+ *( ( TInt* )ptr ) = aParam2;
+ ptr += sizeof ( TInt );
+ ptr -= 8;
+ retval = OstSendNBytes( EXTRACT_GROUP_ID(aTraceID), EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
+ }
+ return retval;
+ }
+
+#endif // __OSTTRACEGEN2_TUINT32_TUINT_TINT__
+
+
+#ifndef __OSTTRACEGEN2_TUINT32_TUINT32_TINT32__
+#define __OSTTRACEGEN2_TUINT32_TUINT32_TINT32__
+
+inline TBool OstTraceGen2( TUint32 aTraceID, TUint32 aParam1, TInt32 aParam2 )
+ {
+ TBool retval = BTraceFiltered8( EXTRACT_GROUP_ID(aTraceID), EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
+ if ( retval )
+ {
+ TUint8 data[ 8 ];
+ TUint8* ptr = data;
+ *( ( TUint* )ptr ) = aParam1;
+ ptr += sizeof ( TUint );
+ *( ( TInt* )ptr ) = aParam2;
+ ptr += sizeof ( TInt );
+ ptr -= 8;
+ retval = OstSendNBytes( EXTRACT_GROUP_ID(aTraceID), EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
+ }
+ return retval;
+ }
+
+#endif // __OSTTRACEGEN2_TUINT32_TUINT32_TINT32__
+
+
+
+#endif
+
+// End of file
+
--- a/clock/clockui/clockalarmeditor/clockalarmeditor.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockalarmeditor/clockalarmeditor.pro Mon Aug 09 18:30:52 2010 +0530
@@ -23,7 +23,8 @@
../../clockmw/clockalarms/inc \
../../clockmw/clocksettingsutility/inc \
../../clockmw/clocktimezone/inc \
- ../../inc
+ ../../inc \
+ ./traces
DEPENDPATH += \
./inc \
--- a/clock/clockui/clockalarmeditor/data/xml/clockalarmeditor.docml Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockalarmeditor/data/xml/clockalarmeditor.docml Mon Aug 09 18:30:52 2010 +0530
@@ -3,9 +3,6 @@
<object name="deleteAction" type="HbAction">
<string locid="txt_clock_opt_delete" name="text" value="Delete"/>
</object>
- <object name="discardChanges" type="HbAction">
- <string locid="txt_clock_opt_discard_changes" name="text" value="Discard changes"/>
- </object>
<widget name="alarmEditorView" type="HbView">
<widget name="alarmEditorViewWidget" role="HbView:widget" type="HbWidget">
<widget name="subtitleGroupBox" type="HbGroupBox">
@@ -22,9 +19,8 @@
</widget>
<widget name="viewMenu" role="HbView:menu" type="HbMenu">
<ref object="deleteAction" role="HbMenu:addAction"/>
- <ref object="discardChanges" role="HbMenu:addAction"/>
</widget>
- <string locid="txt_common_common_clock" name="title" value="Clock"/>
+ <string locid="txt_clock_title_clock3" name="title" value="Clock"/>
</widget>
<metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/clock/clockui/clockalarmeditor/inc/clockalarmeditor.h Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockalarmeditor/inc/clockalarmeditor.h Mon Aug 09 18:30:52 2010 +0530
@@ -37,6 +37,7 @@
class HbDateTimePicker;
class HbDialog;
class HbTranslator;
+class HbAbstractVkbHost;
class XQSettingsManager;
class XQSettingsKey;
class AlarmClient;
@@ -58,16 +59,19 @@
public:
CLOCKALARMEDITOR_EXPORT void showAlarmEditor();
-public slots:
+private slots:
void handleDoneAction();
void handleDeleteAction();
- void handleDiscardAction();
void handleTimeChange(const QString &text);
void handleOccurenceChanged(int index);
void handleOkAction();
void launchTimePicker();
void handleAlarmSoundChanged(int checkedState);
void selectedAction(HbAction *action);
+ void handleDayChanged(int index);
+ void handleDescriptionChanged(const QString &text);
+ void handleKeypadOpen();
+ void handleKeypadClosed();
signals:
void alarmSet();
@@ -94,7 +98,9 @@
int mAlarmId;
int mStartOfWeek;
bool mAlarmDayItemInserted;
+ bool mIsQuickAlarm;
QString mTimeFormat;
+ QTime mOldAlarmTime;
HbDataForm *mAlarmEditorForm;
HbDataFormModel *mAlarmEditorModel;
@@ -104,14 +110,14 @@
HbDataFormModelItem *mAlarmSoundItem;
HbDataFormModelItem *mAlarmDescription;
- HbView *mAlarmEditorView;
- HbAction *mDiscardAction;
+ QPointer<HbView> mAlarmEditorView;
HbAction *mDeleteAction;
HbAction *mDoneAction;
HbAction *mOkAction;
HbAction *mCancelAction;
QPointer<HbDialog> mTimePickerDialog;
+ QPointer<HbAbstractVkbHost> mVirtualKeyboard;
XQSettingsManager *mSettingsManager;
XQSettingsKey *mPreviosAlarmTime;
--- a/clock/clockui/clockalarmeditor/src/clockalarmcustomitem.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockalarmeditor/src/clockalarmcustomitem.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -24,6 +24,11 @@
// User includes.
#include "clockalarmcustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockalarmcustomitemTraces.h"
+#endif
+
/*!
\class ClockAlarmCustomItem
@@ -40,7 +45,9 @@
ClockAlarmCustomItem::ClockAlarmCustomItem(QGraphicsItem *parent)
:HbDataFormViewItem(parent)
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT );
}
/*!
@@ -48,7 +55,9 @@
*/
ClockAlarmCustomItem::~ClockAlarmCustomItem()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT );
}
/*!
@@ -58,6 +67,7 @@
*/
HbAbstractViewItem* ClockAlarmCustomItem::createItem()
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_CREATEITEM_ENTRY );
return new ClockAlarmCustomItem(*this);
}
@@ -67,13 +77,16 @@
*/
bool ClockAlarmCustomItem::canSetModelIndex(const QModelIndex &index) const
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
index.data(HbDataFormModelItem::ItemTypeRole).toInt());
if(itemType == (HbDataFormModelItem::CustomItemBase)) {
+ OstTraceFunctionExit0( CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT );
return true;
} else {
+ OstTraceFunctionExit0( DUP1_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT );
return false;
}
@@ -81,6 +94,7 @@
void ClockAlarmCustomItem::restore()
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_RESTORE_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -95,6 +109,7 @@
"objectName", modlItem->contentWidgetData("objectName"));
}
+ OstTraceFunctionExit0( CLOCKALARMCUSTOMITEM_RESTORE_EXIT );
}
/*!
@@ -104,7 +119,9 @@
*/
HbWidget* ClockAlarmCustomItem::createCustomWidget()
{
+ OstTraceFunctionEntry0( CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY );
mCustomButton = new HbPushButton(this);
+ OstTraceFunctionExit0( CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mCustomButton;
}
--- a/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -33,9 +33,11 @@
#include <HbGroupBox>
#include <HbDocumentLoader>
#include <HbTranslator>
+#include <HbAbstractVkbHost>
+#include <HbLineEdit>
#include <xqsettingsmanager.h>
#include <xqsettingskey.h>
-
+#include <QLocale>
// User includes
#include "clockprivatecrkeys.h"
@@ -44,6 +46,11 @@
#include "settingsutility.h"
#include "timezoneclient.h"
#include "clockalarmcustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockalarmeditorTraces.h"
+#endif
+
// Constants
const int KOneHourInMinute(60);
@@ -75,6 +82,7 @@
mAlarmId(alarmId),
mStartOfWeek(0),
mAlarmDayItemInserted(false),
+ mIsQuickAlarm(true),
mAlarmEditorForm(0),
mAlarmEditorModel(0),
mAlarmTimeItem(0),
@@ -84,6 +92,7 @@
mAlarmDescription(0),
mAlarmClient(alarmClient)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY );
// Load the translation file and install the alarmeditor specific translator
mTranslator = new HbTranslator("clockalarmeditor");
mTranslator->loadCommon();
@@ -146,16 +155,11 @@
// Get the menu items for the alarm editor.
mDeleteAction = qobject_cast<HbAction *> (
loader->findObject("deleteAction"));
- mDiscardAction = qobject_cast<HbAction *>(
- loader->findObject("discardChanges"));
// Connect the signals for the menu item.
connect(
mDeleteAction, SIGNAL(triggered()),
this, SLOT(handleDeleteAction()));
- connect(
- mDiscardAction, SIGNAL(triggered()),
- this, SLOT(handleDiscardAction()));
// Add the done soft key action.
mDoneAction = new HbAction(Hb::DoneNaviAction);
@@ -163,7 +167,19 @@
mDoneAction, SIGNAL(triggered()),
this, SLOT(handleDoneAction()));
mAlarmEditorView->setNavigationAction(mDoneAction);
+
+ if (mAlarmEditorView) {
+ mVirtualKeyboard = new HbAbstractVkbHost(mAlarmEditorView);
+ }
+ connect(
+ mVirtualKeyboard, SIGNAL(keypadOpened()),
+ this, SLOT(handleKeypadOpen()));
+ connect(
+ mVirtualKeyboard, SIGNAL(keypadClosed()),
+ this, SLOT(handleKeypadClosed()));
+
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT );
}
/*!
@@ -171,12 +187,14 @@
*/
ClockAlarmEditor::~ClockAlarmEditor()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY );
// Remove the translator
if (mTranslator) {
delete mTranslator;
mTranslator = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT );
}
/*!
@@ -184,10 +202,12 @@
*/
void ClockAlarmEditor::showAlarmEditor()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SHOWALARMEDITOR_ENTRY );
// Store the current view and set alarm editor as current view.
HbMainWindow *window = hbInstance->allMainWindows().first();
window->addView(mAlarmEditorView);
window->setCurrentView(mAlarmEditorView);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SHOWALARMEDITOR_EXIT );
}
/*!
@@ -195,6 +215,7 @@
*/
void ClockAlarmEditor::handleDoneAction()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEDONEACTION_ENTRY );
int alarmDayIndex = -1;
if (mAlarmDayItemInserted) {
alarmDayIndex = mAlarmDayItem->contentWidgetData("currentIndex").toInt();
@@ -215,6 +236,7 @@
emit alarmSet();
closeAlarmEditor();
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEDONEACTION_EXIT );
}
/*!
@@ -222,39 +244,9 @@
*/
void ClockAlarmEditor::handleDeleteAction()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEDELETEACTION_ENTRY );
closeAlarmEditor();
-}
-
-/*!
- Handles discard changes action on the editor.
- */
-void ClockAlarmEditor::handleDiscardAction()
-{
- // Reset alarm time.
- mAlarmTimeItem->setContentWidgetData(
- "text",mAlarmInfo.nextDueTime.toString(mTimeFormat));
- // Reset repeat info.
- mAlarmOccurenceItem->setContentWidgetData("currentIndex", mAlarmInfo.repeatType);
-
- // Reset alarm day item.
- if (mAlarmDayItemInserted) {
- int currentIndex = mAlarmInfo.alarmDateTime.dayOfWeek() - 1;
- currentIndex -= mStartOfWeek;
- if(0 > currentIndex){
- currentIndex += KDaysInWeek;
- }
- mAlarmDayItem->setContentWidgetData(
- "currentIndex",currentIndex);
- }
-
- // Reset for alarm sound.
- if (AlarmVolumeOn == mAlarmInfo.volumeStatus) {
- mAlarmSoundItem->setContentWidgetData("checkState", Qt::Checked);
- } else {
- mAlarmSoundItem->setContentWidgetData("checkState", Qt::Unchecked);
- }
-
- mAlarmDescription->setContentWidgetData("text", mAlarmInfo.alarmDesc);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEDELETEACTION_EXIT );
}
/*!
@@ -262,6 +254,7 @@
*/
void ClockAlarmEditor::handleTimeChange(const QString &text)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLETIMECHANGE_ENTRY );
// If it is a new alarm.
if (!mAlarmId) {
// Decide the day to focus.
@@ -271,11 +264,13 @@
text,
mTimeFormat);
if (!alarmTime.isValid()) {
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT );
return;
}
QTime homeTime = QTime::currentTime();
if (-1 == alarmDayIndex) {
+ OstTraceFunctionExit0( DUP1_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT );
return;
}
if (homeTime > alarmTime) {
@@ -290,11 +285,19 @@
if(0 > alarmDayIndex){
alarmDayIndex += KDaysInWeek;
}
+ mAlarmEditorForm->removeConnection(
+ mAlarmDayItem, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(handleDayChanged(int)));
+ mIsQuickAlarm = true;
mAlarmDayItem->setContentWidgetData(
"currentIndex",
alarmDayIndex);
+ mAlarmEditorForm->addConnection(
+ mAlarmDayItem, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(handleDayChanged(int)));
}
}
+ OstTraceFunctionExit0( DUP2_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT );
}
/*!
@@ -302,7 +305,10 @@
*/
void ClockAlarmEditor:: handleOccurenceChanged(int index)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_ENTRY );
Q_UNUSED(index)
+
+ mIsQuickAlarm = false;
int repeatIndex =
mAlarmOccurenceItem->contentWidgetData("currentIndex").toInt();
@@ -315,6 +321,7 @@
mTimeFormat);
QTime homeTime = QTime::currentTime();
if (-1 == alarmDayIndex) {
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT );
return;
}
if (homeTime > alarmTime) {
@@ -327,7 +334,10 @@
// Show the alarm days field to select the day.
mAlarmDayItem = new HbDataFormModelItem(
HbDataFormModelItem::ComboBoxItem,
- QString(hbTrId("txt_clock_formlabel_day")));
+ QString(hbTrId("txt_clk_setlabel_day")));
+ mAlarmEditorForm->addConnection(
+ mAlarmDayItem, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(handleDayChanged(int)));
// Add the alarm days beginning from the start of week.
QStringList alarmDays;
@@ -356,6 +366,7 @@
mAlarmDayItemInserted = false;
}
}
+ OstTraceFunctionExit0( DUP1_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT );
}
/*!
@@ -363,6 +374,7 @@
*/
void ClockAlarmEditor::handleOkAction()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEOKACTION_ENTRY );
// Get the time from the time picker.
QTime newAlarmTime = static_cast<HbDateTimePicker *> (
mTimePickerDialog->contentWidget())->time();
@@ -370,9 +382,12 @@
// Update the selected time value.
mAlarmTimeItem->setContentWidgetData("text",newAlarmTime.toString(mTimeFormat));
- if (mAlarmInfo.nextDueTime != newAlarmTime ) {
+ if (mOldAlarmTime != newAlarmTime && mIsQuickAlarm) {
handleTimeChange(newAlarmTime.toString(mTimeFormat));
}
+
+ mOldAlarmTime = newAlarmTime;
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEOKACTION_EXIT );
}
/*!
@@ -380,6 +395,7 @@
*/
void ClockAlarmEditor::launchTimePicker()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_LAUNCHTIMEPICKER_ENTRY );
if (mTimePickerDialog) {
delete mTimePickerDialog;
}
@@ -424,6 +440,7 @@
mTimePickerDialog->addAction(mCancelAction);
mTimePickerDialog->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_LAUNCHTIMEPICKER_EXIT );
}
/*!
@@ -431,12 +448,15 @@
*/
void ClockAlarmEditor::handleAlarmSoundChanged(int checkedState)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_ENTRY );
Q_UNUSED(checkedState)
- if (AlarmVolumeOff == mAlarmInfo.volumeStatus) {
+ mIsQuickAlarm = false;
+/* if (AlarmVolumeOff == mAlarmInfo.volumeStatus) {
mAlarmInfo.volumeStatus = AlarmVolumeOn;
} else {
mAlarmInfo.volumeStatus = AlarmVolumeOff;
- }
+ }*/
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_EXIT );
}
/*!
@@ -444,9 +464,70 @@
*/
void ClockAlarmEditor::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SELECTEDACTION_ENTRY );
if (action == mOkAction) {
handleOkAction();
}
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SELECTEDACTION_EXIT );
+}
+
+/*!
+ Slot to handle the change in day item.
+ */
+void ClockAlarmEditor::handleDayChanged(int index)
+{
+ Q_UNUSED(index)
+ mIsQuickAlarm = false;
+}
+
+/*!
+ Slot to handle the change in description.
+ */
+void ClockAlarmEditor::handleDescriptionChanged(const QString &text)
+{
+ Q_UNUSED(text)
+ mIsQuickAlarm = false;
+}
+
+/*!
+ Slot to handle the open event of vkb.
+ */
+void ClockAlarmEditor::handleKeypadOpen()
+{
+ QModelIndex descriptionItemIndex =
+ mAlarmEditorModel->indexFromItem(mAlarmDescription);
+ HbDataFormViewItem *viewItem = static_cast<HbDataFormViewItem *> (
+ mAlarmEditorForm->itemByIndex(descriptionItemIndex));
+ if (viewItem) {
+ HbLineEdit *editor = static_cast<HbLineEdit *>(
+ viewItem->dataItemContentWidget());
+ int temp = editor->text().length();
+ bool flag = editor->hasSelectedText();
+ if (!flag) {
+ editor->setSelection(0, temp);
+ }
+ }
+}
+
+/*!
+ Slot to handle the close event of vkb.
+ */
+void ClockAlarmEditor::handleKeypadClosed()
+{
+ QModelIndex descriptionItemIndex =
+ mAlarmEditorModel->indexFromItem(mAlarmDescription);
+ HbDataFormViewItem *viewItem = static_cast<HbDataFormViewItem *> (
+ mAlarmEditorForm->itemByIndex(descriptionItemIndex));
+ if (viewItem) {
+ HbLineEdit *editor = static_cast<HbLineEdit *>(
+ viewItem->dataItemContentWidget());
+
+ editor->setSelection(0, 0);
+ if (editor->text().isEmpty()) {
+ editor->setText(hbTrId("txt_clk_formlabel_val_alarm"));
+ }
+
+ }
}
/*!
@@ -454,6 +535,7 @@
*/
void ClockAlarmEditor::initModel()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_INITMODEL_ENTRY );
// Remove the model.
if (mAlarmEditorForm->model()) {
delete mAlarmEditorForm->model();
@@ -466,6 +548,7 @@
populateModelItems();
// Set the model.
mAlarmEditorForm->setModel(mAlarmEditorModel);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_INITMODEL_EXIT );
}
/*!
@@ -473,8 +556,9 @@
*/
void ClockAlarmEditor::populateModelItems()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_POPULATEMODELITEMS_ENTRY );
// Time.
- // Creats a data form model item to set time.
+ // Creates a data form model item to set time.
mAlarmTimeItem = mAlarmEditorModel->appendDataFormItem(
HbDataFormModelItem::CustomItemBase,
QString(hbTrId("txt_clk_setlabel_time")),
@@ -517,6 +601,9 @@
HbDataFormModelItem::ComboBoxItem,
QString(hbTrId("txt_clk_setlabel_day")),
mAlarmEditorModel->invisibleRootItem());
+ mAlarmEditorForm->addConnection(
+ mAlarmDayItem, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(handleDayChanged(int)));
// Add the alarm days beginning from the start of week.
QStringList alarmDays;
@@ -553,7 +640,7 @@
if (AlarmVolumeOn == mAlarmInfo.volumeStatus) {
mAlarmSoundItem->setContentWidgetData("checkState",Qt::Checked);
}
- mAlarmSoundItem->setContentWidgetData("objectName", "alarmaSound");
+ mAlarmSoundItem->setContentWidgetData("objectName", "alarmSound");
mAlarmEditorForm->addConnection(
mAlarmSoundItem, SIGNAL(stateChanged(int)),
this,SLOT(handleAlarmSoundChanged(int)));
@@ -565,7 +652,11 @@
mAlarmEditorModel->invisibleRootItem());
mAlarmDescription->setContentWidgetData("text", mAlarmInfo.alarmDesc);
mAlarmDescription->setContentWidgetData("objectName", "alaramDescription");
+ mAlarmEditorForm->addConnection(
+ mAlarmDescription, SIGNAL(textChanged (const QString &)),
+ this, SLOT(handleDescriptionChanged(const QString &)));
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_POPULATEMODELITEMS_EXIT );
}
/*!
@@ -575,6 +666,7 @@
*/
void ClockAlarmEditor::initAlarmInfo()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_INITALARMINFO_ENTRY );
// Fill default values for alarmInfo.
mAlarmInfo.nextDueTime = getPreviousAlarmTime();
mAlarmInfo.alarmDesc =
@@ -602,6 +694,11 @@
mAlarmClient.getAlarmInfo(mAlarmId, mAlarmInfo);
mAlarmClient.deleteAlarm(mAlarmId);
}
+
+ // Set the value for previous alarm time.
+ mOldAlarmTime = mAlarmInfo.nextDueTime;
+
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_INITALARMINFO_EXIT );
}
/*!
@@ -610,6 +707,7 @@
void ClockAlarmEditor::setAlarm(
QString timeInfo, QString descInfo, int repeatType, int alarmDayIndex)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SETALARM_ENTRY );
QTime alarmTime;
AlarmInfo alarmInfo;
@@ -633,7 +731,12 @@
}
// Fill the alarm volume status
- alarmInfo.volumeStatus = mAlarmInfo.volumeStatus;
+ int state = mAlarmSoundItem->contentWidgetData("checkState").toInt();
+ if (Qt::Checked == state) {
+ alarmInfo.volumeStatus = AlarmVolumeOn;
+ } else {
+ alarmInfo.volumeStatus = AlarmVolumeOff;
+ }
// Request the listener to set the alarm.
mAlarmClient.setAlarm(alarmInfo);
@@ -655,6 +758,7 @@
// Save previous alarm time.
setPreviosAlarmTime(alarmTime);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SETALARM_EXIT );
}
/*!
@@ -665,6 +769,7 @@
*/
QTime ClockAlarmEditor::getPreviousAlarmTime()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_ENTRY );
QTime previousTime(9,0,0);
// Read the initial values from the cenrep.
@@ -677,9 +782,11 @@
previousTime.setHMS(
alarmTimeMinutes / 60, alarmTimeMinutes % 60, 0);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT );
return previousTime;
}
+ OstTraceFunctionExit0( DUP1_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT );
return previousTime;
}
@@ -688,18 +795,22 @@
*/
void ClockAlarmEditor::setPreviosAlarmTime(QTime time)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SETPREVIOSALARMTIME_ENTRY );
int alarmTimeMinutes = (time.hour() * 60) + (time.minute());
// Write the value to cenrep.
mSettingsManager->writeItemValue(*mPreviosAlarmTime, alarmTimeMinutes);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SETPREVIOSALARMTIME_EXIT );
}
void ClockAlarmEditor::closeAlarmEditor()
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_CLOSEALARMEDITOR_ENTRY );
// Remove the alarm editor.
HbMainWindow *window = hbInstance->allMainWindows().first();
window->removeView(mAlarmEditorView);
deleteLater();
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_CLOSEALARMEDITOR_EXIT );
}
/*!
@@ -709,6 +820,7 @@
*/
void ClockAlarmEditor::displayDSTRollOverNote(AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_ENTRY );
QString alarmTime = alarmInfo.nextDueTime.toString(mTimeFormat);
QString dstRollOverText =
@@ -716,6 +828,7 @@
QString displayText = dstRollOverText.arg(alarmTime);
// show the note
launchDialog(displayText);
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_EXIT );
}
/*!
@@ -725,6 +838,7 @@
*/
void ClockAlarmEditor::displayRemainingTimeNote(AlarmInfo& alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_ENTRY );
QDateTime currentDateTime= QDateTime::currentDateTime();
QTime alarmTime = alarmInfo.origAlarmTime;
@@ -862,6 +976,7 @@
if (showDisplayText) {
launchDialog(displayText);
}
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_EXIT );
}
/*!
@@ -872,24 +987,27 @@
*/
void ClockAlarmEditor::getDayText(int alarmDay,QString& dayText)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_GETDAYTEXT_ENTRY );
+ QLocale qLocale;
switch(alarmDay) {
- case 1:dayText.append(hbTrId("txt_clk_setlabel_val_monday"));
+ case 1:dayText.append(qLocale.dayName(1));
break;
- case 2:dayText.append(hbTrId("txt_clk_setlabel_val_tuesday"));
- break;
- case 3:dayText.append(hbTrId("txt_clk_setlabel_val_wednesday"));
+ case 2:dayText.append(qLocale.dayName(2));
break;
- case 4:dayText.append(hbTrId("txt_clk_setlabel_val_thursday"));
+ case 3:dayText.append(qLocale.dayName(3));
break;
- case 5:dayText.append(hbTrId("txt_clk_setlabel_val_friday"));
+ case 4:dayText.append(qLocale.dayName(4));
break;
- case 6:dayText.append(hbTrId("txt_clk_setlabel_val_saturday"));
+ case 5:dayText.append(qLocale.dayName(5));
break;
- case 7:dayText.append(hbTrId("txt_clk_setlabel_val_sunday"));
+ case 6:dayText.append(qLocale.dayName(6));
+ break;
+ case 7:dayText.append(qLocale.dayName(7));
break;
default:
break;
}
+OstTraceFunctionExit0( CLOCKALARMEDITOR_GETDAYTEXT_EXIT );
}
/*!
gets remaining seconds to the alarm time from current date time
@@ -898,6 +1016,7 @@
*/
int ClockAlarmEditor::getRemainingSeconds(QDateTime& alarmDateTime)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_GETREMAININGSECONDS_ENTRY );
QDateTime currentDateTime = QDateTime::currentDateTime();
int currentDateTimeSec =
@@ -918,6 +1037,7 @@
}
int remainingSeconds = alarmDateTimeSec - currentDateTimeSec;
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_GETREMAININGSECONDS_EXIT );
return remainingSeconds;
}
@@ -926,6 +1046,7 @@
*/
void ClockAlarmEditor::launchDialog(QString title, QString text)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_LAUNCHDIALOG_ENTRY );
HbNotificationDialog *notificationDialog = new HbNotificationDialog();
notificationDialog->setTitle(title);
@@ -935,6 +1056,7 @@
notificationDialog->setTimeout(HbPopup::ConfirmationNoteTimeout);
notificationDialog->show();
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_LAUNCHDIALOG_EXIT );
}
/*!
@@ -943,6 +1065,7 @@
void ClockAlarmEditor::sortAlarmDaysList(QStringList& alarmDaysList)
{
+ OstTraceFunctionEntry0( CLOCKALARMEDITOR_SORTALARMDAYSLIST_ENTRY );
for(int index=(mStartOfWeek + 1),j=KDaysInWeek;j!=0 ;index++,j--){
if(index > KDaysInWeek){
index = index - KDaysInWeek;
@@ -951,5 +1074,6 @@
getDayText(index, alarmDayText );
alarmDaysList.append(alarmDayText);
}
+ OstTraceFunctionExit0( CLOCKALARMEDITOR_SORTALARMDAYSLIST_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockalarmeditor/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockalarmeditor/traces/clockalarmcustomitemTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKALARMCUSTOMITEMTRACES_H__
+#define __CLOCKALARMCUSTOMITEMTRACES_H__
+
+#define KOstTraceComponentID 0x2001cc10
+
+#define CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY 0x8a0001
+#define CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT 0x8a0002
+#define DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY 0x8a0003
+#define DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT 0x8a0004
+#define CLOCKALARMCUSTOMITEM_CREATEITEM_ENTRY 0x8a0005
+#define CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_ENTRY 0x8a0006
+#define CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a0007
+#define DUP1_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a0008
+#define CLOCKALARMCUSTOMITEM_RESTORE_ENTRY 0x8a0009
+#define CLOCKALARMCUSTOMITEM_RESTORE_EXIT 0x8a000a
+#define CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY 0x8a000b
+#define CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a000c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockalarmeditor/traces/clockalarmeditorTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,68 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKALARMEDITORTRACES_H__
+#define __CLOCKALARMEDITORTRACES_H__
+
+#define KOstTraceComponentID 0x2001cc10
+
+#define CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY 0x8a000d
+#define CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT 0x8a000e
+#define DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY 0x8a000f
+#define DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT 0x8a0010
+#define CLOCKALARMEDITOR_SHOWALARMEDITOR_ENTRY 0x8a0011
+#define CLOCKALARMEDITOR_SHOWALARMEDITOR_EXIT 0x8a0012
+#define CLOCKALARMEDITOR_HANDLEDONEACTION_ENTRY 0x8a0013
+#define CLOCKALARMEDITOR_HANDLEDONEACTION_EXIT 0x8a0014
+#define CLOCKALARMEDITOR_HANDLEDELETEACTION_ENTRY 0x8a0015
+#define CLOCKALARMEDITOR_HANDLEDELETEACTION_EXIT 0x8a0016
+#define CLOCKALARMEDITOR_HANDLEDISCARDACTION_ENTRY 0x8a0017
+#define CLOCKALARMEDITOR_HANDLEDISCARDACTION_EXIT 0x8a0018
+#define CLOCKALARMEDITOR_HANDLETIMECHANGE_ENTRY 0x8a0019
+#define CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT 0x8a001a
+#define DUP1_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT 0x8a001b
+#define DUP2_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT 0x8a001c
+#define CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_ENTRY 0x8a001d
+#define CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT 0x8a001e
+#define DUP1_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT 0x8a001f
+#define CLOCKALARMEDITOR_HANDLEOKACTION_ENTRY 0x8a0020
+#define CLOCKALARMEDITOR_HANDLEOKACTION_EXIT 0x8a0021
+#define CLOCKALARMEDITOR_LAUNCHTIMEPICKER_ENTRY 0x8a0022
+#define CLOCKALARMEDITOR_LAUNCHTIMEPICKER_EXIT 0x8a0023
+#define CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_ENTRY 0x8a0024
+#define CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_EXIT 0x8a0025
+#define CLOCKALARMEDITOR_SELECTEDACTION_ENTRY 0x8a0026
+#define CLOCKALARMEDITOR_SELECTEDACTION_EXIT 0x8a0027
+#define CLOCKALARMEDITOR_INITMODEL_ENTRY 0x8a0028
+#define CLOCKALARMEDITOR_INITMODEL_EXIT 0x8a0029
+#define CLOCKALARMEDITOR_POPULATEMODELITEMS_ENTRY 0x8a002a
+#define CLOCKALARMEDITOR_POPULATEMODELITEMS_EXIT 0x8a002b
+#define CLOCKALARMEDITOR_INITALARMINFO_ENTRY 0x8a002c
+#define CLOCKALARMEDITOR_INITALARMINFO_EXIT 0x8a002d
+#define CLOCKALARMEDITOR_SETALARM_ENTRY 0x8a002e
+#define CLOCKALARMEDITOR_SETALARM_EXIT 0x8a002f
+#define CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_ENTRY 0x8a0030
+#define CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT 0x8a0031
+#define DUP1_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT 0x8a0032
+#define CLOCKALARMEDITOR_SETPREVIOSALARMTIME_ENTRY 0x8a0033
+#define CLOCKALARMEDITOR_SETPREVIOSALARMTIME_EXIT 0x8a0034
+#define CLOCKALARMEDITOR_CLOSEALARMEDITOR_ENTRY 0x8a0035
+#define CLOCKALARMEDITOR_CLOSEALARMEDITOR_EXIT 0x8a0036
+#define CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_ENTRY 0x8a0037
+#define CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_EXIT 0x8a0038
+#define CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_ENTRY 0x8a0039
+#define CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_EXIT 0x8a003a
+#define CLOCKALARMEDITOR_GETDAYTEXT_ENTRY 0x8a003b
+#define CLOCKALARMEDITOR_GETDAYTEXT_EXIT 0x8a003c
+#define CLOCKALARMEDITOR_GETREMAININGSECONDS_ENTRY 0x8a003d
+#define CLOCKALARMEDITOR_GETREMAININGSECONDS_EXIT 0x8a003e
+#define CLOCKALARMEDITOR_LAUNCHDIALOG_ENTRY 0x8a003f
+#define CLOCKALARMEDITOR_LAUNCHDIALOG_EXIT 0x8a0040
+#define CLOCKALARMEDITOR_SORTALARMDAYSLIST_ENTRY 0x8a0041
+#define CLOCKALARMEDITOR_SORTALARMDAYSLIST_EXIT 0x8a0042
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockalarmeditor/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,68 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_CREATEITEM_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_RESTORE_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMCUSTOMITEM_RESTORE_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_CLOSEALARMEDITOR_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_CLOSEALARMEDITOR_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_ENTRY=0x37
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_DISPLAYDSTROLLOVERNOTE_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_DISPLAYREMAININGTIMENOTE_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETDAYTEXT_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETDAYTEXT_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETREMAININGSECONDS_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_GETREMAININGSECONDS_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEALARMSOUNDCHANGED_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDELETEACTION_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDELETEACTION_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDISCARDACTION_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDISCARDACTION_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDONEACTION_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEDONEACTION_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEOKACTION_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLEOKACTION_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLETIMECHANGE_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_INITALARMINFO_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_INITALARMINFO_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_INITMODEL_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_INITMODEL_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_LAUNCHDIALOG_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_LAUNCHDIALOG_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_LAUNCHTIMEPICKER_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_LAUNCHTIMEPICKER_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_POPULATEMODELITEMS_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_POPULATEMODELITEMS_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SELECTEDACTION_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SELECTEDACTION_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SETALARM_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SETALARM_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SETPREVIOSALARMTIME_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SETPREVIOSALARMTIME_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SHOWALARMEDITOR_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SHOWALARMEDITOR_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SORTALARMDAYSLIST_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMEDITOR_SORTALARMDAYSLIST_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMCUSTOMITEM_CANSETMODELINDEX_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMCUSTOMITEM_CLOCKALARMCUSTOMITEM_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_CLOCKALARMEDITOR_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_GETPREVIOUSALARMTIME_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_HANDLEOCCURENCECHANGED_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CLOCKALARMEDITOR_HANDLETIMECHANGE_EXIT=0x1c
--- a/clock/clockui/clockappcontroller/clockappcontroller.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockappcontroller/clockappcontroller.pro Mon Aug 09 18:30:52 2010 +0530
@@ -31,6 +31,7 @@
../../clockmw/clocktimezone/inc \
../../clockmw/clocksettingsutility/inc \
../../clockmw/clockalarms/inc \
+ ./traces
symbian: {
TARGET.CAPABILITY = ALL -TCB
--- a/clock/clockui/clockappcontroller/src/clockappcontroller.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockappcontroller/src/clockappcontroller.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -19,6 +19,11 @@
#include "clockappcontroller.h"
#include "clockappcontrollerifimpl.h"
#include "clockviewmanager.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockappcontrollerTraces.h"
+#endif
+
/*!
\class ClockAppController
@@ -35,6 +40,7 @@
mViewManager(0),
mIfImpl(0)
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY );
// Construct the interface implementation.
mIfImpl = new ClockAppControllerIfImpl(this, this);
@@ -44,6 +50,7 @@
mViewManager, "clockappcontroller.cpp",
"ClockViewManager is 0");
connect(mViewManager, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT );
}
/*!
@@ -51,6 +58,7 @@
*/
ClockAppController::~ClockAppController()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY );
if (mViewManager) {
delete mViewManager;
mViewManager = 0;
@@ -59,6 +67,7 @@
delete mIfImpl;
mIfImpl = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT );
}
/*!
@@ -66,8 +75,10 @@
*/
void ClockAppController::handleAppReady()
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLER_HANDLEAPPREADY_ENTRY );
emit appReady();
disconnect(mViewManager, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLER_HANDLEAPPREADY_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockappcontroller/src/clockappcontrollerifimpl.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockappcontroller/src/clockappcontrollerifimpl.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -23,6 +23,11 @@
#include "timezoneclient.h"
#include "settingsutility.h"
#include "alarmclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockappcontrollerifimplTraces.h"
+#endif
+
/*!
\class ClockAppControllerIfImpl
@@ -43,12 +48,14 @@
:QObject(parent),
mAppController(controller)
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY );
// Construct the timezone client.
mTimeZoneClient = TimezoneClient::getInstance();
// Construct the settings utility object.
mSettingsUtility = new SettingsUtility(this);
// Construct the alarm client object.
mAlarmClient = new AlarmClient(this);
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT );
}
/*!
@@ -56,6 +63,7 @@
*/
ClockAppControllerIfImpl::~ClockAppControllerIfImpl()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY );
if (!mTimeZoneClient->isNull()) {
mTimeZoneClient->deleteInstance();
}
@@ -67,6 +75,7 @@
delete mAlarmClient;
mAlarmClient = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT );
}
@@ -79,6 +88,8 @@
*/
TimezoneClient* ClockAppControllerIfImpl::timezoneClient()
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_ENTRY );
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_EXIT );
return mTimeZoneClient;
}
@@ -91,6 +102,8 @@
*/
SettingsUtility* ClockAppControllerIfImpl::settingsUtility()
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_ENTRY );
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_EXIT );
return mSettingsUtility;
}
@@ -103,6 +116,8 @@
*/
AlarmClient* ClockAppControllerIfImpl::alarmClient()
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_ENTRY );
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_EXIT );
return mAlarmClient;
}
@@ -115,7 +130,9 @@
*/
void ClockAppControllerIfImpl::switchToView(ClockViews viewId)
{
+ OstTraceFunctionEntry0( CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY );
mAppController->mViewManager->showView(viewId);
+ OstTraceFunctionExit0( CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockappcontroller/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockappcontroller/traces/clockappcontrollerTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKAPPCONTROLLERTRACES_H__
+#define __CLOCKAPPCONTROLLERTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce3
+
+#define CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY 0x8a0001
+#define CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT 0x8a0002
+#define DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY 0x8a0003
+#define DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT 0x8a0004
+#define CLOCKAPPCONTROLLER_HANDLEAPPREADY_ENTRY 0x8a0005
+#define CLOCKAPPCONTROLLER_HANDLEAPPREADY_EXIT 0x8a0006
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockappcontroller/traces/clockappcontrollerifimplTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKAPPCONTROLLERIFIMPLTRACES_H__
+#define __CLOCKAPPCONTROLLERIFIMPLTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce3
+
+#define CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY 0x8a0007
+#define CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT 0x8a0008
+#define DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY 0x8a0009
+#define DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT 0x8a000a
+#define CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_ENTRY 0x8a000b
+#define CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_EXIT 0x8a000c
+#define CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_ENTRY 0x8a000d
+#define CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_EXIT 0x8a000e
+#define CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_ENTRY 0x8a000f
+#define CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_EXIT 0x8a0010
+#define CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY 0x8a0011
+#define CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT 0x8a0012
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockappcontroller/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,20 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_ALARMCLIENT_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_SETTINGSUTILITY_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_SWITCHTOVIEW_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLERIFIMPL_TIMEZONECLIENT_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLER_HANDLEAPPREADY_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPCONTROLLER_HANDLEAPPREADY_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPCONTROLLERIFIMPL_CLOCKAPPCONTROLLERIFIMPL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPCONTROLLER_CLOCKAPPCONTROLLER_EXIT=0x4
--- a/clock/clockui/clockapplication/clockapplication.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockapplication/clockapplication.pro Mon Aug 09 18:30:52 2010 +0530
@@ -20,7 +20,8 @@
INCLUDEPATH += \
. \
- ../clockappcontroller/inc
+ ../clockappcontroller/inc \
+ ./traces
DEPENDPATH += \
. \
--- a/clock/clockui/clockapplication/src/clockapplication.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockapplication/src/clockapplication.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -19,6 +19,11 @@
// User includes
#include "clockapplication.h"
#include "clockappcontroller.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockapplicationTraces.h"
+#endif
+
/*!
\class ClockApplication
@@ -31,6 +36,8 @@
ClockApplication::ClockApplication(int &argc, char *argv[]):
HbApplication(argc, argv)
{
+OstTraceFunctionEntry0( CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY );
+OstTraceFunctionExit0( CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT );
}
/*!
@@ -38,10 +45,12 @@
*/
ClockApplication::~ClockApplication()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY );
if (mController) {
delete mController;
mController = 0;
}
+OstTraceFunctionExit0( DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT );
}
/*!
@@ -49,8 +58,10 @@
*/
void ClockApplication::createController()
{
+ OstTraceFunctionEntry0( CLOCKAPPLICATION_CREATECONTROLLER_ENTRY );
mController = new ClockAppController;
connect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+OstTraceFunctionExit0( CLOCKAPPLICATION_CREATECONTROLLER_EXIT );
}
/*!
@@ -58,8 +69,10 @@
*/
bool ClockApplication::execution()
{
+ OstTraceFunctionEntry0( CLOCKAPPLICATION_EXECUTION_ENTRY );
int ret = 0;
ret = exec();
+ OstTraceFunctionExit0( CLOCKAPPLICATION_EXECUTION_EXIT );
return ret;
}
@@ -68,8 +81,10 @@
*/
void ClockApplication::handleAppReady()
{
+ OstTraceFunctionEntry0( CLOCKAPPLICATION_HANDLEAPPREADY_ENTRY );
emit applicationReady();
disconnect(mController, SIGNAL(appReady()), this, SLOT(handleAppReady()));
+OstTraceFunctionExit0( CLOCKAPPLICATION_HANDLEAPPREADY_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockapplication/src/main.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockapplication/src/main.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -22,6 +22,11 @@
// User includes
#include "clockapplication.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "mainTraces.h"
+#endif
+
/*!
The main entry point of the clock application.
@@ -30,6 +35,7 @@
*/
int main(int argc, char *argv[])
{
+ OstTraceFunctionEntry0( _MAIN_ENTRY );
// Create and initialize an ClockApplication instance
QScopedPointer<ClockApplication> application(
new ClockApplication(argc, argv));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/traces/clockapplicationTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKAPPLICATIONTRACES_H__
+#define __CLOCKAPPLICATIONTRACES_H__
+
+#define KOstTraceComponentID 0x10005903
+
+#define CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY 0x8a0001
+#define CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT 0x8a0002
+#define DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY 0x8a0003
+#define DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT 0x8a0004
+#define CLOCKAPPLICATION_CREATECONTROLLER_ENTRY 0x8a0005
+#define CLOCKAPPLICATION_CREATECONTROLLER_EXIT 0x8a0006
+#define CLOCKAPPLICATION_EXECUTION_ENTRY 0x8a0007
+#define CLOCKAPPLICATION_EXECUTION_EXIT 0x8a0008
+#define CLOCKAPPLICATION_HANDLEAPPREADY_ENTRY 0x8a0009
+#define CLOCKAPPLICATION_HANDLEAPPREADY_EXIT 0x8a000a
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/traces/fixed_id.definitions Mon Aug 09 18:30:52 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]_CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_CREATECONTROLLER_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_CREATECONTROLLER_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_EXECUTION_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_EXECUTION_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_HANDLEAPPREADY_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CLOCKAPPLICATION_HANDLEAPPREADY_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKAPPLICATION_CLOCKAPPLICATION_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]__MAIN_ENTRY=0xb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockapplication/traces/mainTraces.h Mon Aug 09 18:30:52 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 0x10005903
+
+#define _MAIN_ENTRY 0x8a000b
+
+
+#endif
+
+// End of file
+
--- a/clock/clockui/clockcityselectionlist/clockcityselectionlist.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockcityselectionlist/clockcityselectionlist.pro Mon Aug 09 18:30:52 2010 +0530
@@ -23,7 +23,8 @@
INCLUDEPATH += \
./inc \
../../inc \
- ../../clockmw/clocktimezone/inc
+ ../../clockmw/clocktimezone/inc \
+ ./traces
DEPENDPATH += \
./inc \
--- a/clock/clockui/clockcityselectionlist/data/xml/clockcityselectionlist.docml Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockcityselectionlist/data/xml/clockcityselectionlist.docml Mon Aug 09 18:30:52 2010 +0530
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<hbdocument version="0.9">
<object name="addOwnCityAction" type="HbAction">
- <string name="text" value="Add own city"/>
+ <string locid="txt_clk_opt_add_own_city" name="text" value="Add own city"/>
</object>
<widget name="clockCitySelectionView" type="HbView">
<widget name="clockCitySelectionWidget" role="HbView:widget" type="HbWidget">
@@ -35,7 +35,7 @@
<widget name="viewMenu" role="HbView:menu" type="HbMenu">
<ref object="addOwnCityAction" role="HbMenu:addAction"/>
</widget>
- <string locid="txt_common_common_clock" name="title" value="Clock"/>
+ <string locid="txt_clock_title_clock" name="title" value="Clock"/>
</widget>
<metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/clock/clockui/clockcityselectionlist/src/clockcitylistproxymodel.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockcityselectionlist/src/clockcitylistproxymodel.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -20,6 +20,11 @@
// User includes
#include "clockcitylistproxymodel.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockcitylistproxymodelTraces.h"
+#endif
+
/*!
\class ClockCityListProxyModel
@@ -38,7 +43,9 @@
ClockCityListProxyModel::ClockCityListProxyModel(QObject *parent)
:QSortFilterProxyModel(parent)
{
+ OstTraceFunctionEntry0( CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_EXIT );
}
/*!
@@ -52,11 +59,13 @@
bool ClockCityListProxyModel::filterAcceptsRow(
int sourceRow, const QModelIndex &sourceParent) const
{
+ OstTraceFunctionEntry0( CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_ENTRY );
// Get the model index of the source model.
QModelIndex modelIndex = sourceModel()->index(
sourceRow, filterKeyColumn(), sourceParent);
if (!modelIndex.isValid()) {
+ OstTraceFunctionExit0( CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT );
return false;
}
@@ -71,6 +80,7 @@
if (Qt::UserRole + 100 == role) {
QString string = modelData.value<QString>();
if (string.contains(filterExp)) {
+ OstTraceFunctionExit0( DUP1_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT );
return true;
}
}
--- a/clock/clockui/clockcityselectionlist/src/clockcityselectionlist.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockcityselectionlist/src/clockcityselectionlist.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -25,6 +25,11 @@
#include "clockcityselectionlist_p.h"
#include "clockdatatypes.h"
#include "timezoneclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockcityselectionlistTraces.h"
+#endif
+
/*!
\class ClockCitySelectionList
@@ -53,9 +58,11 @@
:QObject(parent),
d_ptr(new ClockCitySelectionListPrivate(client, this))
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY );
// Load the translation file and install the editor specific translator
mTranslator = new HbTranslator("clockcityselectionlist");
mTranslator->loadCommon();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT );
}
/*!
@@ -67,18 +74,22 @@
:QObject(parent),
d_ptr(new ClockCitySelectionListPrivate(0, this))
{
+ OstTraceFunctionEntry0( DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY );
// Load the translation file and install the editor specific translator
mTranslator = new HbTranslator("clockcityselectionlist");
mTranslator->loadCommon();
+ OstTraceFunctionExit0( DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT );
}
ClockCitySelectionList::~ClockCitySelectionList()
{
+ OstTraceFunctionEntry0( DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY );
// Remove the translator
if (mTranslator) {
delete mTranslator;
mTranslator = 0;
}
+ OstTraceFunctionExit0( DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT );
}
/*!
@@ -87,7 +98,9 @@
*/
void ClockCitySelectionList::showCityList()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLIST_SHOWCITYLIST_ENTRY );
d_ptr->showCityList();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLIST_SHOWCITYLIST_EXIT );
}
/*!
@@ -96,7 +109,9 @@
*/
void ClockCitySelectionList::closeCityList()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLIST_CLOSECITYLIST_ENTRY );
d_ptr->closeCityList();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLIST_CLOSECITYLIST_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -1,4 +1,4 @@
-/*
+ /*
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
@@ -46,6 +46,11 @@
#include "timezoneclient.h"
#include "clockdatatypes.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockcityselectionlist_pTraces.h"
+#endif
+
/*!
\class ClockCitySelectionListPrivate
@@ -65,6 +70,7 @@
mLoader(0),
mOwnsClient(false)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY );
// First get the q-pointer.
q_ptr = static_cast<ClockCitySelectionList *> (parent);
@@ -73,6 +79,7 @@
mClient = TimezoneClient::getInstance();
mOwnsClient = true;
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT );
}
/*!
@@ -80,6 +87,7 @@
*/
ClockCitySelectionListPrivate::~ClockCitySelectionListPrivate()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY );
if (mOwnsClient) {
mClient->deleteInstance();
}
@@ -101,6 +109,7 @@
delete mVirtualKeyboard;
}
+ OstTraceFunctionExit0( DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT );
}
/*!
@@ -108,6 +117,7 @@
*/
void ClockCitySelectionListPrivate::populateListModel()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_ENTRY );
// First get the data from the timezone client.
QList<LocationInfo> &infoList = mClient->getLocations();
@@ -145,6 +155,7 @@
// Cleanup.
infoList.clear();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_EXIT );
}
/*!
@@ -155,6 +166,7 @@
void ClockCitySelectionListPrivate::handleItemActivated(
const QModelIndex &index)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_ENTRY );
LocationInfo selectedInfo;
selectedInfo.timezoneId = index.data(Qt::UserRole + 101).value<int>();
selectedInfo.cityGroupId = index.data(Qt::UserRole + 102).value<int>();
@@ -169,6 +181,7 @@
// Close the list.
closeCityList();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_EXIT );
}
/*!
@@ -176,6 +189,7 @@
*/
void ClockCitySelectionListPrivate::handleBackAction()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_ENTRY );
LocationInfo info;
info.timezoneId = -1;
@@ -193,6 +207,7 @@
// Close the list.
closeCityList();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_EXIT );
}
/*!
@@ -200,6 +215,7 @@
*/
void ClockCitySelectionListPrivate::closeCityList()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_ENTRY );
// We are done, lets remove the view off the main window.
HbMainWindow *window = hbInstance->allMainWindows().at(0);
window->removeView(mView);
@@ -213,6 +229,7 @@
if (mListModel) {
delete mListModel;
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_EXIT );
}
/*!
@@ -223,6 +240,7 @@
void ClockCitySelectionListPrivate::updateSearchCriteria(
const QString &criteria)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_ENTRY );
int originalMask = mListView->enabledAnimations();
mListView->setEnabledAnimations(HbAbstractItemView::TouchDown);
@@ -236,6 +254,7 @@
mProxyModel->setFilterRegExp(searchExp);
mProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_EXIT );
}
/*!
@@ -243,6 +262,7 @@
*/
void ClockCitySelectionListPrivate::handleAddOwnCityAction()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_ENTRY );
if (mAddOwnCityDialog) {
delete mAddOwnCityDialog;
}
@@ -283,6 +303,7 @@
mOkAction = static_cast<HbAction *> (mAddCityDocloader->findObject("okAction"));
mAddOwnCityDialog->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_EXIT );
}
/*!
@@ -290,6 +311,7 @@
*/
void ClockCitySelectionListPrivate::handleOkAction()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_ENTRY );
QString cityName = mCityNameEdit->text();
// Add the city if city name is not empty
@@ -317,6 +339,7 @@
populateListModel();
}
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_EXIT );
}
/*!
@@ -325,6 +348,7 @@
*/
void ClockCitySelectionListPrivate::handleTimeZoneSelection(int index)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_ENTRY );
// Get the selected time zone offset.
int selectedTimeZoneOffset = mTimeZoneOffsetList.at(index);
@@ -342,6 +366,7 @@
qSort(countries);
mCountryComboBox->setItems(countries);
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_EXIT );
}
/*!
@@ -349,9 +374,11 @@
*/
void ClockCitySelectionListPrivate::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_ENTRY );
if (action==mOkAction) {
handleOkAction();
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_EXIT );
}
/*!
@@ -359,6 +386,7 @@
*/
void ClockCitySelectionListPrivate::loadSection(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_ENTRY );
bool loadSuccess;
if (mAddOwnCityDialog) {
if (Qt::Horizontal == orientation) {
@@ -369,6 +397,7 @@
"portrait", &loadSuccess);
}
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_EXIT );
}
/*!
@@ -377,6 +406,7 @@
*/
void ClockCitySelectionListPrivate::cancelSearch()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_ENTRY );
// Clear the search criteria.
mSearchBox->setCriteria(QString(""));
@@ -390,6 +420,7 @@
// Set focus to the first city in the list.
mListView->scrollTo(mProxyModel->index(0, 0));
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_EXIT );
}
/*!
@@ -397,6 +428,7 @@
*/
void ClockCitySelectionListPrivate::focusLineEdit()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_ENTRY );
if (mSearchBox) {
// mView->scene()->setFocusItem(mSearchBox);
HbLineEdit *searchBoxEditor = 0;
@@ -419,6 +451,7 @@
delete event;
}
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_EXIT );
}
/*!
@@ -426,6 +459,7 @@
*/
void ClockCitySelectionListPrivate::showCityList()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_ENTRY );
// Construct the document loader.
bool success = false;
mLoader = new HbDocumentLoader;
@@ -506,6 +540,7 @@
// Focus the search box.
focusLineEdit();
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_EXIT );
}
/*!
@@ -513,6 +548,7 @@
*/
QStringList ClockCitySelectionListPrivate::getOffsetTexts()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_ENTRY );
int offsetCount(mTimeZoneOffsetList.count());
// Get all the time zone offsets
@@ -545,6 +581,7 @@
offsetTextList.append(offsetText);
offsetText.clear();
}
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_EXIT );
return offsetTextList;
}
@@ -553,8 +590,10 @@
*/
void ClockCitySelectionListPrivate::addCityNameField()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_ENTRY );
mCityNameEdit = new HbLineEdit();
mCityNameEdit->setFocus(Qt::MouseFocusReason);
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_EXIT );
}
/*!
@@ -562,6 +601,7 @@
*/
void ClockCitySelectionListPrivate::addTimeZoneField()
{
+OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_ENTRY );
// mTimeZoneComboBox = new HbComboBox();
QStringList texts = getOffsetTexts();
@@ -576,6 +616,7 @@
connect(
mTimeZoneComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(handleTimeZoneSelection(int)));
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_EXIT );
}
/*!
@@ -583,8 +624,10 @@
*/
void ClockCitySelectionListPrivate::addCountryListField()
{
+ OstTraceFunctionEntry0( CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_ENTRY );
// Populate the country list based on the current TZ offset selected.
handleTimeZoneSelection(mCurrentTZOffsetIndex);
+ OstTraceFunctionExit0( CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/clockcitylistproxymodelTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,19 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKCITYLISTPROXYMODELTRACES_H__
+#define __CLOCKCITYLISTPROXYMODELTRACES_H__
+
+#define KOstTraceComponentID 0xabcde123
+
+#define CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_ENTRY 0x8a0001
+#define CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_EXIT 0x8a0002
+#define CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_ENTRY 0x8a0003
+#define CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0004
+#define DUP1_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT 0x8a0005
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/clockcityselectionlistTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKCITYSELECTIONLISTTRACES_H__
+#define __CLOCKCITYSELECTIONLISTTRACES_H__
+
+#define KOstTraceComponentID 0xabcde123
+
+#define CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY 0x8a0006
+#define CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT 0x8a0007
+#define DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY 0x8a0008
+#define DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT 0x8a0009
+#define DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY 0x8a000a
+#define DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT 0x8a000b
+#define CLOCKCITYSELECTIONLIST_SHOWCITYLIST_ENTRY 0x8a000c
+#define CLOCKCITYSELECTIONLIST_SHOWCITYLIST_EXIT 0x8a000d
+#define CLOCKCITYSELECTIONLIST_CLOSECITYLIST_ENTRY 0x8a000e
+#define CLOCKCITYSELECTIONLIST_CLOSECITYLIST_EXIT 0x8a000f
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/clockcityselectionlist_pTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,52 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKCITYSELECTIONLIST_PTRACES_H__
+#define __CLOCKCITYSELECTIONLIST_PTRACES_H__
+
+#define KOstTraceComponentID 0xabcde123
+
+#define CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY 0x8a0010
+#define CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT 0x8a0011
+#define DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY 0x8a0012
+#define DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT 0x8a0013
+#define CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_ENTRY 0x8a0014
+#define CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_EXIT 0x8a0015
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_ENTRY 0x8a0016
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_EXIT 0x8a0017
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_ENTRY 0x8a0018
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_EXIT 0x8a0019
+#define CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_ENTRY 0x8a001a
+#define CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_EXIT 0x8a001b
+#define CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_ENTRY 0x8a001c
+#define CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_EXIT 0x8a001d
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_ENTRY 0x8a001e
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_EXIT 0x8a001f
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_ENTRY 0x8a0020
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_EXIT 0x8a0021
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_ENTRY 0x8a0022
+#define CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_EXIT 0x8a0023
+#define CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_ENTRY 0x8a0024
+#define CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_EXIT 0x8a0025
+#define CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_ENTRY 0x8a0026
+#define CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_EXIT 0x8a0027
+#define CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_ENTRY 0x8a0028
+#define CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_EXIT 0x8a0029
+#define CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_ENTRY 0x8a002a
+#define CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_EXIT 0x8a002b
+#define CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_ENTRY 0x8a002c
+#define CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_EXIT 0x8a002d
+#define CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_ENTRY 0x8a002e
+#define CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_EXIT 0x8a002f
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_ENTRY 0x8a0030
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_EXIT 0x8a0031
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_ENTRY 0x8a0032
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_EXIT 0x8a0033
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_ENTRY 0x8a0034
+#define CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_EXIT 0x8a0035
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockcityselectionlist/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,55 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYLISTPROXYMODEL_CLOCKCITYLISTPROXYMODEL_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDCITYNAMEFIELD_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDCOUNTRYLISTFIELD_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_ADDTIMEZONEFIELD_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CANCELSEARCH_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_CLOSECITYLIST_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_FOCUSLINEEDIT_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_GETOFFSETTEXTS_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEADDOWNCITYACTION_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEBACKACTION_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEITEMACTIVATED_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLEOKACTION_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_HANDLETIMEZONESELECTION_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_LOADSECTION_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_POPULATELISTMODEL_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_SELECTEDACTION_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_SHOWCITYLIST_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLISTPRIVATE_UPDATESEARCHCRITERIA_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_CLOSECITYLIST_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_CLOSECITYLIST_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_SHOWCITYLIST_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKCITYSELECTIONLIST_SHOWCITYLIST_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYLISTPROXYMODEL_FILTERACCEPTSROW_EXIT=0x5
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYSELECTIONLISTPRIVATE_CLOCKCITYSELECTIONLISTPRIVATE_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CLOCKCITYSELECTIONLIST_CLOCKCITYSELECTIONLIST_EXIT=0xb
--- a/clock/clockui/clockplugins/clocksettingsviewplugin/clocksettingsviewplugin.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/clocksettingsviewplugin.pro Mon Aug 09 18:30:52 2010 +0530
@@ -26,7 +26,8 @@
INCLUDEPATH += . \
../../../inc \
../../clocksettingsview/inc \
- ../../../clockmw/clocksettingsutility/inc
+ ../../../clockmw/clocksettingsutility/inc \
+ ./traces
LIBS += \
-lclocksettingsview
--- a/clock/clockui/clockplugins/clocksettingsviewplugin/src/clocksettingsviewplugin.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/src/clocksettingsviewplugin.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -21,6 +21,11 @@
// User includes
#include "clockregionalsettingsview.h"
#include "clocksettingsviewplugin.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clocksettingsviewpluginTraces.h"
+#endif
+
/*!
\class ClockSettingsViewPlugin
@@ -34,6 +39,8 @@
*/
ClockSettingsViewPlugin::ClockSettingsViewPlugin()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY );
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT );
}
/*!
@@ -41,6 +48,8 @@
*/
ClockSettingsViewPlugin::~ClockSettingsViewPlugin()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY );
+ OstTraceFunctionExit0( DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT );
}
/*!
@@ -48,9 +57,11 @@
*/
void ClockSettingsViewPlugin::launchRegionalSettingsView()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_ENTRY );
//The view is removed from main window and deleted once you select back on view
ClockRegionalSettingsView *view = new ClockRegionalSettingsView();
view->showView();
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_EXIT );
}
Q_EXPORT_PLUGIN2(clocksettingsviewplugin, ClockSettingsViewPlugin)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/traces/clocksettingsviewpluginTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKSETTINGSVIEWPLUGINTRACES_H__
+#define __CLOCKSETTINGSVIEWPLUGINTRACES_H__
+
+#define KOstTraceComponentID 0x2003157c
+
+#define CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY 0x8a0001
+#define CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT 0x8a0002
+#define DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY 0x8a0003
+#define DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT 0x8a0004
+#define CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_ENTRY 0x8a0005
+#define CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_EXIT 0x8a0006
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/clocksettingsviewplugin/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,8 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEWPLUGIN_LAUNCHREGIONALSETTINGSVIEW_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKSETTINGSVIEWPLUGIN_CLOCKSETTINGSVIEWPLUGIN_EXIT=0x4
--- a/clock/clockui/clockplugins/datetimesettingsplugin/datetimesettingsplugin.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/datetimesettingsplugin.pro Mon Aug 09 18:30:52 2010 +0530
@@ -26,7 +26,8 @@
INCLUDEPATH += . \
../../../inc \
../../../clockmw/clocktimezone/inc \
- ../../clocksettingsview/inc
+ ../../clocksettingsview/inc \
+ ./traces
LIBS += \
-lcpframework \
--- a/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -23,12 +23,19 @@
// User includes
#include "datetimesettingsplugin.h"
#include "datetimesettingsview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "datetimesettingspluginTraces.h"
+#endif
+
/*!
Constructor.
*/
DateTimeSettingsPlugin::DateTimeSettingsPlugin()
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY );
+ OstTraceFunctionExit0( DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT );
}
/*!
@@ -36,6 +43,8 @@
*/
DateTimeSettingsPlugin::~DateTimeSettingsPlugin()
{
+ OstTraceFunctionEntry0( DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY );
+ OstTraceFunctionExit0( DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT );
}
/*!
@@ -43,7 +52,9 @@
*/
int DateTimeSettingsPlugin::uid() const
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSPLUGIN_UID_ENTRY );
// UID of the plugin.
+ OstTraceFunctionExit0( DATETIMESETTINGSPLUGIN_UID_EXIT );
return 0x102818E9;
}
@@ -54,6 +65,7 @@
createSettingFormItemData(
CpItemDataHelper &itemDataHelper) const
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_ENTRY );
HbIcon icon ;
HbExtendedLocale locale = HbExtendedLocale::system();
QString timeInfo = locale.format(
@@ -70,6 +82,7 @@
itemDataHelper,hbTrId("txt_cp_main_view_list_time_date"),
displayString,icon);
entryItemList.append(entryItem);
+ OstTraceFunctionExit0( DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_EXIT );
return entryItemList;
}
--- a/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -26,6 +26,11 @@
#include "datetimesettingsview.h"
#include "clocksettingsview.h"
#include "timezoneclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "datetimesettingsviewTraces.h"
+#endif
+
/*!
\class DateTimeSettingsView
@@ -49,6 +54,7 @@
CpSettingFormEntryItemData(
itemDataHelper, text, description, icon, parent)
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY );
// Construct the timezone client.
mTimezoneClient = TimezoneClient::getInstance();
connect(
@@ -62,6 +68,7 @@
connect(
mTickTimer, SIGNAL(timeout()),
this, SLOT(updateDisplayTime()));
+ OstTraceFunctionExit0( DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT );
}
/*!
@@ -69,6 +76,7 @@
*/
DateTimeSettingsView::~DateTimeSettingsView()
{
+ OstTraceFunctionEntry0( DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY );
if (mTickTimer) {
mTickTimer->stop();
delete mTickTimer;
@@ -78,6 +86,7 @@
if (!mTimezoneClient->isNull()) {
mTimezoneClient->deleteInstance();
}
+ OstTraceFunctionExit0( DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT );
}
/*!
@@ -85,8 +94,10 @@
*/
void DateTimeSettingsView::onLaunchView()
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSVIEW_ONLAUNCHVIEW_ENTRY );
ClockSettingsView *settingsView = new ClockSettingsView(this);
settingsView->loadSettingsView();
+ OstTraceFunctionExit0( DATETIMESETTINGSVIEW_ONLAUNCHVIEW_EXIT );
}
/*!
@@ -94,6 +105,7 @@
*/
void DateTimeSettingsView::updateDisplayTime()
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
QString timeInfo = locale.format(
QTime::currentTime(), r_qtn_time_usual_with_zero);
@@ -106,6 +118,7 @@
setDescription(displayString);
// Start the Timer for 1 minute.
mTickTimer->start(60000);
+ OstTraceFunctionExit0( DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_EXIT );
}
/*!
@@ -113,6 +126,8 @@
*/
CpBaseSettingView *DateTimeSettingsView::createSettingView() const
{
+ OstTraceFunctionEntry0( DATETIMESETTINGSVIEW_CREATESETTINGVIEW_ENTRY );
+ OstTraceFunctionExit0( DATETIMESETTINGSVIEW_CREATESETTINGVIEW_EXIT );
return 0;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/traces/datetimesettingspluginTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,22 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __DATETIMESETTINGSPLUGINTRACES_H__
+#define __DATETIMESETTINGSPLUGINTRACES_H__
+
+#define KOstTraceComponentID 0x102818e9
+
+#define DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY 0x8a0001
+#define DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT 0x8a0002
+#define DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY 0x8a0003
+#define DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT 0x8a0004
+#define DATETIMESETTINGSPLUGIN_UID_ENTRY 0x8a0005
+#define DATETIMESETTINGSPLUGIN_UID_EXIT 0x8a0006
+#define DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_ENTRY 0x8a0007
+#define DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_EXIT 0x8a0008
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/traces/datetimesettingsviewTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,24 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __DATETIMESETTINGSVIEWTRACES_H__
+#define __DATETIMESETTINGSVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x102818e9
+
+#define DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY 0x8a0009
+#define DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT 0x8a000a
+#define DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY 0x8a000b
+#define DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT 0x8a000c
+#define DATETIMESETTINGSVIEW_ONLAUNCHVIEW_ENTRY 0x8a000d
+#define DATETIMESETTINGSVIEW_ONLAUNCHVIEW_EXIT 0x8a000e
+#define DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_ENTRY 0x8a000f
+#define DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_EXIT 0x8a0010
+#define DATETIMESETTINGSVIEW_CREATESETTINGVIEW_ENTRY 0x8a0011
+#define DATETIMESETTINGSVIEW_CREATESETTINGVIEW_EXIT 0x8a0012
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,20 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_UID_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSPLUGIN_UID_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_CREATESETTINGVIEW_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_CREATESETTINGVIEW_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_ONLAUNCHVIEW_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_ONLAUNCHVIEW_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_DATETIMESETTINGSVIEW_UPDATEDISPLAYTIME_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DATETIMESETTINGSPLUGIN_DATETIMESETTINGSPLUGIN_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DATETIMESETTINGSVIEW_DATETIMESETTINGSVIEW_EXIT=0xc
--- a/clock/clockui/clocksettingsview/clocksettingsview.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clocksettingsview/clocksettingsview.pro Mon Aug 09 18:30:52 2010 +0530
@@ -26,7 +26,8 @@
../../clockmw/clocksettingsutility/inc \
../../clockmw/clocktimezone/inc \
../clockcityselectionlist/inc \
- ../../inc
+ ../../inc \
+ ./traces
DEPENDPATH += \
--- a/clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -31,6 +31,7 @@
#include <HbComboBox>
#include <HbListWidgetItem>
#include <HbTranslator>
+#include <QLocale>
// User includes
#include "clockregionalsettingsview.h"
@@ -38,6 +39,11 @@
#include "clocksettingsdefines.h"
#include "settingsdatatypes.h"
#include "settingscustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockregionalsettingsviewTraces.h"
+#endif
+
/*!
\class ClockRegionalSettingsView
@@ -53,6 +59,7 @@
mView(0),
mLoader(0)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY );
// Construct the document loader.
mLoader = new ClockSettingsDocLoader;
@@ -65,6 +72,7 @@
// Create the custom prototype.
mCustomPrototype = new SettingsCustomItem();
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT );
}
/*!
@@ -72,6 +80,7 @@
*/
ClockRegionalSettingsView::~ClockRegionalSettingsView()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY );
if (mLoader) {
delete mLoader;
mLoader = 0;
@@ -89,6 +98,7 @@
delete mTranslator;
mTranslator = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT );
}
/*!
@@ -96,6 +106,7 @@
*/
void ClockRegionalSettingsView::showView()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_ENTRY );
bool success;
// Load the application xml.
@@ -141,6 +152,7 @@
connect(
backAction, SIGNAL(triggered()),
this, SLOT(handleBackAction()));
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_EXIT );
}
/*!
@@ -148,10 +160,11 @@
*/
void ClockRegionalSettingsView::handleBackAction()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
HbExtendedLocale::WeekDay startOfWeekIndex =
HbExtendedLocale::system().startOfWeek();
- // TODO: Save workdays settings.
+ // Save workdays settings.
QItemSelectionModel *model = 0;
model = mWorkdaysItem->selectionModel();
QModelIndexList selectedModelIndex = model->selectedIndexes();
@@ -185,6 +198,7 @@
// Cleanup.
window->removeView(mView);
deleteLater();
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_EXIT );
}
/*!
@@ -195,7 +209,9 @@
*/
void ClockRegionalSettingsView::handleItemDisplayed(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_ENTRY );
if (!index.isValid()) {
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT );
return;
}
@@ -227,6 +243,7 @@
default:
break;
}
+ OstTraceFunctionExit0( DUP1_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT );
}
/*!
@@ -235,9 +252,10 @@
*/
void ClockRegionalSettingsView::handleTimeFormatChange()
{
-// mSettingsUtility->setTimeFormat(mTimeFormatItem->text());
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_ENTRY );
mSettingsUtility->setTimeFormat(
mTimeFormatItem->contentWidgetData("text").toString());
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_EXIT );
}
/*!
@@ -246,16 +264,19 @@
*/
void ClockRegionalSettingsView::handleTimeSeparatorChange()
{
-// mSettingsUtility->setTimeSeparator(mTimeSeparatorItem->text());
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_ENTRY );
mSettingsUtility->setTimeSeparator(
mTimeSeparatorItem->contentWidgetData("text").toString());
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_EXIT );
}
/*!
*/
void ClockRegionalSettingsView::handleDateFormatChange(QString text)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_ENTRY );
mSettingsUtility->setDateFormat(text);
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_EXIT );
}
/*!
@@ -264,7 +285,9 @@
*/
void ClockRegionalSettingsView::handleDateSeparatorChange(QString text)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_ENTRY );
mSettingsUtility->setDateSeparator(text);
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_EXIT );
}
/*!
@@ -273,6 +296,7 @@
void ClockRegionalSettingsView::handleDataChanged(
const QModelIndex& topLeft, const QModelIndex& bottomRight)
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_ENTRY );
Q_UNUSED(bottomRight)
@@ -293,6 +317,7 @@
default:
break;
}
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_EXIT );
}
/*!
@@ -300,6 +325,7 @@
*/
void ClockRegionalSettingsView::createModel()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_ENTRY );
if (mForm->model()) {
delete mForm->model();
mForm->setModel(0);
@@ -317,6 +343,7 @@
SIGNAL(dataChanged(const QModelIndex, const QModelIndex)),
this,
SLOT(handleDataChanged(const QModelIndex, const QModelIndex)));
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_EXIT );
}
/*!
@@ -324,6 +351,7 @@
*/
void ClockRegionalSettingsView::populateFormModel()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_ENTRY );
if (!mFormModel) {
createModel();
}
@@ -397,14 +425,15 @@
HbDataFormModelItem *item = 0;
// Create the weekday list based on start of week.
QStringList weekdaysList;
+ QLocale qLocale;
weekdaysList
- << hbTrId("txt_clk_setlabel_val_monday")
- << hbTrId("txt_clk_setlabel_val_tuesday")
- << hbTrId("txt_clk_setlabel_val_wednesday")
- << hbTrId("txt_clk_setlabel_val_thursday")
- << hbTrId("txt_clk_setlabel_val_friday")
- << hbTrId("txt_clk_setlabel_val_saturday")
- << hbTrId("txt_clk_setlabel_val_sunday");
+ << qLocale.dayName(1)
+ << qLocale.dayName(2)
+ << qLocale.dayName(3)
+ << qLocale.dayName(4)
+ << qLocale.dayName(5)
+ << qLocale.dayName(6)
+ << qLocale.dayName(7);
HbDataFormModelItem::DataItemType workdaysItemType =
static_cast<HbDataFormModelItem::DataItemType>
@@ -422,6 +451,7 @@
item->setContentWidgetData("items", weekdaysList);
item->setContentWidgetData("currentIndex", startOfWeek);
item->setContentWidgetData("objectName", "startOfWeek");
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_EXIT );
}
/*!
@@ -430,16 +460,18 @@
QStringList ClockRegionalSettingsView::weekdayList()
{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_ENTRY );
QStringList weekDays;
QStringList daysList;
+ QLocale qLocale;
daysList
- << hbTrId("txt_clk_setlabel_val_monday")
- << hbTrId("txt_clk_setlabel_val_tuesday")
- << hbTrId("txt_clk_setlabel_val_wednesday")
- << hbTrId("txt_clk_setlabel_val_thursday")
- << hbTrId("txt_clk_setlabel_val_friday")
- << hbTrId("txt_clk_setlabel_val_saturday")
- << hbTrId("txt_clk_setlabel_val_sunday");
+ << qLocale.dayName(1)
+ << qLocale.dayName(2)
+ << qLocale.dayName(3)
+ << qLocale.dayName(4)
+ << qLocale.dayName(5)
+ << qLocale.dayName(6)
+ << qLocale.dayName(7);
HbExtendedLocale::WeekDay startOfWeekIndex =
HbExtendedLocale::system().startOfWeek();
@@ -453,6 +485,7 @@
}
}
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_EXIT );
return weekDays;
}
@@ -463,21 +496,26 @@
void ClockRegionalSettingsView::updateWeekStartOn()
{
-if (mStartOfWeekItem != 0)
- {
- HbExtendedLocale locale;
- HbExtendedLocale::WeekDay weekdDayStart = locale.startOfWeek();
- int currentDay = mStartOfWeekItem->currentIndex();
- if(currentDay == weekdDayStart )
- {
- return;
- }
- else
- {
- mStartOfWeekItem->setCurrentIndex(weekdDayStart);
- updateWeekDays();
- }
- }
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY );
+ if (mStartOfWeekItem != 0)
+ {
+ HbExtendedLocale locale;
+ HbExtendedLocale::WeekDay weekdDayStart = locale.startOfWeek();
+ int currentDay = mStartOfWeekItem->currentIndex();
+ if(currentDay == weekdDayStart )
+ {
+ OstTraceFunctionExit0(
+ CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT );
+ return;
+ }
+ else
+ {
+ mStartOfWeekItem->setCurrentIndex(weekdDayStart);
+ updateWeekDays();
+ }
+ }
+ OstTraceFunctionExit0(
+ DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT );
}
/*!
@@ -485,31 +523,33 @@
*/
void ClockRegionalSettingsView::updateWeekDays()
{
-QStringList weekdays = weekdayList();
-QString workdays = mCustomPrototype->workdaysSetting();
-QItemSelectionModel *model = 0;
-model = mWorkdaysItem->selectionModel();
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY );
+ QStringList weekdays = weekdayList();
+ QString workdays = mCustomPrototype->workdaysSetting();
+ QItemSelectionModel *model = 0;
+ model = mWorkdaysItem->selectionModel();
-for (int i = 0, index = workdays.size() - 1;
- i < mWorkdaysItem->count(); ++i, index--)
- {
- QString str = weekdays[i];
- mWorkdaysItem->item(i)->setText(str);
+ for (int i = 0, index = workdays.size() - 1;
+ i < mWorkdaysItem->count(); ++i, index--)
+ {
+ QString str = weekdays[i];
+ mWorkdaysItem->item(i)->setText(str);
- QChar ch = workdays.at(index);
- if ( ch == QChar('0'))
- {
- // Not a workday.
- model->select(
- model->model()->index(i,0),
- QItemSelectionModel::Deselect);
- }
- else
- {
- // Workday.
- model->select(
- model->model()->index(i,0),
- QItemSelectionModel::Select);}
- }
+ QChar ch = workdays.at(index);
+ if ( ch == QChar('0'))
+ {
+ // Not a workday.
+ model->select(
+ model->model()->index(i,0),
+ QItemSelectionModel::Deselect);
+ }
+ else
+ {
+ // Workday.
+ model->select(
+ model->model()->index(i,0),
+ QItemSelectionModel::Select);}
+ }
+ OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clocksettingsview/src/clocksettingsdocloader.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clocksettingsview/src/clocksettingsdocloader.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -20,6 +20,11 @@
#include "clocksettingsdocloader.h"
#include "clocksettingsdefines.h"
#include "clocksettingsview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clocksettingsdocloaderTraces.h"
+#endif
+
/*!
\class ClockSettingsDocLoader
@@ -35,6 +40,7 @@
*/
QObject *ClockSettingsDocLoader::createObject(const QString &type, const QString &name)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSDOCLOADER_CREATEOBJECT_ENTRY );
return HbDocumentLoader::createObject(type, name);
}
--- a/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -38,6 +38,11 @@
#include "timezoneclient.h"
#include "settingsdatatypes.h"
#include "settingscustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clocksettingsviewTraces.h"
+#endif
+
/*!
\class ClockSettingsView
@@ -54,6 +59,7 @@
ClockSettingsView::ClockSettingsView(QObject *parent)
:QObject(parent)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY );
// Load the translation file and install the editor specific translator
mTranslator = new HbTranslator("clocksettingsview");
@@ -102,6 +108,7 @@
connect(
mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
this, SLOT(eventMonitor(XQSettingsKey, QVariant)));
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT );
}
/*!
@@ -109,6 +116,7 @@
*/
ClockSettingsView::~ClockSettingsView()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
}
@@ -127,6 +135,7 @@
}
+ OstTraceFunctionExit0( DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT );
}
/*!
@@ -134,6 +143,7 @@
*/
void ClockSettingsView::loadSettingsView()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_ENTRY );
bool loadSuccess;
// Construct the document loader instance
@@ -172,6 +182,7 @@
// Setup the view.
setupView();
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_EXIT );
}
/*!
@@ -179,9 +190,11 @@
*/
void ClockSettingsView::handleBackAction()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLEBACKACTION_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
window->removeView(mSettingsView);
deleteLater();
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLEBACKACTION_EXIT );
}
/*!
@@ -189,6 +202,7 @@
*/
void ClockSettingsView::updatePlaceItem()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATEPLACEITEM_ENTRY );
// Get the current zone info.
LocationInfo currentZoneInfo = mTimezoneClient->getCurrentZoneInfoL();
@@ -200,6 +214,7 @@
+ tr(", ") + currentZoneInfo.countryName;
mPlaceDataFormItem->setContentWidgetData("text", placeInfo);
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_UPDATEPLACEITEM_EXIT );
}
/*!
@@ -207,7 +222,9 @@
*/
void ClockSettingsView::updateDateItem()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATEDATEITEM_ENTRY );
mDateDataFormItem->setContentWidgetData("text", mSettingsUtility->date());
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_UPDATEDATEITEM_EXIT );
}
/*!
@@ -215,6 +232,7 @@
*/
void ClockSettingsView::updateTimeItem()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATETIMEITEM_ENTRY );
if (!mTickTimer->isActive()) {
mTickTimer->stop();
}
@@ -222,6 +240,7 @@
// Start the timer again.
mTickTimer->start(60000 - 1000 * QTime::currentTime().second());
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_UPDATETIMEITEM_EXIT );
}
/*!
@@ -229,6 +248,7 @@
*/
void ClockSettingsView::handleOrientationChanged(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_ENTRY );
bool success;
// If horizontal, load the landscape section.
if (Qt::Horizontal == orientation) {
@@ -242,10 +262,12 @@
CLOCK_SETTINGS_VIEW_PORTRAIT_SECTION,
&success);
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_EXIT );
}
void ClockSettingsView::handleNetworkTimeStateChange(int state)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_ENTRY );
bool cenrepValue = mTimezoneClient->timeUpdateOn();
if ((Qt::Checked == state && !cenrepValue)
|| (Qt::Unchecked == state && cenrepValue)) {
@@ -258,6 +280,7 @@
mTimezoneClient->setTimeUpdateOn(false);
}
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_EXIT );
}
/*!
@@ -268,6 +291,7 @@
*/
void ClockSettingsView::setupView()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_SETUPVIEW_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
window->addView(mSettingsView);
window->setCurrentView(mSettingsView);
@@ -294,6 +318,7 @@
updatePlaceItem();
mTickTimer->start(60000 - 1000 * QTime::currentTime().second());
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_SETUPVIEW_EXIT );
}
/*!
@@ -301,6 +326,7 @@
*/
void ClockSettingsView::createModel()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_CREATEMODEL_ENTRY );
// Remove the model.
if (mSettingsForm->model()) {
delete mSettingsForm->model();
@@ -312,6 +338,7 @@
// Add the items to the view.
populateModel();
mSettingsForm->setModel(mSettingsModel);
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_CREATEMODEL_EXIT );
}
/*!
@@ -319,6 +346,7 @@
*/
void ClockSettingsView::populateModel()
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_POPULATEMODEL_ENTRY );
if (!mSettingsModel) {
createModel();
}
@@ -451,6 +479,7 @@
mAlarmSnoozeItem, SIGNAL(currentIndexChanged(int)),
this, SLOT(handleAlarmSnoozeTimeChanged(int)));
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_POPULATEMODEL_EXIT );
}
/*!
@@ -460,6 +489,7 @@
*/
void ClockSettingsView::handleAutoTimeUpdateChange(int value)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_ENTRY );
int state = (mNetworkTimeItem->contentWidgetData("checkState")).toInt();
if (value) {
@@ -494,6 +524,7 @@
}
}
updatePlaceItem();
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_EXIT );
}
/*!
@@ -503,10 +534,12 @@
*/
void ClockSettingsView::handleAlarmSnoozeTimeChanged(int index)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_ENTRY );
if (mAlarmSnoozeTimeHash.value(index)) {
mSettingsManager->writeItemValue(
*mAlarmSnoozeTimeKey, mAlarmSnoozeTimeHash.value(index));
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_EXIT );
}
/*!
@@ -514,8 +547,10 @@
*/
void ClockSettingsView::handleClockTypeChanged()
{
- mSettingsUtility->setClockType(
- mClockTypeItem->contentWidgetData("text").toString());
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_ENTRY );
+ mSettingsUtility->setClockType(
+ mClockTypeItem->contentWidgetData("text").toString());
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_EXIT );
}
/*!
@@ -527,6 +562,7 @@
void ClockSettingsView::eventMonitor(
const XQSettingsKey& key, const QVariant& value)
{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY );
if (key.uid() == KCRUidClockApp && key.key() == KClockAppSnoozeTime) {
if (mSettingsManager->error() == XQSettingsManager::NoError) {
@@ -540,6 +576,7 @@
}
}
}
+ OstTraceFunctionExit0( CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -36,6 +36,11 @@
#include "clockcityselectionlist.h"
#include "timezoneclient.h"
#include "clockregionalsettingsview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "settingscustomitemTraces.h"
+#endif
+
/*!
\class SettingsCustomItem
@@ -52,10 +57,12 @@
SettingsCustomItem::SettingsCustomItem(QGraphicsItem *parent)
:HbDataFormViewItem(parent)
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY );
// Construct the settignsutility.
mSettingsUtility = new SettingsUtility();
// Construct the timezone client.
mTimezoneClient = TimezoneClient::getInstance();
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT );
}
/*!
@@ -63,7 +70,9 @@
*/
SettingsCustomItem::~SettingsCustomItem()
{
- // Nothing yet.
+ OstTraceFunctionEntry0( DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY );
+ // Nothing yet.
+ OstTraceFunctionExit0( DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT );
}
/*!
@@ -72,6 +81,7 @@
*/
HbAbstractViewItem* SettingsCustomItem::createItem()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_CREATEITEM_ENTRY );
return new SettingsCustomItem(*this);
}
@@ -81,14 +91,17 @@
*/
bool SettingsCustomItem::canSetModelIndex(const QModelIndex &index) const
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_CANSETMODELINDEX_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
index.data(HbDataFormModelItem::ItemTypeRole).toInt());
if(itemType >= HbDataFormModelItem::CustomItemBase &&
itemType <= (HbDataFormModelItem::CustomItemBase + 50)) {
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT );
return true;
} else {
+ OstTraceFunctionExit0( DUP1_SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT );
return false;
}
@@ -96,6 +109,7 @@
void SettingsCustomItem::restore()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_RESTORE_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(
modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -147,11 +161,14 @@
default:
break;
}
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_RESTORE_EXIT );
}
void SettingsCustomItem::setWeekdaysList(QStringList list)
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_ENTRY );
mWeekdaysList = list;
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_EXIT );
}
/*!
@@ -160,6 +177,7 @@
*/
HbWidget* SettingsCustomItem::createCustomWidget()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY );
HbDataFormModelItem::DataItemType itemType =
static_cast<HbDataFormModelItem::DataItemType>(modelIndex()
.data(HbDataFormModelItem::ItemTypeRole).toInt());
@@ -171,6 +189,7 @@
connect(
mTimeWidget, SIGNAL(clicked()),
this, SLOT(launchTimePicker()));
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mTimeWidget;
}
@@ -180,6 +199,7 @@
connect(
mDateWidget, SIGNAL(clicked()),
this, SLOT(launchDatePicker()));
+ OstTraceFunctionExit0( DUP1_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mDateWidget;
}
@@ -189,6 +209,7 @@
connect(
mPlaceWidget, SIGNAL(clicked()),
this, SLOT(launchCitySelectionList()));
+ OstTraceFunctionExit0( DUP2_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mPlaceWidget;
}
@@ -198,6 +219,7 @@
connect(
mRegSettingsWidget, SIGNAL(clicked()),
this, SLOT(launchRegSettingsView()));
+ OstTraceFunctionExit0( DUP3_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mRegSettingsWidget;
}
@@ -230,6 +252,7 @@
}
}
+ OstTraceFunctionExit0( DUP4_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT );
return mWorkdaysWidget;
}
@@ -243,6 +266,7 @@
*/
void SettingsCustomItem::launchTimePicker()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY );
if (mTimePickerDialog) {
delete mTimePickerDialog;
}
@@ -279,6 +303,7 @@
mTimePickerDialog->addAction(mCancelAction);
mTimePickerDialog->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_EXIT );
}
/*!
@@ -286,6 +311,7 @@
*/
void SettingsCustomItem::handleOkAction()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_HANDLEOKACTION_ENTRY );
if (mTimePickerDialog) {
// Get the time from the time picker.
QTime newTime = static_cast<HbDateTimePicker *> (
@@ -317,6 +343,7 @@
QDateTime(newDate, QTime::currentTime()));
}
}
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_HANDLEOKACTION_EXIT );
}
/*!
@@ -324,6 +351,7 @@
*/
void SettingsCustomItem::launchDatePicker()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_ENTRY );
if (mDatePickerDialog) {
delete mDatePickerDialog;
}
@@ -357,6 +385,7 @@
mDatePickerDialog->addAction(mCancelAction);
mDatePickerDialog->open(this, SLOT(selectedAction(HbAction*)));
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_EXIT );
}
/*!
@@ -364,12 +393,14 @@
*/
void SettingsCustomItem::launchCitySelectionList()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_ENTRY );
mCitySelectionList = new ClockCitySelectionList(mTimezoneClient, this);
connect(
mCitySelectionList, SIGNAL(citySelected(LocationInfo)),
this, SLOT(updatePlaceItem(LocationInfo)));
mCitySelectionList->showCityList();
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_EXIT );
}
/*!
@@ -379,9 +410,11 @@
*/
void SettingsCustomItem::updatePlaceItem(LocationInfo info)
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_UPDATEPLACEITEM_ENTRY );
if (-1 != info.timezoneId) {
mTimezoneClient->setAsCurrentLocationL(info);
}
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_UPDATEPLACEITEM_EXIT );
}
/*!
@@ -389,12 +422,14 @@
*/
void SettingsCustomItem::launchRegSettingsView()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_ENTRY );
ClockRegionalSettingsView *view =
new ClockRegionalSettingsView();
connect(mTimezoneClient, SIGNAL(timechanged()),
view, SLOT(updateWeekStartOn()));
view->showView();
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_EXIT );
}
/*!
@@ -402,9 +437,11 @@
*/
void SettingsCustomItem::selectedAction(HbAction *action)
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_SELECTEDACTION_ENTRY );
if (action==mOkAction) {
handleOkAction();
}
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_SELECTEDACTION_EXIT );
}
/*!
@@ -412,6 +449,7 @@
*/
QString SettingsCustomItem::workdaysSetting()
{
+ OstTraceFunctionEntry0( SETTINGSCUSTOMITEM_WORKDAYSSETTING_ENTRY );
HbExtendedLocale locale = HbExtendedLocale::system();
// 0(Sun)0(sat)1(Fri)1(Thu)1(Wed)1(Tue)1(Mon)
QString workdaysString = locale.workDays();
@@ -430,6 +468,7 @@
}
// workdays.append('\0');
+ OstTraceFunctionExit0( SETTINGSCUSTOMITEM_WORKDAYSSETTING_EXIT );
return workdays;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/clockregionalsettingsviewTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,46 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKREGIONALSETTINGSVIEWTRACES_H__
+#define __CLOCKREGIONALSETTINGSVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x10005906
+
+#define CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY 0x8a0001
+#define CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT 0x8a0002
+#define DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY 0x8a0003
+#define DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT 0x8a0004
+#define CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_ENTRY 0x8a0005
+#define CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_EXIT 0x8a0006
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_ENTRY 0x8a0007
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_EXIT 0x8a0008
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_ENTRY 0x8a0009
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT 0x8a000a
+#define DUP1_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT 0x8a000b
+#define CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_ENTRY 0x8a000c
+#define CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_EXIT 0x8a000d
+#define CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_ENTRY 0x8a000e
+#define CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_EXIT 0x8a000f
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_ENTRY 0x8a0010
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_EXIT 0x8a0011
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_ENTRY 0x8a0012
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_EXIT 0x8a0013
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_ENTRY 0x8a0014
+#define CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_EXIT 0x8a0015
+#define CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_ENTRY 0x8a0016
+#define CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_EXIT 0x8a0017
+#define CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_ENTRY 0x8a0018
+#define CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_EXIT 0x8a0019
+#define CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_ENTRY 0x8a001a
+#define CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_EXIT 0x8a001b
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY 0x8a001c
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT 0x8a001d
+#define DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT 0x8a001e
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY 0x8a001f
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT 0x8a0020
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/clocksettingsdocloaderTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,15 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKSETTINGSDOCLOADERTRACES_H__
+#define __CLOCKSETTINGSDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x10005906
+
+#define CLOCKSETTINGSDOCLOADER_CREATEOBJECT_ENTRY 0x8a0021
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/clocksettingsviewTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,46 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKSETTINGSVIEWTRACES_H__
+#define __CLOCKSETTINGSVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x10005906
+
+#define CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY 0x8a0022
+#define CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT 0x8a0023
+#define DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY 0x8a0024
+#define DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT 0x8a0025
+#define CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_ENTRY 0x8a0026
+#define CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_EXIT 0x8a0027
+#define CLOCKSETTINGSVIEW_HANDLEBACKACTION_ENTRY 0x8a0028
+#define CLOCKSETTINGSVIEW_HANDLEBACKACTION_EXIT 0x8a0029
+#define CLOCKSETTINGSVIEW_UPDATEPLACEITEM_ENTRY 0x8a002a
+#define CLOCKSETTINGSVIEW_UPDATEPLACEITEM_EXIT 0x8a002b
+#define CLOCKSETTINGSVIEW_UPDATEDATEITEM_ENTRY 0x8a002c
+#define CLOCKSETTINGSVIEW_UPDATEDATEITEM_EXIT 0x8a002d
+#define CLOCKSETTINGSVIEW_UPDATETIMEITEM_ENTRY 0x8a002e
+#define CLOCKSETTINGSVIEW_UPDATETIMEITEM_EXIT 0x8a002f
+#define CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_ENTRY 0x8a0030
+#define CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_EXIT 0x8a0031
+#define CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_ENTRY 0x8a0032
+#define CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_EXIT 0x8a0033
+#define CLOCKSETTINGSVIEW_SETUPVIEW_ENTRY 0x8a0034
+#define CLOCKSETTINGSVIEW_SETUPVIEW_EXIT 0x8a0035
+#define CLOCKSETTINGSVIEW_CREATEMODEL_ENTRY 0x8a0036
+#define CLOCKSETTINGSVIEW_CREATEMODEL_EXIT 0x8a0037
+#define CLOCKSETTINGSVIEW_POPULATEMODEL_ENTRY 0x8a0038
+#define CLOCKSETTINGSVIEW_POPULATEMODEL_EXIT 0x8a0039
+#define CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_ENTRY 0x8a003a
+#define CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_EXIT 0x8a003b
+#define CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_ENTRY 0x8a003c
+#define CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_EXIT 0x8a003d
+#define CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_ENTRY 0x8a003e
+#define CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_EXIT 0x8a003f
+#define CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY 0x8a0040
+#define CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT 0x8a0041
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,101 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSDOCLOADER_CREATEOBJECT_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CREATEMODEL_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CREATEMODEL_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY=0x40
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEBACKACTION_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEBACKACTION_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLENETWORKTIMESTATECHANGE_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEORIENTATIONCHANGED_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_LOADSETTINGSVIEW_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_POPULATEMODEL_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_POPULATEMODEL_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_SETUPVIEW_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_SETUPVIEW_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEDATEITEM_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEDATEITEM_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEPLACEITEM_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEPLACEITEM_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATETIMEITEM_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATETIMEITEM_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKSETTINGSVIEW_CLOCKSETTINGSVIEW_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY=0x44
+[TRACE]TRACE_FLOW[0x8A]_DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_DUP2_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x51
+[TRACE]TRACE_FLOW[0x8A]_DUP3_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_DUP4_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x53
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CANSETMODELINDEX_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_CREATEITEM_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_HANDLEOKACTION_ENTRY=0x56
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_HANDLEOKACTION_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_ENTRY=0x5a
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_ENTRY=0x5e
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_EXIT=0x5f
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY=0x54
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_EXIT=0x55
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_RESTORE_ENTRY=0x4a
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_RESTORE_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SELECTEDACTION_ENTRY=0x60
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SELECTEDACTION_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY=0x42
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT=0x43
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_EXIT=0x4d
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_UPDATEPLACEITEM_ENTRY=0x5c
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_UPDATEPLACEITEM_EXIT=0x5d
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_WORKDAYSSETTING_ENTRY=0x62
+[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_WORKDAYSSETTING_EXIT=0x63
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clocksettingsview/traces/settingscustomitemTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,48 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __SETTINGSCUSTOMITEMTRACES_H__
+#define __SETTINGSCUSTOMITEMTRACES_H__
+
+#define KOstTraceComponentID 0x10005906
+
+#define SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY 0x8a0042
+#define SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT 0x8a0043
+#define DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_ENTRY 0x8a0044
+#define DUP1_SETTINGSCUSTOMITEM_SETTINGSCUSTOMITEM_EXIT 0x8a0045
+#define SETTINGSCUSTOMITEM_CREATEITEM_ENTRY 0x8a0046
+#define SETTINGSCUSTOMITEM_CANSETMODELINDEX_ENTRY 0x8a0047
+#define SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a0048
+#define DUP1_SETTINGSCUSTOMITEM_CANSETMODELINDEX_EXIT 0x8a0049
+#define SETTINGSCUSTOMITEM_RESTORE_ENTRY 0x8a004a
+#define SETTINGSCUSTOMITEM_RESTORE_EXIT 0x8a004b
+#define SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_ENTRY 0x8a004c
+#define SETTINGSCUSTOMITEM_SETWEEKDAYSLIST_EXIT 0x8a004d
+#define SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_ENTRY 0x8a004e
+#define SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a004f
+#define DUP1_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a0050
+#define DUP2_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a0051
+#define DUP3_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a0052
+#define DUP4_SETTINGSCUSTOMITEM_CREATECUSTOMWIDGET_EXIT 0x8a0053
+#define SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_ENTRY 0x8a0054
+#define SETTINGSCUSTOMITEM_LAUNCHTIMEPICKER_EXIT 0x8a0055
+#define SETTINGSCUSTOMITEM_HANDLEOKACTION_ENTRY 0x8a0056
+#define SETTINGSCUSTOMITEM_HANDLEOKACTION_EXIT 0x8a0057
+#define SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_ENTRY 0x8a0058
+#define SETTINGSCUSTOMITEM_LAUNCHDATEPICKER_EXIT 0x8a0059
+#define SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_ENTRY 0x8a005a
+#define SETTINGSCUSTOMITEM_LAUNCHCITYSELECTIONLIST_EXIT 0x8a005b
+#define SETTINGSCUSTOMITEM_UPDATEPLACEITEM_ENTRY 0x8a005c
+#define SETTINGSCUSTOMITEM_UPDATEPLACEITEM_EXIT 0x8a005d
+#define SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_ENTRY 0x8a005e
+#define SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_EXIT 0x8a005f
+#define SETTINGSCUSTOMITEM_SELECTEDACTION_ENTRY 0x8a0060
+#define SETTINGSCUSTOMITEM_SELECTEDACTION_EXIT 0x8a0061
+#define SETTINGSCUSTOMITEM_WORKDAYSSETTING_ENTRY 0x8a0062
+#define SETTINGSCUSTOMITEM_WORKDAYSSETTING_EXIT 0x8a0063
+
+
+#endif
+
+// End of file
+
--- a/clock/clockui/clockviewmanager/clockviewmanager.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviewmanager/clockviewmanager.pro Mon Aug 09 18:30:52 2010 +0530
@@ -30,7 +30,8 @@
../clockviews/inc \
../clockappcontroller/inc \
../clockwidget/clockwidgetimpl/inc \
- ../../inc
+ ../../inc \
+ ./traces
symbian: {
TARGET.CAPABILITY = ALL -TCB
--- a/clock/clockui/clockviewmanager/src/clockdocloader.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviewmanager/src/clockdocloader.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -22,6 +22,11 @@
#include "clockwidget.h"
#include "clockworldview.h"
#include "clockhomecityitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockdocloaderTraces.h"
+#endif
+
/*!
\class ClockDocLoader
@@ -37,21 +42,26 @@
*/
QObject *ClockDocLoader::createObject(const QString &type, const QString &name)
{
+ OstTraceFunctionEntry0( CLOCKDOCLOADER_CREATEOBJECT_ENTRY );
if (CLOCK_MAIN_VIEW == name) {
QObject *object = new ClockMainView();
object->setObjectName(name);
+ OstTraceFunctionExit0( CLOCKDOCLOADER_CREATEOBJECT_EXIT );
return object;
} else if (CLOCK_WIDGET == name) {
QObject *object = new ClockWidget();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP1_CLOCKDOCLOADER_CREATEOBJECT_EXIT );
return object;
} else if (CLOCK_WORLD_VIEW == name) {
QObject *object = new ClockWorldView();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP2_CLOCKDOCLOADER_CREATEOBJECT_EXIT );
return object;
} else if (CLOCK_WORLD_HOMECITY == name) {
QObject *object = new ClockHomeCityItem();
object->setObjectName(name);
+ OstTraceFunctionExit0( DUP3_CLOCKDOCLOADER_CREATEOBJECT_EXIT );
return object;
}
--- a/clock/clockui/clockviewmanager/src/clockviewmanager.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviewmanager/src/clockviewmanager.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -30,6 +30,11 @@
#include "clockcommon.h"
#include "clockdatatypes.h"
#include "clockworldview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockviewmanagerTraces.h"
+#endif
+
/*!
\class ClockViewManager
@@ -49,6 +54,7 @@
mAppControllerIf(controllerIf),
mWorldClockView(0)
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY );
// Activity Reason from Activity Manager
int activityReason = qobject_cast<HbApplication*>(qApp)->activateReason();
@@ -87,6 +93,7 @@
this, SLOT(loadOtherViews()));
}
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT );
}
/*!
@@ -94,7 +101,9 @@
*/
ClockViewManager::~ClockViewManager()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY );
// No implementation yet.
+OstTraceFunctionExit0( DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT );
}
/*!
@@ -104,6 +113,7 @@
*/
void ClockViewManager::showView(ClockViews view)
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_SHOWVIEW_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
switch (view) {
@@ -131,6 +141,7 @@
default:
break;
}
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_SHOWVIEW_EXIT );
}
/*!
@@ -138,6 +149,7 @@
*/
void ClockViewManager::loadMainView()
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADMAINVIEW_ENTRY );
bool loadSuccess;
// Construct the document loader instance
@@ -158,6 +170,7 @@
// Set the main view to the window
hbInstance->allMainWindows().first()->addView(mMainView);
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADMAINVIEW_EXIT );
}
/*!
@@ -165,6 +178,7 @@
*/
void ClockViewManager::loadWorldClockView()
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_ENTRY );
// Construct the document loader instance
ClockDocLoader *docLoader = new ClockDocLoader();
@@ -181,6 +195,7 @@
HbEffect::disable(mWorldClockView->toolBar()->graphicsItem());
mWorldClockView->setupView(mAppControllerIf, docLoader);
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_EXIT );
}
/*!
@@ -188,6 +203,7 @@
*/
void ClockViewManager::loadOtherViews()
{
+ OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADOTHERVIEWS_ENTRY );
mMainView->setupAfterViewReady();
// Load world clock view
@@ -204,6 +220,7 @@
// needs to be created so that a new entry can also be created. Finally
// NotesApplication object needs to emit applicationReady Signal.
emit appReady();
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADOTHERVIEWS_EXIT );
}
// End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviewmanager/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviewmanager/traces/clockdocloaderTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,19 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKDOCLOADERTRACES_H__
+#define __CLOCKDOCLOADERTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce5
+
+#define CLOCKDOCLOADER_CREATEOBJECT_ENTRY 0x8a0001
+#define CLOCKDOCLOADER_CREATEOBJECT_EXIT 0x8a0002
+#define DUP1_CLOCKDOCLOADER_CREATEOBJECT_EXIT 0x8a0003
+#define DUP2_CLOCKDOCLOADER_CREATEOBJECT_EXIT 0x8a0004
+#define DUP3_CLOCKDOCLOADER_CREATEOBJECT_EXIT 0x8a0005
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviewmanager/traces/clockviewmanagerTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKVIEWMANAGERTRACES_H__
+#define __CLOCKVIEWMANAGERTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce5
+
+#define CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY 0x8a0006
+#define CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT 0x8a0007
+#define DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY 0x8a0008
+#define DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT 0x8a0009
+#define CLOCKVIEWMANAGER_SHOWVIEW_ENTRY 0x8a000a
+#define CLOCKVIEWMANAGER_SHOWVIEW_EXIT 0x8a000b
+#define CLOCKVIEWMANAGER_LOADMAINVIEW_ENTRY 0x8a000c
+#define CLOCKVIEWMANAGER_LOADMAINVIEW_EXIT 0x8a000d
+#define CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_ENTRY 0x8a000e
+#define CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_EXIT 0x8a000f
+#define CLOCKVIEWMANAGER_LOADOTHERVIEWS_ENTRY 0x8a0010
+#define CLOCKVIEWMANAGER_LOADOTHERVIEWS_EXIT 0x8a0011
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviewmanager/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,19 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKDOCLOADER_CREATEOBJECT_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKDOCLOADER_CREATEOBJECT_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADMAINVIEW_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADMAINVIEW_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADOTHERVIEWS_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADOTHERVIEWS_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_SHOWVIEW_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_CLOCKVIEWMANAGER_SHOWVIEW_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKDOCLOADER_CREATEOBJECT_EXIT=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CLOCKDOCLOADER_CREATEOBJECT_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP3_CLOCKDOCLOADER_CREATEOBJECT_EXIT=0x5
--- a/clock/clockui/clockviews/clockviews.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviews/clockviews.pro Mon Aug 09 18:30:52 2010 +0530
@@ -32,7 +32,8 @@
../clockalarmeditor/inc \
../clockwidget/clockwidgetimpl/inc \
../clockcityselectionlist/inc \
- ../inc
+ ../inc \
+ ./traces
DEPENDPATH += \
./inc \
--- a/clock/clockui/clockviews/data/xml/clockmainview.docml Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviews/data/xml/clockmainview.docml Mon Aug 09 18:30:52 2010 +0530
@@ -41,7 +41,7 @@
</widget>
<real name="z" value="21"/>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
- <sizehint height="47.7612un" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) )"/>
+ <sizehint height="15.52239un" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) )"/>
</widget>
<widget name="horizontalDivider" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -54,14 +54,32 @@
<icon iconName="qtg_graf_input_h_swipe" name="icon"/>
<real name="z" value="2"/>
</widget>
- <widget name="placeLabel" type="HbLabel">
- <enums name="alignment" value="AlignAbsolute|AlignRight|AlignTrailing"/>
+ <widget name="placeLabel" type="HbWidget">
+ <widget name="placetext" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizepolicy horizontalPolicy="Maximum" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED"/>
+ <sizehint height="var(hb-param-text-height-tiny)" type="MINIMUM"/>
+ <string name="plainText" value="India +5:30 GMT"/>
+ </widget>
+ <widget name="dstIcon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon iconName=" " name="icon"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-graphic-size-secondary)" type="FIXED" width="var(hb-param-graphic-size-secondary)"/>
+ </widget>
<enums name="layoutDirection" value="LeftToRight"/>
<real name="z" value="2"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="expr(var(hb-param-text-height-tiny) )" type="PREFERRED" width="18.58295un"/>
- <string name="plainText" value="united kingdom 0:00 GMT"/>
+ <sizepolicy horizontalPolicy="Maximum" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="expr(var(hb-param-text-height-tiny) )" type="PREFERRED" width="21.49254un"/>
<fontspec name="fontSpec" role="Undefined" textheight="expr(var(hb-param-text-height-tiny) )"/>
+ <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-middle-horizontal)" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <stretchitem stretchfactor="1"/>
+ <linearitem itemname="placetext"/>
+ <linearitem itemname="dstIcon"/>
+ <stretchitem stretchfactor="1"/>
+ </layout>
</widget>
<layout type="anchor">
<anchoritem dst="clockWidget" dstEdge="TOP" spacing="2un" src="" srcEdge="TOP"/>
@@ -70,14 +88,14 @@
<anchoritem dst="noAlarmLabel" dstEdge="BOTTOM" spacing="-35.26739un" src="" srcEdge="BOTTOM"/>
<anchoritem dst="dateLabel" dstEdge="LEFT" spacing="2un" src="" srcEdge="LEFT"/>
<anchoritem dst="dateLabel" dstEdge="TOP" spacing="29.73761un" src="" srcEdge="TOP"/>
- <anchoritem dst="alarmListView" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmListView" dstEdge="BOTTOM" spacing="-18un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmListView" dstEdge="LEFT" spacing="-0.44776un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmListView" dstEdge="BOTTOM" spacing="-18.51493un" src="" srcEdge="BOTTOM"/>
<anchoritem dst="horizontalDivider" dstEdge="LEFT" spacing="6.1194un" src="" srcEdge="LEFT"/>
<anchoritem dst="horizontalDivider" dstEdge="BOTTOM" spacing="-9.70896un" src="" srcEdge="BOTTOM"/>
<anchoritem dst="verticalDivider" dstEdge="RIGHT" spacing="-8.80597un" src="" srcEdge="RIGHT"/>
<anchoritem dst="verticalDivider" dstEdge="BOTTOM" spacing="-2.84328un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="placeLabel" dstEdge="TOP" spacing="35.07463un" src="" srcEdge="TOP"/>
- <anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="-16.04392un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="placeLabel" dstEdge="TOP" spacing="28.20896un" src="" srcEdge="TOP"/>
+ <anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="-6.71642un" src="" srcEdge="RIGHT"/>
</layout>
</widget>
<widget name="viewToolbar" role="HbView:toolBar" type="HbToolBar">
@@ -97,6 +115,22 @@
<widget name="dateLabel" type="HbLabel">
<sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
</widget>
+ <widget name="clockWidget" plugin="clockwidgetplugin" type="ClockWidget">
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="31.9un" type="FIXED" width="31.9un"/>
+ </widget>
+ <widget name="placeLabel" type="HbWidget">
+ <sizehint height="expr(var(hb-param-text-height-tiny) )" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - 4un )"/>
+ </widget>
+ <widget name="verticalDivider" type="HbLabel">
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="horizontalDivider" type="HbLabel">
+ <icon iconName="qtg_graf_divider_h_thin" name="icon"/>
+ <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
+ <sizepolicy horizontalPolicy="Minimum" horizontalStretch="1" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="0.5un" type="PREFERRED" width="21.49254un"/>
+ </widget>
<widget name="clockMainViewWidget" role="HbView:widget" type="HbWidget">
<layout type="anchor">
<anchoritem dst="clockWidget" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="" srcEdge="TOP"/>
@@ -120,29 +154,28 @@
<anchoritem dst="placeLabel" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-right) )" src="" srcEdge="RIGHT"/>
</layout>
</widget>
- <widget name="placeLabel" type="HbLabel">
- <sizehint height="expr(var(hb-param-text-height-tiny) )" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - 4un )"/>
- <enums name="alignment" value="AlignAbsolute|AlignVCenter|AlignHCenter"/>
- </widget>
- <widget name="clockWidget" plugin="clockwidgetplugin" type="ClockWidget">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="31.9un" type="FIXED" width="31.9un"/>
- </widget>
- <widget name="horizontalDivider" type="HbLabel">
- <icon iconName="qtg_graf_divider_h_thin" name="icon"/>
- <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
- <sizepolicy horizontalPolicy="Minimum" horizontalStretch="1" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="0.5un" type="PREFERRED" width="21.49254un"/>
- </widget>
- <widget name="verticalDivider" type="HbLabel">
- <bool name="visible" value="TRUE"/>
- </widget>
</section>
<section name="landscape">
<widget name="alarmListView" type="HbListView">
<sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<sizehint type="MAXIMUM" width="53.73un"/>
</widget>
+ <widget name="clockWidget" plugin="clockwidgetplugin" type="ClockWidget">
+ <sizehint height="expr(var(hb-param-screen-short-edge) - var(hb-param-widget-chrome-height) - var(hb-param-widget-toolbar-height) - 12.75un )" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - var(hb-param-widget-chrome-height) - var(hb-param-widget-toolbar-height) - 12.75un )"/>
+ </widget>
+ <widget name="placeLabel" type="HbWidget">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ </widget>
+ <widget name="verticalDivider" type="HbLabel">
+ <icon iconName="qtg_graf_divider_v_thin" name="icon"/>
+ <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint type="PREFERRED" width="0.1un"/>
+ </widget>
+ <widget name="horizontalDivider" type="HbLabel">
+ <sizehint height="0.5un" type="PREFERRED" width="21.49254un"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
<widget name="clockMainViewWidget" role="HbView:widget" type="HbWidget">
<layout type="anchor">
<anchoritem dst="alarmListView" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
@@ -166,23 +199,6 @@
<anchoritem dst="placeLabel" dstEdge="BOTTOM" spacing="-expr(var(hb-param-margin-gene-bottom) )" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
- <widget name="placeLabel" type="HbLabel">
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <enums name="alignment" value="AlignAbsolute|AlignVCenter|AlignHCenter"/>
- </widget>
- <widget name="clockWidget" plugin="clockwidgetplugin" type="ClockWidget">
- <sizehint height="expr(var(hb-param-screen-short-edge) - var(hb-param-widget-chrome-height) - var(hb-param-widget-toolbar-height) - 12.75un )" type="PREFERRED" width="expr(var(hb-param-screen-short-edge) - var(hb-param-widget-chrome-height) - var(hb-param-widget-toolbar-height) - 12.75un )"/>
- </widget>
- <widget name="horizontalDivider" type="HbLabel">
- <sizehint height="0.5un" type="PREFERRED" width="21.49254un"/>
- <bool name="visible" value="TRUE"/>
- </widget>
- <widget name="verticalDivider" type="HbLabel">
- <icon iconName="qtg_graf_divider_v_thin" name="icon"/>
- <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint type="PREFERRED" width="0.1un"/>
- </widget>
</section>
<metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
--- a/clock/clockui/clockviews/inc/clockmainview.h Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviews/inc/clockmainview.h Mon Aug 09 18:30:52 2010 +0530
@@ -81,6 +81,7 @@
private:
QTimer *mTickTimer;
+ QColor mLabelColorGroup;
HbAction *mRefreshMainView;
HbAction *mDisplayWorldClockView;
@@ -90,6 +91,7 @@
HbLabel *mDayLabel;
HbLabel *mPlaceLabel;
+ HbLabel *mDstIcon;
HbLabel *mHorizontalDivider;
HbLabel *mVerticalDivider;
ClockWidget *mClockWidget;
--- a/clock/clockui/clockviews/src/clockalarmlistitemprototype.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviews/src/clockalarmlistitemprototype.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -23,11 +23,17 @@
#include "clockalarmlistitemprototype.h"
#include "clockdatatypes.h"
#include "clockmainview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockalarmlistitemprototypeTraces.h"
+#endif
+
/*!
\class ClockAlarmListItemPrototype
- TODO: Write description here.
+ This is the prototype class for the items in the list view. This class is
+ responsible for creating any cutom item types.
*/
/*!
@@ -38,7 +44,9 @@
ClockAlarmListItemPrototype::ClockAlarmListItemPrototype(QGraphicsItem *parent)
:HbListViewItem(parent)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT );
}
/*!
@@ -46,7 +54,9 @@
*/
ClockAlarmListItemPrototype::~ClockAlarmListItemPrototype()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT );
}
/*!
@@ -56,6 +66,7 @@
*/
void ClockAlarmListItemPrototype::updateChildItems()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY );
// First allow the base class to update.
HbListViewItem::updateChildItems();
@@ -74,6 +85,7 @@
malarmIconItem->setIcon(alarmIconPath);
}
}
+ OstTraceFunctionExit0( CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_EXIT );
}
/*!
@@ -83,6 +95,7 @@
*/
ClockAlarmListItemPrototype *ClockAlarmListItemPrototype::createItem()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTITEMPROTOTYPE_CREATEITEM_ENTRY );
return new ClockAlarmListItemPrototype(*this);
}
@@ -91,9 +104,11 @@
*/
void ClockAlarmListItemPrototype::handleAlarmStatusChanged()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_ENTRY );
int row = modelIndex().row();
emit static_cast<ClockAlarmListItemPrototype*>(
prototype())->alarmStatusHasChanged(row);
+ OstTraceFunctionExit0( CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockviews/src/clockalarmlistmodel.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviews/src/clockalarmlistmodel.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -30,6 +30,11 @@
#include "clockalarmlistitemprototype.h"
#include "clockappcontrollerif.h"
#include "settingsutility.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockalarmlistmodelTraces.h"
+#endif
+
// Constants
const int KOneHourInMinute(60);
@@ -54,6 +59,7 @@
mSourceModel(0),
mAppControllerIf(controllerIf)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY );
// Construct the source model.
mSourceModel = new QStandardItemModel(0, 1, this);
@@ -71,6 +77,7 @@
connect(
mTickTimer, SIGNAL(timeout()),
this, SLOT(updateRemainingTime()));
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT );
}
/*!
@@ -78,10 +85,12 @@
*/
ClockAlarmListModel::~ClockAlarmListModel()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY );
if (mSourceModel) {
delete mSourceModel;
mSourceModel = 0;
}
+ OstTraceFunctionExit0( DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT );
}
/*!
@@ -89,8 +98,10 @@
*/
void ClockAlarmListModel::populateModel()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_POPULATEMODEL_ENTRY );
// Populate the model in a different thread.
QTimer::singleShot(1, this, SLOT(populateSourceModel()));
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_POPULATEMODEL_EXIT );
}
/*!
Returns the source model to be used with clock main view.
@@ -100,6 +111,8 @@
*/
QAbstractItemModel *ClockAlarmListModel::sourceModel()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_SOURCEMODEL_ENTRY );
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_SOURCEMODEL_EXIT );
return mSourceModel;
}
@@ -108,6 +121,7 @@
*/
void ClockAlarmListModel::populateSourceModel()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_ENTRY );
// Clear the model if it has any data already.
mSourceModel->clear();
mSourceModel->setColumnCount(1);
@@ -138,6 +152,7 @@
// Start the Timer for 1 minute.
mTickTimer->start(60000 - 1000 * QTime::currentTime().second());
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_EXIT );
}
/*!
@@ -147,6 +162,7 @@
*/
QString ClockAlarmListModel::calculateRemainingTime(AlarmInfo alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_ENTRY );
QDateTime currentDateTime = QDateTime::currentDateTime();
QDateTime alarmTime = QDateTime(
alarmInfo.alarmDateTime, alarmInfo.nextDueTime);
@@ -199,6 +215,7 @@
formatTimeNote = hbTrId("txt_clock_main_view_setlabel_in_1days");
timeNote = formatTimeNote.arg(QString::number(dayleft));
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_EXIT );
return timeNote;
}
@@ -210,6 +227,7 @@
*/
int ClockAlarmListModel::getRemainingSeconds(QDateTime &alarmDateTime)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_GETREMAININGSECONDS_ENTRY );
int remainingSeconds;
QDateTime currentDateTime = QDateTime::currentDateTime();
@@ -232,6 +250,7 @@
}
remainingSeconds = alarmTimeInSec - currentTimeInSec;
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_GETREMAININGSECONDS_EXIT );
return remainingSeconds;
}
@@ -244,6 +263,7 @@
*/
void ClockAlarmListModel::updateSourceModel(int alarmId)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_ENTRY );
Q_UNUSED(alarmId)
int alarmInfoCount;
int modelCount;
@@ -331,6 +351,7 @@
mTickTimer->stop();
}
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_EXIT );
}
/*!
@@ -340,6 +361,7 @@
*/
void ClockAlarmListModel::updateRemainingTime()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_ENTRY );
// Get the list of pending clock alarms from server.
AlarmInfo alarmInfo;
for (int row = 0; row < mSourceModel->rowCount(); row++) {
@@ -365,6 +387,7 @@
}
// Start the Timer for 1 minute.
mTickTimer->start(60000);
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_EXIT );
}
/*!
@@ -377,6 +400,7 @@
QStringList ClockAlarmListModel::getDisplayStringListforAlarmItem(
AlarmInfo alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_ENTRY );
QStringList displayStringList;
QString timeString;
if (Snoozed == alarmInfo.alarmState) {
@@ -400,8 +424,8 @@
QString remainingTime = calculateRemainingTime(alarmInfo);
displayStringList.append(remainingTime);
} else {
- // TODO: localization
- displayStringList.append(QString("In-active"));
+ displayStringList.append(
+ hbTrId("txt_clock_main_view_setlabel_inactive"));
}
QString alarmDescription = alarmInfo.alarmDesc;
@@ -428,6 +452,7 @@
}
}
displayStringList.append(repeatTypeString);
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_EXIT );
return displayStringList;
}
@@ -438,6 +463,7 @@
*/
void ClockAlarmListModel::appendAlarmToModel(AlarmInfo alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_ENTRY );
// Append only pending alarms to the model.
if (Notified != alarmInfo.alarmState) {
QStandardItem *item = new QStandardItem();
@@ -481,6 +507,7 @@
mSourceModel->appendRow(item);
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_EXIT );
}
/*!
@@ -493,6 +520,7 @@
void ClockAlarmListModel::updateAlarmDetails(
QModelIndex modelIndex, AlarmInfo alarmInfo)
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_ENTRY );
if (Notified != alarmInfo.alarmState) {
QStringList displayStringList =
getDisplayStringListforAlarmItem(alarmInfo);
@@ -534,6 +562,7 @@
alarmData.append(alarmInfo.alarmStatus);
mSourceModel->setData(modelIndex, alarmData, AlarmDetails);
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_EXIT );
}
/*!
@@ -543,6 +572,7 @@
*/
int ClockAlarmListModel::getActiveAlarmCount()
{
+ OstTraceFunctionEntry0( CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_ENTRY );
int activeAlarmCount = 0;
for (int index = 0; index < mSourceModel->rowCount(); index++) {
// Get the data for the alarm.
@@ -552,6 +582,7 @@
activeAlarmCount++;
}
}
+ OstTraceFunctionExit0( CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_EXIT );
return activeAlarmCount;
}
// End of file --Don't remove this.
--- a/clock/clockui/clockviews/src/clockhomecityitem.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviews/src/clockhomecityitem.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -26,6 +26,11 @@
// User Includes.
#include "clockhomecityitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockhomecityitemTraces.h"
+#endif
+
/*!
\class ClockHomeCityItem
@@ -41,6 +46,7 @@
ClockHomeCityItem::ClockHomeCityItem(QGraphicsItem *parent) :
HbWidget(parent)
{
+ OstTraceFunctionEntry0( CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY );
// Path for widgetml and css files.
HbStyleLoader::registerFilePath(":/style/clockhomecityitem.css");
HbStyleLoader::registerFilePath(":/style/clockhomecityitem.widgetml");
@@ -52,6 +58,7 @@
frame->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox_normal");
setBackgroundItem(frame->graphicsItem(), -2);
+ OstTraceFunctionExit0( CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT );
}
/*!
@@ -59,9 +66,11 @@
*/
ClockHomeCityItem::~ClockHomeCityItem()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY );
HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem.css");
HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem.widgetml");
HbStyleLoader::unregisterFilePath(":/style/clockhomecityitem_color.css");
+ OstTraceFunctionExit0( DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT );
}
/*!
@@ -72,6 +81,7 @@
*/
void ClockHomeCityItem::setHomeCityItemData(const QVariantMap &itemData)
{
+ OstTraceFunctionEntry0( CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_ENTRY );
if (!itemData.isEmpty()) {
QMapIterator<QString, QVariant> iter(itemData);
while (iter.hasNext()) {
@@ -121,6 +131,7 @@
}
repolish();
}
+ OstTraceFunctionExit0( CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockviews/src/clockmainview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviews/src/clockmainview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -26,8 +26,9 @@
#include <HbListView>
#include <HbNotificationDialog>
#include <HbStyleLoader>
-#include <hbapplication> // hbapplication
-#include <hbactivitymanager> // activity manager
+#include <HbColorScheme>
+#include <HbApplication> // hbapplication
+#include <HbActivityManager> // activity manager
// User includes
#include "clockmainview.h"
@@ -42,6 +43,11 @@
#include "clockalarmlistitemprototype.h"
#include "clockalarmlistmodel.h"
#include "clockwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockmainviewTraces.h"
+#endif
+
/*!
\class ClockMainView
@@ -61,7 +67,9 @@
mIsLongTop(false),
mIsScreenShotCapruted(false)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY );
// Nothing yet.
+ OstTraceFunctionExit0( CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT );
}
/*!
@@ -69,6 +77,7 @@
*/
ClockMainView::~ClockMainView()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
mDocLoader = 0;
@@ -84,6 +93,7 @@
HbStyleLoader::unregisterFilePath(
":/style/clockalarmlistitemprototype_color.css");
+ OstTraceFunctionExit0( DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT );
}
/*!
@@ -96,12 +106,16 @@
void ClockMainView::setupView(
ClockAppControllerIf &controllerIf, ClockDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
mTimezoneClient = controllerIf.timezoneClient();
mSettingsUtility = controllerIf.settingsUtility();
mAlarmClient = controllerIf.alarmClient();
+
+ // Fetch the color group of the labels from the theme.
+ mLabelColorGroup = HbColorScheme::color("qtc_view_normal");
// Create the model.
mAlarmListModel = new ClockAlarmListModel(*mAppControllerIf, this);
@@ -137,6 +151,7 @@
// Get the "No alarm set" label.
mNoAlarmLabel = qobject_cast<HbLabel *> (
mDocLoader->findWidget(CLOCK_NOALARMLABEL));
+ mNoAlarmLabel->setTextColor(mLabelColorGroup);
// Get the alarm's list.
mAlarmList = qobject_cast<HbListView *> (
@@ -185,7 +200,10 @@
}
mDayLabel = static_cast<HbLabel *> (mDocLoader->findObject("dateLabel"));
- mPlaceLabel = static_cast<HbLabel *> (mDocLoader->findObject("placeLabel"));
+ mDayLabel->setTextColor(mLabelColorGroup);
+ mPlaceLabel = static_cast<HbLabel *> (mDocLoader->findObject("placetext"));
+ mPlaceLabel->setTextColor(mLabelColorGroup);
+ mDstIcon = static_cast<HbLabel *> (mDocLoader->findObject("dstIcon"));
mClockWidget = static_cast<ClockWidget*> (
mDocLoader->findObject(CLOCK_WIDGET));
@@ -212,6 +230,7 @@
// connect for the aboutToQuit events on application Exit as to call saveActivity
connect(qobject_cast<HbApplication*>(qApp), SIGNAL(aboutToQuit()), this, SLOT(saveActivity()));
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SETUPVIEW_EXIT );
}
/*!
@@ -220,6 +239,7 @@
*/
void ClockMainView::setupAfterViewReady()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SETUPAFTERVIEWREADY_ENTRY );
// Get the toolbar/menu actions.
mRefreshMainView = static_cast<HbAction *> (
mDocLoader->findObject("alarmsAction"));
@@ -260,6 +280,7 @@
mTimezoneClient, SIGNAL(cityUpdated()),
this, SLOT(updatePlaceLabel()));
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SETUPAFTERVIEWREADY_EXIT );
}
/*!
@@ -270,6 +291,7 @@
*/
void ClockMainView::handleAlarmStatusChanged(int row)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_ENTRY );
AlarmInfo alarmInfo;
// Get the data for the alarm.
@@ -311,6 +333,7 @@
mSelectedItem = -1;
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_EXIT );
}
/*!
@@ -319,8 +342,10 @@
*/
void ClockMainView::refreshMainView()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_REFRESHMAINVIEW_ENTRY );
mRefreshMainView->setChecked(true);
+ OstTraceFunctionExit0( CLOCKMAINVIEW_REFRESHMAINVIEW_EXIT );
}
/*!
@@ -329,9 +354,11 @@
*/
void ClockMainView::displayWorldClockView()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_ENTRY );
mAppControllerIf->switchToView(WorldClock);
// no need to capture the screenshot here as it's done in ClockViewManager::showView
+ OstTraceFunctionExit0( CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_EXIT );
}
/*!
@@ -340,11 +367,13 @@
*/
void ClockMainView::addNewAlarm()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_ADDNEWALARM_ENTRY );
ClockAlarmEditor *alarmEditor = new ClockAlarmEditor(*mAlarmClient);
alarmEditor->showAlarmEditor();
// capture screenshot for future use, if application
// is exited/Quit from alarmEditor
captureScreenShot(true);
+ OstTraceFunctionExit0( CLOCKMAINVIEW_ADDNEWALARM_EXIT );
}
/*!
@@ -353,12 +382,14 @@
*/
void ClockMainView::openSettings()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_OPENSETTINGS_ENTRY );
// Create the settings view.
ClockSettingsView *settingsView = new ClockSettingsView(this);
settingsView->loadSettingsView();
// capture screenshot for future use, if application
// is exited/Quit from alarmEditor
captureScreenShot(true);
+ OstTraceFunctionExit0( CLOCKMAINVIEW_OPENSETTINGS_EXIT );
}
/*!
@@ -368,6 +399,7 @@
*/
void ClockMainView::handleActivated(const QModelIndex &index)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLEACTIVATED_ENTRY );
if(!mIsLongTop) {// Get the data for the alarm.
int row = index.row();
QList<QVariant> alarmData =
@@ -383,6 +415,7 @@
// is exited/Quit from alarmEditor
captureScreenShot(true);
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLEACTIVATED_EXIT );
}
/*!
@@ -395,6 +428,7 @@
void ClockMainView::handleLongPress(
HbAbstractViewItem *item, const QPointF &coords)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLELONGPRESS_ENTRY );
mIsLongTop = true;
AlarmInfo alarmInfo;
@@ -424,6 +458,7 @@
itemContextMenu->setPreferredPos(coords);
itemContextMenu->setAttribute(Qt::WA_DeleteOnClose, true );
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLELONGPRESS_EXIT );
}
/*!
@@ -432,6 +467,7 @@
*/
void ClockMainView::deleteAlarm()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_DELETEALARM_ENTRY );
if (-1 < mSelectedItem) {
// Get the data for the alarm.
QList<QVariant> alarmData = mAlarmListModel->sourceModel()->
@@ -440,6 +476,7 @@
mAlarmClient->deleteAlarm(alarmId);
mSelectedItem = -1;
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_DELETEALARM_EXIT );
}
/*!
@@ -447,6 +484,7 @@
*/
void ClockMainView::removeSnoozedAlarm()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_REMOVESNOOZEDALARM_ENTRY );
if (-1 < mSelectedItem) {
// Get the data for the alarm.
QList<QVariant> alarmData = mAlarmListModel->sourceModel()->
@@ -455,16 +493,19 @@
mAlarmClient->deleteSnoozedAlarm(alarmId);
mSelectedItem = -1;
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_REMOVESNOOZEDALARM_EXIT );
}
void ClockMainView::updateView()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_UPDATEVIEW_ENTRY );
// Update the place label.
updatePlaceLabel(mTimezoneClient->timeUpdateOn());
// Update date label.
updateDateLabel();
// Update clock widget.
updateClockWidget();
+ OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATEVIEW_EXIT );
}
/*!
@@ -474,6 +515,7 @@
*/
void ClockMainView::updatePlaceLabel(int autoTimeUpdate)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_UPDATEPLACELABEL_ENTRY );
if (-1 == autoTimeUpdate) {
autoTimeUpdate = mTimezoneClient->timeUpdateOn();
}
@@ -526,9 +568,13 @@
gmtOffset += tr(" ");
// Append DST info.
+ HbIcon *dstIcon = new HbIcon("");
if (currentZoneInfo.dstOn) {
- gmtOffset += hbTrId("txt_common_setlabel_dst");
+ dstIcon->setIconName("qtg_mono_day_light_saving_time");
+ dstIcon->setColor(mLabelColorGroup);
+
}
+ mDstIcon->setIcon(*dstIcon);
// Update the labels with the correct info.
mPlaceLabel->clear();
@@ -540,6 +586,7 @@
currentZoneInfo.cityName + tr(", ")
+ currentZoneInfo.countryName + tr(" ") + gmtOffset);
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATEPLACELABEL_EXIT );
}
/*!
@@ -547,6 +594,7 @@
*/
void ClockMainView::handleAlarmListDisplay()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_ENTRY );
// alarmEditor closed reset the captured screenshot, current view is main view now
captureScreenShot(false);
// Get the list of pending clock alarms from server.
@@ -570,6 +618,7 @@
}
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_EXIT );
}
/*!
@@ -580,6 +629,7 @@
void ClockMainView::checkOrientationAndLoadSection(
Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_ENTRY );
bool success;
// If horizontal, load the landscape section.
if (Qt::Horizontal == orientation) {
@@ -606,6 +656,7 @@
hideAlarmList(false);
}
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_EXIT );
}
/*!
@@ -613,9 +664,11 @@
*/
void ClockMainView::selectedMenuAction(HbAction *action)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SELECTEDMENUACTION_ENTRY );
if (action == mDeleteAction) {
deleteAlarm();
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SELECTEDMENUACTION_EXIT );
}
/*!
@@ -623,13 +676,16 @@
*/
void ClockMainView::handleMenuClosed()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HANDLEMENUCLOSED_ENTRY );
mIsLongTop = false;
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HANDLEMENUCLOSED_EXIT );
}
/*!
Sets the model to the alarm list.
*/
void ClockMainView::setmodel()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SETMODEL_ENTRY );
// Set the model.
if (mAlarmList) {
mAlarmList->setModel(mAlarmListModel->sourceModel());
@@ -642,6 +698,7 @@
mAlarmList->setLayoutName("layout-alarmlist");
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SETMODEL_EXIT );
}
/*!
@@ -651,6 +708,7 @@
*/
void ClockMainView::hideAlarmList(bool hide)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_HIDEALARMLIST_ENTRY );
if (hide) {
mNoAlarmLabel->show();
mAlarmList->hide();
@@ -660,6 +718,7 @@
mNoAlarmLabel->hide();
mHideAlarmList = false;
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_HIDEALARMLIST_EXIT );
}
/*!
@@ -667,6 +726,7 @@
*/
void ClockMainView::updateDateLabel()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_UPDATEDATELABEL_ENTRY );
// Get the current datetime.
QDateTime dateTime = QDateTime::currentDateTime();
// Get the day name.
@@ -680,6 +740,7 @@
dayDateString += currentDate;
mDayLabel->setPlainText(dayDateString);
+ OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATEDATELABEL_EXIT );
}
/*!
@@ -695,6 +756,7 @@
*/
void ClockMainView::updateClockWidget()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_UPDATECLOCKWIDGET_ENTRY );
QStringList clockType;
int index = mSettingsUtility->clockType(clockType);
int zeroIndex(0);
@@ -713,6 +775,7 @@
}
mClockWidget->updateTime();
+ OstTraceFunctionExit0( CLOCKMAINVIEW_UPDATECLOCKWIDGET_EXIT );
}
/*!
@@ -721,12 +784,14 @@
*/
void ClockMainView::captureScreenShot(bool captureScreenShot)
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_CAPTURESCREENSHOT_ENTRY );
// check if screen shot needs to be captured
if (captureScreenShot) {
mScreenShot.clear();
mScreenShot.insert("screenshot", QPixmap::grabWidget(mainWindow(), mainWindow()->rect()));
}
mIsScreenShotCapruted = captureScreenShot; // set mIsScreenShotCapruted set validity of screenshot
+ OstTraceFunctionExit0( CLOCKMAINVIEW_CAPTURESCREENSHOT_EXIT );
}
/*!
@@ -734,6 +799,7 @@
*/
void ClockMainView::saveActivity()
{
+ OstTraceFunctionEntry0( CLOCKMAINVIEW_SAVEACTIVITY_ENTRY );
// Get a pointer to activity Manager
HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
// check if a valid screenshot is already captured
@@ -752,5 +818,6 @@
if ( !ok ) {
qFatal("Add failed" );
}
+ OstTraceFunctionExit0( CLOCKMAINVIEW_SAVEACTIVITY_EXIT );
}
// End of file --Don't remove.
--- a/clock/clockui/clockviews/src/clockworldview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockviews/src/clockworldview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -36,6 +36,11 @@
#include "timezoneclient.h"
#include "clockcityselectionlist.h"
#include "clockhomecityitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockworldviewTraces.h"
+#endif
+
/*!
\class ClockWorldView
@@ -52,6 +57,7 @@
:HbView(parent),
mSelectedItem(-1)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY );
// Timer for updating list data upon time change/update.
mRefreshTimer = new QTimer();
connect(
@@ -60,6 +66,7 @@
// Create the model.
mCityListModel = new QStandardItemModel();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT );
}
/*!
@@ -67,6 +74,7 @@
*/
ClockWorldView::~ClockWorldView()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY );
if (mDocLoader) {
delete mDocLoader;
mDocLoader = 0;
@@ -78,6 +86,7 @@
HbStyleLoader::unregisterFilePath(":/style/hblistviewitem.css");
HbStyleLoader::unregisterFilePath(":/style/hblistviewitem.widgetml");
HbStyleLoader::unregisterFilePath(":/style/hblistviewitem_color.css");
+ OstTraceFunctionExit0( DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT );
}
/*!
@@ -91,6 +100,7 @@
ClockAppControllerIf &controllerIf,
ClockDocLoader *docLoader)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_SETUPVIEW_ENTRY );
mDocLoader = docLoader;
mAppControllerIf = &controllerIf;
@@ -189,6 +199,7 @@
mAddCityAction->setEnabled(false);
mAddCityMenuAction->setVisible(false);
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_SETUPVIEW_EXIT );
}
/*!
@@ -196,6 +207,7 @@
*/
void ClockWorldView::refreshCityList()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_REFRESHCITYLIST_ENTRY );
updateCurrentLocationInfo(mTimezoneClient->timeUpdateOn());
int cityInfoCount = mCityInfoList.count();
@@ -214,6 +226,7 @@
// Start the timer again for one minute.
QTimer::singleShot(60 * 1000, this, SLOT(refreshCityList()));
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_REFRESHCITYLIST_EXIT );
}
/*!
@@ -221,6 +234,7 @@
*/
void ClockWorldView::updateCurrentLocationInfo(int networkTime)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
Qt::Orientation currentOrienation = window->orientation();
loadSection(currentOrienation);
@@ -268,6 +282,7 @@
mHomeCityWidget->setHomeCityItemData(itemList);
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_EXIT );
}
/*!
@@ -280,6 +295,7 @@
void ClockWorldView::handleItemLongPressed(
HbAbstractViewItem *item, const QPointF &coords)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_ENTRY );
// Get the ndex of the selected item.
mSelectedItem = item->modelIndex().row();
@@ -296,6 +312,7 @@
itemContextMenu->open(this, SLOT(selectedMenuAction(HbAction*)));
itemContextMenu->setPreferredPos(coords);
itemContextMenu->setAttribute( Qt::WA_DeleteOnClose,true);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_EXIT );
}
/*!
@@ -304,6 +321,7 @@
*/
void ClockWorldView::handleAddLocation()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEADDLOCATION_ENTRY );
// Construct the city selection list and show the same.
mCitySelectionList = new ClockCitySelectionList(mTimezoneClient, this);
connect(
@@ -312,6 +330,7 @@
// Show the city list.
mCitySelectionList->showCityList();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEADDLOCATION_EXIT );
}
/*!
@@ -320,6 +339,7 @@
*/
void ClockWorldView::handleDeleteAction()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEDELETEACTION_ENTRY );
if (-1 != mSelectedItem) {
QStandardItem *item = mCityListModel->takeItem(mSelectedItem);
mCityListModel->removeRow(mSelectedItem);
@@ -340,6 +360,7 @@
mAddCityMenuAction->setVisible(true);
}
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEDELETEACTION_EXIT );
}
/*!
@@ -347,6 +368,7 @@
*/
void ClockWorldView::handleSetAsCurrentLocationAction()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_ENTRY );
// Get the info of the selected item.
LocationInfo newHomeCity = mCityInfoList[mSelectedItem];
@@ -382,6 +404,7 @@
// Update the data file.
mTimezoneClient->saveLocations(mCityInfoList);
mSelectedItem = -1;
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_EXIT );
}
/*!
@@ -392,6 +415,7 @@
*/
void ClockWorldView::handleCitySelected(LocationInfo info)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLECITYSELECTED_ENTRY );
// Info is invalid if the timezoneId is set to -1. We don't do anything in
// that case.
if (-1 != info.timezoneId) {
@@ -439,6 +463,7 @@
}
// Cleanup.
mCitySelectionList->deleteLater();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLECITYSELECTED_EXIT );
}
/*!
@@ -446,7 +471,9 @@
*/
void ClockWorldView::showAlarmsView()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_SHOWALARMSVIEW_ENTRY );
mAppControllerIf->switchToView(MainView);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_SHOWALARMSVIEW_EXIT );
}
/*!
@@ -455,7 +482,9 @@
*/
void ClockWorldView::refreshWorldView()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_REFRESHWORLDVIEW_ENTRY );
mDisplayWorldClockView->setChecked(true);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_REFRESHWORLDVIEW_EXIT );
}
/*!
@@ -463,6 +492,7 @@
*/
void ClockWorldView::loadSection(Qt::Orientation orientation)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_LOADSECTION_ENTRY );
bool networkTime = mTimezoneClient->timeUpdateOn();
bool loadSuccess;
if (Qt::Horizontal == orientation) {
@@ -498,6 +528,7 @@
}
}
mCityListView->update();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_LOADSECTION_EXIT );
}
/*!
@@ -506,9 +537,11 @@
*/
void ClockWorldView::updateAllLocationInfo()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_ENTRY );
updateCurrentLocationInfo(mTimezoneClient->timeUpdateOn());
updateCityList();
refreshCityList();
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_EXIT );
}
/*!
@@ -516,11 +549,13 @@
*/
void ClockWorldView::selectedMenuAction(HbAction *action)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_SELECTEDMENUACTION_ENTRY );
if (action == mSetCurrentLocationAction) {
handleSetAsCurrentLocationAction();
} else if (action == mRemoveCityAction) {
handleDeleteAction();
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_SELECTEDMENUACTION_EXIT );
}
/*!
@@ -530,6 +565,7 @@
*/
QModelIndex ClockWorldView::addCityToList(const LocationInfo& locationInfo)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_ADDCITYTOLIST_ENTRY );
// Here we construct a model item and add it to the list model.
QStandardItem *modelItem = new QStandardItem();
@@ -543,6 +579,7 @@
index, getCityListDecorationString(locationInfo),
Qt::DecorationRole);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_ADDCITYTOLIST_EXIT );
return index;
}
@@ -555,10 +592,13 @@
*/
bool ClockWorldView::isDay(QDateTime dateTime)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_ISDAY_ENTRY );
// It is day between 6:00 AM and 6:00 PM. Otherwise night.
if (17 < dateTime.time().hour() || 6 > dateTime.time().hour()) {
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_ISDAY_EXIT );
return false;
}
+ OstTraceFunctionExit0( DUP1_CLOCKWORLDVIEW_ISDAY_EXIT );
return true;
}
@@ -570,6 +610,7 @@
QVariantList ClockWorldView::getCityListDisplayString(
const LocationInfo& locationInfo)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_ENTRY );
QVariantList displayString;
QDateTime dateTime = QDateTime::currentDateTime();
dateTime = dateTime.toUTC();
@@ -645,6 +686,7 @@
QString timeInfo = dateTime.toString(mSettingsUtility->timeFormatString());
displayString.append(timeInfo);
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_EXIT );
return displayString;
}
@@ -656,6 +698,7 @@
QVariantList ClockWorldView::getCityListDecorationString(
const LocationInfo& locationInfo)
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_ENTRY );
QVariantList decorationString;
QDateTime dateTime = QDateTime::currentDateTime();
dateTime = dateTime.toUTC();
@@ -677,6 +720,7 @@
}
decorationString.append(HbIcon(dstIconPath));
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_EXIT );
return decorationString;
}
@@ -686,6 +730,7 @@
*/
void ClockWorldView::updateCityList()
{
+ OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATECITYLIST_ENTRY );
int cityInfoCount = mCityInfoList.count();
if (cityInfoCount) {
@@ -741,6 +786,7 @@
mTimezoneClient->saveLocations(mCityInfoList);
}
}
+ OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATECITYLIST_EXIT );
}
// End of file-- Don't delete.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockalarmlistitemprototypeTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,23 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKALARMLISTITEMPROTOTYPETRACES_H__
+#define __CLOCKALARMLISTITEMPROTOTYPETRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY 0x8a0001
+#define CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT 0x8a0002
+#define DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY 0x8a0003
+#define DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT 0x8a0004
+#define CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY 0x8a0005
+#define CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_EXIT 0x8a0006
+#define CLOCKALARMLISTITEMPROTOTYPE_CREATEITEM_ENTRY 0x8a0007
+#define CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_ENTRY 0x8a0008
+#define CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_EXIT 0x8a0009
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockalarmlistmodelTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,40 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKALARMLISTMODELTRACES_H__
+#define __CLOCKALARMLISTMODELTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY 0x8a000a
+#define CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT 0x8a000b
+#define DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY 0x8a000c
+#define DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT 0x8a000d
+#define CLOCKALARMLISTMODEL_POPULATEMODEL_ENTRY 0x8a000e
+#define CLOCKALARMLISTMODEL_POPULATEMODEL_EXIT 0x8a000f
+#define CLOCKALARMLISTMODEL_SOURCEMODEL_ENTRY 0x8a0010
+#define CLOCKALARMLISTMODEL_SOURCEMODEL_EXIT 0x8a0011
+#define CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_ENTRY 0x8a0012
+#define CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_EXIT 0x8a0013
+#define CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_ENTRY 0x8a0014
+#define CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_EXIT 0x8a0015
+#define CLOCKALARMLISTMODEL_GETREMAININGSECONDS_ENTRY 0x8a0016
+#define CLOCKALARMLISTMODEL_GETREMAININGSECONDS_EXIT 0x8a0017
+#define CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_ENTRY 0x8a0018
+#define CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_EXIT 0x8a0019
+#define CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_ENTRY 0x8a001a
+#define CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_EXIT 0x8a001b
+#define CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_ENTRY 0x8a001c
+#define CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_EXIT 0x8a001d
+#define CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_ENTRY 0x8a001e
+#define CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_EXIT 0x8a001f
+#define CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_ENTRY 0x8a0020
+#define CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_EXIT 0x8a0021
+#define CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_ENTRY 0x8a0022
+#define CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_EXIT 0x8a0023
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockhomecityitemTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,20 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKHOMECITYITEMTRACES_H__
+#define __CLOCKHOMECITYITEMTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY 0x8a0024
+#define CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT 0x8a0025
+#define DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY 0x8a0026
+#define DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT 0x8a0027
+#define CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_ENTRY 0x8a0028
+#define CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_EXIT 0x8a0029
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockmainviewTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,64 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKMAINVIEWTRACES_H__
+#define __CLOCKMAINVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY 0x8a002a
+#define CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT 0x8a002b
+#define DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY 0x8a002c
+#define DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT 0x8a002d
+#define CLOCKMAINVIEW_SETUPVIEW_ENTRY 0x8a002e
+#define CLOCKMAINVIEW_SETUPVIEW_EXIT 0x8a002f
+#define CLOCKMAINVIEW_SETUPAFTERVIEWREADY_ENTRY 0x8a0030
+#define CLOCKMAINVIEW_SETUPAFTERVIEWREADY_EXIT 0x8a0031
+#define CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_ENTRY 0x8a0032
+#define CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_EXIT 0x8a0033
+#define CLOCKMAINVIEW_REFRESHMAINVIEW_ENTRY 0x8a0034
+#define CLOCKMAINVIEW_REFRESHMAINVIEW_EXIT 0x8a0035
+#define CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_ENTRY 0x8a0036
+#define CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_EXIT 0x8a0037
+#define CLOCKMAINVIEW_ADDNEWALARM_ENTRY 0x8a0038
+#define CLOCKMAINVIEW_ADDNEWALARM_EXIT 0x8a0039
+#define CLOCKMAINVIEW_OPENSETTINGS_ENTRY 0x8a003a
+#define CLOCKMAINVIEW_OPENSETTINGS_EXIT 0x8a003b
+#define CLOCKMAINVIEW_HANDLEACTIVATED_ENTRY 0x8a003c
+#define CLOCKMAINVIEW_HANDLEACTIVATED_EXIT 0x8a003d
+#define CLOCKMAINVIEW_HANDLELONGPRESS_ENTRY 0x8a003e
+#define CLOCKMAINVIEW_HANDLELONGPRESS_EXIT 0x8a003f
+#define CLOCKMAINVIEW_DELETEALARM_ENTRY 0x8a0040
+#define CLOCKMAINVIEW_DELETEALARM_EXIT 0x8a0041
+#define CLOCKMAINVIEW_REMOVESNOOZEDALARM_ENTRY 0x8a0042
+#define CLOCKMAINVIEW_REMOVESNOOZEDALARM_EXIT 0x8a0043
+#define CLOCKMAINVIEW_UPDATEVIEW_ENTRY 0x8a0044
+#define CLOCKMAINVIEW_UPDATEVIEW_EXIT 0x8a0045
+#define CLOCKMAINVIEW_UPDATEPLACELABEL_ENTRY 0x8a0046
+#define CLOCKMAINVIEW_UPDATEPLACELABEL_EXIT 0x8a0047
+#define CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_ENTRY 0x8a0048
+#define CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_EXIT 0x8a0049
+#define CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_ENTRY 0x8a004a
+#define CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_EXIT 0x8a004b
+#define CLOCKMAINVIEW_SELECTEDMENUACTION_ENTRY 0x8a004c
+#define CLOCKMAINVIEW_SELECTEDMENUACTION_EXIT 0x8a004d
+#define CLOCKMAINVIEW_HANDLEMENUCLOSED_ENTRY 0x8a004e
+#define CLOCKMAINVIEW_HANDLEMENUCLOSED_EXIT 0x8a004f
+#define CLOCKMAINVIEW_SETMODEL_ENTRY 0x8a0050
+#define CLOCKMAINVIEW_SETMODEL_EXIT 0x8a0051
+#define CLOCKMAINVIEW_HIDEALARMLIST_ENTRY 0x8a0052
+#define CLOCKMAINVIEW_HIDEALARMLIST_EXIT 0x8a0053
+#define CLOCKMAINVIEW_UPDATEDATELABEL_ENTRY 0x8a0054
+#define CLOCKMAINVIEW_UPDATEDATELABEL_EXIT 0x8a0055
+#define CLOCKMAINVIEW_UPDATECLOCKWIDGET_ENTRY 0x8a0056
+#define CLOCKMAINVIEW_UPDATECLOCKWIDGET_EXIT 0x8a0057
+#define CLOCKMAINVIEW_CAPTURESCREENSHOT_ENTRY 0x8a0058
+#define CLOCKMAINVIEW_CAPTURESCREENSHOT_EXIT 0x8a0059
+#define CLOCKMAINVIEW_SAVEACTIVITY_ENTRY 0x8a005a
+#define CLOCKMAINVIEW_SAVEACTIVITY_EXIT 0x8a005b
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/clockworldviewTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,55 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKWORLDVIEWTRACES_H__
+#define __CLOCKWORLDVIEWTRACES_H__
+
+#define KOstTraceComponentID 0x2002bce6
+
+#define CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY 0x8a005c
+#define CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT 0x8a005d
+#define DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY 0x8a005e
+#define DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT 0x8a005f
+#define CLOCKWORLDVIEW_SETUPVIEW_ENTRY 0x8a0060
+#define CLOCKWORLDVIEW_SETUPVIEW_EXIT 0x8a0061
+#define CLOCKWORLDVIEW_REFRESHCITYLIST_ENTRY 0x8a0062
+#define CLOCKWORLDVIEW_REFRESHCITYLIST_EXIT 0x8a0063
+#define CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_ENTRY 0x8a0064
+#define CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_EXIT 0x8a0065
+#define CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_ENTRY 0x8a0066
+#define CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_EXIT 0x8a0067
+#define CLOCKWORLDVIEW_HANDLEADDLOCATION_ENTRY 0x8a0068
+#define CLOCKWORLDVIEW_HANDLEADDLOCATION_EXIT 0x8a0069
+#define CLOCKWORLDVIEW_HANDLEDELETEACTION_ENTRY 0x8a006a
+#define CLOCKWORLDVIEW_HANDLEDELETEACTION_EXIT 0x8a006b
+#define CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_ENTRY 0x8a006c
+#define CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_EXIT 0x8a006d
+#define CLOCKWORLDVIEW_HANDLECITYSELECTED_ENTRY 0x8a006e
+#define CLOCKWORLDVIEW_HANDLECITYSELECTED_EXIT 0x8a006f
+#define CLOCKWORLDVIEW_SHOWALARMSVIEW_ENTRY 0x8a0070
+#define CLOCKWORLDVIEW_SHOWALARMSVIEW_EXIT 0x8a0071
+#define CLOCKWORLDVIEW_REFRESHWORLDVIEW_ENTRY 0x8a0072
+#define CLOCKWORLDVIEW_REFRESHWORLDVIEW_EXIT 0x8a0073
+#define CLOCKWORLDVIEW_LOADSECTION_ENTRY 0x8a0074
+#define CLOCKWORLDVIEW_LOADSECTION_EXIT 0x8a0075
+#define CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_ENTRY 0x8a0076
+#define CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_EXIT 0x8a0077
+#define CLOCKWORLDVIEW_SELECTEDMENUACTION_ENTRY 0x8a0078
+#define CLOCKWORLDVIEW_SELECTEDMENUACTION_EXIT 0x8a0079
+#define CLOCKWORLDVIEW_ADDCITYTOLIST_ENTRY 0x8a007a
+#define CLOCKWORLDVIEW_ADDCITYTOLIST_EXIT 0x8a007b
+#define CLOCKWORLDVIEW_ISDAY_ENTRY 0x8a007c
+#define CLOCKWORLDVIEW_ISDAY_EXIT 0x8a007d
+#define DUP1_CLOCKWORLDVIEW_ISDAY_EXIT 0x8a007e
+#define CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_ENTRY 0x8a007f
+#define CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_EXIT 0x8a0080
+#define CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_ENTRY 0x8a0081
+#define CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_EXIT 0x8a0082
+#define CLOCKWORLDVIEW_UPDATECITYLIST_ENTRY 0x8a0083
+#define CLOCKWORLDVIEW_UPDATECITYLIST_EXIT 0x8a0084
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockviews/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,134 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_CREATEITEM_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_ENTRY=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_HANDLEALARMSTATUSCHANGED_EXIT=0x9
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTITEMPROTOTYPE_UPDATECHILDITEMS_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_ENTRY=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_APPENDALARMTOMODEL_EXIT=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_CALCULATEREMAININGTIME_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY=0xa
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT=0xb
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_ENTRY=0x22
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETACTIVEALARMCOUNT_EXIT=0x23
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_ENTRY=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETDISPLAYSTRINGLISTFORALARMITEM_EXIT=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETREMAININGSECONDS_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_GETREMAININGSECONDS_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_POPULATEMODEL_ENTRY=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_POPULATEMODEL_EXIT=0xf
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_POPULATESOURCEMODEL_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_SOURCEMODEL_ENTRY=0x10
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_SOURCEMODEL_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_ENTRY=0x20
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATEALARMDETAILS_EXIT=0x21
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATEREMAININGTIME_EXIT=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKALARMLISTMODEL_UPDATESOURCEMODEL_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY=0x24
+[TRACE]TRACE_FLOW[0x8A]_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT=0x25
+[TRACE]TRACE_FLOW[0x8A]_CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_ENTRY=0x28
+[TRACE]TRACE_FLOW[0x8A]_CLOCKHOMECITYITEM_SETHOMECITYITEMDATA_EXIT=0x29
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_ADDNEWALARM_ENTRY=0x38
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_ADDNEWALARM_EXIT=0x39
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CAPTURESCREENSHOT_ENTRY=0x58
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CAPTURESCREENSHOT_EXIT=0x59
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_ENTRY=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CHECKORIENTATIONANDLOADSECTION_EXIT=0x4b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY=0x2a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_DELETEALARM_ENTRY=0x40
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_DELETEALARM_EXIT=0x41
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_ENTRY=0x36
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_DISPLAYWORLDCLOCKVIEW_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEACTIVATED_ENTRY=0x3c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEACTIVATED_EXIT=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_ENTRY=0x48
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEALARMLISTDISPLAY_EXIT=0x49
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_ENTRY=0x32
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEALARMSTATUSCHANGED_EXIT=0x33
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLELONGPRESS_ENTRY=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLELONGPRESS_EXIT=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEMENUCLOSED_ENTRY=0x4e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HANDLEMENUCLOSED_EXIT=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HIDEALARMLIST_ENTRY=0x52
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_HIDEALARMLIST_EXIT=0x53
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_OPENSETTINGS_ENTRY=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_OPENSETTINGS_EXIT=0x3b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REFRESHMAINVIEW_ENTRY=0x34
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REFRESHMAINVIEW_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REMOVESNOOZEDALARM_ENTRY=0x42
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_REMOVESNOOZEDALARM_EXIT=0x43
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SAVEACTIVITY_ENTRY=0x5a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SAVEACTIVITY_EXIT=0x5b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SELECTEDMENUACTION_ENTRY=0x4c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SELECTEDMENUACTION_EXIT=0x4d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETMODEL_ENTRY=0x50
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETMODEL_EXIT=0x51
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETUPAFTERVIEWREADY_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETUPAFTERVIEWREADY_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETUPVIEW_ENTRY=0x2e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_SETUPVIEW_EXIT=0x2f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATECLOCKWIDGET_ENTRY=0x56
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATECLOCKWIDGET_EXIT=0x57
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEDATELABEL_ENTRY=0x54
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEDATELABEL_EXIT=0x55
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEPLACELABEL_ENTRY=0x46
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEPLACELABEL_EXIT=0x47
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEVIEW_ENTRY=0x44
+[TRACE]TRACE_FLOW[0x8A]_CLOCKMAINVIEW_UPDATEVIEW_EXIT=0x45
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_ADDCITYTOLIST_ENTRY=0x7a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_ADDCITYTOLIST_EXIT=0x7b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY=0x5c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT=0x5d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_ENTRY=0x81
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_EXIT=0x82
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_ENTRY=0x7f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_EXIT=0x80
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEADDLOCATION_ENTRY=0x68
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEADDLOCATION_EXIT=0x69
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLECITYSELECTED_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLECITYSELECTED_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEDELETEACTION_ENTRY=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEDELETEACTION_EXIT=0x6b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_ENTRY=0x6c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_EXIT=0x6d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_ISDAY_ENTRY=0x7c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_ISDAY_EXIT=0x7d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_LOADSECTION_ENTRY=0x74
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_LOADSECTION_EXIT=0x75
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_REFRESHCITYLIST_ENTRY=0x62
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_REFRESHCITYLIST_EXIT=0x63
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_REFRESHWORLDVIEW_ENTRY=0x72
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_REFRESHWORLDVIEW_EXIT=0x73
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SELECTEDMENUACTION_ENTRY=0x78
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SELECTEDMENUACTION_EXIT=0x79
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SETUPVIEW_ENTRY=0x60
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SETUPVIEW_EXIT=0x61
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SHOWALARMSVIEW_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_SHOWALARMSVIEW_EXIT=0x71
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_ENTRY=0x76
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_EXIT=0x77
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATECITYLIST_ENTRY=0x83
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATECITYLIST_EXIT=0x84
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_ENTRY=0x64
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_EXIT=0x65
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMLISTITEMPROTOTYPE_CLOCKALARMLISTITEMPROTOTYPE_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_ENTRY=0xc
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKALARMLISTMODEL_CLOCKALARMLISTMODEL_EXIT=0xd
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_ENTRY=0x26
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKHOMECITYITEM_CLOCKHOMECITYITEM_EXIT=0x27
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_ENTRY=0x2c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKMAINVIEW_CLOCKMAINVIEW_EXIT=0x2d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY=0x5e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT=0x5f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWORLDVIEW_ISDAY_EXIT=0x7e
--- a/clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.pro Mon Aug 09 18:30:52 2010 +0530
@@ -33,10 +33,13 @@
}
}
-DEPENDPATH += ./inc \
- ./src
+DEPENDPATH += \
+ ./inc \
+ ./src
-INCLUDEPATH += ./inc
+INCLUDEPATH += \
+ ./inc \
+ ./traces
SOURCES += \
clockwidget.cpp \
--- a/clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -23,6 +23,11 @@
// User includes
#include "analogclockwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "analogclockwidgetTraces.h"
+#endif
+
// Constants
const int clockUpdateInterval (1000); // msec
@@ -41,6 +46,7 @@
AnalogClockWidget::AnalogClockWidget(QGraphicsItem *parent) :
HbWidget(parent)
{
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY );
bool result = HbStyleLoader::registerFilePath(
":/resource/analogclockwidget.widgetml");
result = HbStyleLoader::registerFilePath(
@@ -49,6 +55,7 @@
constructPrimitives();
mTimer = new QTimer(this);
connect(mTimer, SIGNAL(timeout()), SLOT(tick()));
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT );
}
/*!
@@ -56,9 +63,11 @@
*/
AnalogClockWidget::~AnalogClockWidget()
{
+ OstTraceFunctionEntry0( DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY );
mTimer->stop();
HbStyleLoader::unregisterFilePath(":/resource/analogclockwidget.widgetml");
HbStyleLoader::unregisterFilePath(":/resource/analogclockwidget.css");
+OstTraceFunctionExit0( DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT );
}
/*!
@@ -66,6 +75,7 @@
*/
void AnalogClockWidget::constructPrimitives()
{
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_ENTRY );
if (!mClockBackground) {
mClockBackground = new HbIconItem(
QLatin1String("qtg_graf_clock_day_bg"), this);
@@ -93,6 +103,7 @@
HbStyle::setItemName(
mClockSecondHand, QLatin1String("clock_second_hand"));
}
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_EXIT );
}
/*!
@@ -101,6 +112,7 @@
*/
void AnalogClockWidget::updatePrimitives()
{
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY );
if (!mClockBackground) {
mClockBackground = new HbIconItem(
QLatin1String("qtg_graf_clock_day_bg"), this);
@@ -161,6 +173,7 @@
if (!mTimer->isActive()) {
mTimer->start(clockUpdateInterval);
}
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_EXIT );
}
/*!
@@ -168,8 +181,10 @@
*/
void AnalogClockWidget::tick()
{
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_TICK_ENTRY );
updatePrimitives();
update();
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_TICK_EXIT );
}
/*!
@@ -177,8 +192,10 @@
*/
void AnalogClockWidget::setGeometry(const QRectF &rect)
{
+ OstTraceFunctionEntry0( ANALOGCLOCKWIDGET_SETGEOMETRY_ENTRY );
HbWidget::setGeometry(rect);
updatePrimitives();
+OstTraceFunctionExit0( ANALOGCLOCKWIDGET_SETGEOMETRY_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockwidget/clockwidgetimpl/src/clockwidget.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockwidget/clockwidgetimpl/src/clockwidget.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -22,6 +22,11 @@
#include "clockwidget.h"
#include "analogclockwidget.h"
#include "digitalclockwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockwidgetTraces.h"
+#endif
+
/*!
\class ClockWidget
@@ -36,7 +41,9 @@
: HbWidget(parent, flags),
mClockType(ClockTypeDigital)
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_CLOCKWIDGET_ENTRY );
loadClockWidget();
+OstTraceFunctionExit0( CLOCKWIDGET_CLOCKWIDGET_EXIT );
}
/*!
@@ -44,7 +51,9 @@
*/
ClockWidget::~ClockWidget()
{
+ OstTraceFunctionEntry0( DUP1_CLOCKWIDGET_CLOCKWIDGET_ENTRY );
+OstTraceFunctionExit0( DUP1_CLOCKWIDGET_CLOCKWIDGET_EXIT );
}
/*!
@@ -52,6 +61,8 @@
*/
ClockWidget::ClockType ClockWidget::clockType() const
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_CLOCKTYPE_ENTRY );
+ OstTraceFunctionExit0( CLOCKWIDGET_CLOCKTYPE_EXIT );
return mClockType;
}
@@ -60,6 +71,7 @@
*/
void ClockWidget::setClockType(const ClockType &type)
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_SETCLOCKTYPE_ENTRY );
if (type == ClockTypeAnalog) {
if(type != mClockType){
mClockType = ClockTypeAnalog;
@@ -71,6 +83,7 @@
updateClockWidget();
}
}
+OstTraceFunctionExit0( CLOCKWIDGET_SETCLOCKTYPE_EXIT );
}
/*!
@@ -78,11 +91,13 @@
*/
void ClockWidget::updateTime()
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_UPDATETIME_ENTRY );
if (mClockType == ClockTypeAnalog) {
mAnalogClock->tick();
} else {
mDigitalClock->updatePrimitives();
}
+OstTraceFunctionExit0( CLOCKWIDGET_UPDATETIME_EXIT );
}
/*!
@@ -90,6 +105,7 @@
*/
void ClockWidget::loadClockWidget()
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_LOADCLOCKWIDGET_ENTRY );
mLayout = new QGraphicsLinearLayout(Qt::Vertical);
mLayout->setContentsMargins(0,0,0,0);
@@ -102,6 +118,7 @@
mLayout->addItem(mDigitalClock);
}
setLayout(mLayout);
+OstTraceFunctionExit0( CLOCKWIDGET_LOADCLOCKWIDGET_EXIT );
}
/*!
@@ -109,6 +126,7 @@
*/
void ClockWidget::updateClockWidget()
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_UPDATECLOCKWIDGET_ENTRY );
if (mClockType == ClockTypeAnalog) {
mLayout->removeItem(mDigitalClock);
delete mDigitalClock;
@@ -125,15 +143,19 @@
}
mLayout->addItem(mDigitalClock);
}
+OstTraceFunctionExit0( CLOCKWIDGET_UPDATECLOCKWIDGET_EXIT );
}
ClockWidget::TimeFormat ClockWidget::timeFormat() const
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_TIMEFORMAT_ENTRY );
+ OstTraceFunctionExit0( CLOCKWIDGET_TIMEFORMAT_EXIT );
return mTimeFormat;
}
void ClockWidget::setTimeFormat(const TimeFormat &timeFormat)
{
+ OstTraceFunctionEntry0( CLOCKWIDGET_SETTIMEFORMAT_ENTRY );
if(mDigitalClock){
mTimeFormat = timeFormat;
if (timeFormat == ClockWidget::TimeFormat12Hrs) {
@@ -142,5 +164,6 @@
mDigitalClock->setAmPm(false);
}
}
+OstTraceFunctionExit0( CLOCKWIDGET_SETTIMEFORMAT_EXIT );
}
// End of file --Don't remove this.
--- a/clock/clockui/clockwidget/clockwidgetimpl/src/digitalclockwidget.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/clock/clockui/clockwidget/clockwidgetimpl/src/digitalclockwidget.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -27,6 +27,11 @@
// User includes
#include "digitalclockwidget.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "digitalclockwidgetTraces.h"
+#endif
+
// Constants
const int clockUpdateInterval (60000); // msec
@@ -47,6 +52,7 @@
: HbWidget(parent),
mUseAmPm(useAmPm)
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY );
bool result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget.widgetml");
result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget.css");
result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget_color.css");
@@ -60,6 +66,7 @@
int initialIntervalTime = (clockUpdateInterval - ( time.msec() + (time.second() * 1000)));
mTimer->start(initialIntervalTime);
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT );
}
/*!
@@ -67,11 +74,13 @@
*/
DigitalClockWidget::~DigitalClockWidget()
{
+ OstTraceFunctionEntry0( DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY );
mTimer->stop();
HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget.widgetml");
HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget.css");
HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget_color.css");
+OstTraceFunctionExit0( DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT );
}
/*!
@@ -79,9 +88,11 @@
*/
void DigitalClockWidget::tick()
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_TICK_ENTRY );
mTimer->setInterval(clockUpdateInterval);
updatePrimitives();
update();
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_TICK_EXIT );
}
/*!
@@ -89,6 +100,7 @@
*/
void DigitalClockWidget::setAmPm(bool useAmPm)
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_SETAMPM_ENTRY );
bool old = mUseAmPm;
mUseAmPm = useAmPm;
@@ -103,6 +115,7 @@
}
}
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_SETAMPM_EXIT );
}
/*!
@@ -110,7 +123,9 @@
*/
void DigitalClockWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_RESIZEEVENT_ENTRY );
HbWidget::resizeEvent(event);
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_RESIZEEVENT_EXIT );
}
/*!
@@ -118,6 +133,7 @@
*/
void DigitalClockWidget::createPrimitives()
{
+ OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_CREATEPRIMITIVES_ENTRY );
mClockLabel = new HbTextItem(this);
mClockLabel->setTextWrapping( Hb::TextNoWrap );
HbStyle::setItemName(mClockLabel, QLatin1String("clockLabel"));
@@ -125,6 +141,7 @@
mAmPmLabel = new HbTextItem(this);
mClockLabel->setTextWrapping( Hb::TextNoWrap );
HbStyle::setItemName(mAmPmLabel, QLatin1String("amPmLabel"));
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_CREATEPRIMITIVES_EXIT );
}
/*!
@@ -133,6 +150,7 @@
*/
void DigitalClockWidget::updatePrimitives()
{
+OstTraceFunctionEntry0( DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY );
QTime time = QTime::currentTime();
QString timeString;
@@ -154,4 +172,5 @@
mClockLabel->setText(timeString);
+OstTraceFunctionExit0( DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_EXIT );
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/OstTraceDefinitions.h Mon Aug 09 18:30:52 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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/analogclockwidgetTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,26 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __ANALOGCLOCKWIDGETTRACES_H__
+#define __ANALOGCLOCKWIDGETTRACES_H__
+
+#define KOstTraceComponentID 0x2002e715
+
+#define ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY 0x8a0001
+#define ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT 0x8a0002
+#define DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY 0x8a0003
+#define DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT 0x8a0004
+#define ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_ENTRY 0x8a0005
+#define ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_EXIT 0x8a0006
+#define ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY 0x8a0007
+#define ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_EXIT 0x8a0008
+#define ANALOGCLOCKWIDGET_TICK_ENTRY 0x8a0009
+#define ANALOGCLOCKWIDGET_TICK_EXIT 0x8a000a
+#define ANALOGCLOCKWIDGET_SETGEOMETRY_ENTRY 0x8a000b
+#define ANALOGCLOCKWIDGET_SETGEOMETRY_EXIT 0x8a000c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/clockwidgetTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,32 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __CLOCKWIDGETTRACES_H__
+#define __CLOCKWIDGETTRACES_H__
+
+#define KOstTraceComponentID 0x2002e715
+
+#define CLOCKWIDGET_CLOCKWIDGET_ENTRY 0x8a000d
+#define CLOCKWIDGET_CLOCKWIDGET_EXIT 0x8a000e
+#define DUP1_CLOCKWIDGET_CLOCKWIDGET_ENTRY 0x8a000f
+#define DUP1_CLOCKWIDGET_CLOCKWIDGET_EXIT 0x8a0010
+#define CLOCKWIDGET_CLOCKTYPE_ENTRY 0x8a0011
+#define CLOCKWIDGET_CLOCKTYPE_EXIT 0x8a0012
+#define CLOCKWIDGET_SETCLOCKTYPE_ENTRY 0x8a0013
+#define CLOCKWIDGET_SETCLOCKTYPE_EXIT 0x8a0014
+#define CLOCKWIDGET_UPDATETIME_ENTRY 0x8a0015
+#define CLOCKWIDGET_UPDATETIME_EXIT 0x8a0016
+#define CLOCKWIDGET_LOADCLOCKWIDGET_ENTRY 0x8a0017
+#define CLOCKWIDGET_LOADCLOCKWIDGET_EXIT 0x8a0018
+#define CLOCKWIDGET_UPDATECLOCKWIDGET_ENTRY 0x8a0019
+#define CLOCKWIDGET_UPDATECLOCKWIDGET_EXIT 0x8a001a
+#define CLOCKWIDGET_TIMEFORMAT_ENTRY 0x8a001b
+#define CLOCKWIDGET_TIMEFORMAT_EXIT 0x8a001c
+#define CLOCKWIDGET_SETTIMEFORMAT_ENTRY 0x8a001d
+#define CLOCKWIDGET_SETTIMEFORMAT_EXIT 0x8a001e
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/digitalclockwidgetTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,28 @@
+// Created by TraceCompiler 2.2.3
+// DO NOT EDIT, CHANGES WILL BE LOST
+
+#ifndef __DIGITALCLOCKWIDGETTRACES_H__
+#define __DIGITALCLOCKWIDGETTRACES_H__
+
+#define KOstTraceComponentID 0x2002e715
+
+#define DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY 0x8a001f
+#define DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT 0x8a0020
+#define DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY 0x8a0021
+#define DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT 0x8a0022
+#define DIGITALCLOCKWIDGET_TICK_ENTRY 0x8a0023
+#define DIGITALCLOCKWIDGET_TICK_EXIT 0x8a0024
+#define DIGITALCLOCKWIDGET_SETAMPM_ENTRY 0x8a0025
+#define DIGITALCLOCKWIDGET_SETAMPM_EXIT 0x8a0026
+#define DIGITALCLOCKWIDGET_RESIZEEVENT_ENTRY 0x8a0027
+#define DIGITALCLOCKWIDGET_RESIZEEVENT_EXIT 0x8a0028
+#define DIGITALCLOCKWIDGET_CREATEPRIMITIVES_ENTRY 0x8a0029
+#define DIGITALCLOCKWIDGET_CREATEPRIMITIVES_EXIT 0x8a002a
+#define DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY 0x8a002b
+#define DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_EXIT 0x8a002c
+
+
+#endif
+
+// End of file
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/clockui/clockwidget/clockwidgetimpl/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -0,0 +1,46 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_FLOW=0x8a
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_CONSTRUCTPRIMITIVES_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_SETGEOMETRY_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_SETGEOMETRY_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_TICK_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_TICK_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_ANALOGCLOCKWIDGET_UPDATEPRIMITIVES_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_CLOCKTYPE_ENTRY=0x11
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_CLOCKTYPE_EXIT=0x12
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_CLOCKWIDGET_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_CLOCKWIDGET_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_LOADCLOCKWIDGET_ENTRY=0x17
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_LOADCLOCKWIDGET_EXIT=0x18
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_SETCLOCKTYPE_ENTRY=0x13
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_SETCLOCKTYPE_EXIT=0x14
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_SETTIMEFORMAT_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_SETTIMEFORMAT_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_TIMEFORMAT_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_TIMEFORMAT_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_UPDATECLOCKWIDGET_ENTRY=0x19
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_UPDATECLOCKWIDGET_EXIT=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_UPDATETIME_ENTRY=0x15
+[TRACE]TRACE_FLOW[0x8A]_CLOCKWIDGET_UPDATETIME_EXIT=0x16
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_CREATEPRIMITIVES_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_CREATEPRIMITIVES_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_RESIZEEVENT_ENTRY=0x27
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_RESIZEEVENT_EXIT=0x28
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_SETAMPM_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_SETAMPM_EXIT=0x26
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_TICK_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_TICK_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_DIGITALCLOCKWIDGET_UPDATEPRIMITIVES_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_DUP1_ANALOGCLOCKWIDGET_ANALOGCLOCKWIDGET_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWIDGET_CLOCKWIDGET_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CLOCKWIDGET_CLOCKWIDGET_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_DUP1_DIGITALCLOCKWIDGET_DIGITALCLOCKWIDGET_EXIT=0x22
--- a/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml Mon Aug 09 18:30:52 2010 +0530
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.9">
+<hbdocument version="1.1">
<object name="makeFavoriteAction" type="HbAction">
<string locid="txt_notes_opt_mark_as_favorite" name="text" value="Mark as favourite"/>
</object>
@@ -10,8 +10,8 @@
<string locid="txt_notes_opt_discard_changes" name="text" value="Discard changes"/>
</object>
<object name="newNoteAction" type="HbAction">
- <string locid="txt_notes_opt_new_note" name="text" value="New note"/>
- </object>
+ <string locid="txt_notes_opt_new_note" name="text" value="New note"/>
+ </object>
<object name="deleteAction" type="HbAction">
<icon iconName="qtg_mono_delete" name="icon"/>
</object>
@@ -21,48 +21,55 @@
<widget name="notesEditorView" type="HbView">
<widget name="noteEditorWidget" role="HbView:widget" type="HbWidget">
<widget name="notesEditorSubHeading" type="HbGroupBox">
- <string name="heading" value=" "/>
- <bool name="collapsable" value="FALSE"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="PREFERRED"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="MINIMUM"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="MAXIMUM"/>
+ <bool name="collapsable" value="FALSE"/>
+ <bool name="visible" value="TRUE"/>
+ <string name="heading" value=" "/>
</widget>
<widget name="editorHeading" type="HbLabel">
- <enums name="alignment" value="AlignLeft|AlignLeading"/>
+ <enums name="alignment" value="AlignLeft|AlignLeading"/>
<sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED" width="48un"/>
- <string locid="txt_notes_subhead_new_note" name="plainText" value="New note"/>
- </widget>
- <widget name="favoriteIcon" type="HbLabel">
- <enums name="alignment" value="AlignRight|AlignTrailing"/>
- <sizehint height="var(hb-param-graphic-size-secondary)" type="PREFERRED" width="4un"/>
- </widget>
- <widget name="textEdit" type="HbTextEdit"/>
+ <string locid="txt_notes_subhead_new_note" name="plainText"/>
+ </widget>
+ <widget name="favoriteIcon" type="HbLabel">
+ <enums name="alignment" value="AlignRight|AlignTrailing"/>
+ <sizehint height="var(hb-param-graphic-size-secondary)" type="PREFERRED" width="4un"/>
+ <icon iconName=" " name="icon"/>
+ </widget>
+ <widget name="textEdit" type="HbTextEdit">
+ <string name="plainText"/>
+ </widget>
<layout type="anchor">
- <anchoritem dst="notesEditorSubHeading" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="notesEditorSubHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
<anchoritem dst="notesEditorSubHeading" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="notesEditorSubHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="notesEditorSubHeading" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
+ <anchoritem dst="notesEditorSubHeading" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="editorHeading" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="notesEditorSubHeading" srcEdge="LEFT"/>
+ <anchoritem dst="editorHeading" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="TOP"/>
+ <anchoritem dst="editorHeading" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
+ <anchoritem dst="favoriteIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="editorHeading" srcEdge="RIGHT"/>
+ <anchoritem dst="favoriteIcon" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="TOP"/>
+ <anchoritem dst="favoriteIcon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="notesEditorSubHeading" srcEdge="RIGHT"/>
+ <anchoritem dst="favoriteIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
<anchoritem dst="textEdit" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="textEdit" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
<anchoritem dst="textEdit" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
<anchoritem dst="textEdit" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="editorHeading" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
- <anchoritem dst="editorHeading" dstEdge="TOP" spacing="0.5un" src="" srcEdge="TOP"/>
- <anchoritem dst="editorHeading" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
- <anchoritem dst="favoriteIcon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="favoriteIcon" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
- <anchoritem dst="favoriteIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="editorHeading" srcEdge="RIGHT"/>
- <anchoritem dst="favoriteIcon" dstEdge="TOP" spacing="0.5un" src="" srcEdge="TOP"/>
</layout>
</widget>
<widget name="viewMenu" role="HbView:menu" type="HbMenu">
- <ref object="makeFavoriteAction" role="HbMenu:addAction"/>
- <ref object="makeAsTodoAction" role="HbMenu:addAction"/>
+ <ref object="makeFavoriteAction" role="HbWidget:addAction"/>
+ <ref object="makeAsTodoAction" role="HbWidget:addAction"/>
</widget>
<widget name="viewToolbar" role="HbView:toolBar" type="HbToolBar">
<enums name="orientation" value="Horizontal"/>
- <ref object="addToCalendarAction" role="HbToolBar:addAction"/>
- <ref object="deleteAction" role="HbToolBar:addAction"/>
+ <ref object="addToCalendarAction" role="HbWidget:addAction"/>
+ <ref object="deleteAction" role="HbWidget:addAction"/>
</widget>
<string locid="txt_notes_title_notes" name="title" value="Notes"/>
</widget>
- <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
</metadata>
</hbdocument>
--- a/notes/notesui/noteseditor/inc/noteseditor_p.h Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/noteseditor/inc/noteseditor_p.h Mon Aug 09 18:30:52 2010 +0530
@@ -65,6 +65,7 @@
bool saveNote();
bool saveTodo();
void editingCompleted(bool status);
+ void viewCreationCompleted(int error);
private:
bool isNoteEdited();
--- a/notes/notesui/noteseditor/src/noteseditor_p.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/noteseditor/src/noteseditor_p.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -78,7 +78,12 @@
mAgendaUtil, SIGNAL(entriesChanged(QList<ulong> )),
this, SLOT(handleEntriesChanged(QList<ulong> )));
-OstTraceFunctionExit0( NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT );
+ // Register for the calenInstance view creation sucessfully
+ connect(
+ mAgendaUtil, SIGNAL(entryViewCreationCompleted(int)),
+ this, SLOT(viewCreationCompleted(int)));
+
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT );
}
/*!
@@ -96,7 +101,7 @@
delete mTranslator;
mTranslator = 0;
}
-OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT );
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_NOTESEDITORPRIVATE_EXIT );
}
@@ -121,7 +126,7 @@
// launch note editor
mNoteEditor->execute(newNote);
-OstTraceFunctionExit0( NOTESEDITORPRIVATE_EDIT_EXIT );
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -134,7 +139,7 @@
{
OstTraceFunctionEntry0( DUP1_NOTESEDITORPRIVATE_EDIT_ENTRY );
Q_UNUSED(handle)
-OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_EDIT_EXIT );
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -175,7 +180,7 @@
OstTraceFunctionExit0( DUP2_NOTESEDITORPRIVATE_EDIT_EXIT );
return;
}
-OstTraceFunctionExit0( DUP3_NOTESEDITORPRIVATE_EDIT_EXIT );
+ OstTraceFunctionExit0( DUP3_NOTESEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -188,16 +193,14 @@
OstTraceFunctionEntry0( DUP3_NOTESEDITORPRIVATE_EDIT_ENTRY );
// Fetch the entry using the id provided
AgendaEntry entry = mAgendaUtil->fetchById(id);
- if (!entry.isNull()) {
- // Edit the agenda entry based on the entry type.
- edit(entry);
+ if (entry.isNull()) {
+ // save the entries , to show the entry once instances are created
+ // if entry is null exit ,later call back comes in viewCreationCompleted
+ mNoteId =id;
} else {
- // Invalid entry.
- OstTraceFunctionExit0( DUP4_NOTESEDITORPRIVATE_EDIT_EXIT );
- return;
+ edit(entry);
}
-
-OstTraceFunctionExit0( DUP5_NOTESEDITORPRIVATE_EDIT_EXIT );
+ OstTraceFunctionExit0( DUP5_NOTESEDITORPRIVATE_EDIT_EXIT );
}
/*!
@@ -208,7 +211,7 @@
*/
void NotesEditorPrivate::create(NotesEditor::CreateType type)
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_CREATE_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_CREATE_ENTRY );
switch(type) {
case NotesEditor::CreateNote: {
@@ -258,7 +261,7 @@
break;
}
-OstTraceFunctionExit0( NOTESEDITORPRIVATE_CREATE_EXIT );
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_CREATE_EXIT );
}
@@ -269,7 +272,7 @@
*/
ulong NotesEditorPrivate::close(NotesEditor::CloseType type)
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_CLOSE_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_CLOSE_ENTRY );
switch (type) {
case NotesEditor::CloseWithSave: {
@@ -391,7 +394,7 @@
mSaveEntry = false;
}
}
-OstTraceFunctionExit0( NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_EXIT );
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_HANDLEENTRIESCHANGED_EXIT );
}
/*!
@@ -442,7 +445,7 @@
window->removeView(mNoteEditor->mEditor);
mNoteEditor->deleteLater();
-OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT );
+ OstTraceFunctionExit0( DUP1_NOTESEDITORPRIVATE_MARKNOTEASTODO_EXIT );
}
/*!
@@ -451,11 +454,11 @@
*/
void NotesEditorPrivate::updateNoteText()
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_UPDATENOTETEXT_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_UPDATENOTETEXT_ENTRY );
mModifiedNote.setDescription(mNoteEditor->getDescription());
-OstTraceFunctionExit0( NOTESEDITORPRIVATE_UPDATENOTETEXT_EXIT );
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_UPDATENOTETEXT_EXIT );
}
/*!
@@ -463,7 +466,7 @@
*/
void NotesEditorPrivate::deleteNote()
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_DELETENOTE_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_DELETENOTE_ENTRY );
if (!mNewEntry) {
// Delete the note. All the changes are discarded.
@@ -479,7 +482,7 @@
mTodoEditor->deleteLater();
}
-OstTraceFunctionExit0( NOTESEDITORPRIVATE_DELETENOTE_EXIT );
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_DELETENOTE_EXIT );
}
/*!
@@ -487,13 +490,14 @@
*/
bool NotesEditorPrivate::saveNote()
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_SAVENOTE_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_SAVENOTE_ENTRY );
bool status = false;
QString description = mNoteEditor->getDescription();
- // Check the length. If it is 0, don't create/modify the note.
- if (description.length()) {
+ // Check the size after simplified() which removes all the space inside the
+ // description. If it is 0, don't create/modify the note.
+ if (0 < description.simplified().size()) {
// Save the note here.
if (mNewEntry) {
if (AgendaEntry::TypeNote == mModifiedNote.type()) {
@@ -560,7 +564,7 @@
*/
bool NotesEditorPrivate::saveTodo()
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_SAVETODO_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_SAVETODO_ENTRY );
if (AgendaEntry::TypeTodo != mModifiedNote.type()) {
// This should never happen.
@@ -623,7 +627,7 @@
*/
void NotesEditorPrivate::editingCompleted(bool status)
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_EDITINGCOMPLETED_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_EDITINGCOMPLETED_ENTRY );
if(mNoteEditor) {
mNoteEditor->deleteLater();
@@ -633,7 +637,31 @@
}
emit q_ptr->editingCompleted(status);
-OstTraceFunctionExit0( NOTESEDITORPRIVATE_EDITINGCOMPLETED_EXIT );
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_EDITINGCOMPLETED_EXIT );
+}
+
+/*!
+ Called when instances of calenInstanceview and entryInstanceview is created
+ successfully.
+
+ \param int status to indicate whether the creation was successful or not.
+ */
+void NotesEditorPrivate::viewCreationCompleted(int error)
+{
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_ENTRY );
+ if ((KErrNone == error)) {
+ AgendaEntry entry;
+ entry = mAgendaUtil->fetchById(mNoteId);
+ // if entry is there , then show the view.
+ if (!entry.isNull()) {
+ // Edit the agenda entry based on the entry type.
+ edit(entry);
+ } else {
+ // emit this signal so that the client can free the memory.
+ emit q_ptr->editingCompleted(true);
+ }
+ }
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_EXIT );
}
/*!
@@ -643,7 +671,7 @@
*/
bool NotesEditorPrivate::isNoteEdited()
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_ISNOTEEDITED_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_ISNOTEEDITED_ENTRY );
if (mModifiedNote.description().compare(mOriginalNote.description())) {
OstTraceFunctionExit0( NOTESEDITORPRIVATE_ISNOTEEDITED_EXIT );
@@ -665,7 +693,7 @@
*/
bool NotesEditorPrivate::isTodoEdited()
{
-OstTraceFunctionEntry0( NOTESEDITORPRIVATE_ISTODOEDITED_ENTRY );
+ OstTraceFunctionEntry0( NOTESEDITORPRIVATE_ISTODOEDITED_ENTRY );
if ( mModifiedNote.summary().compare(mOriginalNote.summary())) {
OstTraceFunctionExit0( NOTESEDITORPRIVATE_ISTODOEDITED_EXIT );
@@ -709,6 +737,6 @@
HbNotificationDialog::ConfirmationNoteTimeout);
notificationDialog->setTitle(text);
notificationDialog->show();
-OstTraceFunctionExit0( NOTESEDITORPRIVATE_SHOWNOTIFICATION_EXIT );
+ OstTraceFunctionExit0( NOTESEDITORPRIVATE_SHOWNOTIFICATION_EXIT );
}
// End of file --Don't remove this.
--- a/notes/notesui/noteseditor/src/notesnoteeditor.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/noteseditor/src/notesnoteeditor.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -205,7 +205,7 @@
mMarkFavouriteAction->setText(
hbTrId("txt_notes_opt_remove_from_favorites"));
} else {
- iconName = "";
+ iconName = " ";
mMarkFavouriteAction->setText(
hbTrId("txt_notes_opt_mark_as_favorite"));
@@ -220,7 +220,7 @@
// Set the sub heading
mViewHeading->setPlainText(hbTrId("txt_notes_subhead_note"));
} else {
- mFavouriteIcon->setIcon(HbIcon(""));
+ mFavouriteIcon->setIcon(HbIcon(" "));
// For handling the edit of note when text is given as input
mTextEditor->setPlainText(mOwner->mModifiedNote.description());
@@ -429,7 +429,7 @@
mOwner->mModifiedNote.setFavourite(0);
// Update the icon.
- mFavouriteIcon->setIcon(HbIcon(""));
+ mFavouriteIcon->setIcon(HbIcon(" "));
// Change the text on the action.
mMarkFavouriteAction->setText(
@@ -553,7 +553,7 @@
mOwner->mModifiedNote = mOwner->mOriginalNote = entry;
mOwner->mNewEntry = true;
- mFavouriteIcon->setIcon(HbIcon(""));
+ mFavouriteIcon->setIcon(HbIcon(" "));
// For handling the edit of note when text is given as input
mTextEditor->setPlainText(mOwner->mModifiedNote.description());
--- a/notes/notesui/noteseditor/src/notestodoeditor.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/noteseditor/src/notestodoeditor.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -51,6 +51,10 @@
#include "notestodoeditorTraces.h"
#endif
+// Constants
+const int MaxRowsInTextItem(10);
+const int MaxCharacterLimit(255);
+
/*!
\class NotesTodoEditor
@@ -381,6 +385,8 @@
QString(""), mFormModel->invisibleRootItem());
mSubjectItem->setContentWidgetData("text", mOwner->mModifiedNote.summary());
+ mSubjectItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
+ mSubjectItem->setContentWidgetData("maxLength", MaxCharacterLimit);
mSubjectItem->setContentWidgetData("objectName", "subjectItem");
mDataForm->addConnection(
@@ -567,6 +573,7 @@
mDescriptionItemIndex =
mFormModel->indexFromItem(mDescriptionItem).row();
+ mDescriptionItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
mDescriptionItem->setContentWidgetData(
QString("text"), mOwner->mModifiedNote.description());
--- a/notes/notesui/noteseditor/traces/fixed_id.definitions Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/noteseditor/traces/fixed_id.definitions Mon Aug 09 18:30:52 2010 +0530
@@ -37,7 +37,6 @@
[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
@@ -75,6 +74,8 @@
[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_TIMEFORMATSTRING_EXIT=0x27
[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_UPDATENOTETEXT_ENTRY=0x2d
[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_UPDATENOTETEXT_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_ENTRY=0xb3
+[TRACE]TRACE_FLOW[0x8A]_NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_EXIT=0xb4
[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_CLOSE_ENTRY=0x11
[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_CREATE_ENTRY=0xf
[TRACE]TRACE_FLOW[0x8A]_NOTESEDITOR_CREATE_EXIT=0x10
@@ -178,3 +179,4 @@
[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_UPDATESUMMARYTEXT_EXIT=0x6d
[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_VALIDALARMSET_ENTRY=0x72
[TRACE]TRACE_FLOW[0x8A]_NOTESTODOEDITOR_VALIDALARMSET_EXIT=0x73
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP4_NOTESEDITORPRIVATE_EDIT_EXIT=0x1e
--- a/notes/notesui/noteseditor/traces/noteseditor_pTraces.h Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/noteseditor/traces/noteseditor_pTraces.h Mon Aug 09 18:30:52 2010 +0530
@@ -18,7 +18,6 @@
#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
@@ -58,6 +57,8 @@
#define DUP6_NOTESEDITORPRIVATE_ISTODOEDITED_EXIT 0x8a0043
#define NOTESEDITORPRIVATE_SHOWNOTIFICATION_ENTRY 0x8a0044
#define NOTESEDITORPRIVATE_SHOWNOTIFICATION_EXIT 0x8a0045
+#define NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_ENTRY 0x8a00b3
+#define NOTESEDITORPRIVATE_VIEWCREATIONCOMPLETED_EXIT 0x8a00b4
#endif
--- a/notes/notesui/notesmodel/src/notesmodel.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/notesmodel/src/notesmodel.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -1023,8 +1023,13 @@
// Set the to-do done icon.
QList<QVariant> iconList;
iconList.append(HbIcon("qtg_small_todo_done"));
- // To-do is already completed. No need to set alarm.
- iconList.append(QVariant(QVariant::Invalid));
+ if (1 == entry.priority()) {
+ // Set the High Priority icon if priority is high or else not.
+ iconList.append(HbIcon("qtg_small_priority_high"));
+ } else {
+ // To-do is already completed. No need to set alarm.
+ iconList.append(QVariant(QVariant::Invalid));
+ }
// Set the icons.
mSourceModel->setData(
--- a/notes/notesui/notesviews/src/notestodoview.cpp Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/notesviews/src/notestodoview.cpp Mon Aug 09 18:30:52 2010 +0530
@@ -484,18 +484,18 @@
OstTraceFunctionEntry0( NOTESTODOVIEW_UPDATESUBTITLE_ENTRY );
Q_UNUSED(id)
- // Get the number of notes and to-do entries.
+ // Get the number of incompleted to-do entries.
QList<ulong> entries = mAgendaUtil->entryIds(
AgendaUtil::IncludeIncompletedTodos);
mSubTitle->setHeading(
hbTrId("txt_notes_subhead_todos_ln_pending",entries.count()));
- if (0 >= entries.count()) {
+ if (0 < mProxyModel->rowCount()) {
+ mEmptyListLabel->hide();
+ mListView->show();
+ } else {
mEmptyListLabel->show();
mListView->hide();
- } else {
- mEmptyListLabel->hide();
- mListView->show();
}
OstTraceFunctionExit0( NOTESTODOVIEW_UPDATESUBTITLE_EXIT );
}
--- a/organizer_plat/calendar_editor_api/inc/caleneditor.h Mon Jul 26 13:54:38 2010 +0530
+++ b/organizer_plat/calendar_editor_api/inc/caleneditor.h Mon Aug 09 18:30:52 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
@@ -48,20 +48,23 @@
TypeUnKnown = -1
};
- explicit CalenEditor(QObject *parent = 0);
- explicit CalenEditor(AgendaUtil *agendaUtil, QObject *parent = 0);
- virtual ~CalenEditor();
-
-public:
- void edit(const QFile &handle, bool launchCalendar);
- void edit(AgendaEntry entry, bool launchCalendar);
- void edit(ulong id, bool launchCalendar);
- void create(QDateTime newEntryDateTime,
+ CALENEDITOR_EXPORT explicit CalenEditor(QObject *parent = 0);
+ CALENEDITOR_EXPORT explicit CalenEditor(AgendaUtil *agendaUtil, QObject *parent = 0);
+ CALENEDITOR_EXPORT virtual ~CalenEditor();
+ CALENEDITOR_EXPORT void edit(const QFile &handle, bool launchCalendar);
+ CALENEDITOR_EXPORT void edit(AgendaEntry entry, bool launchCalendar);
+ CALENEDITOR_EXPORT void edit(ulong id, bool launchCalendar);
+ CALENEDITOR_EXPORT void create(QDateTime newEntryDateTime,
bool launchCalendar,
CalenEditor::CreateType type = TypeAppointment);
- void create(AgendaEntry entry,
+ CALENEDITOR_EXPORT void create(AgendaEntry entry,
bool launchCalendar,
CalenEditor::CreateType type = TypeAppointment);
+ /**
+ * This Function saves the entries
+ * Should only be called after edit or create function has been called
+ */
+ CALENEDITOR_EXPORT void saveAndCloseEditor();
signals:
void entrySaved();
--- a/organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/unittest_caleneditor.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/organizer_plat/calendar_editor_api/tsrc/unittest_caleneditor/unittest_caleneditor.pro Mon Aug 09 18:30:52 2010 +0530
@@ -30,6 +30,7 @@
DEFINES += TESTCALENEDITOR \
CALENEDITOR_LIB
INCLUDEPATH += . \
+ ../../../../calendarui/caleneditor/traces \
../../../../calendarui/caleneditor/inc \
../../../../calendarui/agendainterface/inc \
../../../../calendarui/commonutils/inc \
@@ -59,8 +60,7 @@
caleneditor_p.cpp \
caleneditordocloader.cpp
-HEADERS += caleneditor.h \
- caleneditorcustomitem.h \
+HEADERS += caleneditorcustomitem.h \
caleneditorcommon.h \
caleneditordocloader.h \
caleneditor_p.h
--- a/organizer_plat/calendar_launcher_api/inc/calenlauncher.h Mon Jul 26 13:54:38 2010 +0530
+++ b/organizer_plat/calendar_launcher_api/inc/calenlauncher.h Mon Aug 09 18:30:52 2010 +0530
@@ -14,7 +14,7 @@
* Description: Calendar Launcher
*
*/
-#include <qobject>
+#include <QObject>
#include <qdatetime.h>
#ifdef CALENLAUNCHER_LIB
@@ -29,7 +29,7 @@
public:
enum CalenView{
MonthView = 0,
- DayView
+ AgendaView
};
CalenLauncher(QObject* parent = 0);
~CalenLauncher();
--- a/organizer_plat/calendar_launcher_api/tsrc/unittest_calenlauncher/unittest_calenlauncher.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/organizer_plat/calendar_launcher_api/tsrc/unittest_calenlauncher/unittest_calenlauncher.pro Mon Aug 09 18:30:52 2010 +0530
@@ -22,7 +22,7 @@
DEPENDPATH += . \
./src \
../../../../calendarui/calenlauncher/src \
- ../../../../calendarui/calenlauncher/inc
+ ../../inc
INCLUDEPATH += .
--- a/tsrc/tsrc.pro Mon Jul 26 13:54:38 2010 +0530
+++ b/tsrc/tsrc.pro Mon Aug 09 18:30:52 2010 +0530
@@ -22,8 +22,7 @@
../clock/tsrc \
../notes/tsrc \
../organizer_plat/tsrc \
- ../organizer_pub/tsrc \
- ../pimappsupport/tsrc
+ ../organizer_pub/tsrc
CONFIG += ordered