when requesting a context menu provide a URL for the viewport, because in the column view this URL can differ from the navigator URL

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

1 files changed, 7 insertions, 6 deletions

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 32a8553f9..3251f56c2 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -64,6 +64,7 @@ protected:
     virtual void dropEvent(QDropEvent* event);
     virtual void mousePressEvent(QMouseEvent* event);
     virtual void paintEvent(QPaintEvent* event);
+    virtual void contextMenuEvent(QContextMenuEvent* event);
 
 private:
     /** Used by ColumnWidget::setActive(). */
@@ -215,6 +216,12 @@ void ColumnWidget::paintEvent(QPaintEvent* event)
     }
 }
 
+void ColumnWidget::contextMenuEvent(QContextMenuEvent* event)
+{
+    QListView::contextMenuEvent(event);
+    m_columnView->m_controller->triggerContextMenuRequest(event->pos(), m_url);
+}
+
 void ColumnWidget::activate()
 {
     const QColor bgColor = KColorScheme(KColorScheme::View).background();
@@ -338,12 +345,6 @@ QAbstractItemView* DolphinColumnView::createColumn(const QModelIndex& index)
     return view;
 }
 
-void DolphinColumnView::contextMenuEvent(QContextMenuEvent* event)
-{
-    QColumnView::contextMenuEvent(event);
-    m_controller->triggerContextMenuRequest(event->pos());
-}
-
 void DolphinColumnView::mousePressEvent(QMouseEvent* event)
 {
     m_controller->triggerActivation();