Ported KonqPopupMenu away from xmlgui to make things debuggable (we had code that dynamically created XML, and then passed it for gui merging with KonqPopupMenu's own generated XML, that was too much magic and headaches).

There are now unit tests for KonqPopupMenu, and its code has a bit less magic hacks than before.
There is no more KonqPopupMenuPlugin though, but I'm happy to re-create it once there's a real use case for it.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index f88f91622..5bb59ec04 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -172,7 +172,9 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
 
 void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 {
-    KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems;
+    KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
+                                                      | KParts::BrowserExtension::ShowProperties
+                                                      | KParts::BrowserExtension::ShowUrlOperations;
     // TODO KonqKfmIconView had if ( !rootItem->isWritable() )
     //            popupFlags |= KParts::BrowserExtension::NoDeletion;
 
@@ -186,7 +188,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
     }
 
     KFileItemList items; items.append(item);
-    emit m_extension->popupMenu( 0, QCursor::pos(), items, KParts::OpenUrlArguments(), KParts::BrowserArguments(), popupFlags );
+    emit m_extension->popupMenu( QCursor::pos(), items, KParts::OpenUrlArguments(), KParts::BrowserArguments(), popupFlags );
 }
 
 #include "dolphinpart.moc"