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

equal deleted inserted replaced

-:fd30d51f876b
+:b6db4fd4947b
 #include <hbmainwindow.h>
 #include <hbframeitem.h>
 #include <hbframedrawer.h>
 #include <hbfontspec.h>
 #include <hbcolorscheme.h>
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
 #include <agendautil.h>
 #include <agendaentry.h>
 //user includes
 #include "calenagendautils.h"
 #include "calenpreviewpane.h"
 #include "calenmonthview.h"
 // Macros
 #define TWO_SECONDS_TIMER 2000 // millseconds
-#define SCROLLING_SPEED 50
+#define SCROLLING_SPEED 10
+#define MAX_PAN_DIRECTION_THRESHOLD 50
+#define MIN_PAN_DIRECTION_THRESHOLD 20
 static const QString EMPTYSTRING(" ");
 /*!
 Constructor
 	mTwoSecTimer = new QTimer(this);
 	mScrollDirection = invalid;
 	mIsNoEntriesAdded = true;
 	mIsGestureHandled = false;
 	mNoEntriesLabel = 0;
+	mHtDiff = 0.0;
+	mScrollDuration = 0;
 	setAcceptDrops(true);
 	setScrollDirections(Qt::Vertical);
 	setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
 	// Connect the scrollig finished signal
 	// Get Instances for the day
 	GetInstanceListL();
 	// Get the content of the scroll area
-	QGraphicsWidget* content = this->contentWidget();
+	QGraphicsWidget* content = contentWidget();
 	// Adjust the layout
 	QGraphicsLinearLayout* layout = static_cast<QGraphicsLinearLayout *>
 															(content->layout());
 	int instanceCount = mInstanceArray.count();
 	HbFontSpec font(HbFontSpec::Secondary);
 			QString summary = mInstanceArray[i].summary();
 			if(!summary.length()) {
 				// No summary display "No subject"
 				summary.append(hbTrId("txt_calendar_dblist_unnamed"));
 			}
-			QDateTime startTime = mInstanceArray[i].startTime();
+			// Chcek the entry type, based on the type display time field in
-			HbExtendedLocale systemLocale =HbExtendedLocale::system();
+			// preview pane.
-			QString start = systemLocale.format(startTime.time(),
+			QString start;
-			                                    r_qtn_time_usual_with_zero);
+			if(mInstanceArray[i].type() != AgendaEntry::TypeTodo ) {
-			start.append(EMPTYSTRING);
+				QDateTime startTime = mInstanceArray[i].startTime();
+				HbExtendedLocale systemLocale =HbExtendedLocale::system();
+				start = systemLocale.format(startTime.time(),
+				                                    r_qtn_time_usual_with_zero);
+				start.append(EMPTYSTRING);
+			}
 			// Append summary to start time
 			QString text = start.append(summary);
 			label->setPlainText(text);
 			layout->setStretchFactor(label,0);
 		}
 */
 void CalenPreviewPane::startAutoScroll()
 {
 	if (mIsNoEntriesAdded) {
 		scrollContentsTo(QPointF(0.0,0.0));
-		// Call pan gesture with zero delta just to stop the scfrolling
-		HbScrollArea::panGesture(QPointF(0.0,0.0));
 		return;
 	}
 	// Start the 2 seconds timer
 	mTwoSecTimer->setSingleShot(true);
 void CalenPreviewPane::onTwoSecondsTimeout()
 {
 	mTwoSecTimer->stop();
 	disconnect(mTwoSecTimer, SIGNAL(timeout()),
 										   this, SLOT(onTwoSecondsTimeout()));
-	// Start the scrolling in the proper direction
+	// Calculate the timer and the height difference of pane and its content
+	if (!mScrollDuration) {
+qreal contentHeight = contentWidget()->size().height();
+qreal paneHeight = size().height();
+mHtDiff = contentHeight - paneHeight;
+if (mHtDiff > 0) { // content is more than widget height, we need to scroll
+mScrollDuration = mHtDiff / SCROLLING_SPEED;
+}
+	}
+// Start the scrolling in the proper direction
 	if (mScrollDirection == up) {
 		// Start scrolling upwards
 		mScrollDirection = down;
 		mNumOfScrolls++;
-		upGesture(SCROLLING_SPEED);
+		QPointF targetPos(0.0, -mHtDiff);
+scrollContentsTo(-targetPos, mScrollDuration * 1000);
 	} else if (mScrollDirection == down) {
 		mScrollDirection = up;
 		mNumOfScrolls++;
 		// Start scrolling downwards
-		downGesture(SCROLLING_SPEED);
+		QPointF targetPos(0.0, 0.0);
+scrollContentsTo(targetPos, mScrollDuration * 1000);
 	}
 }
 /*!
 Slot to handle scrolling finished
 	connect(mTwoSecTimer, SIGNAL(timeout()), this, SLOT(onTwoSecondsTimeout()));
 	mTwoSecTimer->start(TWO_SECONDS_TIMER);
 }
 /*!
-Function to listen mouse press events
+Function to listen for all gestures
 */
-void CalenPreviewPane::mousePressEvent(QGraphicsSceneMouseEvent* event)
+void CalenPreviewPane::gestureEvent(QGestureEvent *event)
 {
-	mIsGestureHandled = false;
+if(HbPanGesture *gesture = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))) {
-	mPressedPos = event->pos();
+if (gesture->state() == Qt::GestureStarted) {
-	event->accept();
+// TODO: This work aroung till framework provides an api
-}
+// to know the direciton of the pan, until then we need
+// calculate the direction explicitly
-/*!
+// Get to know the direction of the gesture
-Function to listen mouse release events
+QPointF delta = gesture->delta();
-*/
+if (abs(delta.y()) > MAX_PAN_DIRECTION_THRESHOLD) {
-void CalenPreviewPane::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+// Now see if y coord diff has crossed threshold
-{
+if (delta.x() > MAX_PAN_DIRECTION_THRESHOLD) {
-	qreal posDiff = mPressedPos.x()-event->pos().x();
+mIsGestureHandled = true;
-	if (abs(posDiff) < 50 && !mIsGestureHandled) {
+// right gesture
-		// Preview pane tapped
+mView->handlePreviewPaneGesture(true);
-		mServices.IssueCommandL(ECalenDayView);
+event->accept(Qt::PanGesture);
-	}
+} else if (delta.x() < -MAX_PAN_DIRECTION_THRESHOLD){
-	event->accept();
+mIsGestureHandled = true;
-}
+// left gesture
+mView->handlePreviewPaneGesture(false);
-/*!
+event->accept(Qt::PanGesture);
-Function to listen mouse move events
+} else {
-*/
+event->accept(Qt::PanGesture);
-void CalenPreviewPane::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
+return;
-{
+}
-	qreal posDiff = mPressedPos.x()-event->pos().x();
+} else if (abs(delta.y()) < MAX_PAN_DIRECTION_THRESHOLD) {
-	if (posDiff < -50) {
+if (delta.x() > MIN_PAN_DIRECTION_THRESHOLD) {
-		mIsGestureHandled = true;
+mIsGestureHandled = true;
-		// right gesture
+// right gesture
-		mView->handlePreviewPaneGesture(true);
+mView->handlePreviewPaneGesture(true);
-	} else if (posDiff > 50) {
+event->accept(Qt::PanGesture);
-		mIsGestureHandled = true;
+} else if (delta.x() < -MIN_PAN_DIRECTION_THRESHOLD){
-		// left gesture
+mIsGestureHandled = true;
-		mView->handlePreviewPaneGesture(false);
+// left gesture
-	}
+mView->handlePreviewPaneGesture(false);
-	event->accept();
+event->accept(Qt::PanGesture);
+}else {
+event->accept(Qt::PanGesture);
+return;
+}
+}
+}
+} else if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+if (gesture->state() == Qt::GestureFinished) {
+if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+// Preview pane tapped
+mServices.IssueCommandL(ECalenAgendaView);
+event->accept(Qt::TapGesture);
+}
+}
+}
 }
 /*!
 Set monthview pointer
 */

changeset 45	b6db4fd4947b
parent 23	fd30d51f876b
child 51	0b38fc5b94c6