X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/efbce1059cfab4629d5436ce27f9130b59ac4602..ed0df8dc1fc9576e36c920882e7f4b00a2811113:/src/dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 46cb74520..85ff5039f 100644
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -26,10 +26,11 @@
 #include <QClipboard>
 #include <QDir>
 
+Qt::MouseButtons DolphinController::m_mouseButtons = Qt::NoButton;
+
 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
     m_zoomLevel(0),
-    m_mouseButtons(Qt::NoButton),
     m_url(),
     m_dolphinView(dolphinView),
     m_itemView(0)
@@ -73,10 +74,11 @@ void DolphinController::triggerUrlChangeRequest(const KUrl& url)
     }
 }
 
-void DolphinController::triggerContextMenuRequest(const QPoint& pos)
+void DolphinController::triggerContextMenuRequest(const QPoint& pos,
+                                                  const QList<QAction*>& customActions)
 {
     emit activated();
-    emit requestContextMenu(pos);
+    emit requestContextMenu(pos, customActions);
 }
 
 void DolphinController::requestActivation()
@@ -102,6 +104,11 @@ void DolphinController::indicateSortOrderChange(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
+void DolphinController::indicateSortFoldersFirstChange(bool foldersFirst)
+{
+    emit sortFoldersFirstChanged(foldersFirst);
+}
+
 void DolphinController::indicateAdditionalInfoChange(const KFileItemDelegate::InformationList& info)
 {
     emit additionalInfoChanged(info);
@@ -159,6 +166,11 @@ void DolphinController::emitHideToolTip()
     emit hideToolTip();
 }
 
+void DolphinController::emitItemTriggered(const KFileItem& item)
+{
+    emit itemTriggered(item);
+}
+
 KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 {
     Q_ASSERT(m_itemView != 0);
@@ -179,9 +191,6 @@ void DolphinController::triggerItem(const QModelIndex& index)
             m_itemView->clearSelection();
             emit itemEntered(KFileItem());
         }
-        m_mouseButtons = Qt::NoButton;
-    } else if (m_mouseButtons & Qt::RightButton) {
-        m_mouseButtons = Qt::NoButton;
     }
 }
 
@@ -195,9 +204,6 @@ void DolphinController::requestTab(const QModelIndex& index)
         if (validRequest) {
             emit tabRequested(item.url());
         }
-        m_mouseButtons = Qt::NoButton;
-    } else if (m_mouseButtons & Qt::RightButton) {
-        m_mouseButtons = Qt::NoButton;
     }
 }