Revert last fix, otherwise context menus on viewport don't work anymore. I'll try...

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

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 7681b88389c583a05a6ddaef62c10cc1cb89790a..2dc3bc1530bf6f0be7bf12f741f3bc9a7f909a65 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -309,14 +309,12 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
 
     QListView::contextMenuEvent(event);
 
-    if (selectionModel()->hasSelection()) {
-        const QModelIndex index = indexAt(event->pos());
-        if (index.isValid() || m_active) {
-            // Only open a context menu above an item or if the mouse is above
-            // the active column.
-            const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos());
-            m_view->m_controller->triggerContextMenuRequest(pos);
-        }
+    const QModelIndex index = indexAt(event->pos());
+    if (index.isValid() || m_active) {
+        // Only open a context menu above an item or if the mouse is above
+        // the active column.
+        const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos());
+        m_view->m_controller->triggerContextMenuRequest(pos);
     }
 }
 

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 9dd91b308c5b0c5b720d1cf07a1f0a591fed1d7b..f4bba2f039c1748a264feae271081d854fcdfd94 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -167,9 +167,7 @@ QStyleOptionViewItem DolphinDetailsView::viewOptions() const
 void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 {
     QTreeView::contextMenuEvent(event);
-    if (selectionModel()->hasSelection()) {
-        m_controller->triggerContextMenuRequest(event->pos());
-    }
+    m_controller->triggerContextMenuRequest(event->pos());
 }
 
 void DolphinDetailsView::mousePressEvent(QMouseEvent* event)

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 95ea011b03aa83a2514ce3c3f6b069398dba0929..08ff9cf48894ecd2c39aea8bd33002c5967084ec 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -162,9 +162,7 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 {
     KCategorizedView::contextMenuEvent(event);
-    if (selectionModel()->hasSelection()) {
-        m_controller->triggerContextMenuRequest(event->pos());
-    }
+    m_controller->triggerContextMenuRequest(event->pos());
 }
 
 void DolphinIconsView::mousePressEvent(QMouseEvent* event)