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

equal deleted inserted replaced

-:2c54b51f39c4
+:bb2d3e476f29
 // User includes
 #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"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #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
 	of the HbMainWindow.
 	if (!mNewEntry) {
 		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"));
 		}
 */
 void CalenEditorPrivate::populateSubjectItem()
 {
 	OstTraceFunctionEntry0( CALENEDITORPRIVATE_POPULATESUBJECTITEM_ENTRY );
 	mSubjectItem->setContentWidgetData("text", mEditedEntry->summary());
-	mSubjectItem->setContentWidgetData("minRows", 2);
+	mSubjectItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
-	mSubjectItem->setContentWidgetData("maxRows", 4);
+	mSubjectItem->setContentWidgetData("maxLength", MaxCharacterLimit);
 	mSubjectItem->setContentWidgetData("objectName", "subjectItem");
 	mCalenEditorForm->addConnection(mSubjectItem,
 	                                SIGNAL(textChanged(const QString)), this,
 	                                SLOT(handleSubjectChange(const QString)));
 	OstTraceFunctionExit0( CALENEDITORPRIVATE_POPULATESUBJECTITEM_EXIT );
 void CalenEditorPrivate::populateAllDayItem()
 {
 	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);
 	}
 	mAllDayCheckBoxItem->setContentWidgetData("objectName", "allDayItem");
 	mCalenEditorForm->addConnection(mAllDayCheckBoxItem,
 }
 /*!
 	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 hour = currentDateTime.time().hour();
-	int minutes = currentTime.minute();
+	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.
 	// Like if current time is 7:14 am, plus one hour is 8:14 am and it will be rounded off to 8:00am
 	//For time between 15 and 45 mins, its rounded off to 30 mins
 		minutes = 30;
 	}else {
 		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);
 }
 /*!
 	Sets to default time, when AllDay is unchecked
 */
 	// The default time will be 8.00 am only if its not on current day
 	// else the time is calculated accordingly
 	bool isSameDay = CalenDateUtils::isOnToday(fromDateTime);
 	if (isSameDay) {
-		fromDateTime.setDate(fromDateTime.date());
+		fromDateTime = defaultTimeSameDay();
-		fromDateTime.setTime(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);
 }
 		fromDateTime = mEditedEntry->startTime();
 	} else {
 		// 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 = defaultTimeSameDay();
-			fromDateTime.setTime(defaultTimeSameDay());
 		}
 	}
 	mViewFromItem->populateDateTime(fromDateTime, true);
 	mNewEntryDateTime = fromDateTime;
 				nextInstanceStartTime.date()) == 1)) {
 				mViewFromItem->disableFromToDateField();
 			}
 		}
 	} else {
-		toDateTime = fromDateTime.addSecs(SecsInOneYear);
+		toDateTime = fromDateTime.addSecs(SecsInOneHour);
 	}
 	mViewToItem->populateDateTime(toDateTime, false);
 	// Set the default start time to the event.
 	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 (isAllDayEvent()) {
-		(mAllDayCheckBoxItem->contentWidgetData("checkState") == Qt::Checked))
-		|| (!mNewEntry && mEditedEntry->type() == AgendaEntry::TypeEvent)) {
 // 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);
 // Set it back to mEditedEntry
 mEditedEntry->setStartAndEndTime(mEditedEntry->startTime(), actualEndTime);
 	OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVEFROMDATETIME_ENTRY );
 	QDateTime endTime = mEditedEntry->endTime();
 	// 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
 		// new start time to get the new end time
 		if (fromDateTime > endTime) {
 	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()) {
+		// For repeating entries reminder options will be provided only
+		// when the repeatuntil date is in future
 		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();
+	} else {
-		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();
+				// Set the default alarm time 15 minutes before
+				mReminderField->setCurrentIndex(2);
 			}
 		}
 	}
 	OstTraceFunctionExit0( CALENEDITORPRIVATE_UPDATEREMINDERCHOICES_EXIT );
 }
 	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(-SecsInOneYear);
+		startTime = toDateTime.addSecs(-SecsInOneHour);
 		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
 									descIndex, HbDataFormModelItem::TextItem,
 									QString(hbTrId(
 									"txt_calendar_formlabel_val_description")),
 									mCalenEditorModel->invisibleRootItem());
 	mDescriptionItem->setContentWidgetData("text", mEditedEntry->description());
-	mDescriptionItem->setContentWidgetData("minRows", 2);
+	mDescriptionItem->setContentWidgetData("maxRows", MaxRowsInTextItem);
-	mDescriptionItem->setContentWidgetData("maxRows", 4);
 	mDescriptionItem->setContentWidgetData("objectName", "descriptionItem");
 	mCalenEditorForm->addConnection(
 								mDescriptionItem,
 								SIGNAL(textChanged(const QString)), this,
 								SLOT(handleDescriptionChange(const QString)));
 		if (mRepeatField->isRepeatUntilItemAdded()) {
 			referenceDate = mRepeatField->repeatUntilDate();
 		} 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.
 		if (mReminderField->isReminderFieldEnabled() &&
 					mReminderField->currentReminderIndex() != 0) {
 		// Update Start/End Times with Edited entry values
 		enableFromTotimeFileds(true, mEditedEntry->startTime(),
 		                       mEditedEntry->endTime());
 		mReminderField->removeReminderTimeField();
 		mReminderField->setReminderChoices();
+		// Set the default alarm time 15 minutes before
+		mReminderField->setCurrentIndex(2);
 		updateReminderChoices();
 	}
 	if(!mNewEntry){
 		addDiscardAction();
 	OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEDONE_ENTRY );
 	if (mEditRange == ThisAndAll) {
 		mRepeatField->saveRepeatRule();
 	}
-	// Set back the all day endtime back
+	// Set the all-day endtime back
-	 if(mOriginalEntry->type() == AgendaEntry::TypeEvent) {
+	if(isAllDayEvent()) {
-		 // The time has to be set for the allday exceptional entries and
+		// Set the all-day end time to 12:00AM to next day here only
-		 // while editing all the instances of a repeating all day entry
+		// In case if user doesnt change/edit anything then,
-		 if(mEditRange == ThisOnly ||
+		// we shall not show "Entry updated" popup
-		 	(mAllDayCheckBoxItem &&
+		QDateTime actualStartTime =
-		 	mAllDayCheckBoxItem->contentWidgetData("checkState") == Qt::Checked)) {
+				CalenDateUtils::beginningOfDay(mEditedEntry->startTime());
-			// Set EndTime of AllDay event to 00:00:00 of next day
-			QDateTime actualEndTime = mEditedEntry->endTime().addSecs(60);
+		// Set EndTime of AllDay event to 00:00:00 of next day
-			mEditedEntry->setStartAndEndTime(mEditedEntry->startTime(), actualEndTime);
+		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
 	switch (mDataHandler->shouldSaveOrDeleteOrDoNothing(mLaunchCalendar)) {
 		case CalenEditorPrivate::ActionSave:
 		}
 	}
 	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"));
 		}
 	}
 	emit q_ptr->entrySaved();
 	OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_SAVEENTRY_EXIT );
 */
 bool CalenEditorPrivate::handleAllDayToSave()
 {
 OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY );
-QDateTime tempSartTime =
+// Check the state of AllDay checkBox
-CalenDateUtils::beginningOfDay(mEditedEntry->startTime());
+// If the all day item was not added, definitely its an instance of a
+// repeating entry(TypeAppoinment or TypeEvent)
-// Set EndTime of AllDay event to 00:00:00 of next day
+// In this case the parent entry type should not be changed
-QDateTime tempEndTime = mEditedEntry->endTime().addDays(1);
+// so return false
-QTime tempEndQTime = tempEndTime.time();
+	if (!mIsAllDayItemAdded) {
-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)) {
 	    // 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)) {
+															== Qt::Checked)) {
-		// changes Start/End times of entry to Beginning ot the day
-		mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
 		mEditedEntry->setType(AgendaEntry::TypeEvent);
 		OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
 		return false;
 	} else if ((mAllDayCheckBoxItem->contentWidgetData("checkState")
-	        == Qt::Checked) && (mEditedEntry->type() !=
+															== Qt::Checked)) {
-								AgendaEntry::TypeEvent)) {
+		bool isAllDayEvent = CalenAgendaUtils::isAlldayEvent(*mOriginalEntry);
-		// Editing existing Meetingentry, and Alldat Box is Checked
+		// Editing existing Meeting entry, and Allday Box is Checked
-		// changes Start/End times of entry to Beginning ot the day
+		if (!isAllDayEvent) {
-		mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
+			// Clone the entry to AllDayEntry, Delete old entry from Database
+			mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
-		// Clone the entry to AllDayEntry, Delete old entry from Database
+			// For later reference for the notification popup
-		mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
+			mEditedEntry->setType(AgendaEntry::TypeEvent);
-		// For later reference for the notification popup
+			OstTraceFunctionExit0( DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
-		mEditedEntry->setType(AgendaEntry::TypeEvent);
+			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) {
+															!= Qt::Checked) {
-if (mEditedEntry->type() != AgendaEntry::TypeAppoinment) {
+		if (mEditedEntry->type() != AgendaEntry::TypeAppoinment) {
-	            // Editing existing AllDayentry, and Alldat Box is Not-Checked
+			// Editing existing AllDayentry, and Allday Box is Not-Checked
-	            // Clone the entry to MeetingEntry, Delete old entry from Database
+			// Clone the entry to MeetingEntry, Delete old entry from Database
-	            mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeAppoinment);
+			mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeAppoinment);
-	            // For later reference for the notification popup
+			// For later reference for the notification popup
-	            mEditedEntry->setType(AgendaEntry::TypeAppoinment);
+			mEditedEntry->setType(AgendaEntry::TypeAppoinment);
-	            OstTraceFunctionExit0( DUP3_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+			OstTraceFunctionExit0( DUP3_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
-	            return true;
+			return true;
-	        }
+		} else if (CalenAgendaUtils::isAlldayEvent(*mOriginalEntry)) {
-// Check if the duration of the meeting is matching the all-day criteria
+			// This else case will be executed when the original entry is
-// if yes, then we need to store it as all-day instead of normal meeting
+			// an all day and the entry type is still TypeAppoinment.
-else if (mEditedEntry->startTime() == CalenDateUtils::beginningOfDay(mEditedEntry->startTime())) {
+			// eg: Outlook synced all day entry type will be still TypeAppoinment
-// Get the end time and see if it is at the beginning of the end date day
+			// In this case cloning is not required but entry has to be saved.
-if (mEditedEntry->endTime() == CalenDateUtils::beginningOfDay(mEditedEntry->endTime())) {
+			// So return false
-// Store it as all-day
+			OstTraceFunctionExit0( DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
-mEditedEntry->setType(AgendaEntry::TypeEvent);
+			// save it
-// Check if this was an all-day earlier and now user has changed it like that
+			return false;
-// or it is a new entry
+		}
-if (mOriginalEntry->type() == AgendaEntry::TypeEvent ||
+		// Check if the duration of the meeting is matching the all-day criteria
-mNewEntry) {
+		// if yes, then we need to store it as all-day instead of normal meeting
-OstTraceFunctionExit0( DUP4_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+		else if (mEditedEntry->startTime() ==
-return false;
+					CalenDateUtils::beginningOfDay(mEditedEntry->startTime())) {
-} else {
+			// Get the end time and see if it is at the beginning of the end date day
-// It was a meeting
+			if (mEditedEntry->endTime() ==
-// Clone the entry to AllDayEntry, Delete old entry from Database
+					CalenDateUtils::beginningOfDay(mEditedEntry->endTime())) {
-mEditedEntry->setStartAndEndTime(tempSartTime, tempEndTime);
+				// Since the start and end time matches the all day criteria
-mAgendaUtil->cloneEntry(*mEditedEntry, AgendaEntry::TypeEvent);
+				// Store it as all-day
-// For later reference for the notification popup
+				mEditedEntry->setType(AgendaEntry::TypeEvent);
-mEditedEntry->setType(AgendaEntry::TypeEvent);
+				// Check if this was an all-day earlier and now user
-OstTraceFunctionExit0( DUP5_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT );
+				// has changed it like that or it is a new entry
-return true;
+				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;
 }
 {
 	OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISALLDAYEVENT_ENTRY );
 	if (mAllDayCheckBoxItem) {
 		return (mAllDayCheckBoxItem->contentWidgetData("checkState")
 													== Qt::Checked)? true:false;
-	} else if (!mNewEntry && mEditedEntry->type() == AgendaEntry::TypeEvent) {
+	} else if (!mNewEntry && CalenAgendaUtils::isAlldayEvent(*mOriginalEntry)) {
-		// If editing single occurence then all day item not shown but still it
+		// This else is for exceptional entries
-		// is an all day event..
+		// 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 {
 		OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT );
 		return false;

changeset 57	bb2d3e476f29
parent 55	2c54b51f39c4
child 64	1881ad52dc45