[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps] dolphin/src/kitemviews: Respect the
From:       Tirtha Chatterjee <tirtha.p.chatterjee () gmail ! com>
Date:       2011-08-27 10:32:48
Message-ID: 20110827103248.29AFFA6078 () git ! kde ! org
[Download RAW message or body]

Git commit b0db096e4a3efc58da1c341b9259eb890e90d451 by Tirtha Chatterjee.
Committed on 27/08/2011 at 12:25.
Pushed by chatterjee into branch 'master'.

Respect the KGlobalSettings::singleClick() attribute, function accordingly

REVIEW: 102447

M  +14   -2    dolphin/src/kitemviews/kitemlistcontroller.cpp

http://commits.kde.org/kde-baseapps/b0db096e4a3efc58da1c341b9259eb890e90d451

diff --git a/dolphin/src/kitemviews/kitemlistcontroller.cpp \
b/dolphin/src/kitemviews/kitemlistcontroller.cpp index 29e2f47..2e32880 100644
--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
+++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
@@ -32,6 +32,7 @@
 #include <QGraphicsSceneEvent>
 #include <QMimeData>
 
+#include <KGlobalSettings>
 #include <KDebug>
 
 KItemListController::KItemListController(QObject* parent) :
@@ -389,6 +390,8 @@ bool \
KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con  } else \
                if (shiftOrControlPressed) {
                 // The mouse click should only update the selection, not trigger the \
item  emitItemClicked = false;
+            } else if (!KGlobalSettings::singleClick()) {
+                emitItemClicked = false;
             }
         }
 
@@ -407,8 +410,15 @@ bool \
KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con  
 bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event, \
const QTransform& transform)  {
-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    const QPointF pos = transform.map(event->pos());
+    const int index = m_view->itemAt(pos);
+
+    bool emitItemClicked = !KGlobalSettings::singleClick() &&
+                           (event->button() & Qt::LeftButton) &&
+                           index >= 0 && index < m_model->count();
+    if (emitItemClicked) {
+        emit itemClicked(index, event->button());
+    }
     return false;
 }
 
@@ -546,6 +556,8 @@ bool KItemListController::processEvent(QEvent* event, const \
                QTransform& transfor
         return mouseMoveEvent(static_cast<QGraphicsSceneMouseEvent*>(event), \
QTransform());  case QEvent::GraphicsSceneMouseRelease:
         return mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(event), \
QTransform()); +    case QEvent::GraphicsSceneMouseDoubleClick:
+        return mouseDoubleClickEvent(static_cast<QGraphicsSceneMouseEvent*>(event), \
QTransform());  case QEvent::GraphicsSceneWheel:
          return wheelEvent(static_cast<QGraphicsSceneWheelEvent*>(event), \
QTransform());  case QEvent::GraphicsSceneDragEnter:


[prev in list] [next in list] [prev in thread] [next in thread]