provide middle-mouse-button support for Konqueror (= create new window or tab)

CCMAIL: faure@kde.org

svn path=/trunk/KDE/kdebase/apps/; revision=800298

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index deee4af9490a2e1c78b0a02a9bcaffea57f6366f..41c6ff3a3f8d1d5643a3fa8a33179d72d3613994 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -85,6 +85,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
             this, SLOT(slotErrorMessage(QString)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
             this, SLOT(slotItemTriggered(KFileItem)));
             this, SLOT(slotErrorMessage(QString)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
             this, SLOT(slotItemTriggered(KFileItem)));

+    connect(m_view, SIGNAL(tabRequested(KUrl)),
+            this, SLOT(createNewWindow(KUrl)));

     connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl)),
             this, SLOT(slotOpenContextMenu(KFileItem,KUrl)));
     connect(m_view, SIGNAL(selectionChanged(KFileItemList)),
     connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl)),
             this, SLOT(slotOpenContextMenu(KFileItem,KUrl)));
     connect(m_view, SIGNAL(selectionChanged(KFileItemList)),


@@ -263,24 +265,18 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
     // since the idea was not to need BrowserArguments for non-browser stuff...
     KParts::BrowserArguments browserArgs;
     browserArgs.trustedSource = true;
     // since the idea was not to need BrowserArguments for non-browser stuff...
     KParts::BrowserArguments browserArgs;
     browserArgs.trustedSource = true;

+    emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs);
+}

 
 

-    // MMB click support.
-    // TODO: this doesn't work, mouseButtons() is always 0.
-    // Issue N176832 for the missing QAIV signal; task 177399
-    kDebug() << QApplication::mouseButtons();
-    if (QApplication::mouseButtons() & Qt::MidButton) {
-        kDebug() << "MMB!!" << item.mimetype();
-        if (item.mimeTypePtr()->is("inode/directory")) {
-            emit m_extension->createNewWindow(item.url(), args);
-        } else {
-            kDebug() << "run()";
-            item.run();
-        }
-    } else {
-        // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted]
-        kDebug() << "LMB";
-        emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs);
-    }
+void DolphinPart::createNewWindow(const KUrl& url)
+{
+    // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code
+    // should be moved into DolphinPart::slotItemTriggered()
+    KFileItem item(S_IFDIR, (mode_t)-1, url);
+    Q_ASSERT(item.mimeTypePtr()->is("inode/directory"));  // the signal 'tabRequested' is only emitted for dirs
+    KParts::OpenUrlArguments args;
+    args.setMimeType(item.mimetype());
+    emit m_extension->createNewWindow(url, args);

 }
 
 void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 }
 
 void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index eaf9cb74e587b392bfdf81a75e7f4164093c0240..3ef654039d81f7bb3806ded898aade75e208ad76 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -92,7 +92,7 @@ Q_SIGNALS:
 
     /**
      * Emitted whenever the current URL is about to be changed.
 
     /**
      * Emitted whenever the current URL is about to be changed.

-     */ 
+     */

     void aboutToOpenURL();
 
 private Q_SLOTS:
     void aboutToOpenURL();
 
 private Q_SLOTS:


@@ -109,6 +109,10 @@ private Q_SLOTS:
      * Handles clicking on an item
      */
     void slotItemTriggered(const KFileItem& item);
      * Handles clicking on an item
      */
     void slotItemTriggered(const KFileItem& item);

+    /**
+     * Creates a new window showing the content of \a url.
+     */
+    void createNewWindow(const KUrl& url);

     /**
      * Opens the context menu on the current mouse position.
      * @item  File item context. If item is 0, the context menu
     /**
      * Opens the context menu on the current mouse position.
      * @item  File item context. If item is 0, the context menu