Opening a tab with the middle mouse button should always be done with one click,...

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index abbae6ec790c567eb0c05e41bf4869c2ac77d522..fe8c426f33acb544173441406ac883f46fa3196b 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -29,7 +29,7 @@
 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
     m_zoomLevel(0),
-    m_openTab(false),
+    m_mouseButtons(Qt::NoButton),
     m_url(),
     m_dolphinView(dolphinView),
     m_itemView(0)
@@ -52,7 +52,7 @@ void DolphinController::setItemView(QAbstractItemView* view)
 {
     if (m_itemView != 0) {
         disconnect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
-                   this, SLOT(updateOpenTabState()));
+                   this, SLOT(updateMouseButtonState()));
     }
 
     m_itemView = view;
@@ -62,7 +62,7 @@ void DolphinController::setItemView(QAbstractItemView* view)
         
         // TODO: this is a workaround until  Qt-issue 176832 has been fixed
         connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
-                this, SLOT(updateOpenTabState()));
+                this, SLOT(updateMouseButtonState()));
     }
 }
 
@@ -84,11 +84,11 @@ void DolphinController::requestActivation()
     emit activated();
 }
 
-void DolphinController::indicateDroppedUrls(const KUrl::List& urls,
+void DolphinController::indicateDroppedUrls(const KFileItem& destItem,
                                             const KUrl& destPath,
-                                            const KFileItem& destItem)
+                                            QDropEvent* event)
 {
-    emit urlsDropped(urls, destPath, destItem);
+    emit urlsDropped(destItem, destPath, event);
 }
 
 
@@ -153,6 +153,11 @@ void DolphinController::replaceUrlByClipboard()
     }
 }
 
+void DolphinController::emitHideToolTip()
+{
+    emit hideToolTip();
+}
+
 KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 {
     Q_ASSERT(m_itemView != 0);
@@ -165,21 +170,33 @@ KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 
 void DolphinController::triggerItem(const QModelIndex& index)
 {
-    const bool openTab = m_openTab;
-    m_openTab = false;
-
-    const KFileItem item = itemForIndex(index);
-    if (index.isValid() && (index.column() == KDirModel::Name)) {
-        if (openTab && (item.isDir() || m_dolphinView->isTabsForFilesEnabled())) {
-            emit tabRequested(item.url());
-        } else {
+    if (m_mouseButtons & Qt::LeftButton) {
+        const KFileItem item = itemForIndex(index);
+        if (index.isValid() && (index.column() == KDirModel::Name)) {
             emit itemTriggered(item);
-        }
-    } else {
-        m_itemView->clearSelection();
-        if (!openTab) {
+        } else {
+            m_itemView->clearSelection();
             emit itemEntered(KFileItem());
         }
+        m_mouseButtons = Qt::NoButton;
+    } else if (m_mouseButtons & Qt::RightButton) {
+        m_mouseButtons = Qt::NoButton;
+    }
+}
+
+void DolphinController::requestTab(const QModelIndex& index)
+{
+    if (m_mouseButtons & Qt::MidButton) {
+        const KFileItem item = itemForIndex(index);
+        const bool validRequest = index.isValid() &&
+                                  (index.column() == KDirModel::Name) &&
+                                  (item.isDir() || m_dolphinView->isTabsForFilesEnabled());
+        if (validRequest) {
+            emit tabRequested(item.url());
+        }
+        m_mouseButtons = Qt::NoButton;
+    } else if (m_mouseButtons & Qt::RightButton) {
+        m_mouseButtons = Qt::NoButton;
     }
 }
 
@@ -196,9 +213,9 @@ void DolphinController::emitViewportEntered()
     emit viewportEntered();
 }
 
-void DolphinController::updateOpenTabState()
+void DolphinController::updateMouseButtonState()
 {
-    m_openTab = QApplication::mouseButtons() & Qt::MidButton;
+    m_mouseButtons = QApplication::mouseButtons();
 }
 
 #include "dolphincontroller.moc"