The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / views / viewextensionsfactory.cpp

diff --git a/src/views/viewextensionsfactory.cpp b/src/views/viewextensionsfactory.cpp
index 6d4ab09caef9d13b1651288d09facc1fb68f3ffc..5dabd66cc4ac2e69622919660acdc1a3069407c5 100644 (file)
--- a/src/views/viewextensionsfactory.cpp
+++ b/src/views/viewextensionsfactory.cpp
@@ -43,7 +43,6 @@ ViewExtensionsFactory::ViewExtensionsFactory(QAbstractItemView* view,
                                              DolphinViewController* dolphinViewController,
                                              const ViewModeController* viewModeController) :
     QObject(view),
                                              DolphinViewController* dolphinViewController,
                                              const ViewModeController* viewModeController) :
     QObject(view),

-    m_appliedPointingHandCursor(false),

     m_view(view),
     m_dolphinViewController(dolphinViewController),
     m_toolTipManager(0),
     m_view(view),
     m_dolphinViewController(dolphinViewController),
     m_toolTipManager(0),


@@ -129,10 +128,6 @@ ViewExtensionsFactory::ViewExtensionsFactory(QAbstractItemView* view,
             this, SLOT(slotNameFilterChanged(const QString&)));
 
     view->viewport()->installEventFilter(this);
             this, SLOT(slotNameFilterChanged(const QString&)));
 
     view->viewport()->installEventFilter(this);

-
-    // Apply a pointing-hand cursor when hovering files
-    connect(view, SIGNAL(entered(const QModelIndex&)), SLOT(applyPointingHandCursor()));
-    connect(view, SIGNAL(viewportEntered()), SLOT(restoreCursor()));

 }
 
 ViewExtensionsFactory::~ViewExtensionsFactory()
 }
 
 ViewExtensionsFactory::~ViewExtensionsFactory()


@@ -162,21 +157,9 @@ bool ViewExtensionsFactory::autoFolderExpandingEnabled() const
 bool ViewExtensionsFactory::eventFilter(QObject* watched, QEvent* event)
 {
     Q_UNUSED(watched);
 bool ViewExtensionsFactory::eventFilter(QObject* watched, QEvent* event)
 {
     Q_UNUSED(watched);

-
-    switch (event->type()) {
-    case QEvent::Wheel:
-        if (m_selectionManager != 0) {
-            m_selectionManager->reset();
-        }
-        break;
-
-    case QEvent::Leave:
-        restoreCursor();
-        break;
-
-    default: break;
+    if ((event->type() == QEvent::Wheel) && (m_selectionManager != 0)) {
+        m_selectionManager->reset();

     }
     }

-

     return false;
 }
 
     return false;
 }
 


@@ -253,22 +236,6 @@ void ViewExtensionsFactory::requestActivation()
     m_dolphinViewController->requestActivation();
 }
 
     m_dolphinViewController->requestActivation();
 }
 

-void ViewExtensionsFactory::applyPointingHandCursor()
-{
-    if (!m_appliedPointingHandCursor &&  !(QApplication::mouseButtons() & Qt::LeftButton)) {
-        QApplication::setOverrideCursor(QCursor(Qt::PointingHandCursor));
-        m_appliedPointingHandCursor = true;
-    }
-}
-
-void ViewExtensionsFactory::restoreCursor()
-{
-    if (m_appliedPointingHandCursor) {
-        QApplication::restoreOverrideCursor();
-        m_appliedPointingHandCursor = false;
-    }
-}
-

 DolphinSortFilterProxyModel* ViewExtensionsFactory::proxyModel() const
 {
     return static_cast<DolphinSortFilterProxyModel*>(m_view->model());
 DolphinSortFilterProxyModel* ViewExtensionsFactory::proxyModel() const
 {
     return static_cast<DolphinSortFilterProxyModel*>(m_view->model());