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

equal deleted inserted replaced

-:ef813d54df51
+:a5a1242fd2e8
 // System includes
 #include <QtGui>
 #include <qfont.h>
 #include <qicon.h>
 #include <qpainter.h>
+#include <qevent.h>
 #include <hblabel.h>
 #include <hbmainwindow.h>
 #include <hbframeitem.h>
 #include <hbframedrawer.h>
 #include <hbfontspec.h>
 	mIsNoEntriesAdded = true;
 	mIsGestureHandled = false;
 	mNoEntriesLabel = 0;
 	mHtDiff = 0.0;
 	mScrollDuration = 0;
+	mPreviewTextColor = HbColorScheme::color("qtc_cal_day_preview_text");
 	setAcceptDrops(true);
 	setScrollDirections(Qt::Vertical);
 	setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
 	// Connect the scrollig finished signal
 {
 OstTraceFunctionEntry0( CALENPREVIEWPANE_SETNOENTRIESLABEL_ENTRY );
 	mNoEntriesLabel = label;
+	if (mPreviewTextColor.isValid()) {
+		mNoEntriesLabel->setTextColor(mPreviewTextColor);
+	}
 	OstTraceFunctionExit0( CALENPREVIEWPANE_SETNOENTRIESLABEL_EXIT );
 }
 /*!
 Populates the preview with proper data
 	mScrollDirection = up;
 	// Scroll contents to zero position before we display to the user
 	// if it was scrolling already or timer was running
 	mNumOfScrolls = 0;
+	mScrollDuration = 0;
 	stopScrolling();
 	mDate = date;
 	// Get Instances for the day
 															(content->layout());
 	int instanceCount = mInstanceArray.count();
 	HbFontSpec font(HbFontSpec::Secondary);
 	if (mIsNoEntriesAdded) {
 		if (!instanceCount) {
+			if (mPreviewTextColor.isValid()) {
+				mNoEntriesLabel->setTextColor(mPreviewTextColor);
+			}
 		    mNoEntriesLabel->setVisible(true);
 		    OstTraceFunctionExit0( CALENPREVIEWPANE_POPULATELABEL_EXIT );
 		    return;
 		} else {
 			// Remove the no entries label
 				label = new HbLabel(this);
 				// Set the required font
 				label->setFontSpec(font);
-				// Set the text color from the theme
-				QColor previewPaneColor = HbColorScheme::color(
-												"qtc_cal_day_preview_text");
-				if (previewPaneColor.isValid()) {
-				    label->setTextColor(previewPaneColor);
-				}
 				// Set the elide mode to right
 				label->setElideMode(Qt::ElideRight);
 				// Add the label to the list
 				mLabelList.append(label);
 				layout->addItem(label);
 			} else {
 				// Reuse the same label
 				label = mLabelList.at(i);
 				count--;
+			}
+			if (mPreviewTextColor.isValid()) {
+				label->setTextColor(mPreviewTextColor);
 			}
 			QString summary = mInstanceArray[i].summary();
 			if(!summary.length()) {
 				// No summary display "Unnamed"
 				summary.append(hbTrId("txt_calendar_preview_unnamed"));
 			}
 		}
 		// Clear the list
 		mLabelList.clear();
+		if (mPreviewTextColor.isValid()) {
+			mNoEntriesLabel->setTextColor(mPreviewTextColor);
+		}
 		// Add the no entries text to the preview pane
 		mNoEntriesLabel->setVisible(true);
 		mIsNoEntriesAdded = true;
 	}
 	layout->activate();
 	if (mIsNoEntriesAdded) {
 		scrollContentsTo(QPointF(0.0,0.0));
 		OstTraceFunctionExit0( CALENPREVIEWPANE_STARTAUTOSCROLL_EXIT );
 		return;
 	}
+	// Stop the timer
+	mTwoSecTimer->stop();
+	// Set the proper scroll direction
+	mScrollDirection = up;
 	// Start the 2 seconds timer
 	mTwoSecTimer->setSingleShot(true);
 	connect(mTwoSecTimer, SIGNAL(timeout()), this, SLOT(onTwoSecondsTimeout()));
 	mTwoSecTimer->start(TWO_SECONDS_TIMER);
 mScrollDuration = mHtDiff / SCROLLING_SPEED;
 }
 	}
 // Start the scrolling in the proper direction
-	if (mScrollDirection == up) {
+	if (mScrollDirection == up && mScrollDuration) {
 		// Start scrolling upwards
 		mScrollDirection = down;
 		mNumOfScrolls++;
 		QPointF targetPos(0.0, -mHtDiff);
 scrollContentsTo(-targetPos, mScrollDuration * 1000);
-	} else if (mScrollDirection == down) {
+	} else if (mScrollDirection == down && mScrollDuration) {
 		mScrollDirection = up;
 		mNumOfScrolls++;
 		// Start scrolling downwards
 		QPointF targetPos(0.0, 0.0);
 scrollContentsTo(targetPos, mScrollDuration * 1000);
 }
 } else if(QTapGesture *tapGesture = qobject_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {
 if (tapGesture && tapGesture->state() == Qt::GestureFinished) {
 	HbInstantFeedback::play(HbFeedback::Basic);
 // Preview pane tapped
+	// Stop the scrolling first
+	stopScrolling();
+	// Issue command to launch agenda view
 mServices.IssueCommandL(ECalenAgendaView);
+mView->disconnectAboutToQuitEvent();
 event->accept(Qt::TapGesture);
 }
 }
-OstTraceFunctionExit0( DUP2_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
+OstTraceFunctionExit0( DUP3_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
 }
 /*!
 Set monthview pointer
 */
 */
 void CalenPreviewPane::stopScrolling()
 {
 OstTraceFunctionEntry0( CALENPREVIEWPANE_STOPSCROLLING_ENTRY );
-	if (isScrolling() || mTwoSecTimer->isActive()) {
+mTwoSecTimer->stop();
+	if (isScrolling()) {
+mNumOfScrolls = 0; // required so that timer will not get started again in
+// scrollingFinished() slot
+// Stop the scrolling by sending the foucs out event
+QFocusEvent* focusEvent = new QFocusEvent(QFocusEvent::FocusOut, Qt::MouseFocusReason);
+focusOutEvent(focusEvent);
+// Set the contents position to zero
 		scrollContentsTo(QPointF(0.0,0.0));
-		// Call pan gesture with zero delta just to stop the scfrolling
-		HbScrollArea::panGesture(QPointF(0.0,0.0));
-		mTwoSecTimer->stop();
 	}
 	OstTraceFunctionExit0( CALENPREVIEWPANE_STOPSCROLLING_EXIT );
 }
 void CalenPreviewPane::effectFinished()
 {
 mIsGestureHandled = false;
 }
+/*!
+Slot to handle the change in theme
+*/
+void CalenPreviewPane::handleThemeChange()
+{
+OstTraceFunctionEntry0( CALENPREVIEWPANE_HANDLETHEMECHANGE_ENTRY );
+mPreviewTextColor = HbColorScheme::color("qtc_cal_day_preview_text");
+OstTraceFunctionExit0( CALENPREVIEWPANE_HANDLETHEMECHANGE_EXIT );
+}
 // End of file  --Don't remove this.

changeset 68	a5a1242fd2e8
parent 58	ef813d54df51
child 77	b0711afde476