FCL/sf/app/organizer: comparison calendarui/caleneditor/src/caleneditor

equal deleted inserted replaced

-:a5a1242fd2e8
+:b0711afde476
 */
 void CalenEditorPrivate::showEditOccurencePopup()
 {
 	OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_ENTRY );
 	HbDialog *popUp = new HbDialog();
+	// Set the parent for the dialog
+	// Once the editor 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);
 		AgendaEntry::Type entryType = mEditedEntry->type();
 		if( entryType == AgendaEntry::TypeAppoinment) {
 			headingWidget->setHeading(hbTrId("txt_calendar_subhead_meeting"));
 		}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"));
-		}
 	}
 	initModel();
 	// Set the custom item.
 	CalenEditorCustomItem *customItem =
 /*!
 	Calculates default time when Event is on same day.
 */
 QDateTime CalenEditorPrivate::defaultTimeSameDay( )
 {
+	OstTraceFunctionEntry0( CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_ENTRY );
 	QDateTime currentDateTime = QDateTime::currentDateTime();
 	//Start time should be one hour more than current time.
 	currentDateTime = currentDateTime.addSecs(SecsInOneHour);
 		currentDateTime = currentDateTime.addSecs(SecsInOneHour);
 	}
 	// After adding one hour and rounding off the minutes to current time,
 	// if midnight crossover happens return default time(8:00 am) for next day
-	if(CalenDateUtils::isOnToday(currentDateTime))
+	if(CalenDateUtils::isOnToday(currentDateTime)) {
+		OstTraceFunctionExit0( CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_EXIT );
 		return currentDateTime;
-	else
+	} else {
 		return CalenDateUtils::defaultTime(currentDateTime);
+	}
 }
 /*!
 	Sets to default time, when AllDay is unchecked
 */
 void CalenEditorPrivate::refreshTimeForUncheckAllDay()
 {
+	OstTraceFunctionEntry0( CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_ENTRY );
 	//Get the default time as 8:00 am from CalenDateUtils.
 	QDateTime fromDateTime = CalenDateUtils::defaultTime(mEditedEntry->startTime());
 	QDateTime toDateTime;
 	// The default time will be 8.00 am only if its not on current day
 	toDateTime = fromDateTime.addSecs(SecsInOneHour);
 	mViewToItem->populateDateTime(toDateTime, false);
 	// Set the default start time to the event.
 	mEditedEntry->setStartAndEndTime(fromDateTime, toDateTime);
+	OstTraceFunctionExit0( CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_EXIT );
 }
 /*!
 	Populates the start and end time of the event item.
 */
 	Triggered when the subject editor is being edited.
 	\param subject Contains the string displayed in the subject item.
 */
 void CalenEditorPrivate::handleSubjectChange(const QString subject)
 {
+	OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_ENTRY );
 	mEditedEntry->setSummary(subject);
 	if(!mNewEntry ){
 		addDiscardAction();
 	}
+	OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_EXIT );
 }
 /*!
 Triggered when the Allday Checkbox is being edited.
 \param state of checkbox.
 * Handles the completion of location editing
 */
 void CalenEditorPrivate::handleLocationEditingFinished()
 {
 OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_ENTRY );
+QString trimmedLocation ;
+trimmedLocation  = mEditedEntry->location().trimmed();
 if ( !mOriginalEntry->location().isEmpty() )
 {
-AgendaGeoValue entryGeoValue =mAgendaUtil->fetchById(mEditedEntry->id()).geoValue();
+if(!trimmedLocation .isEmpty())
-if ( !entryGeoValue.isNull() && (mEditedEntry->location()!=mOriginalEntry->location()) )
+{
-{
+AgendaGeoValue entryGeoValue =mAgendaUtil->fetchById(mEditedEntry->id()).geoValue();
+if ( !entryGeoValue.isNull() && (mEditedEntry->location()!=mOriginalEntry->location()) )
-mEditedEntry->setGeoValue(entryGeoValue);
+{
-HbMessageBox* confirmationQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+mEditedEntry->setGeoValue(entryGeoValue);
-confirmationQuery->setDismissPolicy(HbDialog::NoDismiss);
+HbMessageBox* confirmationQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-confirmationQuery->setTimeout(HbDialog::NoTimeout);
+		// Set the parent for the dialog
-confirmationQuery->setIconVisible(true);
+		        // Once the editor object is deleted the dialog will also be deleted
+		confirmationQuery->setParent(this);
-QString displayText;
+confirmationQuery->setDismissPolicy(HbDialog::NoDismiss);
-displayText = displayText.append(hbTrId("txt_calendar_info_location_updated_keep_existing"));
+confirmationQuery->setTimeout(HbDialog::NoTimeout);
+confirmationQuery->setIconVisible(true);
-confirmationQuery->setText(displayText);
+QString displayText;
-// Remove the default actions.
+displayText = displayText.append(hbTrId("txt_calendar_info_location_updated_keep_existing"));
-QList<QAction *> defaultActions = confirmationQuery->actions();
-for (int index=0;index<defaultActions.count();index++)
+confirmationQuery->setText(displayText);
-{
-confirmationQuery->removeAction(defaultActions[index]);
+// Remove the default actions.
-}
+QList<QAction *> defaultActions = confirmationQuery->actions();
+for (int index=0;index<defaultActions.count();index++)
-defaultActions.clear();
+{
-confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_yes")));
+confirmationQuery->removeAction(defaultActions[index]);
-confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_no")));
+}
-confirmationQuery->open(this, SLOT(selectEditingFinishedAction(HbAction*)));
-}
+defaultActions.clear();
+confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_yes")));
+confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_no")));
+confirmationQuery->open(this, SLOT(selectEditingFinishedAction(HbAction*)));
+}
+}
+else
+{
+mEditedEntry->clearGeoValue();
+// sets null string for the location
+mEditedEntry->setLocation(trimmedLocation );
+}
 }
 OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_EXIT );
 }
 /*!
 */
 void CalenEditorPrivate::saveAndCloseEditor()
 {
 	OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_ENTRY );
 	Action action = handleDone();
-	if (CalenEditorPrivate::ActionDelete != action) {
+	closeEditor();
-		closeEditor();
-	}
 	if (CalenEditorPrivate::ActionSave == action) {
 		// check if we need to launch the calendar application
 		if (mLaunchCalendar) {
 			CalenLauncher* launcher = new CalenLauncher(this);
 		closeEditor();
 		OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT );
 		return;
 	}else {
 		// Delete entry and close editor
-		deleteEntry(true);
+		// if editor is launched from Notes then don't delete entry
+		// Just exit from calendar editor
+		if (mOriginalEntry->id() > 0) {
+			// If user is editing single instanc then delete single instance
+			// else delete entry
+			if (mEditRange == ThisOnly) {
+				// User wants to delete only this occurence
+				mAgendaUtil->deleteRepeatedEntry(*mOriginalEntry,
+												AgendaUtil::ThisOnly);
+			} else {
+				// Delete the entry.
+				mAgendaUtil->deleteEntry(mOriginalEntry->id());
+			}
+			closeEditor();
+		}
 	}
 	OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT );
+}
+/*!
+	Deletes the entry based on the selection: This occurence or All occurences
+*/
+void CalenEditorPrivate::handleDeleteOccurence(int index)
+{
+	OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_ENTRY );
+	switch (index) {
+		case 0:
+			// User wants to delete only this occurence
+			mAgendaUtil->deleteRepeatedEntry(mEntry, AgendaUtil::ThisOnly);
+			break;
+		case 1:
+			// User wants to delete all the occurences
+			// Delete the parent entry.
+			if(isChild()) {
+				AgendaEntry entryToBeDeleted = mAgendaUtil->parentEntry(mEntry);
+				mAgendaUtil->deleteEntry(entryToBeDeleted.id());
+			}else {
+				mAgendaUtil->deleteEntry(mOriginalEntry->id());
+			}
+			break;
+	}
+	closeEditor();
+	OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_EXIT );
 }
 /*!
 	Launches the Settings view.
 */
 	closeEditor();
 	OstTraceFunctionExit0( CALENEDITORPRIVATE_DISCARDCHANGES_EXIT );
 }
 /*!
-* Show delete confirmation query
+* Show delete confirmation query based on the entry
 */
-void CalenEditorPrivate::showDeleteConfirmationQuery(bool closeEditor)
+void CalenEditorPrivate::showDeleteConfirmationQuery()
 {
 	OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_ENTRY );
+	if(mOriginalEntry->isRepeating() || isChild()) {
+		showDeleteOccurencePopup();
+	}else {
+		showDeletePopup();
+	}
+	OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT );
+}
+/*!
+* Show delete confirmation query for repeated entries
+*/
+void CalenEditorPrivate::showDeleteOccurencePopup()
+{
+	OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_ENTRY );
+	HbDialog *popUp = new HbDialog();
+	// Set the parent for the dialog
+	// Once the editor 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);
+	HbWidget *editWidget = new HbWidget();
+	editWidget->setLayout(layout);
+	HbRadioButtonList *editButtonList = new HbRadioButtonList();
+	QStringList list;
+	list << hbTrId("txt_calendar_info_this_occurrence_only")
+	        << hbTrId("txt_calendar_info_all_occurences");
+	editButtonList->setItems(list);
+	layout->addItem(editButtonList);
+	popUp->setContentWidget(editWidget);
+	popUp->setHeadingWidget(new HbLabel(hbTrId("txt_calendar_title_delete_repeated_entry")));
+	// Create cancel action
+	HbAction *cancelAction =
+	        new HbAction(hbTrId("txt_common_button_cancel_singledialog"));
+	popUp->addAction(cancelAction);
+	connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
+	connect(editButtonList, SIGNAL(itemSelected(int)), this,
+	        SLOT(handleDeleteOccurence(int)));
+	connect(cancelAction, SIGNAL(triggered()), this, SLOT(close()));
+	// Show the popup
+	popUp->open();
+	OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_EXIT );
+}
+/*!
+* Show delete confirmation query for non repeated entries
+*/
+void CalenEditorPrivate::showDeletePopup()
+{
+	OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETEPOPUP_ENTRY );
 	HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+	// Set the parent for the dialog
+	// Once the editor 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;
+	popup->setText(hbTrId("txt_calendar_info_delete_entry"));
-	switch (mOriginalEntry->type()) {
+	QList<QAction*> list = popup->actions();
-		case AgendaEntry::TypeAppoinment:
+	for(int i=0; i < list.count(); i++)
-		case AgendaEntry::TypeEvent: {
+	{
-			if (mEditRange == ThisAndAll) {
+		popup->removeAction(list[i]);
-				text.append(hbTrId("txt_calendar_info_delete_entries"));
+	}
-			} else {
-				text.append(hbTrId("txt_calendar_info_delete_meeting"));
-			}
-			break;
-		}
-		case AgendaEntry::TypeAnniversary: {
-			text.append(hbTrId("txt_calendar_info_delete_anniversary"));
-			break;
-		}
-	}
-	popup->setText(text);
-QList<QAction*> list = popup->actions();
-for(int i=0; i < list.count(); i++)
-{
-popup->removeAction(list[i]);
-}
 	HbAction *deleteAction = new HbAction(hbTrId("txt_common_button_delete"),
-										popup);
+	                                      popup);
 	popup->addAction(deleteAction);
 	connect(deleteAction, SIGNAL(triggered()), this,
-										SLOT(handleDeleteAction()));
+	        SLOT(handleDeleteAction()));
 	HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"),
-											popup);
+	                                      popup);
-	// Editor should not be closed for all the cases when cancel is pressed
+	connect(cancelAction, SIGNAL(triggered()), this, SLOT(close()));
-	if(closeEditor) {
-		connect(cancelAction, SIGNAL(triggered()), this,
-											SLOT(closeEditor()));
-	}
 	popup->addAction(cancelAction);
 	popup->open();
-	OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT );
+	OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETEPOPUP_EXIT );
 }
 /*!
 	Returns true if the entry is a child ,else false.
 	\return true if the entry is a child, false otherwise.
 */
 bool CalenEditorPrivate::isChild() const
 {
 	OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISCHILD_ENTRY );
-	return mEditedEntry->recurrenceId().toUTC().isNull();
+	return !(mEditedEntry->recurrenceId().toUTC().isNull());
 }
 /*!
 	Check for errors in the form. This function should only be called when the
 	user has decided they want to edit "This and all" from a prompt, or when the
 				OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDONE_EXIT );
 				return CalenEditorPrivate::ActionSave;
 			}
 			OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEDONE_EXIT );
 			return CalenEditorPrivate::ActionNothing;
-		case CalenEditorPrivate::ActionDelete:
-			showDeleteConfirmationQuery(true);
-			OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_HANDLEDONE_EXIT );
-			return CalenEditorPrivate::ActionDelete;
 		case CalenEditorPrivate::ActionNothing:
 			return CalenEditorPrivate::ActionNothing;
 		default:
 			break;
 	}
 	}
 	emit q_ptr->entrySaved();
 	OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_SAVEENTRY_EXIT );
 	return true;
-}
-/*!
-	Delete the entry
-	@param closeEditor set true to close editor else default value is false
-*/
-void CalenEditorPrivate::deleteEntry(bool close)
-{
-	OstTraceFunctionEntry0( CALENEDITORPRIVATE_DELETEENTRY_ENTRY );
-	// if editor is launched from Notes then don't delete entry
-	// Just exit from calendar editor
-	if (mOriginalEntry->id() > 0) {
-		// If user is editing single instanc then delete single instance
-		// else delete entry
-		if (mEditRange == ThisOnly) {
-			// User wants to delete only this occurence
-			mAgendaUtil->deleteRepeatedEntry(*mOriginalEntry,
-			                                 AgendaUtil::ThisOnly);
-		} else {
-			// Delete the entry.
-			mAgendaUtil->deleteEntry(mOriginalEntry->id());
-		}
-		if (close) {
-			closeEditor();
-		}
-	}
-	OstTraceFunctionExit0( CALENEDITORPRIVATE_DELETEENTRY_EXIT );
 }
 /*!
 Change the entry before saving, depending on AllDay checkbox state
 */
 	Used to know if the entry is repeating. For new entries this
 	is the only way to find whether its repeating or not
 */
 bool CalenEditorPrivate::isRepeatUntilItemAdded()
 {
+	OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_ENTRY );
 	// For exceptional entries the repeatfield will not be present
 	// So need to check if the repeat field is there or not
 	if( mRepeatField ) {
 		return mRepeatField->isRepeatUntilItemAdded();
 	}else {
+		OstTraceFunctionExit0( CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_EXIT );
 		return false;
 	}
 }
 /*!
 /*!
 	Gets the reminder options count
 */
 int CalenEditorPrivate::getReminderCount()
 {
+	OstTraceFunctionEntry0( CALENEDITORPRIVATE_GETREMINDERCOUNT_ENTRY );
 	return mReminderField->reminderItemsCount();
 }
 /*!
 	Checks if editing all occurences or a single occurence.
 /*!
 save the entry from other views.
 */
 void CalenEditorPrivate::forcedSaveEntry()
 {
-saveAndCloseEditor();
+OstTraceFunctionEntry0( CALENEDITORPRIVATE_FORCEDSAVEENTRY_ENTRY );
+// Check if the editor is launched completely
+// If yes, save entry and close the editor
+if(mEditorView) {
+		saveAndCloseEditor();
+}else {
+	// If the view is not launched then just emit signal dialogClosed()
+	// When the edit popup is shown for repeating entries,
+	// this else case will get executed
+	emit q_ptr->dialogClosed();
+}
+OstTraceFunctionExit0( CALENEDITORPRIVATE_FORCEDSAVEENTRY_EXIT );
 }
 // End of file	--Don't remove this.

changeset 77	b0711afde476
parent 68	a5a1242fd2e8
child 80	fa7c359294fa