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

equal deleted inserted replaced

-:7ac58b2aae6f
+:ce92091cbd61
 			mModel->insertRows(rowCount,countDiff);
 		}
 		loopEnd = dataCount;
 	}
-	QDateTime currDate = mView->getCurrentDay();
-	QDateTime currDateTime = CalenDateUtils::beginningOfDay(currDate);
 	QDateTime activeDay = mView->getActiveDay();
 	QDateTime activeDateTime = CalenDateUtils::beginningOfDay(activeDay);
 	QModelIndex currentIndex;
 	int modelIndex = 0;
 			// reset the highlight
 			itemData << false;
 		}
 		// Check for current day
-		if (currDateTime == CalenDateUtils::beginningOfDay(dateTime)) {
+		if (QDate::currentDate() == dateTime.date()) {
 			// Set the underline attribute to true
 			itemData << true;
 		} else {
 			itemData << false;
 		}
 		// NOTE: To make sure that we always display proper month,
 		// two calls have been  made to scrollTo(), one with top
 		// visible item and other with bottom visible item
 		// Calculate the first visible item in the grid
-		QModelIndex firstVisibleIndex = mModel->index(indexToBeScrolled -
-								(KNumOfVisibleRows * KCalenDaysInWeek - 1), 0);
-		scrollTo(firstVisibleIndex);
 		// Calculate the last visible item in the grid
 		QModelIndex lastVisibleIndex = mModel->index(indexToBeScrolled, 0);
-		scrollTo(lastVisibleIndex);
+		scrollTo(lastVisibleIndex, HbAbstractItemView::PositionAtBottom);
 	}
 	OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDMODEL_EXIT );
 }
 	handleAppendingRows(monthDataArray);
 	int rowsInPrevMonth = mView->rowsInPrevMonth();
 	// Calculate the proper index to be scrolled to
-	int itemToBeScrolled = rowsInPrevMonth * KCalenDaysInWeek;
+	int itemToBeScrolled = ((rowsInPrevMonth + KNumOfVisibleRows) *
+								   KCalenDaysInWeek) - 1;
 	QModelIndex indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
 	mIsAtomicScroll = true;
-	scrollTo(indexToBeScrolled);
+	scrollTo(indexToBeScrolled, HbAbstractItemView::PositionAtBottom);
-	// Scroll to proper index
-	itemToBeScrolled = ((rowsInPrevMonth + KNumOfVisibleRows) *
-								   KCalenDaysInWeek) - 1;
-	indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
-	mIsAtomicScroll = true;
-	scrollTo(indexToBeScrolled);
 	// Update the sart position of the content widget
 	mStartPos = mContentWidget->pos();
 	// Now connect to the signal which gets emitted when any item on the grid
 // Check if the day has events
 if (monthDataArray[i].HasEvents()) {
 QModelIndex itemIndex = mModel->index(i,0);
 QVariant itemData = itemIndex.data(Qt::UserRole + 1);
 QVariantList list = itemData.toList();
-list.replace(CalendarNamespace::CalendarMonthEventRole, true);
+				if (list.count() > CalendarNamespace::CalendarMonthEventRole ) {
-mModel->itemFromIndex(itemIndex)->setData(list);
+	                list.replace(CalendarNamespace::CalendarMonthEventRole, true);
+	        mModel->itemFromIndex(itemIndex)->setData(list);
+				}
 }
 }
 	} else {
 	    mEventIndicatorNotSet = true;
 	}
 */
 void CalenMonthGrid::handlePrependingRows(QList<CalenMonthData > &monthDataList)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEPREPENDINGROWS_ENTRY );
-	QDateTime currDate = mView->getCurrentDay();
-	QDateTime currDateTime = CalenDateUtils::beginningOfDay( currDate );
 	int rowsInPrevMonth = mView->rowsInPrevMonth();
 	// Add the new days
 	int countToBeAdded = rowsInPrevMonth * KCalenDaysInWeek;
 	mModel->insertRows(0, countToBeAdded);
 		// Disable the focus role
 		itemData << false;
 		// Check for current day
-		if  (currDateTime == CalenDateUtils::beginningOfDay( dateTime )) {
+		if (QDate::currentDate() == dateTime.date()) {
 			// Set the underline icon attribute
 			itemData << true;
 		} else {
 			itemData << false;
 		}
 */
 void CalenMonthGrid::handleAppendingRows(QList<CalenMonthData > &monthDataList)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEAPPENDINGROWS_ENTRY );
-	QDateTime currDate = mView->getCurrentDay();
-	QDateTime currDateTime = CalenDateUtils::beginningOfDay( currDate );
 	int rowsInFutMonth = mView->rowsInFutMonth();
 	int countToBeAdded = rowsInFutMonth * KCalenDaysInWeek;
 	int lastVisibleIndex = monthDataList.count() - countToBeAdded;
 	int rowCount = mModel->rowCount();
 		// Disable the focus role
 		itemData << false;
 		// Check for current day
-		if (currDateTime == CalenDateUtils::beginningOfDay( dateTime )) {
+		if (QDate::currentDate() == dateTime.date()) {
 			// Set the underline icon attribute
 			itemData << true;
 		} else {
 			itemData << false;
 		}
 	OstTraceFunctionExit0( CALENMONTHGRID_SETCURRENTIDEX_EXIT );
 }
 /*!
-Function to override the default behavior of hbgridview on orientation change
-*/
-void CalenMonthGrid::orientationChanged(Qt::Orientation newOrientation)
-{
-OstTraceFunctionEntry0( CALENMONTHGRID_ORIENTATIONCHANGED_ENTRY );
-	// We are overriding this function to avoid the default behavior of
-	// hbgridview on orientation change as it swaps the row and column counts
-	// Calculate the proper index to be scrolled to
-	int rowsInPrevMonth;
-int itemToBeScrolled;
-QModelIndex indexToBeScrolled;
-	if (newOrientation == Qt::Horizontal) {
-		rowsInPrevMonth = mView->rowsInPrevMonth();
-		itemToBeScrolled = rowsInPrevMonth * KCalenDaysInWeek;
-		indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
-		mIsAtomicScroll = true;
-		scrollTo(indexToBeScrolled);
-	} else {
-		rowsInPrevMonth = mView->rowsInPrevMonth();
-		itemToBeScrolled = rowsInPrevMonth * KCalenDaysInWeek;
-		indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
-		mIsAtomicScroll = true;
-		scrollTo(indexToBeScrolled);
-		itemToBeScrolled = ((rowsInPrevMonth + KNumOfVisibleRows) *
-				KCalenDaysInWeek) - 1;
-		indexToBeScrolled = mModel->index(itemToBeScrolled, 0);
-		mIsAtomicScroll = true;
-		scrollTo(indexToBeScrolled);
-	}
-	OstTraceFunctionExit0( CALENMONTHGRID_ORIENTATIONCHANGED_EXIT );
-}
-/*!
 Paint function to draw grid lines
 */
 void CalenMonthGrid::paint(QPainter* painter,
 const QStyleOptionGraphicsItem* option,
 QWidget* widget)

changeset 81	ce92091cbd61
parent 75	7ac58b2aae6f
child 83	5aadd1120515