FCL/sf/app/organizer: comparison calendarui/views/src/calenmonthview.cpp

equal deleted inserted replaced

-:c198609911f9
+:fd30d51f876b
 #include "calenpreviewpane.h"
 #include "calendocloader.h"
 #include "calenthicklinesdrawer.h"
 #include "calencommon.h"
 #include "CalendarInternalCRKeys.h"
+#include "calenpluginlabel.h"
 /*!
 \class CalenMonthView
 Class implementing calendar month view
 */
 /*!
 Default constructor.
 */
 CalenMonthView::CalenMonthView(MCalenServices &services) :
 	CalenNativeView(services), mAgendaUtil(services.agendaInterface()),
-	mGoToTodayAction(0)
+	mGoToTodayAction(0),
+	mPrevRegionalInfo(0),
+	mCurrRegionalInfo(0),
+	mNextRegionalInfo(0)
 {
 	mIsWeekNumbersShown = 0;
 	mOrientation = mServices.MainWindow().orientation();
 	// Read the date from the context
 	mDate = mServices.Context().focusDateAndTimeL();
 {
 	mDocLoader = docLoader;
 	mTitleLabel
 	        = qobject_cast<HbLabel *> (
 								   mDocLoader->findWidget(CALEN_MONTH_TITLE));
+	// Set the title text color
+	QColor monthTitleColor = HbColorScheme::color("qtc_cal_monthgrid_title");
+	if (monthTitleColor.isValid()) {
+		mTitleLabel->setTextColor(monthTitleColor);
+	}
 	mDayNameWidget
 	        = qobject_cast<CalenThickLinesDrawer *> (
 													mDocLoader->findWidget(
 													CALEN_DAYNAMES_WIDGET));
 	HbLabel* currPaneNoEntriesLabel = static_cast<HbLabel *> (
 			docLoader->findWidget(CALEN_NOENTRIES_LABEL_CURR));
 	mCurrPreviewPane->setView(this);
 	mCurrPreviewPane->setNoEntriesLabel(currPaneNoEntriesLabel);
+	mCurrPaneLayoutWidget = qobject_cast<HbWidget*>(docLoader->findWidget(CALEN_CURRPANELAYOUT));
+	mCurrPaneLayout = static_cast<QGraphicsLinearLayout*>(mCurrPaneLayoutWidget->layout());
 	mPrevPaneParent = qobject_cast<HbWidget *> (
 			mDocLoader->findWidget(CALEN_PREVPREVIEWPARENT));
 	// Get previous day preview pane widget
 	mPrevPreviewPane
 			= static_cast<CalenPreviewPane *> (
 			docLoader->findWidget(CALEN_NOENTRIES_LABEL_PREV));
 	mPrevPreviewPane->setView(this);
 	mPrevPreviewPane->setNoEntriesLabel(prevPaneNoEntriesLabel);
 	mPrevPaneParent->setVisible(false);
+	mPrevPaneLayoutWidget = qobject_cast<HbWidget*>(docLoader->findWidget(CALEN_PREVPANELAYOUT));
+	mPrevPaneLayout = static_cast<QGraphicsLinearLayout*>(mPrevPaneLayoutWidget->layout());
 	mNextPaneParent = qobject_cast<HbWidget *> (
 			mDocLoader->findWidget(CALEN_NEXTPREVIEWPARENT));
 	// Get next day preview pane widget
 	mNextPreviewPane
 			= static_cast<CalenPreviewPane *> (
 	HbLabel* nextPaneNoEntriesLabel = static_cast<HbLabel *> (
 			docLoader->findWidget(CALEN_NOENTRIES_LABEL_NEXT));
 	mNextPreviewPane->setView(this);
 	mNextPreviewPane->setNoEntriesLabel(nextPaneNoEntriesLabel);
 	mNextPaneParent->setVisible(false);
+	mNextPaneLayoutWidget = qobject_cast<HbWidget*>(docLoader->findWidget(CALEN_NEXTPANELAYOUT));
+	mNextPaneLayout = static_cast<QGraphicsLinearLayout*>(mNextPaneLayoutWidget->layout());
 	mMonthGridPlusWeekNumWidget
 	        = qobject_cast<HbWidget *> (
 					mDocLoader->findWidget(CALEN_MONTHGRID_WEEKNUMBERS_WIDGET));
 	connect(goToDateAction, SIGNAL(triggered()), this, SLOT(goToDate()));
 	// TODO: Need to move this to docml
 	// Set the title to the submenu
-	HbMenu
+	mDeleteSubMenu =
-	        *deleteSubMenu =
 	                qobject_cast<HbMenu *> (
 						mDocLoader->findObject(CALEN_MONTVIEW_DELETE_SUBMENU));
-	deleteSubMenu->setTitle(hbTrId("txt_calendar_opt_delete_entries"));
+	mDeleteSubMenu->setTitle(hbTrId("txt_calendar_opt_delete_entries"));
 	HbAction
 	        *beforeDateAction =
 	                qobject_cast<HbAction *> (
 						mDocLoader->findObject(CALEN_MONTVIEW_MENU_BEFOREDATE));
 	// Connect to the signal of change orientation.
 	connect(&(mServices.MainWindow()),
 	        SIGNAL(orientationChanged(Qt::Orientation)), this,
 	        SLOT(changeOrientation(Qt::Orientation)));
+	// Connect to the signal when options menu is shown
+	// This is required to add/remove dynamically some options
+	connect(menu(), SIGNAL(aboutToShow ()), this,
+	        SLOT(addRemoveActionsInMenu()));
 	mIsFirstTimeLoad = true;
 	// Add background items to all the widgets
 	addBackgroundFrame();
 }
 */
 void CalenMonthView::addBackgroundFrame()
 {
 // Set the background items for all the widgets
 HbFrameItem* frame = NULL;
-if (mMonthGrid) {
+HbWidget* monthViewExceptPreviewPane = qobject_cast<HbWidget *> (
+						 mDocLoader->findWidget(CALEN_MONTHVIEW_EXCEPT_PANE));
+if (monthViewExceptPreviewPane) {
 // The grid background
 frame = new HbFrameItem(this);
 frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_monthgrid_bg");
-mMonthGrid->setBackgroundItem(frame->graphicsItem(), -2);
+monthViewExceptPreviewPane->setBackgroundItem(frame->graphicsItem(), -2);
 }
 if (mTitleLabel) {
 // The month title
 frame = new HbFrameItem(this);
 frame->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
 frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_monthgrid_title_bg");
 mTitleLabel->setBackgroundItem(frame->graphicsItem(), -2);
 }
+// Set the frame to the preview pane
+frame = new HbFrameItem(this);
+frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_bg");
+mPrevPaneLayoutWidget->setBackgroundItem(frame->graphicsItem(), -5);
+// Set the frame to the preview pane
+frame = new HbFrameItem(this);
+frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_bg");
+mCurrPaneLayoutWidget->setBackgroundItem(frame->graphicsItem(), -5);
+// Set the frame to the preview pane
+frame = new HbFrameItem(this);
+frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+frame->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_bg");
+mNextPaneLayoutWidget->setBackgroundItem(frame->graphicsItem(), -5);
+}
+void CalenMonthView::showHideRegionalInformation()
+{
+XQSettingsKey regionalInfo(XQSettingsKey::TargetCentralRepository,
+KCRUidCalendar.iUid, KShowRegionalInformation);
+int showRegionalInfo = mSettingsManager->readItemValue(regionalInfo).toUInt();
+if (showRegionalInfo) {
+// Add the regional information to the preview panes
+if (!mPrevRegionalInfo) {
+mPrevRegionalInfo = new CalenPluginLabel(mServices, this);
+mPrevPaneLayout->insertItem(0, mPrevRegionalInfo);
+HbFrameItem *frameCurr = new HbFrameItem(this);
+frameCurr->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+frameCurr->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_title_bg");
+mPrevRegionalInfo->setBackgroundItem(frameCurr->graphicsItem(), -2);
+}
+if (!mCurrRegionalInfo) {
+mCurrRegionalInfo = new CalenPluginLabel(mServices, this);
+mCurrPaneLayout->insertItem(0, mCurrRegionalInfo);
+HbFrameItem *frameCurr = new HbFrameItem(this);
+frameCurr->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+frameCurr->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_title_bg");
+mCurrRegionalInfo->setBackgroundItem(frameCurr->graphicsItem(), -2);
+}
+if (!mNextRegionalInfo) {
+mNextRegionalInfo = new CalenPluginLabel(mServices, this);
+mNextPaneLayout->insertItem(0, mNextRegionalInfo);
+HbFrameItem *frameCurr = new HbFrameItem(this);
+frameCurr->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+frameCurr->frameDrawer().setFrameGraphicsName("qtg_fr_cal_preview_title_bg");
+mNextRegionalInfo->setBackgroundItem(frameCurr->graphicsItem(), -2);
+}
+if (pluginEnabled()) {
+			QString *pluginString = pluginText();
+			mPrevRegionalInfo->setPlainText(*pluginString);
+			mCurrRegionalInfo->setPlainText(*pluginString);
+			mNextRegionalInfo->setPlainText(*pluginString);
+		}
+} else {
+if (mPrevRegionalInfo) {
+mPrevPaneLayout->removeItem(mPrevRegionalInfo);
+delete mPrevRegionalInfo;
+mPrevRegionalInfo = NULL;
+}
+if (mCurrRegionalInfo) {
+mPrevPaneLayout->removeItem(mCurrRegionalInfo);
+delete mCurrRegionalInfo;
+mCurrRegionalInfo = NULL;
+}
+if (mNextRegionalInfo) {
+mPrevPaneLayout->removeItem(mNextRegionalInfo);
+delete mNextRegionalInfo;
+mNextRegionalInfo = NULL;
+}
+}
+}
+/*!
+Handles the context changed notification
+*/
+void CalenMonthView::onContextChanged()
+{
+	//Update plugin label after setting context
+	if (mCurrRegionalInfo && mPrevRegionalInfo && mNextPaneLayout
+	        && pluginEnabled()) {
+		QString *pluginString = pluginText();
+		mPrevRegionalInfo->setPlainText(*pluginString);
+		mCurrRegionalInfo->setPlainText(*pluginString);
+		mNextRegionalInfo->setPlainText(*pluginString);
+	}
 }
 /*!
 Calculates the week numbers and sets them to the week labels
 */
 Populates the month view with today as focussed item
 */
 void CalenMonthView::goToToday()
 {
 	QDateTime today = CalenDateUtils::today();
-	// First check if we are not already
+	// First check if we are not alread
 	// showing today's month view
 	if (mDate == today) {
 		return;
+	} else if (mActiveMonth.date().year() == today.date().year() &&
+				mActiveMonth.date().month() == today.date().month()) {
+		// User is in current month only, so just set the focus to current
+		// date grid item and refresh the preview pane
+		int currIndex = mFirstDayOfGrid.daysTo(today);
+		setCurrGridIndex(currIndex);
+		return;
 	}
 	// Set the context and repopulate the view
 	MCalenContext &context = mServices.Context();
 	context.setFocusDateAndTimeL(today, KCalenMonthViewUidValue);
-	mServices.IssueCommandL(ECalenStartActiveStep);
+	refreshViewOnGoToDate();
+}
+/*
+Slot to handle adding / removing actions frm the menu when menu is about to
+shown to the user
+*/
+void CalenMonthView::addRemoveActionsInMenu()
+{
+	HbAction* menuAction = mDeleteSubMenu->menuAction();
+	// Check if there are no entries in the database
+	if (mAgendaUtil->areNoEntriesInCalendar() && menuAction) {
+		// hide the delete entries option
+		menuAction->setVisible(false);
+	} else if (menuAction) {
+		// Show the option to delete
+		menuAction->setVisible(true);
+	}
+	// Check if we are population for current day, if yes then disable the
+	// gototoday action
+	if ((CalenDateUtils::today().date() == mDate.date()) && mGoToTodayAction) {
+		mGoToTodayAction->setVisible(false);
+	} else if (mGoToTodayAction){
+		mGoToTodayAction->setVisible(true);
+	}
 }
 /*!
 Populates the view
 */
 	populatePreviewPane(mDate);
 	// Create the grid items with proper dates
 	createGrid();
+	// Check if regional information needs to be shown
+	// and add it or remove it
+	showHideRegionalInformation();
 	// Complete the population
 	completePopulation();
 	// Population is complete, inform it
 */
 void CalenMonthView::prepareForPopulation()
 {
 	setActiveDay(dateFromContext(mServices.Context()));
 	setDate();
+}
+/*!
+Slot to handle gotodate action
+*/
+void CalenMonthView::refreshViewOnGoToDate()
+{
+	setActiveDay(dateFromContext(mServices.Context()));
+	setDate();
+	setDateToLabel();
+	// fetch list of required calendar instances
+	populateWithInstanceView();
+	populatePreviewPane(mDate);
+	mMonthGrid->updateMonthGridModel(mMonthDataArray, mIndexToBeScrolled);
+	// Start the auto scroll on current preview pane
+	mCurrPreviewPane->startAutoScroll();
 }
 /*!
 Reads the date from the context and stores into mDate
 */
 Calculates the necesary parameters of the month view w.r.t mDate
 */
 void CalenMonthView::setActiveDay(QDateTime day)
 {
 	mDate = day;
-	// Check if we are population for current day, if yes then disable the
-	// gototoday action
-	if ((CalenDateUtils::today().date() == mDate.date()) && mGoToTodayAction) {
-	    mGoToTodayAction->setVisible(false);
-	} else if (mGoToTodayAction){
-	    mGoToTodayAction->setVisible(true);
-	}
 	mActiveMonth = mDate;
 	// Get the first day of the previous month
 	QDateTime prevMonthDate = mDate.addMonths(-1);
 	int prevMonth = prevMonthDate.date().month();
 	// previous month to future month
 	mTotalNumOfGridItems = mFirstDayOfGrid.daysTo(mLastDayOfGrid) + 1;
 	// Calculate the last visible day
 	int index = (mNumOfRowsInPrevMonth + KNumOfVisibleRows) * KCalenDaysInWeek;
-	QDateTime lastVisibleDate = mFirstDayOfGrid.addDays(index);
+	QDateTime lastVisibleDate = mFirstDayOfGrid.addDays(index - 1);
 	QDateTime dateTimeToCalc = mLastDayOfGrid;
 	mNumOfRowsInFutureMonth = 0;
 	while (dateTimeToCalc > lastVisibleDate) {
 		mNumOfRowsInFutureMonth++;
 		dateTimeToCalc = dateTimeToCalc.addDays(-KCalenDaysInWeek);
 	for (int i(0); i < mTotalNumOfGridItems; ++i) {
 		QDateTime currentDay = CalenDateUtils::futureOf(mFirstDayOfGrid, i);
 		CalenMonthData element(currentDay);
 		mMonthDataArray.append(element);
 	}
-	// Update the dates with active flag
-	updateMonthDataArrayWithActiveDates();
 }
 /*!
 Returns the currDay(Today)
 */
 	}
 	// Update the week Numbers model
 	if (mIsWeekNumbersShown) {
 		updateWeekNumGridModel();
 	}
-	// Update the dates with active flag
-	updateMonthDataArrayWithActiveDates();
 }
 /*!
 Called when up gesture is performed
 */
 void CalenMonthView::updateModelWithFutureMonth()
 		QDateTime currentDay = previousLastDayOfGrid.addDays(i);
 		CalenMonthData element(currentDay);
 		mMonthDataArray.append(element);
 	}
-	// Update the mMonthDataArray with instances if any
-	populateNextMonth();
 	// Update the necessary globals
 	mTotalNumOfGridItems += countToBeAdded;
 	mActiveMonth = mActiveMonth.addMonths(1);
 	mNumOfRowsInFutureMonth = (countToBeAdded / KCalenDaysInWeek);
 	// Update the week Numbers model
 	if (mIsWeekNumbersShown) {
 		updateWeekNumGridModel();
 	}
-	// Update the dates with active flag
+	// Update the mMonthDataArray with instances if any
-	updateMonthDataArrayWithActiveDates();
+	populateNextMonth();
 }
 /*!
 Returns the numner of rows in previous month
 */
 	const int todayIndex(gridStart.daysTo(today));
 	QDateTime gridEnd(mLastDayOfGrid.date(), QTime(23, 59, 59, 0));
 	QList<AgendaEntry> list;
-	getInstanceList(list, gridStart, gridEnd);
+	AgendaUtil::FilterFlags filter =
+		        AgendaUtil::FilterFlags(AgendaUtil::IncludeAnniversaries
-	//Parse fetched items
+		                | AgendaUtil::IncludeAppointments
-	if (list.count()) {
+		                | AgendaUtil::IncludeEvents
-		for (int i(0); i < list.count(); i++) {
+		                | AgendaUtil::IncludeReminders
-			AgendaEntry entry = list[i];
+		                | AgendaUtil::IncludeIncompletedTodos);
-			// Parse  Day Notes, Appointments and Remainders
+	// Get the list of dates which have events
-			// Start and end time of Event/Appointment/Remainders has to be
+	QList<QDate> datesWithEvents;
-			// indentified before marking the tags
+	mAgendaUtil->markDatesWithEvents(gridStart,gridEnd,filter,datesWithEvents);
-			// EEvents/Appointments can span multiple days,
-			// while Anniversaries cannot.
+	// Parse thru the list of dates and set the required flags
-			if ((entry.type() == AgendaEntry::TypeEvent) || (entry.type()
+	for(int i(0); i < datesWithEvents.count(); i++) {
-			        == AgendaEntry::TypeAppoinment) || (entry.type()
+		int offset = mFirstDayOfGrid.date().daysTo(datesWithEvents.at(i));
-			        == AgendaEntry::TypeReminder)) {
+		mMonthDataArray[offset].SetHasEvents(true);
-				// The start time of the instance
+	}
-				QDateTime startTime = entry.startTime();
-				// The instance's start index from the grid start
+	datesWithEvents.clear();
-				int startIndex(gridStart.daysTo(startTime));
-				// The end time of the instance
-				QDateTime endTime = entry.endTime();
-				if (CalenAgendaUtils::endsAtStartOfDayL(entry, endTime)) {
-					// prevent problems with items ending tomorrow at 00:00
-					QTime time = endTime.time();
-					time.setHMS(time.hour(), time.minute() - 1, time.second(),
-					            time.msec());
-					endTime.setTime(time);
-					if (endTime <= gridStart) {
-						// ends at the start of the grid -> not visible
-						continue; // skip
-					}
-				}
-				// The instance's end index from the grid start
-				int endIndex(gridStart.daysTo(endTime));
-				// Mark the days from start index to end index
-				for (; startIndex <= endIndex; startIndex++) {
-					if (startIndex >= 0 &&
-							startIndex < mMonthDataArray.count()) {
-						mMonthDataArray[startIndex].SetHasEvents(true);
-					}
-				} // Parse Anniversaries
-			} else if (entry.type() == AgendaEntry::TypeAnniversary) {
-				QDateTime startTime = entry.startTime();
-				// The instance's start index from the grid start
-				int index(gridStart.daysTo(startTime));
-				// Mark the particular day
-				if (index >= 0 && index < mMonthDataArray.count()) {
-					mMonthDataArray[index].SetHasEvents(true);
-				} // Parse To DOs
-			} else if (entry.type() == AgendaEntry::TypeTodo) {
-				QDateTime startTime = entry.startTime();
-				;
-				int index;
-				// Mark the particular day if the instance's start
-				// time is not in the past
-				if (startTime >= today) {
-					index = gridStart.daysTo(startTime);
-				} else {// Mark for today if the instance's
-					// start time is in the past
-					index = todayIndex;
-				}
-				if (index >= 0 && index < mMonthDataArray.count()) {
-					mMonthDataArray[index].SetHasEvents(true);
-				}
-			}
-		}
-	}
-	list.clear();
 }
 /*!
 Parses the fetched entries for previous month and
 sets hasEvent attribute for necessary days
 	const int todayIndex(gridStart.daysTo(today)); // grid index for "today"
 	QDateTime end = gridStart.addDays(mNumOfRowsInPrevMonth * KCalenDaysInWeek);
 	QDateTime gridEnd(end.date(), QTime(23, 59, 59, 0));
-	getInstanceList(list, gridStart, gridEnd);
+	AgendaUtil::FilterFlags filter =
-	//Parse fetched items
+		        AgendaUtil::FilterFlags(AgendaUtil::IncludeAnniversaries
-	if (list.count()) {
+		                | AgendaUtil::IncludeAppointments
-		for (int i(0); i < list.count(); i++) {
+		                | AgendaUtil::IncludeEvents
-			AgendaEntry entry = list[i];
+		                | AgendaUtil::IncludeReminders
+		                | AgendaUtil::IncludeIncompletedTodos);
-			// Parse  Day Notes, Appointments and Remainders
-			// Start and end time of Event/Appointment/Remainders
+	// Get the list of dates which have events
-			// has to be indentified before marking the tags
+	QList<QDate> datesWithEvents;
-			// EEvents/Appointments can span multiple days,
+	mAgendaUtil->markDatesWithEvents(gridStart,gridEnd,filter,datesWithEvents);
-			// while Anniversaries cannot.
-			if ((entry.type() == AgendaEntry::TypeEvent) || (entry.type()
+	// Parse thru the list of dates and set the required flags
-			        == AgendaEntry::TypeAppoinment) || (entry.type()
+	for(int i(0); i < datesWithEvents.count(); i++) {
-			        == AgendaEntry::TypeReminder)) {
+		int offset = mFirstDayOfGrid.date().daysTo(datesWithEvents.at(i));
-				// The start time of the instance
+		mMonthDataArray[offset].SetHasEvents(true);
-				QDateTime startTime = entry.startTime();
+	}
-				// The instance's start index from the grid start
-				int startIndex(gridStart.daysTo(startTime));
+	datesWithEvents.clear();
-				// The end time of the instance
-				QDateTime endTime = entry.endTime();
-				if (CalenAgendaUtils::endsAtStartOfDayL(entry, endTime)) {
-					// prevent problems with items ending tomorrow at 00:00
-					QTime time = endTime.time();
-					time.setHMS(time.hour(), time.minute() - 1, time.second(),
-					            time.msec());
-					endTime.setTime(time);
-					if (endTime <= gridStart) {
-						// ends at the start of the grid -> not visible
-						continue; // skip
-					}
-				}
-				// The instance's end index from the grid start
-				int endIndex(gridStart.daysTo(endTime));
-				// Mark the days from start index to end index
-				for (; startIndex <= endIndex; startIndex++) {
-					if (startIndex >= 0 &&
-							startIndex < mMonthDataArray.count()) {
-						mMonthDataArray[startIndex].SetHasEvents(true);
-					}
-				} // Parse Anniversaries
-			} else if (entry.type() == AgendaEntry::TypeAnniversary) {
-				QDateTime startTime = entry.startTime();
-				// The instance's start index from the grid start
-				int index(gridStart.daysTo(startTime));
-				// Mark the particular day
-				if (index >= 0 && index < mMonthDataArray.count()) {
-					mMonthDataArray[index].SetHasEvents(true);
-				} // Parse To DOs
-			} else if (entry.type() == AgendaEntry::TypeTodo) {
-				QDateTime startTime = entry.startTime();
-				;
-				int index;
-				// Mark the particular day if the instance's
-				// start time is not in the past
-				if (startTime >= today) {
-					index = gridStart.daysTo(startTime);
-				} else {// Mark for today if the instance's
-					//start time is in the past
-					index = todayIndex;
-				}
-				if (index >= 0 && index < mMonthDataArray.count()) {
-					mMonthDataArray[index].SetHasEvents(true);
-				}
-			}
-		}
-	}
-	list.clear();
 }
 /*!
 Parses the fetched entries for future month and
 sets hasEvent attribute for necessary days
 	const QDateTime today(CalenDateUtils::today());
 	const int todayIndex(gridStart.daysTo(today)); // grid index for "today"
 	QDateTime gridEnd(mLastDayOfGrid.date(), QTime(23, 59, 59, 0));
-	getInstanceList(list, gridStart, gridEnd);
+	AgendaUtil::FilterFlags filter =
-	//Parse fetched items
+		        AgendaUtil::FilterFlags(AgendaUtil::IncludeAnniversaries
-	if (list.count()) {
+		                | AgendaUtil::IncludeAppointments
-		for (int i(0); i < list.count(); i++) {
+		                | AgendaUtil::IncludeEvents
-			AgendaEntry entry = list[i];
+		                | AgendaUtil::IncludeReminders
+		                | AgendaUtil::IncludeIncompletedTodos);
-			// Parse  Day Notes, Appointments and Remainders
-			// Start and end time of Event/Appointment/Remainders
+	// Get the list of dates which have events
-			// has to be indentified before marking the tags
+	QList<QDate> datesWithEvents;
-			// EEvents/Appointments can span multiple days,
+	mAgendaUtil->markDatesWithEvents(gridStart,gridEnd,filter,datesWithEvents);
-			// while Anniversaries cannot.
-			if ((entry.type() == AgendaEntry::TypeEvent) || (entry.type()
+	// Parse thru the list of dates and set the required flags
-			        == AgendaEntry::TypeAppoinment) || (entry.type()
+	for(int i(0); i < datesWithEvents.count(); i++) {
-			        == AgendaEntry::TypeReminder)) {
+		int offset = mFirstDayOfGrid.date().daysTo(datesWithEvents.at(i));
-				// The start time of the instance
+		mMonthDataArray[offset].SetHasEvents(true);
-				QDateTime startTime = entry.startTime();
+	}
-				// The instance's start index from the grid start
-				int startIndex(gridStart.daysTo(startTime));
-				// The end time of the instance
-				QDateTime endTime = entry.endTime();
+	datesWithEvents.clear();
-				if (CalenAgendaUtils::endsAtStartOfDayL(entry, endTime)) {
-					// prevent problems with items ending tomorrow at 00:00
-					QTime time = endTime.time();
-					time.setHMS(time.hour(), time.minute() - 1, time.second(),
-					            time.msec());
-					endTime.setTime(time);
-					if (endTime <= gridStart) {
-						// ends at the start of the grid -> not visible
-						continue; // skip
-					}
-				}
-				// The instance's end index from the grid start
-				int endIndex(gridStart.daysTo(endTime));
-				// Mark the days from start index to end index
-				for (; startIndex <= endIndex; startIndex++) {
-					if (startIndex >= 0 &&
-							startIndex < mMonthDataArray.count()) {
-						mMonthDataArray[actualIndex + startIndex].SetHasEvents(true);
-					}
-				} // Parse Anniversaries
-			} else if (entry.type() == AgendaEntry::TypeAnniversary) {
-				QDateTime startTime = entry.startTime();
-				// The instance's start index from the grid start
-				int index(gridStart.daysTo(startTime));
-				// Mark the particular day
-				if (actualIndex +index >= 0 && (actualIndex + index) < mMonthDataArray.count()) {
-					mMonthDataArray[actualIndex + index].SetHasEvents(true);
-				} // Parse To DOs
-			} else if (entry.type() == AgendaEntry::TypeTodo) {
-				QDateTime startTime = entry.startTime();
-				;
-				int index;
-				// Mark the particular day if the instance's
-				// start time is not in the past
-				if (startTime >= today) {
-					index = gridStart.daysTo(startTime);
-				} else {// Mark for today if the instance's
-					// start time is in the past
-					index = todayIndex;
-				}
-				if (actualIndex + index >= 0 && (actualIndex + index) < mMonthDataArray.count()) {
-					mMonthDataArray[actualIndex + index].SetHasEvents(true);
-				}
-			}
-		}
-	}
-	list.clear();
 }
 /*!
 Populates the preview pane
 */
 current view to the main window
 */
 void CalenMonthView::completePopulation()
 {
 	setDateToLabel();
-	//Set this view as current view
-	mServices.MainWindow().setCurrentView(this);
 }
 /*!
 Launches the day view on tapping of the grid item
 */
 	} else {
 		// reset flag
 		mIsPrevPaneGesture = false;
 	}
-	// Check if we are population for current day, if yes then disable the
-// gototoday action
-if ((CalenDateUtils::today() == mDate) && mGoToTodayAction) {
-mGoToTodayAction->setVisible(false);
-} else if (mGoToTodayAction){
-mGoToTodayAction->setVisible(true);
-}
 }
 /*!
 Slot to launch the event editor
 */
 	// Append a single space
 	monthString.append(" ");
 	mLocale.setNumberOptions(QLocale::OmitGroupSeparator);
 	QString yearString = mLocale.toString(mDate.date().year());
 	mTitleLabel->setPlainText(hbTrId("txt_calendar_month_label_title_12").arg(monthString).arg(yearString));
-	QColor monthTitleColor = HbColorScheme::color("qtc_cal_monthgrid_title");
-	if (monthTitleColor.isValid()) {
-	    mTitleLabel->setTextColor(monthTitleColor);
-	}
 }
 /*!
 To handle previewpane swipe
 */
 	if(rightGesture) {
 		// Need to bring up the previous day preview pane
 		// Create the effect on mCurrPreviewPane to slide to right side
 		mPrevPaneParent->setVisible(true);
 		if (mOrientation == Qt::Vertical) {
-			HbEffect::add(mCurrPreviewPane,
+			HbEffect::add(mCurrPaneLayoutWidget,
 						  ":/fxml/portrait_preview_pane_hide_on_right_gesture",
 						  "hide");
-			HbEffect::add(mPrevPreviewPane,
+			HbEffect::add(mPrevPaneLayoutWidget,
 						  ":/fxml/portrait_preview_pane_show_on_right_gesture",
 						  "show");
 		} else {
-			HbEffect::add(mCurrPreviewPane,
+			HbEffect::add(mCurrPaneLayoutWidget,
 						  ":/fxml/landscape_preview_pane_hide_on_right_gesture",
 						  "hide");
-			HbEffect::add(mPrevPreviewPane,
+			HbEffect::add(mPrevPaneLayoutWidget,
 						  ":/fxml/landscape_preview_pane_show_on_right_gesture",
 						  "show");
 		}
 		// Start the effects
-		HbEffect::start(mCurrPreviewPane, "hide");
+		HbEffect::start(mCurrPaneLayoutWidget, "hide");
-		HbEffect::start(mPrevPreviewPane, "show",
+		HbEffect::start(mPrevPaneLayoutWidget, "show",
 										this, "handleRightEffectCompleted");
 		//Remove the mCurrPreviewPane from the layout and add mPrevPreviewPane
 		// to the layout
 		viewLayout->removeAt(1);
 	} else {
 		// Need to bring up the previous day preview pane
 		// Create the effect on mCurrPreviewPane to slide to left side
 		mNextPaneParent->setVisible(true);
 		if (mOrientation == Qt::Vertical) {
-			HbEffect::add(mCurrPreviewPane,
+			HbEffect::add(mCurrPaneLayoutWidget,
 						  ":/fxml/portrait_preview_pane_hide_on_left_gesture",
 						  "hide");
-			HbEffect::add(mNextPreviewPane,
+			HbEffect::add(mNextPaneLayoutWidget,
 						  ":/fxml/portrait_preview_pane_show_on_left_gesture",
 						  "show");
 		} else {
-			HbEffect::add(mCurrPreviewPane,
+			HbEffect::add(mCurrPaneLayoutWidget,
 						  ":/fxml/landscape_preview_pane_hide_on_left_gesture",
 						  "hide");
-			HbEffect::add(mNextPreviewPane,
+			HbEffect::add(mNextPaneLayoutWidget,
 						  ":/fxml/landscape_preview_pane_show_on_left_gesture",
 						  "show");
 		}
 		// Start the effects
-		HbEffect::start(mCurrPreviewPane, "hide");
+		HbEffect::start(mCurrPaneLayoutWidget, "hide");
-		HbEffect::start(mNextPreviewPane, "show",
+		HbEffect::start(mNextPaneLayoutWidget, "show",
 										this, "handleLeftEffectCompleted");
 		//Remove the mCurrPreviewPane from the layout and add mNextPreviewPane
 		// to the layout
 		viewLayout->removeAt(1);
 		viewLayout->addItem(mNextPaneParent);
 	}
 }
 /*!
+Returns the first date in the month grid
+*/
+QDateTime CalenMonthView::firstDayOfGrid()
+{
+	return mFirstDayOfGrid;
+}
+/*!
 Function to handle any locale related changes
 */
 void CalenMonthView::onLocaleChanged(int reason)
 {
 	Q_UNUSED(reason);
 	mCurrPreviewPane->stopScrolling();
 	// Swap the preview panes properly
 	CalenPreviewPane* pane = mCurrPreviewPane;
 	HbWidget* paneParent = mCurrPaneParent;
+	HbWidget* paneLayoutWidget = mCurrPaneLayoutWidget;
 	mCurrPreviewPane = mNextPreviewPane;
 	mCurrPaneParent = mNextPaneParent;
+	mCurrPaneLayoutWidget = mNextPaneLayoutWidget;
 	mNextPreviewPane = mPrevPreviewPane;
 	mNextPaneParent = mPrevPaneParent;
+	mNextPaneLayoutWidget = mPrevPaneLayoutWidget;
 	mPrevPreviewPane = pane;
 	mPrevPaneParent = paneParent;
+	mPrevPaneLayoutWidget = paneLayoutWidget;
 	// Set the focus to proper date
 	setCurrGridIndex(index);
 	// Start the auto scroll on current preview pane
 	mCurrPreviewPane->startAutoScroll();
 	mCurrPreviewPane->stopScrolling();
 	// Swap the preview panes properly
 	CalenPreviewPane* pane = mCurrPreviewPane;
 	HbWidget* paneParent = mCurrPaneParent;
+	HbWidget* paneLayoutWidget = mCurrPaneLayoutWidget;
 	mCurrPreviewPane = mPrevPreviewPane;
 	mCurrPaneParent = mPrevPaneParent;
+	mCurrPaneLayoutWidget = mPrevPaneLayoutWidget;
 	mPrevPreviewPane = mNextPreviewPane;
 	mPrevPaneParent = mNextPaneParent;
+	mPrevPaneLayoutWidget = mNextPaneLayoutWidget;
 	mNextPreviewPane = pane;
 	mNextPaneParent = paneParent;
+	mNextPaneLayoutWidget = paneLayoutWidget;
 	// Set the focus to proper date
 	setCurrGridIndex(index);
 	// Start the auto scroll on current preview pane
 	mCurrPreviewPane->startAutoScroll();

changeset 23	fd30d51f876b
parent 18	c198609911f9
child 26	a949c2543c15
child 45	b6db4fd4947b