X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9c7ccd477a32ad52ff0126024ffbad0f6ea164b5..ec00f379dc42b00a64ab1af25bb4bb1a06bd7449:/src/dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 22f7940bd..1bc1edac0 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -72,11 +72,15 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
             this, SLOT(slotErrorMessage(QString)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
             this, SLOT(slotItemTriggered(KFileItem)));
-    // TODO connect to urlsDropped
-    // TOOD connect to requestContextMenu
-    connect(m_view, SIGNAL(selectionChanged(QList<KFileItem>)), m_extension, SIGNAL(selectionInfo(QList<KFileItem>)));
+    connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)),
+            this, SLOT(slotOpenContextMenu(KFileItem, const KUrl&)));
+    connect(m_view, SIGNAL(selectionChanged(QList<KFileItem>)),
+            m_extension, SIGNAL(selectionInfo(QList<KFileItem>)));
+
+    connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
+            this, SLOT(slotRequestItemInfo(KFileItem)));
 
-    connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(slotRequestItemInfo(KFileItem)));
+    // TODO connect to urlsDropped
 
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
@@ -101,10 +105,15 @@ KAboutData* DolphinPart::createAboutData()
 bool DolphinPart::openUrl(const KUrl& url)
 {
     const QString prettyUrl = url.pathOrUrl();
-    setWindowCaption(prettyUrl);
-    m_extension->setLocationBarUrl(prettyUrl);
+    emit setWindowCaption(prettyUrl);
+    emit m_extension->setLocationBarUrl(prettyUrl);
+    const bool reload = arguments().reload();
+    if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started
+        return true;
+    }
+    setUrl(url); // remember it at the KParts level
     m_view->setUrl(url);
-    if (arguments().reload())
+    if (reload)
         m_view->reload();
     emit started(0); // get the wheel to spin
     return true;
@@ -141,4 +150,19 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
     emit m_extension->openUrlRequest(item.url());
 }
 
+void DolphinPart::slotOpenContextMenu(const KFileItem& item, const KUrl&)
+{
+    // TODO KonqKfmIconView had if ( !rootItem->isWritable() )
+    //            popupFlags |= KParts::BrowserExtension::NoDeletion;
+
+    // and when clicking on the viewport:
+    //        KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
+
+
+    KFileItem* itemCopy = new KFileItem(item); // ugly
+    KFileItemList items; items.append(itemCopy);
+    emit m_extension->popupMenu( 0, QCursor::pos(), items );
+    delete itemCopy;
+}
+
 #include "dolphinpart.moc"