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

equal deleted inserted replaced

-:27feeedec790
+:7ac58b2aae6f
 	mCurrentRow(-100),
 	mIsNonActiveDayFocused(false),
 	mIgnoreItemActivated(false),
 	mGridLineColor(HbColorScheme::color("qtc_cal_grid_line")),
 mActiveDatesSet(false),
-mIsGridAdjusting(false)
+mIsGridAdjusting(false),
+mEventIndicatorNotSet(false)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_CALENMONTHGRID_ENTRY );
 	setScrollDirections(Qt::Vertical);
 	setRowCount(KNumOfVisibleRows);
 	setColumnCount(KCalenDaysInWeek);
-	setLongPressEnabled(false);
 	setItemRecycling(false);
 	setSelectionMode(HbGridView::NoSelection);
 	setUniformItemSizes(true);
 	setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
 	setClampingStyle(HbScrollArea::StrictClamping);
 	setEnabledAnimations(HbAbstractItemView::None);
 	setFrictionEnabled(false);
 	setFlag(QGraphicsItem::ItemHasNoContents, false);
+	// Enable the pixmap cache for better scrolling performance
+	setItemPixmapCacheEnabled(true);
 	// Disable the rows and columns swapping on orientation change
 	setSwapDimensionsOnOrientationChange(false);
 	resetTransform();
 		CalenGridItemPrototype* gridItemPrototype = new CalenGridItemPrototype(this);
 	    connect(
 	            HbTheme::instance(), SIGNAL(changed()),
 	            gridItemPrototype, SLOT(handleThemeChange()));
-		// Set the mode and the prototype
-		setModel(mModel,gridItemPrototype);
 		// Register the widgetml and css files
 		HbStyleLoader::registerFilePath(":/");
 		// Set the layout name
 		setLayoutName("calendarCustomGridItem");
+		// Set the mode and the prototypec --> set it after setting layout name and
+		// other things as it will avoid unnecessary polish calls
+setModel(mModel,gridItemPrototype);
 	} else {
 		// Since, we have finished setData, Now unblock the signals
 		mModel->blockSignals(false);
 		// Since till now, we had blocked signals being generated frm the mode
 	// Now connect to the signal which gets emitted when any item on the grid
 	// is tapped.
 	connect(this, SIGNAL(activated(const QModelIndex &)), this,
 						SLOT(itemActivated(const QModelIndex &)));
+	// Check if we need to set the event indicators
+	if(mEventIndicatorNotSet) {
+	    mEventIndicatorNotSet = false;
+	    updateMonthGridWithEventIndicators(monthDataArray);
+	}
 	OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDWITHINACTIVEMONTHS_EXIT );
 }
 /*!
 	Updates the view with just event indicators
 										QList<CalenMonthData> &monthDataArray)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_ENTRY );
 	int count(monthDataArray.count());
-	for(int i = 0; i < count; i++) {
-		// Check if the day has events
+	// Check if model is updated with all the dates
-		if (monthDataArray[i].HasEvents()) {
+	// If not, return false for later updation
-			QModelIndex itemIndex = mModel->index(i,0);
+	if(count == mModel->rowCount()) {
-			QVariant itemData = itemIndex.data(Qt::UserRole + 1);
+for(int i = 0; i < count; i++) {
-			QVariantList list = itemData.toList();
+// Check if the day has events
-			list.replace(CalendarNamespace::CalendarMonthEventRole, true);
+if (monthDataArray[i].HasEvents()) {
-			mModel->itemFromIndex(itemIndex)->setData(list);
+QModelIndex itemIndex = mModel->index(i,0);
-		}
+QVariant itemData = itemIndex.data(Qt::UserRole + 1);
+QVariantList list = itemData.toList();
+list.replace(CalendarNamespace::CalendarMonthEventRole, true);
+mModel->itemFromIndex(itemIndex)->setData(list);
+}
+}
+	} else {
+	    mEventIndicatorNotSet = true;
 	}
 	OstTraceFunctionExit0( CALENMONTHGRID_UPDATEMONTHGRIDWITHEVENTINDICATORS_EXIT );
 }
 */
 void CalenMonthGrid::gestureEvent(QGestureEvent *event)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_GESTUREEVENT_ENTRY );
-// Dont listem for any gesture when grid is getting adjusted as listening to those was causing
+// Dont listen for any gesture when grid is getting adjusted as listening to those was causing
 // grid to stop abruptly i between
 if (mIsGridAdjusting) {
 // consume the event and return
 qDebug()<<"RETURNING BACK";
 event->ignore();
 // calculate the direction explicitly
 // Get to know the direction of the gesture
 // Use our defined threshold temporarily till scrollarea
 // frm orbit side is made clever enough not to scroll in other direction
 // apart frm the registered scroll direction
-QPointF delta = gesture->delta();
+QPointF delta = gesture->sceneOffset();
-// Check the current orientation of the device and
+qreal horizontalDiff = delta.x();
-// swap the vertical and horizontal distances in landscape
+qreal verticalDiff = delta.y();
-qreal horizontalDiff = 0.0;
-qreal verticalDiff = 0.0;
-if (hbInstance->allMainWindows().at(0)->orientation() == Qt::Vertical) {
-horizontalDiff = delta.x();
-verticalDiff = delta.y();
-} else {
-horizontalDiff = delta.y();
-verticalDiff = delta.x();
-}
 if (abs(horizontalDiff) > MAX_PAN_DIRECTION_THRESHOLD) {
 // Now see if y coord diff has crossed threshold
 if (verticalDiff > MAX_PAN_DIRECTION_THRESHOLD) {
 mIsPanGesture = true;
 mIgnoreItemActivated = true;
 handlePanGestureFinished();
 }
 }
 }
+// Check if we can scroll
+if (!checkIfWeCanScroll(mDirection)) {
+// We cannot scroll, return back
+mIsPanGesture = false;
+mIgnoreItemActivated = false;
+mDirection = invalid;
+event->accept(Qt::PanGesture);
+}
 if (mDirection!= invalid) {
 // Call the parent class to perform the pan gesture
 // When scrolling finished, month grid will adjust to show the proper month
 HbScrollArea::gestureEvent(event);
 }
 */
 void CalenMonthGrid::itemActivated(const QModelIndex &index)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_ITEMACTIVATED_ENTRY );
-	if (mIgnoreItemActivated) {
+QList<CalenMonthData >& monthDataList = mView->monthDataList();
+// Chekc if we need to ignore the event or the newly tapped date is
+// not valid date
+	if (mIgnoreItemActivated || !(CalenDateUtils::isValidDay(monthDataList[index.row()].Day()))) {
 		mIgnoreItemActivated = false;
 		OstTraceFunctionExit0( CALENMONTHGRID_ITEMACTIVATED_EXIT );
 		return;
 	}
 	mIsNonActiveDayFocused = false;
 	// Check if the same item has been tapped twice
 	if (mCurrentRow == index.row()) {
 		// Launch the Day view
 		mView->launchDayView();
 								 true);
 		mModel->itemFromIndex(itemIndex)->setData(list);
 		// Check if inactive date is tapped
 		QDateTime activeMonth = mView->getActiveDay();
 		int month = activeMonth.date().month();
-		QList<CalenMonthData >& monthDataList = mView->monthDataList();
 		if(month != monthDataList[mCurrentRow].Day().date().month()){
 			// Set the flag
 			mIsNonActiveDayFocused = true;
 			QDateTime nonActiveFocusedDay = monthDataList[mCurrentRow].Day();
 */
 void CalenMonthGrid::orientationChanged(Qt::Orientation newOrientation)
 {
 OstTraceFunctionEntry0( CALENMONTHGRID_ORIENTATIONCHANGED_ENTRY );
-Q_UNUSED(newOrientation)
 	// 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;
 	OstTraceFunctionExit0( CALENMONTHGRID_PAINT_EXIT );
 }
 /*!
+Function to check if scrolling is allowed. This function will make an effect
+only when you are going to month that is not supported by us.
+*/
+bool CalenMonthGrid::checkIfWeCanScroll(scrollDirection direction)
+{
+OstTraceFunctionEntry0( CALENMONTHGRID_CHECKIFWECANSCROLL_ENTRY );
+bool value = true;
+// Get the current active Date
+QDateTime activeDate = mView->getActiveDay();
+// if direction is up, then check if the next month is
+// not January, 2101
+if (direction == up) {
+QDateTime nextMonth = activeDate.addMonths(1);
+value = CalenDateUtils::isValidDay(nextMonth);
+} else if (direction == down) { // if direction is up, then check if the next month is
+// not December, 1899
+QDateTime prevMonth = activeDate.addMonths(-1);
+value = CalenDateUtils::isValidDay(prevMonth);
+}
+OstTraceFunctionExit0( CALENMONTHGRID_CHECKIFWECANSCROLL_EXIT );
+return value;
+}
+/*!
 Slot to handle the change in theme
 */
 void CalenMonthGrid::handleThemeChange()
 {
 OstTraceFunctionEntry0(CALENMONTHGRID_HANDLETHEMECHANGE_ENTRY);

changeset 75	7ac58b2aae6f
parent 70	a5ed90760192
child 81	ce92091cbd61