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

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 16caae9d69e85339bfc06ef3bdfe3f625320e73a..41c6ff3a3f8d1d5643a3fa8a33179d72d3613994 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -25,28 +25,31 @@
 
 #include <konq_operations.h>
 
-#include <kpropertiesdialog.h>
-#include <kglobalsettings.h>
+#include <kaboutdata.h>
 #include <kactioncollection.h>
+#include <kconfiggroup.h>
+#include <kdebug.h>
 #include <kdirlister.h>
+#include <kglobalsettings.h>
 #include <kiconloader.h>
+#include <klocale.h>
 #include <kmessagebox.h>
-#include <kparts/genericfactory.h>
+#include <kpluginfactory.h>
+#include <kpropertiesdialog.h>
 #include <ktoggleaction.h>
-#include <kconfiggroup.h>
 
 #include <QActionGroup>
 #include <QApplication>
 #include <QClipboard>
 
-typedef KParts::GenericFactory<DolphinPart> DolphinPartFactory;
-K_EXPORT_COMPONENT_FACTORY(dolphinpart, DolphinPartFactory)
+K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphin"))
 
-DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringList& args)
+DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
 {
     Q_UNUSED(args)
-    setComponentData( DolphinPartFactory::componentData() );
+    setComponentData(DolphinPartFactory::componentData(), false);
     m_extension = new DolphinPartBrowserExtension(this);
 
     // make sure that other apps using this part find Dolphin's view-file-columns icons
@@ -54,7 +57,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
 
     m_dirLister = new KDirLister;
     m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(parentWidget->topLevelWidget());
+    m_dirLister->setMainWindow(parentWidget->window());
     m_dirLister->setDelayedMimeTypes(true);
 
     //connect(m_dirLister, SIGNAL(started(KUrl)), this, SLOT(slotStarted()));
@@ -82,6 +85,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
             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)),
@@ -110,6 +115,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
 
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
+
+    loadPlugins(this, this, componentData());
 }
 
 DolphinPart::~DolphinPart()
@@ -217,6 +224,7 @@ bool DolphinPart::openUrl(const KUrl& url)
     emit m_extension->setLocationBarUrl(prettyUrl);
     emit started(0); // get the wheel to spin
     m_view->setUrl(url);
+    emit aboutToOpenURL();
     if (reload)
         m_view->reload();
     return true;
@@ -257,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;
+    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.url(), 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&)
@@ -327,7 +329,10 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
             editActions.append(actionCollection()->action("delete"));
         actionGroups.insert("editactions", editActions);
 
-        KFileItemList items; items.append(item);
+        // TODO: We should change the signature of the slots (and signals) for being able
+        //       to tell for which items we want a popup.
+        KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()
+                                                               : KFileItemList() << item);
         emit m_extension->popupMenu(QCursor::pos(),
                                     items,
                                     KParts::OpenUrlArguments(),
@@ -364,6 +369,11 @@ void DolphinPartBrowserExtension::paste()
     m_part->view()->paste();
 }
 
+void DolphinPartBrowserExtension::reparseConfiguration()
+{
+    m_part->view()->refresh();
+}
+
 ////
 
 void DolphinPart::slotEditMimeType()