FCL/sf/app/recents: comparison logsui/logsapp/src/logsrecentcallsview.cpp

equal deleted inserted replaced

-:76d2cf7a585e
+:90fe74753f71
 #include "logscomponentrepository.h"
 #include "logsabstractviewmanager.h"
 #include "logsmodel.h"
 #include "logsdefs.h"
 #include "logslogger.h"
-#include "logscall.h"
-#include "logsmessage.h"
-#include "logscontact.h"
 #include "logseffecthandler.h"
 #include "logsmatchesmodel.h"
 #include "logspageindicator.h"
 #include "logsconfigurationparams.h"
 #include <hbswipegesture.h>
 #include <hbmessagebox.h>
 #include <hbactivitymanager.h>
 #include <hbstyleloader.h>
 #include <QTimer>
-#include <QApplication>
 Q_DECLARE_METATYPE(LogsMatchesModel*)
 const int logsMissedCallsMarkingDelayMs = 1000;
 // View update is needed when we activate view for the first time (!mFilter)
 // or if view has to be changed
 if (  !mFilter || ( !args.isNull() && (mCurrentView != view) ) ) {
 updateView( view );
-}
+} else {
 activateEmptyListIndicator(mFilter);
+handleMissedCallsCounter();
+}
 mPageIndicator->setActiveItemIndex(mConversionMap.value(mCurrentView));
 if (mEmptyListLabel) {
 mEmptyListLabelX = mEmptyListLabel->pos().x();
 }
-qApp->installEventFilter(this);
 LogsBaseView::activationCompleted();
 LOGS_QDEBUG( "logs [UI] <- LogsRecentCallsView::activated()" );
 }
 //base class handling first
 LogsBaseView::deactivated();
 deactivateEmptyListIndicator(mFilter);
-qApp->removeEventFilter(this);
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 LOGS_QDEBUG_2( "logs [UI] -> LogsRecentCallsView::updateView(), view:", view );
 mCurrentView = view;
 LogsFilter::FilterType filter = getFilter( view );
 updateFilter(filter);
 updateViewName();
 updateContextMenuItems(mCurrentView);
+handleMissedCallsCounter();
 LOGS_QDEBUG( "logs [UI] <- LogsRecentCallsView::updateView()" );
 }
 // -----------------------------------------------------------------------------
 // LogsRecentCallsView::changeFilter
 mListView->setModel( mFilter );//ownership not transferred
 scrollToTopItem(mListView);
 activateEmptyListIndicator(mFilter);
 LOGS_QDEBUG( "logs [UI] <- LogsRecentCallsView::updateFilter() " );
 }  else {
 LOGS_QWARNING( "logs [UI] LogsRecentCallsView::updateFilter(), !no list widget!" );
 }
 }
 break;
 }
 return filter;
 }
-// -----------------------------------------------------------------------------
-// LogsRecentCallsView::eventFilter
-// -----------------------------------------------------------------------------
-//
-bool LogsRecentCallsView::eventFilter(QObject *obj, QEvent *event)
-{
-//This is a hack to fix ou1cimx1#481152(horizontal swiping initiates call)
-//Since w26 HbAbstractViewItemPrivate is setting threshold for Tap gesture
-//to be the bounding rect (i.e. if swiping is happening inside one list item
-//it will also be considered as a tap => item activated => call)
-//We are trying to prevent usage of the list item rect threshold by
-//setting "horizontallyRestricted" property.
-//See HbAbstractViewItemPrivate::tapTriggered() and
-//HbTapGestureLogic::handleMouseMove() for more info
-if (event->type() == QEvent::Gesture) {
-QGestureEvent* gesture = static_cast<QGestureEvent*> (event);
-QTapGesture* tap = qobject_cast<QTapGesture*>(gesture->gesture(Qt::TapGesture));
-//only change property if swiping on our list, since for the menu it is
-//fine to generate tap gesture event during swiping on one item
-bool tapOnListView = (mListView && mListView->currentViewItem() == obj);
-if (tap && tapOnListView && tap->state() == Qt::GestureStarted) {
-tap->setProperty("horizontallyRestricted", true);
-LOGS_QDEBUG( "logs [UI] TapGesture on list, setting horizontallyRestricted" );
-}
-}
-return LogsBaseView::eventFilter(obj,event);
-}
 // -----------------------------------------------------------------------------
 // LogsRecentCallsView::gestureEvent
 // -----------------------------------------------------------------------------
 //
 void LogsRecentCallsView::gestureEvent(QGestureEvent *event)
 {
 QGesture* gesture = event->gesture(Qt::SwipeGesture);
 if (gesture) {
 LOGS_QDEBUG( "logs [UI] -> LogsRecentCallsView::gestureEvent()" );
 HbSwipeGesture* swipe = static_cast<HbSwipeGesture *>(gesture);
-if (swipe && swipe->state() == Qt::GestureFinished) {
+if (swipe) {
-LOGS_QDEBUG_2( "logs [UI] sceneSwipeAngle: ", swipe->sceneSwipeAngle() );
-LOGS_QDEBUG_2( "logs [UI] swipeAngle: ", swipe->swipeAngle() );
 QSwipeGesture::SwipeDirection direction = swipe->sceneHorizontalDirection();
-if ( decideListMoveDirection(direction) )
+if (swipe->state() == Qt::GestureStarted) {
-event->accept(Qt::SwipeGesture);
+//fix for ou1cimx1#481152, if policy not set then every swipe
+//within list item boundaries will also activate list item
+if (direction == QSwipeGesture::Left
+|| direction == QSwipeGesture::Right) {
+swipe->setGestureCancelPolicy(QGesture::CancelAllInContext);
+LOGS_QDEBUG( "logs [UI] swipe->state() == Qt::GestureStarted" );
+}
+} else  if (swipe->state() == Qt::GestureFinished) {
+LOGS_QDEBUG_2( "logs [UI] sceneSwipeAngle: ", swipe->sceneSwipeAngle() );
+LOGS_QDEBUG_2( "logs [UI] swipeAngle: ", swipe->swipeAngle() );
+if ( decideListMoveDirection(direction) ) {
+event->accept(Qt::SwipeGesture);
+}
 }
 }
+}
 }
 // -----------------------------------------------------------------------------
 // LogsRecentCallsView::decideListMoveDirection
 // -----------------------------------------------------------------------------
 if ( layoutDirection() == Qt::RightToLeft ){
 return !toLeft;
 }
 return toLeft;
 }
+// -----------------------------------------------------------------------------
+// LogsRecentCallsView::handleMissedCallsCounter
+// -----------------------------------------------------------------------------
+//
+void LogsRecentCallsView::handleMissedCallsCounter()
+{
+if (mModel && mCurrentView == XQService::LogsViewMissed) {
+LOGS_QDEBUG( "logs [UI] <-> LogsRecentCallsView::clearMissedCallsCounter()" );
+mModel->clearMissedCallsCounter();
+}
+}

changeset 17	90fe74753f71
parent 15	76d2cf7a585e
child 18	acd4e87b24b4