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

equal deleted inserted replaced

-:a5a1242fd2e8
+:b0711afde476
 #endif
 // Constants
 #define CHARACTER_SPACE     " "
 #define CHARACTER_HYPHEN    " - "
+#define DUMMY_ICON           "dummyIcon"
-//This Property is use for setting a primary left icon
-static const char *primaryLeftIconItem("leftPrimaryIconItem");
 /*!
 	\class AgendaEventView.
 	Responsible for viewing viewing agenda entries. This is friend of
 		mMaptilePath(NULL),
 		mMaptileService(NULL),
 		mProgressTimer(NULL),
 		mProgressIconCount(0),
 		mMaptileStatusReceived(false),
+		mCalenEditorClosed(true),
 		mMaptileStatus(-1),
 		mNotesPluginLoaded(false),
-		mCalenEditorClosed(true)
+		mEntryIdDeleted(0)
 {
 	OstTraceFunctionEntry0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY );
 	mTranslator->loadCommon();
 	mDocLoader = new AgendaEventViewerDocLoader;
 			AGENDA_EVENT_VIEWER_VIEW_OBJECT));
 	// Load all the widgets.
 	mSubjectWidget = qobject_cast<AgendaEventViewerItem *> (
 			mDocLoader->findWidget(AGENDA_EVENT_VIEWER_SUBJECT_WIDGET));
-//load layout that supports icon before subject label
-mSubjectWidget->setProperty(primaryLeftIconItem,true);
 	mDateTimeWidget = qobject_cast<AgendaEventViewerItem *> (
 			mDocLoader->findWidget(AGENDA_EVENT_VIEWER_DATE_TIME_WIDGET));
 	mLocationWidget = qobject_cast<AgendaEventViewerItem *> (
 {
 OstTraceFunctionEntry0( AGENDAEVENTVIEW_EXECUTE_ENTRY );
 	mOriginalAgendaEntry = entry;
 	mAgendaEntry = entry;
+	// For later reference
+	mParentId = mOwner->mAgendaUtil->parentEntry(mAgendaEntry).id();
 	// Add the viewer data reading from the agenda entry.
 	addViewerData();
 	// Remove unnecessary widget from event viewer.
 	removeWidget();
 		// Might be some non-ui based app called us
 		// so create mainwindow now
 		mMainWindow = new HbMainWindow();
 		mMainWindow->addView(mViewer);
 		mMainWindow->setCurrentView(mViewer);
 	    connect(mMainWindow,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation)));
 	} else {
 		window->addView(mViewer);
 		window->setCurrentView(mViewer);
 		connect(window,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation)));
 	}
 	// Add softkey after adding view on window
 	mBackAction = new HbAction(Hb::BackNaviAction);
 	mViewer->setNavigationAction(mBackAction);
 QString subjectIcon(QString::null);
 getPriorityIcon(mAgendaEntry.priority(), priorityIcon);
 getSubjectIcon(mAgendaEntry.type(),subjectIcon);
 itemList.append(subjectIcon);
 itemList.append(priorityIcon);
+// This "DUMMY_ICON" is required only for the subject layout.
+itemList.append(DUMMY_ICON);
 itemList.append(QString::null);
 	mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
 	OstTraceFunctionExit0( AGENDAEVENTVIEW_ADDSUBJECTANDPRIORITYDATA_EXIT );
 QDateTime endDateTime = mAgendaEntry.endTime();
 itemData.append(QString::null);
 itemData.append(QString::null);
 itemData.append("qtg_small_calendar");
+itemData.append(QString::null);
-mDateTimeWidget->setProperty(primaryLeftIconItem, false);
 mDateTimeWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 itemData.clear();
 itemData.append(QString::null);
 */
 void AgendaEventView::addLocationData()
 {
 	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDLOCATIONDATA_ENTRY );
 	QStringList itemData;
+	itemData.append(QString::null);
+	itemData.append(QString::null);
+	itemData.append("qtg_small_location");
 	QString progressIcon(QString::null);
 	if ( mLocationFeatureEnabled ) {
 	    getProgressIndicatorstatus(progressIcon);
 	}
 	 if( progressIcon.isNull() ) {
 	     itemData.append(QString::null);
-	     itemData.append(QString::null);
-	     itemData.append("qtg_small_location");
-	     mLocationWidget->setProperty(primaryLeftIconItem, false);
 	 }
 	 else {
-	     itemData.append("qtg_small_location");
+	     itemData.append( progressIcon );
-	     itemData.append( progressIcon );
-	     itemData.append(QString::null);
-	     mLocationWidget->setProperty(primaryLeftIconItem, true);
 	 }
 	mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(mAgendaEntry.location());
 	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDREMINDERDATA_ENTRY );
 	QStringList itemData;
 	itemData.append(QString::null);
 itemData.append(QString::null);
 itemData.append("qtg_small_reminder");
-mReminderWidget->setProperty(primaryLeftIconItem, false);
+itemData.append(QString::null);
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(alarmTimeText());
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
 	QString completedText;
 	HbExtendedLocale systemLocale = HbExtendedLocale::system();;
 	itemData.append(QString::null);
 	itemData.append(QString::null);
 	itemData.append(QString::null);
-	mReminderWidget->setProperty(primaryLeftIconItem, true);
+	itemData.append(QString::null);
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	completedText = systemLocale.format(mAgendaEntry.completedDateTime().date(),
 					                    r_qtn_date_usual_with_zero);
 	itemData.append(hbTrId("txt_calendar_dblist_completed_date"));
 if(!mAgendaEntry.recurrenceId().isNull()) {
 itemData.append("qtg_small_repeat_exception");
 }else {
 itemData.append("qtg_small_repeat");
 }
-mRepeatWidget->setProperty(primaryLeftIconItem, false);
+itemData.append(QString::null);
 	mRepeatWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(repeatRule());
 	mRepeatWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
 	OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDDESCRIPTIONDATA_ENTRY );
 	QStringList itemData;
 	itemData.append(QString::null);
 	itemData.append(QString::null);
 itemData.append(QString::null);
-mDescriptionWidget->setProperty(primaryLeftIconItem, true);
+itemData.append(QString::null);
 	mDescriptionWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(hbTrId("txt_calendar_dblist_description"));
 	itemData.append(mAgendaEntry.description());
 	mDescriptionWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
 */
 void AgendaEventView::showDeleteOccurencePopup()
 {
 	OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY );
 	HbDialog *popUp = new HbDialog();
+	// Set the parent for the dialog
+	// Once the parent object is deleted the dialog will also be deleted
+	popUp->setParent(this);
 	popUp->setDismissPolicy(HbDialog::NoDismiss);
 	popUp->setTimeout(HbDialog::NoTimeout);
 	popUp->setAttribute( Qt::WA_DeleteOnClose, true );
 	QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
 void AgendaEventView::showDeleteConfirmationQuery()
 {
 OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY );
 HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+	// Set the parent for the dialog
+	// Once the parent object is deleted the dialog will also be deleted
+popup->setParent(this);
 popup->setDismissPolicy(HbDialog::NoDismiss);
 popup->setTimeout(HbDialog::NoTimeout);
 popup->setAttribute( Qt::WA_DeleteOnClose, true );
 QString text = 0;
 for(int i=0; i < list.count(); i++)
 {
 popup->removeAction(list[i]);
 }
 HbAction *deleteAction =
-					new HbAction(hbTrId("txt_calendar_button_delete"), popup);
+					new HbAction(hbTrId("txt_common_button_delete"), popup);
 popup->addAction(deleteAction);
 connect(deleteAction, SIGNAL(triggered()), this ,
 												SLOT(handleDeleteAction()));
 popup->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popup));
 popup->open();
 	Handles the entry deletion of the agenda entry
 */
 void AgendaEventView::handleEntryDeletion(ulong id)
 {
 OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_ENTRY );
+	// Check if the entry which is viewed has been deleted or not
-	if (id == mAgendaEntry.id()) {
+	// The first check id == mAgendaEntry.id() will fail for the following case
-		// Close the agenda entry viewer
+// Exceptional entry is opened in the viewer. Edit this occurence in editor.
-		close();
+// From editor delete all occurences of the entry. In this case the viewer
-		mOwner->deletingCompleted();
+// has the exceptional entry id which is not the same id which got deleted.
-	}
+// Its the parent entry id. So checking if its a child and the entry deleted
+// is the parent of this child.
+if (id == mAgendaEntry.id() ||
+		(!mAgendaEntry.recurrenceId().isNull() && id == mParentId)) {
+	// If the editor is opened and the deletion is happening from editor
+	// then there is no need to emit the signal deletingCompleted() [as the
+	// deletingStarted() is not been emitted already]
+	// In this case closing of viewer will happen only once the editor
+	// is closed properly
+	mEntryIdDeleted = id;
+	if(!mCalenEditor) {
+		// If the editor is not opened then emit deletingCompleted()
+		// and close the viewer
+		mOwner->deletingCompleted();
+		close();
+	}
+}
 	OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_EXIT );
 }
 /*!
 {
 OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_ENTRY );
 	// Cleanup.
 mCalenEditorClosed = true;
-	mCalenEditor->deleteLater();
 	mOwner->editingCompleted();
+	if(mCalenEditor) {
+		mCalenEditor->deleteLater();
+		// Check if the entry is deleted
+		if(mEntryIdDeleted) {
+			ulong currentId = mAgendaEntry.id();
+			// If the deleted entry is the same as current id then close viewer
+			// The second check is for exceptional entries which will be true,
+			// when all the occurences of the entry is deleted from the editor
+			// In this case the entry id deleted won't the same as current id
+			if(currentId == mEntryIdDeleted || mEntryIdDeleted == mParentId) {
+				// Close the viewer as the entry no longer exists
+				close();
+			}
+			// Reset the value.
+			mEntryIdDeleted = 0;
+		}
+	}
 	OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_EXIT );
 }
 /*!
 	Slot to handle User selection for series deleting or single occurence popup
 if (!mMaptileStatusReceived) {
 QString iconName("qtg_anim_small_loading_");
 mProgressIconCount = mProgressIconCount % 10 + 1;
 iconName.append(QVariant(mProgressIconCount).toString());
 QStringList itemData;
+itemData.append(QString::null);
+itemData.append(QString::null);
 itemData.append("qtg_small_location");
 itemData.append(iconName);
-itemData.append(QString::null);
-mLocationWidget->setProperty(primaryLeftIconItem, true);
 mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 mProgressTimer->start(100);
 }
 else {
 if (mProgressTimer->isActive()) {
 if (mMaptileStatus == MapTileService::MapTileFetchingCompleted) {
 QStringList itemData;
 itemData.append(QString::null);
 itemData.append(QString::null);
 itemData.append("qtg_small_location");
-mLocationWidget->setProperty(primaryLeftIconItem, false);
+itemData.append(QString::null);
 mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 Qt::Orientations orientation=hbInstance->allMainWindows().first()->orientation();
 mMaptilePath.clear();
 mMaptileStatus = mMaptileService->getMapTileImage(mAgendaEntry.id(), MapTileService::AddressPlain, mMaptilePath ,orientation);
 addMapTileImage();
 file.close();
 }
 else {
 QStringList itemData;
+itemData.append(QString::null);
+itemData.append(QString::null);
 itemData.append("qtg_small_location");
 QString stopIcon;
 stopIcon.append(QString("qtg_mono_search_stop"));
 itemData.append(stopIcon);
-itemData.append(QString::null);
-mLocationWidget->setProperty(primaryLeftIconItem, true);
 mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 }
 }
 OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATEPROGRESSINDICATOR_EXIT );
 QString subjectIcon(QString::null);
 getPriorityIcon(mAgendaEntry.priority(), priorityIcon);
 getSubjectIcon(mAgendaEntry.type(),subjectIcon);
 itemList.append(subjectIcon);
 itemList.append(priorityIcon);
+// This "DUMMY_ICON" is required only for the subject layout.
+itemList.append(DUMMY_ICON);
 itemList.append(QString::null);
 	mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
 	OstTraceFunctionExit0( AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT );
 }
 Close the editor and save the entry.
 should be call if editor is open
 */
 void AgendaEventView::saveAndCloseEditor()
 {
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_ENTRY );
 if(mCalenEditorClosed){
 QObject *plugin = qobject_cast<QObject*> (
 mNotesEditorPluginLoader->instance());
 NotesEditorInterface* interface =
 else{
 if(mCalenEditor){
 mCalenEditor->saveAndCloseEditor();
 }
 }
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_EXIT );
 }
 /*!
 Close the view .
 should be call if view is open
 */
 void AgendaEventView::closeAgendaEventView()
 {
-close();
+	OstTraceFunctionEntry0( AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_ENTRY );
+close();
+OstTraceFunctionEntry0( AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_EXIT );
 }
 // End of file

changeset 77	b0711afde476
parent 68	a5a1242fd2e8