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

equal deleted inserted replaced

-:fd30d51f876b
+:a949c2543c15
 #include <hblabel.h>
 #include <hbview.h>
 #include <hbextendedlocale.h>
 #include <hbi18ndef.h>
 #include <qdatetime.h>
-#include <HbMessageBox>
 #include <hbgroupbox.h>
 #include <hbapplication.h>
 #include <hbradiobuttonlist.h>
 #include <hbnotificationdialog.h>
 */
 void CalenEditorPrivate::edit(AgendaEntry entry, bool launchCalendar)
 {
 	mNewEntry = false;
 	mLaunchCalendar = launchCalendar;
-	showEditor(entry);
+	openEditor(entry);
 }
 /*!
 	Shows the caleneditor, by using the entry id provided.
 	\param id entry id.
 		case CalenEditor::TypeUnKnown:
 		default:
 			break;
 	}
 	mLaunchCalendar = launchCalendar;
-	showEditor(entry);
+	openEditor(entry);
 }
 /*!
 	Creates a new entry based on the create type.It launches the
 	editor for editing
 		default:
 			break;
 	}
 	mNewEntryDateTime = entry.startTime();
 	mLaunchCalendar = launchCalendar;
-	showEditor(entry);
+	openEditor(entry);
 }
 /*!
 	Queries user whether to edit whole series or just this single occurence
 */
 void CalenEditorPrivate::showEditOccurencePopup()
 {
-	HbDialog popUp;
+	HbDialog *popUp = new HbDialog();
-	popUp.setDismissPolicy(HbDialog::NoDismiss);
+	popUp->setDismissPolicy(HbDialog::NoDismiss);
-	popUp.setTimeout(HbDialog::NoTimeout);
+	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();
 	editButtonList->setItems(list);
 	layout->addItem(editButtonList);
-	popUp.setContentWidget(editWidget);
+	popUp->setContentWidget(editWidget);
-	popUp.setHeadingWidget(new HbLabel(hbTrId("txt_calendar_title_edit")));
+	popUp->setHeadingWidget(new HbLabel(hbTrId("txt_calendar_title_edit")));
-	// Create secondary action
+	// Create cancel action
 	HbAction *cancelAction =
 	        new HbAction(hbTrId("txt_calendar_button_softkey1_cancel"));
-	popUp.setSecondaryAction(cancelAction);
+	popUp->addAction(cancelAction);
 	connect(editButtonList, SIGNAL(itemSelected(int)), this,
 	        SLOT(handleEditOccurence(int)));
-	connect(editButtonList, SIGNAL(itemSelected(int)), &popUp, SLOT(close()));
+	connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
-	connect(cancelAction, SIGNAL(triggered()), &popUp, SLOT(close()));
 	connect(cancelAction, SIGNAL(triggered()), this, SLOT(handleCancel()));
 	// Show the popup
-	popUp.exec();
+	popUp->open();
 }
 /*!
 	Slot to handle User selection for series editing or single occurence popup
 */
 		case 1:
 			// User wants to edit all the occurences
 			mEditRange = ThisAndAll;
 			break;
 	}
+	// If user has selected to edit all the occurences,
+	// then get the parent of it
+	AgendaEntry entryToBeEdited = mEntry;
+	if (mEditRange == ThisAndAll) {
+		entryToBeEdited = mAgendaUtil->parentEntry(mEntry);
+	}
+	showEditor(entryToBeEdited);
 }
 /*!
 	Slot to handle cancel action on the popup
 */
 void CalenEditorPrivate::handleCancel()
 {
 	// User has chosen not to edit the event, hence return
 	mEditRange = UserCancelled;
-}
+	// Do cleanup and return
+	emit q_ptr->dialogClosed();
-/*!
+	return;
-	Displays the editor.
+}
-*/
-void CalenEditorPrivate::showEditor(AgendaEntry entry)
+/*!
-{
+	Opens the editor.
+*/
+void CalenEditorPrivate::openEditor(AgendaEntry entry)
+{
 	if (0 < entry.id()) {
 		mNewEntry = false;
 	}
-	AgendaEntry entryToBeEdited = entry;
 	if (!mNewEntry) {
 		// Before we do anything, check in the entry is repeating
 		// OR its a child item
 		mIsChild = !(entry.recurrenceId().isNull());
 		bool isRepeating = entry.isRepeating();
+		// For later reference
+		mEntry = entry;
 		if (mIsChild || isRepeating) {
 			// Query user if he wants to edit whole series
 			// or just this occurence
 			showEditOccurencePopup();
-			// If user has selected to edit all the occurences,
+			return;
-			// then get the parent of it
+		}else {
-			if (mEditRange == ThisAndAll) {
-				entryToBeEdited = mAgendaUtil->parentEntry(entry);
-			} else if (mEditRange == UserCancelled) {
-				// Do cleanup and return
-				emit q_ptr->dialogClosed();
-				return;
-			}
-		} else {
 			mEditRange = ThisAndAll;
 		}
 	}
+	showEditor(entry);
-	mOriginalEntry = new AgendaEntry(entryToBeEdited);
+}
-	mEditedEntry = new AgendaEntry(entryToBeEdited);
+/*!
+	Displays the editor.
+*/
+void CalenEditorPrivate::showEditor(AgendaEntry entry)
+{
+	mOriginalEntry = new AgendaEntry(entry);
+	mEditedEntry = new AgendaEntry(entry);
 	if (!mEditedEntry->description().isEmpty()) {
 		mDescriptionItemAdded = true;
 	}
 	// Construct the view using docloader
 	setUpView();
 	// Set the title text.
 	mEditorView->setTitle(hbTrId("txt_calendar_title_calendar"));
-	mSoftKeyAction = new HbAction(Hb::BackAction);
+	mSoftKeyAction = new HbAction(Hb::BackNaviAction);
 	mEditorView->setNavigationAction(mSoftKeyAction);
 	connect(mSoftKeyAction, SIGNAL(triggered()), this,
 	        SLOT(saveAndCloseEditor()));
 	// Create the data handler
 	mDataHandler = new CalenEditorDataHandler(this,mEditedEntry, mOriginalEntry);
 }
 /*!
 	HbAction *deleteEventAction = qobject_cast<HbAction *> (
 							mEditorDocLoader->findObject(
 										CALEN_EDITOR_DELETE_EVENT_ACTION));
 	connect(deleteEventAction, SIGNAL(triggered()), this,
-							SLOT(handleDeleteAction()));
+							SLOT(showDeleteConfirmationQuery()));
 	if (!mNewEntry) {
 		//TODO: Add the text id based on the entry type Anniversary or meeting
 		headingWidget->setHeading(hbTrId("txt_calendar_subhead_event"));
 	}
 	// Add the fields to the DataForm.
 	addSubjectItem();
 	// Add all day check box for new entry creation or while editing
 	// parent entry or existing non repeating event
-	if (mNewEntry) {
+	if (mNewEntry || (mEditRange == ThisAndAll)) {
 		addAllDayCheckBoxItem();
-	} else {
+	}
-		if (!mEditedEntry->isRepeating() || (mEditRange == ThisAndAll)) {
-			addAllDayCheckBoxItem();
-		}
-	}
 	addCustomItemFrom();
 	addCustomItemTo();
 	addCustomItemLocation();
 	addReminderItem();
 	// Add the repeat information only if particular occurence is not being
 	if (mEditRange == ThisAndAll) {
 		addRepeatItem();
 	}
 	mCalenEditorForm->setModel(mCalenEditorModel);
 }
 /*!
 	Appends the Subject Item to the Data form Model.
 			AgendaEntry parentEntry = mAgendaUtil->parentEntry(*mEditedEntry);
 			int durationInSeconds = parentEntry.durationInSecs();
 			QDateTime endTime =
 			        mEditedEntry-> startTime().addSecs(durationInSeconds);
-			// set this to the original entr as well as edited entry
+			// set this to the original entry as well as edited entry
 			mOriginalEntry->setStartAndEndTime(mOriginalEntry->startTime(),
 										endTime);
 			mEditedEntry->setStartAndEndTime(mEditedEntry->startTime(), endTime);
 		}
 		fromDateTime = mEditedEntry->startTime();
 			mViewFromItem->setDateRange(
 									prevInstanceStartTime.addDays(1).date(),
 									nextInstanceStartTime.addDays(-1).date());
 			mViewToItem->setDateRange(prevInstanceEndTime.date().addDays(1),
 			                        nextInstanceEndTime.date().addDays(-1));
+			// If repeating daily then disable the date fields as
+			// date cannot be changed
+			if (mEditedEntry->repeatRule().type() == AgendaRepeatRule::DailyRule) {
+				mViewFromItem->disableFromToDateField();
+			}
 		}
 	} else {
 		toDateTime = fromDateTime.addSecs(60 * 60);
 	}
 	mViewToItem->populateDateTime(toDateTime, false);
 	mEditedEntry->setStartAndEndTime(fromDateTime, toDateTime);
 	// Set the default start time to the Original entry if its a new event.
 	if (mNewEntry) {
 		mOriginalEntry->setStartAndEndTime(fromDateTime, toDateTime);
 	}
-	if (mAllDayCheckBoxItem
+	if ((mAllDayCheckBoxItem &&
-	        && (mAllDayCheckBoxItem->contentWidgetData("checkState")
+		(mAllDayCheckBoxItem->contentWidgetData("checkState") == Qt::Checked))
-	                == Qt::Checked)) {
+		|| (!mNewEntry && mEditedEntry->type() == AgendaEntry::TypeEvent)) {
 		// If the all day option is checked, we need to
 		// disable the time fields
 		enableFromTotimeFileds(false, mEditedEntry->startTime(),
 		                       mEditedEntry->endTime());
 	}
 	else {
 		itemIndex = LocationItem - 1;
 	}
 	QModelIndex index = mCalenEditorModel->index(itemIndex, 0);
 	mViewLocationItem = qobject_cast<CalenEditorCustomItem *>
-	                      (mCalenEditorForm->dataFormViewItem(index));
+	                      (mCalenEditorForm->itemByIndex(index));
 	connect(mViewLocationItem, SIGNAL(locationTextChanged(const QString)),
 			this, SLOT(handleLocationChange(const QString)));
 	mViewLocationItem->populateLocation(mEditedEntry->location());
 }
 /*!
 	Save the changed start time of the event.
 */
 	if (mEditRange == ThisAndAll) {
 		// update the repeat choices depending on the meeting duration
 		mRepeatField->updateRepeatChoices();
 	}
+	updateReminderChoices();
+}
+void CalenEditorPrivate::updateReminderChoices()
+{
+	QDate referenceDate;
+	// Start date or repeat until date will be the reference to decide
+	// whether the event is in past or future.
+	if (mRepeatField && mRepeatField->isRepeatUntilItemAdded()) {
+		referenceDate = mRepeatField->repeatUntilDate();
+	} else {
+		referenceDate = mEditedEntry->startTime().date();
+	}
+	// 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 {
+		if ((referenceDate < QDate::currentDate())
+						|| (referenceDate == QDate::currentDate()
+				&& (mEditedEntry->startTime().time() < QTime::currentTime())))
+				 {
+					mReminderField->setReminderOff();
+		} else {
+			// Enabled implies future. If changing from future to future do not
+			// do anything.
+			if (!mReminderField->isReminderFieldEnabled()) {
+				mReminderField->setReminderChoices();
+			}
+		}
+	}
 }
 /*!
 	Save the changed end time of the event.
 */
 void CalenEditorPrivate::saveToDateTime(QDateTime& toDateTime)
 {
 	QDateTime startTime = mEditedEntry->startTime();
+	bool fromDateChanged = false;
 	// Update the start time accordingly on UI - duration will be 60 mins
 	// bydefault for new entry and if it crosses the starttime
 	if (mNewEntry && toDateTime < startTime) {
 		startTime = toDateTime.addSecs(-3600);
-	} else { // for exisitng entry
+		fromDateChanged = true;
+	} else {
+		// for exisitng entry
 		// we need to see if user has moved end time before the start time
 		// then substract the duration of the meeting that was saved earlier to
 		// the new end time to get the new start time
 		if (toDateTime < startTime) {
 			int duration = mEditedEntry->durationInSecs();
 			startTime = toDateTime.addSecs(-duration);
+			fromDateChanged = true;
 		}
 	}
 	// Set the new start time to the form
 	if (mViewFromItem) {
 		mViewFromItem->populateDateTime(startTime, true);
 	if (mEditRange == ThisAndAll) {
 		// update the repeat choices depending on the meeting duration
 		mRepeatField->updateRepeatChoices();
 	}
+	// Update reminder choices if start time got changed.
+	if (fromDateChanged) {
+		updateReminderChoices();
+	}
 }
 /*!
 	Populates the repeat item.
 */
 void CalenEditorPrivate::populateRepeatItem()
 {
 	// Check if all day has been added or not
 	// and calculate the index accordingly
+	// all day added implies reminder time field is also added
 	int index;
-	if (mIsAllDayItemAdded) {
+	if (mIsAllDayItemAdded && !isReminderTimeForAllDayAdded()) {
+		index = RepeatItem - 1;
+	} else if (!mNewEntry && isReminderTimeForAllDayAdded()) {
 		index = RepeatItem;
 	} else {
-		index = RepeatItem - 1;
+		index = RepeatItem - 2;
 	}
 	mRepeatField->populateRepeatItem(index);
 }
 		QTime tempEndQTime = tempEndTime.time();
 		tempEndQTime.setHMS(23, 59, 59);
 		tempEndTime.setTime(tempEndQTime);
 		enableFromTotimeFileds(false, tempSartTime, tempEndTime);
+		QDate referenceDate;
+		if (mRepeatField->isRepeatUntilItemAdded()) {
+			referenceDate = mRepeatField->repeatUntilDate();
+		} else {
+			referenceDate = mEditedEntry->startTime().date();
+		}
+		mReminderField->updateReminderChoicesForAllDay(referenceDate);
+		// If the reminder field is enabled and it is not off
+		// it implies default alarm day and time is being displayed.
+		if (mReminderField->isReminderFieldEnabled() &&
+					mReminderField->currentReminderIndex() != 0) {
+			// Set the default alarm for all day.
+			mReminderField->setDefaultAlarmForAllDay();
+		} else {
+			// Remove reminder time field.
+			mReminderField->removeReminderTimeField();
+		}
 	} else {
 		// AllDayCheckBox in un-checked
 		// Set From/To times buttons editable
 		// Update Start/End Times with Edited entry values
 		enableFromTotimeFileds(true, mEditedEntry->startTime(),
 		                       mEditedEntry->endTime());
+		int index;
+		if (mIsAllDayItemAdded) {
+			index = ReminderTimeForAllDayItem;
+		} else {
+			index = ReminderTimeForAllDayItem - 1;
+		}
+		mReminderField->removeReminderTimeField();
+		mReminderField->setReminderChoices();
+		updateReminderChoices();
 	}
 	addDiscardAction();
 }
 /*!
 	If mLaunchCalendar is true, then it tries to launch the calendar
 */
 void CalenEditorPrivate::saveAndCloseEditor()
 {
 	Action action = handleDone();
-	closeEditor();
+	if (CalenEditorPrivate::ActionDelete != action) {
+		closeEditor();
+	}
 	if (CalenEditorPrivate::ActionSave == action) {
 		// check if we need to launch the calendar application
 		if (mLaunchCalendar) {
 			CalenLauncher* launcher = new CalenLauncher(this);
 /*!
 	Deletes the entry.
 */
 void CalenEditorPrivate::handleDeleteAction()
 {
+	// If its a new entry just close the editor
 	if (mNewEntry) {
-		if (showDeleteConfirmationQuery()) {
+		closeEditor();
-			closeEditor();
-		}
 		return;
-	}
+	}else {
+		// Delete entry and close editor
-	// Delete entry and close editor
+		deleteEntry(true);
-	deleteEntry(true);
+	}
 }
 /*!
 	Launches the Settings view.
 */
 }
 /*!
 * Show delete confirmation query
 */
-int CalenEditorPrivate::showDeleteConfirmationQuery()
+void CalenEditorPrivate::showDeleteConfirmationQuery(bool closeEditor)
 {
-	int retStatus = 0;
+	HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+	popup->setDismissPolicy(HbDialog::NoDismiss);
-	HbMessageBox popup(HbMessageBox::MessageTypeQuestion);
+	popup->setTimeout(HbDialog::NoTimeout);
-	popup.setDismissPolicy(HbDialog::NoDismiss);
+	popup->setAttribute( Qt::WA_DeleteOnClose, true );
-	popup.setTimeout(HbDialog::NoTimeout);
-	popup.setIconVisible(true);
 	QString text = 0;
 	switch (mOriginalEntry->type()) {
 		case AgendaEntry::TypeAppoinment:
 			text.append(hbTrId("txt_calendar_info_delete_anniversary"));
 			break;
 		}
 	}
-	popup.setText(text);
+	popup->setText(text);
-	popup.setPrimaryAction(new HbAction(hbTrId("txt_calendar_button_delete"),
+QList<QAction*> list = popup->actions();
-	                                    &popup));
+for(int i=0; i < list.count(); i++)
-	popup.setSecondaryAction(new HbAction(hbTrId("txt_calendar_button_cancel"),
+{
-	                                      &popup));
+popup->removeAction(list[i]);
-	HbAction *selected = popup.exec();
+}
-	if (selected == popup.primaryAction()) {
+	HbAction *deleteAction = new HbAction(hbTrId("txt_calendar_button_delete"),
-		retStatus = 1;
+										popup);
-	}
+	popup->addAction(deleteAction);
+	connect(deleteAction, SIGNAL(triggered()), this,
-	return retStatus;
+										SLOT(handleDeleteAction()));
+	HbAction *cancelAction = new HbAction(hbTrId("txt_calendar_button_cancel"),
+											popup);
+	// Editor should not be closed for all the cases when cancel is pressed
+	if(closeEditor) {
+		connect(cancelAction, SIGNAL(triggered()), this,
+											SLOT(closeEditor()));
+	}
+	popup->addAction(cancelAction);
+	popup->open();
 }
 /*!
 	Returns true if the entry is a child ,else false.
 	\return true if the entry is a child, false otherwise.
 			if (saveEntry()) {
 				return CalenEditorPrivate::ActionSave;
 			}
 			return CalenEditorPrivate::ActionNothing;
 		case CalenEditorPrivate::ActionDelete:
-			deleteEntry();
+			showDeleteConfirmationQuery(true);
 			return CalenEditorPrivate::ActionDelete;
 		case CalenEditorPrivate::ActionNothing:
 			return CalenEditorPrivate::ActionNothing;
 		default:
 			break;
 	Delete the entry
 	@param closeEditor set true to close editor else default value is false
 */
 void CalenEditorPrivate::deleteEntry(bool close)
 {
 	// 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 (showDeleteConfirmationQuery()) {
+		if (mEditRange == ThisOnly) {
-			if (mEditRange == ThisOnly) {
+			// User wants to delete only this occurence
-				// User wants to delete only this occurence
+			mAgendaUtil->deleteRepeatedEntry(*mOriginalEntry,
-				mAgendaUtil->deleteRepeatedEntry(*mOriginalEntry,
+			                                 AgendaUtil::ThisOnly);
-				                                 AgendaUtil::ThisOnly);
+		} else {
-			} else {
+			// Delete the entry.
-				// Delete the entry.
+			mAgendaUtil->deleteEntry(mOriginalEntry->id());
-				mAgendaUtil->deleteEntry(mOriginalEntry->id());
+		}
-			}
+		if (close) {
-			if (close) {
+			closeEditor();
-				closeEditor();
-			}
 		}
 	}
 }
 /*!
 */
 HbDataFormModelItem* CalenEditorPrivate::allDayCheckBoxItem()
 {
 	return mAllDayCheckBoxItem;
 }
+/*!
+	Checks if all day item is added and if selected implies reminder time is added.
+	When editing single occurence irrespective of type of the event
+	the all day item is not shown.
+	Used to calculate the index of other items which are dependant on this.
+*/
+bool CalenEditorPrivate::isReminderTimeForAllDayAdded()
+{
+	return mReminderField->isReminderTimeForAllDayAdded();
+}
+/*!
+	Checks if it is an all day event or not.
+*/
+bool CalenEditorPrivate::isAllDayEvent()
+{
+	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..
+		return true;;
+	} else {
+		return false;
+	}
+}
+/*!
+	Returns the current index of the reminder field.
+*/
+int CalenEditorPrivate::currentIndexOfReminderField()
+{
+	return mReminderField->currentReminderIndex();
+}
+/*!
+	Sets the index.
+	/param index indicates the index value to be set.
+*/
+void CalenEditorPrivate::setCurrentIndexOfReminderField(int index)
+{
+	mReminderField->setCurrentIndex(index);
+}
+/*!
+	Sets the reminder choices for a non all day event.
+*/
+void CalenEditorPrivate::setReminderChoices()
+{
+		mReminderField->setReminderChoices();
+}
+/*!
+	Checks if editing all occurences or a single occurence.
+*/
+bool CalenEditorPrivate::isEditRangeThisOnly()
+{
+	return (mEditRange == ThisOnly);
+}
+/*!
+	Checks if all day field is added.
+*/
+bool CalenEditorPrivate::isAllDayFieldAdded()
+{
+	return mIsAllDayItemAdded;
+}
 // End of file	--Don't remove this.

changeset 26	a949c2543c15
parent 23	fd30d51f876b
child 32	ea672fcb0ea0