FCL/sf/app/organizer: comparison calendarui/agendaeventviewer/src/agendaeventview.cpp

equal deleted inserted replaced

-:579cc610882e
+:ef813d54df51
 // User includes
 #include <maptileservice.h>//maptile service
 #include <agendautil.h>
 #include <NotesEditorInterface>
-#include <caleneditor.h>
+#include <CalenEditor>
+#include "calenagendautils.h"
 #include "agendaeventview.h"
 #include "agendaeventviewerdocloader.h"
 #include "agendaeventviewercommon.h"
 #include "agendaeventviewer_p.h"
 #include "agendaeventvieweritem.h"
 #include "calendateutils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "agendaeventviewTraces.h"
+#endif
 // Constants
-#define CHARACTER_HYPHEN    "-"
 #define CHARACTER_SPACE     " "
-#define CHARACTER_NEW_LINE  "\n"
+#define CHARACTER_HYPHEN    " - "
 //This Property is use for setting a primary left icon
 static const char *primaryLeftIconItem("leftPrimaryIconItem");
 /*!
 		mProgressIconCount(0),
 		mMaptileStatusReceived(false),
 		mMaptileStatus(-1),
 		mNotesPluginLoaded(false)
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY );
+	mTranslator->loadCommon();
 	mDocLoader = new AgendaEventViewerDocLoader;
 	// Load to-do viewer's docml.
 	bool loadSuccess;
 	mDocLoader->load(AGENDA_EVENT_VIEWER_DOCML, &loadSuccess);
 mProgressTimer->setSingleShot(true);
 connect(mProgressTimer, SIGNAL(timeout()), this, SLOT(updateProgressIndicator()));
 }
+OstTraceFunctionExit0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT );
 }
 /*!
 	Destructor.
 */
 AgendaEventView::~AgendaEventView()
 {
+OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY );
 	// Remove the translator
 	if (mTranslator) {
 		delete mTranslator;
 		mTranslator = 0;
 	if (mProgressTimer) {
 delete mProgressTimer;
 mProgressTimer = NULL;
 }
+	OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEW_AGENDAEVENTVIEW_EXIT );
 }
 /*!
 	Displays the to-do viewer and populates the to-do entry attributes.
 	\param entry Agenda entry from which attributes have to be read.
 */
 void AgendaEventView::execute(AgendaEntry entry,
 											AgendaEventViewer::Actions action)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_EXECUTE_ENTRY );
 	mOriginalAgendaEntry = entry;
 	mAgendaEntry = entry;
 	// Add the viewer data reading from the agenda entry.
 	mBackAction = new HbAction(Hb::BackNaviAction);
 	mViewer->setNavigationAction(mBackAction);
 	connect(mBackAction, SIGNAL(triggered()), this, SLOT(close()));
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_EXECUTE_EXIT );
 }
 /*!
 	Refreshes the to-do viewer after the to-do editor is closed.
 */
 void AgendaEventView::addViewerData()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDVIEWERDATA_ENTRY );
 	// Add the title to event viewer.
 	addGroupBoxData();
 	// Set the summary & priority to viewer.
 	}
 	// Set the description.
 	addDescriptionData();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDVIEWERDATA_EXIT );
 }
 /*!
 	Add the menu item depends up on entry type
 */
 void AgendaEventView::addMenuItem()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDMENUITEM_ENTRY );
 	if (mAgendaEntry.type() == AgendaEntry::TypeTodo) {
 		HbMenu *menu = qobject_cast<HbMenu *> (
 				mDocLoader->findWidget(AGENDA_EVENT_VIEWER_MENU));
 		}
 		connect(mMarkTodoAction, SIGNAL(triggered()), this,
 		        SLOT(markTodoStatus()));
 		menu->addAction(mMarkTodoAction);
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDMENUITEM_EXIT );
 }
 /*!
 	Add the toolbar item
 */
 void AgendaEventView::addToolBarItem(AgendaEventViewer::Actions action)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDTOOLBARITEM_ENTRY );
 	HbToolBar *toolBar = qobject_cast<HbToolBar *> (
 	                       mDocLoader->findWidget(AGENDA_EVENT_VIEWER_TOOLBAR));
 	// Load all the actions for event viewer
 		saveAction->setIcon(HbIcon("qtg_mono_add_to_calendar"));
 		connect(saveAction, SIGNAL(triggered()), this, SLOT(saveAgendaEntry()));
 		toolBar->addAction(saveAction);
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDTOOLBARITEM_EXIT );
 }
 /*!
 	Add the groupbox data depends up on entry type
 */
 void AgendaEventView::addGroupBoxData()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDGROUPBOXDATA_ENTRY );
 	HbGroupBox *groupBox = qobject_cast<HbGroupBox *> (
 			mDocLoader->findWidget(AGENDA_EVENT_VIEWER_GROUPBOX));
 	AgendaEntry::Type entryType = mAgendaEntry.type();
 	if (entryType == AgendaEntry::TypeTodo) {
 		groupBox->setHeading(hbTrId("txt_calendar_subhead_to_do"));
+	} else if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+groupBox->setHeading(hbTrId("txt_calendar_subhead_all_day_event"));
 	} else if (entryType == AgendaEntry::TypeAppoinment) {
 		groupBox->setHeading(hbTrId("txt_calendar_subhead_meeting"));
-	}else if (entryType == AgendaEntry::TypeEvent) {
+	}
-		//TODO: Add text id once available
-		groupBox->setHeading(hbTrId("All day event"));
-	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDGROUPBOXDATA_EXIT );
 }
 /*!
 	Add subject and priority data to Event viewer
 */
 void AgendaEventView::addSubjectAndPriorityData()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_ENTRY );
 	QStringList itemList;
 	itemList.append(hbTrId("txt_calendar_dblist_subject"));
 	if (mAgendaEntry.summary().isEmpty()) {
 		itemList.append(hbTrId("txt_calendar_dblist_val_unnamed"));
 itemList.append(priorityIcon);
 itemList.append(QString::null);
 	mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_EXIT );
 }
 /*!
 	Add date & time data to Event viewer
 */
 void AgendaEventView::addDateTimeData()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDDATETIMEDATA_ENTRY );
 QStringList itemData;
 HbExtendedLocale systemLocale = HbExtendedLocale::system();
 QDateTime startDateTime = mAgendaEntry.startTime();
 QDateTime endDateTime = mAgendaEntry.endTime();
 itemData.append(QString::null);
 itemData.append(QString::null);
 itemData.append("qtg_small_calendar");
 mDateTimeWidget->setProperty(primaryLeftIconItem, false);
 mDateTimeWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 itemData.clear();
 itemData.append(QString::null);
 QString startDateText;
 QString dateTimeText;
 QString data;
 // Add agenda entry specific fields to the viewer
 switch (mAgendaEntry.type()) {
 	case AgendaEntry::TypeAppoinment:
+	case AgendaEntry::TypeEvent:
-		startTimeText.append(systemLocale.format(
+	    // Check if entry is an all-day
-							startDateTime.time(), r_qtn_time_usual_with_zero));
+	    if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+dateTimeText.append(systemLocale.format(startDateTime.date(),
-		endTimeText.append(systemLocale.format(endDateTime.time(),
+	                                                        r_qtn_date_usual_with_zero));
-												r_qtn_time_usual_with_zero));
+if (CalenDateUtils::onSameDay(startDateTime, endDateTime.addSecs(-60))) {
-		startDateText.append(
+data.append(dateTimeText);
-				systemLocale.format(startDateTime.date(),
+} else {
-												r_qtn_date_usual_with_zero));
+QString endDate;
-		if (CalenDateUtils::onSameDay(startDateTime, endDateTime)) {
+endDate.append(
-			data.append(hbTrId("txt_calendar_dblist_start_end_time").arg(
+systemLocale.format(endDateTime.addSecs(-60).date(),
-											startTimeText).arg(endTimeText));
+r_qtn_date_usual_with_zero));
-			data.append(CHARACTER_SPACE);
+data.append(dateTimeText);
-			data.append(hbTrId("txt_calendar_dblist_meeting_date").arg(
+data.append(" - ");
-											startDateText));
+data.append(endDate);
-		} else {
+}
-			data.append(hbTrId("txt_calendar_dblist_start_time_date").arg(
+	    } else {
-											startTimeText).arg(startDateText));
+startTimeText.append(systemLocale.format(
-			QString endDateText;
+startDateTime.time(), r_qtn_time_usual_with_zero));
-			endDateText.append(
-					systemLocale.format(endDateTime.date(),
+endTimeText.append(systemLocale.format(endDateTime.time(),
-												r_qtn_date_usual_with_zero));
+r_qtn_time_usual_with_zero));
-			data.append(hbTrId("txt_calendar_dblist_end_time_date").arg(
+startDateText.append(
-											endTimeText).arg(endDateText));
+systemLocale.format(startDateTime.date(),
-		}
+r_qtn_date_usual_with_zero));
+if (CalenDateUtils::onSameDay(startDateTime, endDateTime)) {
+data.append(startTimeText);
+data.append(CHARACTER_HYPHEN);
+data.append(endTimeText);
+data.append(CHARACTER_SPACE);
+data.append(startDateText);
+} else {
+// If both start and end time of a meeting are on different dates
+data.append(startTimeText);
+data.append(CHARACTER_SPACE);
+data.append(startDateText);
+QString endDateText;
+endDateText.append(
+systemLocale.format(endDateTime.date(),
+r_qtn_date_usual_with_zero));
+data.append(CHARACTER_HYPHEN);
+data.append(endTimeText);
+data.append(CHARACTER_SPACE);
+data.append(endDateText);
+}
+	    }
 		break;
 	case AgendaEntry::TypeAnniversary:
 	case AgendaEntry::TypeTodo:
 		dateTimeText.append(systemLocale.format(endDateTime.date(),
-												r_qtn_date_usual_with_zero));
+											r_qtn_date_usual_with_zero));
-		data.append(hbTrId(
+		data.append(dateTimeText);
-						"txt_calendar_dblist_meeting_date").arg(dateTimeText));
-		break;
-	case AgendaEntry::TypeEvent:
-		dateTimeText.append(systemLocale.format(startDateTime.date(),
-												r_qtn_date_usual_with_zero));
-		if (CalenDateUtils::onSameDay(startDateTime, endDateTime.addSecs(-60))) {
-			data.append(hbTrId("txt_calendar_dblist_meeting_date").arg(
-											dateTimeText));
-		} else {
-			QString endDate;
-			endDate.append(
-					systemLocale.format(endDateTime.addSecs(-60).date(),
-												r_qtn_date_usual_with_zero));
-			data.append(hbTrId("txt_calendar_dblist_start_end_time").arg(
-											dateTimeText).arg(endDate));
-		}
 		break;
 	default:
 		break;
 }
 	itemData.append(data);
 mDateTimeWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDDATETIMEDATA_EXIT );
 }
 /*!
 	Add location data to Event viewer
 */
 void AgendaEventView::addLocationData()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDLOCATIONDATA_ENTRY );
 	QStringList itemData;
 	QString progressIcon(QString::null);
 	if ( mLocationFeatureEnabled ) {
 	    getProgressIndicatorstatus(progressIcon);
 	}
 	 if( progressIcon.isNull() ) {
 	     itemData.append(QString::null);
 	     itemData.append(QString::null);
 	     itemData.append("qtg_small_location");
 	mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(mAgendaEntry.location());
 	mLocationWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDLOCATIONDATA_EXIT );
 }
 /*!
 Add maptile image to Event viewer
 */
 void AgendaEventView::addMapTileImage()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDMAPTILEIMAGE_ENTRY );
 if (mLocationFeatureEnabled && !mAgendaEntry.location().isEmpty() && !mMaptilePath.isEmpty()) {
 HbIcon maptile(mMaptilePath);
 mMaptileLabel->setIcon(maptile);
-mMaptileLabel->setPreferredSize(QSizeF(maptile.width(), maptile.height()));
+//get the margin size
-}
+qreal left, bottom;
+mMaptileLabel->getContentsMargins( &left, 0, 0, &bottom );
+mMaptileLabel->setPreferredSize(
+QSizeF( maptile.width() + left, maptile.height() + bottom ) );
+}
+OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDMAPTILEIMAGE_EXIT );
 }
 /*!
 	Add reminder data to Event viewer
 */
 void AgendaEventView::addReminderData()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDREMINDERDATA_ENTRY );
 	QStringList itemData;
 	itemData.append(QString::null);
 itemData.append(QString::null);
 itemData.append("qtg_small_reminder");
 mReminderWidget->setProperty(primaryLeftIconItem, false);
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(alarmTimeText());
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
-}
+	mReminderWidgetAdded = true;
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDREMINDERDATA_EXIT );
+}
 /*!
 	Add completed to-do data to Event viewer
 */
 void AgendaEventView::addCompletedTodoData()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_ENTRY );
 	QStringList itemData;
-	QString     completedText;
+	QString completedText;
-HbExtendedLocale systemLocale = HbExtendedLocale::system();;
+	HbExtendedLocale systemLocale = HbExtendedLocale::system();;
-itemData.append(QString::null);
 	itemData.append(QString::null);
 	itemData.append(QString::null);
-mReminderWidget->setProperty(primaryLeftIconItem, false);
+	itemData.append(QString::null);
+	mReminderWidget->setProperty(primaryLeftIconItem, true);
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	completedText = systemLocale.format(mAgendaEntry.completedDateTime().date(),
 					                    r_qtn_date_usual_with_zero);
 	itemData.append(hbTrId("txt_calendar_dblist_completed_date"));
 	itemData.append(completedText);
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDCOMPLETEDTODODATA_EXIT );
 }
 /*!
 	Add repeat data to Event viewer
 */
 void AgendaEventView::addRepeatData()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDREPEATDATA_ENTRY );
 	QStringList itemData;
 	itemData.append(QString::null);
 itemData.append(QString::null);
-itemData.append("qtg_small_repeat");
+if(!mAgendaEntry.recurrenceId().isNull()) {
+itemData.append("qtg_small_repeat_exception");
+}else {
+itemData.append("qtg_small_repeat");
+}
 mRepeatWidget->setProperty(primaryLeftIconItem, false);
 	mRepeatWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(repeatRule());
 	mRepeatWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDREPEATDATA_EXIT );
 }
 /*!
 	Add description data to Event viewer
 */
 void AgendaEventView::addDescriptionData()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_ENTRY );
 	QStringList itemData;
 	itemData.append(QString::null);
 	itemData.append(QString::null);
 itemData.append(QString::null);
-mDescriptionWidget->setProperty(primaryLeftIconItem, false);
+mDescriptionWidget->setProperty(primaryLeftIconItem, true);
 	mDescriptionWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(hbTrId("txt_calendar_dblist_description"));
 	itemData.append(mAgendaEntry.description());
 	mDescriptionWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_EXIT );
 }
 /*!
 	Returns priority icon
 */
 void AgendaEventView::getPriorityIcon(int priority, QString &priorityIcon)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETPRIORITYICON_ENTRY );
 	switch(priority) {
 		case 1:priorityIcon.append("qtg_small_priority_high");
 		break;
 		case 3:priorityIcon.append("qtg_small_priority_low");
 		break;
 		default:
 		break;
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_GETPRIORITYICON_EXIT );
 }
 /*!
 	Returns repeat rule
 */
-QString AgendaEventView::repeatRule() const
+QString AgendaEventView::repeatRule()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_REPEATRULE_ENTRY );
 	QString repeatRule;
-	AgendaRepeatRule agendaRepeatRule = mAgendaEntry.repeatRule();
+	AgendaRepeatRule agendaRepeatRule;
+	if (mAgendaEntry.isRepeating()) {
+	    agendaRepeatRule = mAgendaEntry.repeatRule();
+	} else {
+if (!mAgendaEntry.recurrenceId().isNull()) {
+AgendaEntry parentEntry= mOwner->mAgendaUtil->parentEntry(mAgendaEntry);
+agendaRepeatRule = parentEntry.repeatRule();
+}
+	}
 	if (agendaRepeatRule.type() != AgendaRepeatRule::InvalidRule)
 	{
 		switch (agendaRepeatRule.type()) {
 			case AgendaRepeatRule::DailyRule:
 				repeatRule.append(hbTrId("txt_calendar_dblist_repeats_daily"));
 			break;
 			case AgendaRepeatRule::WeeklyRule:
 				if (AgendaUtil::isWorkdaysRepeatingEntry(agendaRepeatRule)) {
-					repeatRule.append(hbTrId("txt_calendar_dblist_repeats_workdays"));
+					repeatRule.append(
+								hbTrId("txt_calendar_dblist_repeats_workdays"));
 				} else {
 					if (agendaRepeatRule.interval() == 2) {
 						repeatRule.append(
 							hbTrId("txt_calendar_dblist_repeats_fortnightly"));
 					} else {
 						hbTrId("txt_calendar_dblist_repeats_yearly"));
 			break;
 			default:
 			break;
 		}
-		repeatRule.append(CHARACTER_NEW_LINE);
+		repeatRule.append(CHARACTER_SPACE);
 		HbExtendedLocale systemLocale = HbExtendedLocale::system();
 		QString untilDateString = systemLocale.format(
-				mAgendaEntry.repeatRule().until().date(),
+		                agendaRepeatRule.until().date(),
-				r_qtn_date_usual_with_zero);
+		                r_qtn_date_usual_with_zero);
 		repeatRule.append(
 			hbTrId("txt_calendar_dblist_repeats_daily_val_until_1").
 			arg(untilDateString));
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_REPEATRULE_EXIT );
 	return repeatRule;
 }
 /*!
 	Alarm time text to display in the viewer.
 	\return QString	Holds the alarm time text.
 */
 QString AgendaEventView::alarmTimeText() const
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_ALARMTIMETEXT_ENTRY );
 	QString alarmDateTimeText;
 	QDateTime startTime;
 	QDateTime alarmDateTime;
 		int alarmTimeOffsetInMinutes = mAgendaEntry.alarm().timeOffset();
 		alarmDateTime = startTime.addSecs(-alarmTimeOffsetInMinutes * 60);
 		HbExtendedLocale systemLocale = HbExtendedLocale::system();
-		alarmDateTimeText.append(
+		alarmDateTimeText.append(systemLocale.format(alarmDateTime.time(),
-						hbTrId("txt_calendar_list_reminder_time_date").arg(
+										r_qtn_time_usual_with_zero));
-						systemLocale.format(alarmDateTime.time(),
+		// Show the alarm date only if its not on the same day of the entry
-						r_qtn_time_usual_with_zero)).arg(
+		if (!CalenDateUtils::onSameDay(alarmDateTime, startTime)) {
-						systemLocale.format(alarmDateTime.date(),
+			alarmDateTimeText.append(CHARACTER_SPACE);
-						r_qtn_date_usual_with_zero)));
+			alarmDateTimeText.append(systemLocale.format(alarmDateTime.date(),
-	}
+											r_qtn_date_usual_with_zero));
+		}
+	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ALARMTIMETEXT_EXIT );
 	return alarmDateTimeText;
 }
 /*!
 	Remove unnecessary widget from layout.
 */
 void AgendaEventView::removeWidget()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_REMOVEWIDGET_ENTRY );
 	if (mAgendaEntry.location().isEmpty()) {
 		mLocationWidget->hide();
 		mLinearLayout->removeItem(mLocationWidget);
 	}
 	QFile file(mMaptilePath);
-if ( !mLocationFeatureEnabled || !file.exists()
+if (!mLocationFeatureEnabled || !file.exists()
-|| mAgendaEntry.location().isEmpty()){
+|| mAgendaEntry.location().isEmpty()) {
 //code added to hide and remove maptile image
 mMaptileLabel->hide();
 mLinearLayout->removeItem(mMaptileLabel);
 }
 file.close();
 			mLinearLayout->removeItem(mReminderWidget);
 			mReminderWidgetAdded = false;
 		}
 	}
-	if (mAgendaEntry.repeatRule().type() == AgendaRepeatRule::InvalidRule) {
+	// Check whether the entry is a completed To-do. if so then remove the
+	// time and date widget.
+	if (mAgendaEntry.type() == AgendaEntry::TypeTodo &&
+			AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
+		mDateTimeWidget->hide();
+		mLinearLayout->removeItem(mDateTimeWidget);
+	}
+	if ((mAgendaEntry.repeatRule().type() == AgendaRepeatRule::InvalidRule) &&
+			(mAgendaEntry.recurrenceId().isNull())) {
 		mRepeatWidget->hide();
 		mLinearLayout->removeItem(mRepeatWidget);
 	}
 	if (mAgendaEntry.description().isEmpty()) {
 	}
 	mLinearLayout->invalidate();
 	mLinearLayout->activate();
-}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_REMOVEWIDGET_EXIT );
+}
-/*!
-	Update the completed to-do or reminder data to event viewer.
+/*!
-*/
+	Update all the fields according to to-do status change..
-void AgendaEventView::updateCompletedReminderData()
+*/
-{
+void AgendaEventView::updateFieldsforTodoStatus()
+{
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_ENTRY );
 	if (AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
+		// For completed to-do due date and time should be removed.
+		mDateTimeWidget->hide();
+		mLinearLayout->removeItem(mDateTimeWidget);
+		// Fill the completed data information.
 		addCompletedTodoData();
+		// Add the completed date to thte viewer.
 		if (!mReminderWidgetAdded) {
 			mReminderWidget->show();
 			mLinearLayout->insertItem(2, mReminderWidget);
 			mReminderWidgetAdded = true;
 		}
 	} else {
+			// Add the date and time widget to the viewer.
+			mDateTimeWidget->show();
+			mLinearLayout->insertItem(1, mDateTimeWidget);
 		if (!mAgendaEntry.alarm().isNull()) {
 			addReminderData();
 			if (!mReminderWidgetAdded) {
 				mReminderWidget->show();
 				mLinearLayout->insertItem(2, mReminderWidget);
 				mReminderWidgetAdded = true;
 			}
 		} else {
+			// Remove the completed date from the viewer.
 			if (mReminderWidgetAdded) {
 				mReminderWidget->hide();
 				mLinearLayout->removeItem(mReminderWidget);
 				mReminderWidgetAdded = false;
 			}
 		}
 	}
+	// The To-do icon changes according to the To-do status change.
+	updateSubjectandPriorityData();
 	mLinearLayout->invalidate();
 	mLinearLayout->activate();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT );
 }
 /*!
 	Remove all widgets from layout.
 */
 void AgendaEventView::removeAllWidgets()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_REMOVEALLWIDGETS_ENTRY );
 	for (int i = 2; i < mLinearLayout->count(); i++) {
 		mLinearLayout->removeAt(i);
 	}
 	mLinearLayout->invalidate();
 	mLinearLayout->activate();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_REMOVEALLWIDGETS_EXIT );
 }
 /*!
 	Add all widgets to layout.
 */
 void AgendaEventView::addAllWidgets()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDALLWIDGETS_ENTRY );
 	mLinearLayout->addItem(mLocationWidget);
 	mLocationWidget->show();
 	mLinearLayout->addItem(mMaptileLabel);
 	mMaptileLabel->show();
 	mDescriptionWidget->show();
 	mLinearLayout->invalidate();
 	mLinearLayout->activate();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDALLWIDGETS_EXIT );
 }
 /*!
 	Queries user whether to delete whole series or just this single occurence
 */
 void AgendaEventView::showDeleteOccurencePopup()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY );
 	HbDialog *popUp = new HbDialog();
 	popUp->setDismissPolicy(HbDialog::NoDismiss);
 	popUp->setTimeout(HbDialog::NoTimeout);
 	popUp->setAttribute( Qt::WA_DeleteOnClose, true );
 	connect(deleteButtonList, SIGNAL(itemSelected(int)), this,
 											SLOT(handleDeleteOccurence(int)));
 	connect(deleteButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
 	popUp->addAction(new HbAction(
-			hbTrId("txt_calendar_button_softkey1_cancel")));
+			hbTrId("txt_common_button_cancel_singledialog")));
 	// Show the popup
 	popUp->open();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_EXIT );
 }
 /*!
 	Show delete confirmation query
 */
 void AgendaEventView::showDeleteConfirmationQuery()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY );
 HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
 popup->setDismissPolicy(HbDialog::NoDismiss);
 popup->setTimeout(HbDialog::NoTimeout);
 popup->setAttribute( Qt::WA_DeleteOnClose, true );
 QString text = 0;
 switch (mAgendaEntry.type()) {
 case AgendaEntry::TypeAppoinment:
 case AgendaEntry::TypeEvent: {
-text.append(hbTrId("txt_calendar_info_delete_meeting"));
+			// Check for all-day
-break;
+	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;
 }
 case AgendaEntry::TypeTodo: {
 HbAction *deleteAction =
 					new HbAction(hbTrId("txt_calendar_button_delete"), popup);
 popup->addAction(deleteAction);
 connect(deleteAction, SIGNAL(triggered()), this ,
 												SLOT(handleDeleteAction()));
-popup->addAction(new HbAction(hbTrId("txt_calendar_button_cancel"), popup));
+popup->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popup));
 popup->open();
+OstTraceFunctionExit0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_EXIT );
 }
 /*!
 	Handles the delete action
 */
 void AgendaEventView::handleDeleteAction()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEDELETEACTION_ENTRY );
 // If delete button is pressed delete the entry
 // To notify client that deleting Started
 // Calendar Application changing state from viewing to deleting.
 mOwner->deletingStarted();
 // Delete the entry.
 mOwner->mAgendaUtil->deleteEntry(mAgendaEntry.id());
+OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEDELETEACTION_EXIT );
 }
 /*!
 	Marks to-do entry as done or undone based on the completed value.
 */
 void AgendaEventView::markTodoStatus()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_MARKTODOSTATUS_ENTRY );
 	QDateTime currentDateTime = QDateTime::currentDateTime();
 	// Set the to-do status using the agenda util.
 	if (AgendaEntry::TodoCompleted != mAgendaEntry.status()) {
 		mMarkTodoAction->setText(hbTrId("txt_calendar_menu_mark_as_done"));
 		mAgendaEntry.setStatus(AgendaEntry::TodoNeedsAction);
 		mOwner->mAgendaUtil->setCompleted(mAgendaEntry, false, currentDateTime);
 	}
-	updateCompletedReminderData();
+	updateFieldsforTodoStatus();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_MARKTODOSTATUS_EXIT );
 }
 /*!
 	Edits the agenda entry by lanching the to-do viewer.
 */
 void AgendaEventView::edit()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_EDIT_ENTRY );
 	mOwner->editingStarted();
 	if (AgendaEntry::TypeTodo == mAgendaEntry.type()) {
 		// Load notes editor plugin if not loaded.
 		                        this, SLOT(handleCalendarEditorClosed()));
 		mCalenEditor->edit(mAgendaEntry, false);
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_EDIT_EXIT );
 }
 /*!
 	Deletes the agenda entry.
 */
 void AgendaEventView::deleteAgendaEntry()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_DELETEAGENDAENTRY_ENTRY );
 	// Before we do anything, check in the entry is repeating
 	// OR its a child item
 	bool isChild = !(mAgendaEntry.recurrenceId().isNull());
 	bool isRepeating = mAgendaEntry.isRepeating();
 		showDeleteOccurencePopup();
 	} else {
 showDeleteConfirmationQuery();
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_DELETEAGENDAENTRY_EXIT );
 }
 /*!
 	Save the agenda entry to calendar db.
 */
 void AgendaEventView::saveAgendaEntry()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_SAVEAGENDAENTRY_ENTRY );
 	// Save entry to calendar.
-	mOwner->mAgendaUtil->addEntry(mAgendaEntry);
+	mOwner->mAgendaUtil->store(mAgendaEntry);
 	// Close the agenda entry viewer
 	close();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_SAVEAGENDAENTRY_EXIT );
 }
 /*!
 	Closes the event viewer
 */
 void AgendaEventView::close()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_CLOSE_ENTRY );
 	// Remove the view from main window.
 	HbMainWindow *window = hbInstance->allMainWindows().first();
 	// Cleanup.
 	disconnect(
 			mBackAction, SIGNAL(triggered()),
 			this, SLOT(close()));
 	window->removeView(mViewer);
+	if (AgendaEntry::TypeTodo == mAgendaEntry.type()) {
+	    mAgendaEntry.setStartAndEndTime(
+	            CalenDateUtils::today(), CalenDateUtils::today());
+	}
 	mOwner->viewingCompleted(mAgendaEntry.startTime().date());
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_CLOSE_EXIT );
 }
 /*!
 	Handles entry updation of the event entry.
 */
 void AgendaEventView::handleEntryUpdation(ulong id)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYUPDATION_ENTRY );
 	AgendaEntry updatedEntry = mOwner->mAgendaUtil->fetchById(id);
 	// Agenda entry is not null then refresh the view else close event viewer
 	if (!updatedEntry.isNull()) {
 		mAgendaEntry = updatedEntry;
-		if (updatedEntry.isRepeating() && mAgendaEntry.type()
+		// If the updated entry's & original entry's repeat rule mismatches than
-		        != AgendaEntry::TypeTodo) {
+		// show the parent entry.
+		if (updatedEntry.isRepeating() &&
+		        mAgendaEntry.type() != AgendaEntry::TypeTodo &&
+		        mOriginalAgendaEntry.repeatRule() ==
+		                updatedEntry.repeatRule()) {
 			// if start date of original entry is between start date of updated
 			// entry and until date of updated entry then only update time.
 			if (mOriginalAgendaEntry.startTime().date()
 			        >= updatedEntry.startTime().date()
 			        && mOriginalAgendaEntry.startTime().date()
 	} else {
 		// Close the agenda entry viewer
 		close();
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYUPDATION_EXIT );
 }
 /*!
 	Handles the entry deletion of the agenda entry
 */
 void AgendaEventView::handleEntryDeletion(ulong id)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_ENTRY );
 	if (id == mAgendaEntry.id()) {
 		// Close the agenda entry viewer
 		close();
 		mOwner->deletingCompleted();
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_EXIT );
 }
 /*!
 	Handles the Note Editor editing completion of the agenda entry
 */
 void AgendaEventView::handleNoteEditorClosed(bool status)
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_ENTRY );
 	Q_UNUSED(status);
 	// To avoid loading the plugin again for editing,
 	// Unload the plug-in while destruction.
 	mOwner->editingCompleted();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLENOTEEDITORCLOSED_EXIT );
 }
 /*!
 	Handles the Note Editor editing completion of the agenda entry
 */
 void AgendaEventView::handleCalendarEditorClosed()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_ENTRY );
 	// Cleanup.
 	mCalenEditor->deleteLater();
 	mOwner->editingCompleted();
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_EXIT );
 }
 /*!
 	Slot to handle User selection for series deleting or single occurence popup
 */
 void AgendaEventView::handleDeleteOccurence(int index)
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_ENTRY );
 	// To notify client that deleting Started
 	// Calendar Application changing state from viewing to deleting.
 	mOwner->deletingStarted();
 			mOwner->mAgendaUtil->deleteRepeatedEntry(mAgendaEntry,
 			                                         AgendaUtil::ThisAndAll);
 			break;
 	}
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEDELETEOCCURENCE_EXIT );
 }
 /*!
 Returns subject icon
 */
 void AgendaEventView::getSubjectIcon(AgendaEntry::Type type, QString &subjectIcon)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETSUBJECTICON_ENTRY );
 switch(type) {
 case AgendaEntry::TypeAppoinment:
+case AgendaEntry::TypeEvent:
 {
-subjectIcon.append("qtg_small_meeting");
+// Check for all-day
+if (CalenAgendaUtils::isAlldayEvent(mAgendaEntry)) {
+subjectIcon.append("qtg_small_day");
+} else {
+subjectIcon.append("qtg_small_meeting");
+}
 }
 break;
 case AgendaEntry::TypeTodo:
 {
-subjectIcon.append("qtg_small_todo");
+if (AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
+subjectIcon.append("qtg_small_todo_done");
+} else {
+subjectIcon.append("qtg_small_todo");
 }
-break;
-case AgendaEntry::TypeEvent:
-{
-subjectIcon.append("qtg_small_day");
 }
 break;
 case AgendaEntry::TypeAnniversary:
 {
 subjectIcon.append("qtg_small_anniversary");
 break;
 default:
 break;
 }
+OstTraceFunctionExit0( AGENDAEVENTVIEW_GETSUBJECTICON_EXIT );
 }
 /*!
 According to maptile fetching status , update the viewer screen.
 */
 void AgendaEventView::updateProgressIndicator()
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_ENTRY );
 if (!mMaptileStatusReceived) {
 QString iconName("qtg_anim_small_loading_");
 mProgressIconCount = mProgressIconCount % 10 + 1;
 iconName.append(QVariant(mProgressIconCount).toString());
 QStringList itemData;
 mLocationWidget->setProperty(primaryLeftIconItem, true);
 mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 }
 }
+OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_EXIT );
 }
 /*!
 Maptile status received from maptile service
 */
 void AgendaEventView::receiveMapTileStatus(int entryid,int addressType, int status)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_RECEIVEMAPTILESTATUS_ENTRY );
 if (mAgendaEntry.id() == entryid && addressType == MapTileService::AddressPlain) {
 mMaptileStatusReceived = true;
 mMaptileStatus = status;
 updateProgressIndicator();
 }
+OstTraceFunctionExit0( AGENDAEVENTVIEW_RECEIVEMAPTILESTATUS_EXIT );
 }
 /*!
 Returns progress indication icon as per status of entry in database.
 */
 void AgendaEventView::getProgressIndicatorstatus(QString &progressIcon)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_ENTRY );
 MapTileService::AddressType addressType;
 addressType = MapTileService::AddressPlain;
 int eventId = mAgendaEntry.id();
 mMaptilePath.clear();
 mMaptileStatus = -1;
 //no further need of this coonnection
 disconnect(mMaptileService, SIGNAL(maptileFetchingStatusUpdate(int,
 int ,int)), this, SLOT(receiveMapTileStatus(int,int,int)));
 progressIcon.append(QString::null);
 }
-}
+OstTraceFunctionExit0( AGENDAEVENTVIEW_GETPROGRESSINDICATORSTATUS_EXIT );
+}
+/*!
+	Updates the To-do icon for the changes in to-do status.
+*/
+void AgendaEventView::updateSubjectandPriorityData()
+{
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY );
+	QStringList itemList;
+QString priorityIcon(QString::null);
+QString subjectIcon(QString::null);
+getPriorityIcon(mAgendaEntry.priority(), priorityIcon);
+getSubjectIcon(mAgendaEntry.type(),subjectIcon);
+itemList.append(subjectIcon);
+itemList.append(priorityIcon);
+itemList.append(QString::null);
+	mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
+	OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT );
+}
 /*!
 Reload the maptile image on system orientation change.
 */
 void AgendaEventView::changedOrientation(Qt::Orientation orientation)
 {
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_CHANGEDORIENTATION_ENTRY );
 if (mMaptileStatus == MapTileService::MapTileFetchingCompleted) {
 mMaptilePath.clear();
 mMaptileService->getMapTileImage(mAgendaEntry.id(), MapTileService::AddressPlain, mMaptilePath,orientation);
 addMapTileImage();
 }
+OstTraceFunctionExit0( AGENDAEVENTVIEW_CHANGEDORIENTATION_EXIT );
 }
 // End of file

changeset 58	ef813d54df51
parent 50	579cc610882e
child 68	a5a1242fd2e8