- fixed issue that the horizontal progress bar and the space info bar get hidden...

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 46cb74520e50cccdfe24846b8c9fb60a2ddbc923..b3801bda8d0aa977f68d61083380d8eadcc5cda8 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -26,10 +26,12 @@
 #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_nameFilter(),
     m_url(),
     m_dolphinView(dolphinView),
     m_itemView(0)
@@ -44,6 +46,7 @@ void DolphinController::setUrl(const KUrl& url)
 {
     if (m_url != url) {
         m_url = url;
+        emit cancelPreviews();
         emit urlChanged(url);
     }
 }
@@ -73,10 +76,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 +106,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);
@@ -112,6 +121,19 @@ void DolphinController::indicateActivationChange(bool active)
     emit activationChanged(active);
 }
 
+void DolphinController::setNameFilter(const QString& nameFilter)
+{
+    if (nameFilter != m_nameFilter) {
+        m_nameFilter = nameFilter;
+        emit nameFilterChanged(nameFilter);
+    }
+}
+
+QString DolphinController::nameFilter() const
+{
+    return m_nameFilter;
+}
+
 void DolphinController::setZoomLevel(int level)
 {
     Q_ASSERT(level >= ZoomLevelInfo::minimumLevel());
@@ -131,7 +153,7 @@ void DolphinController::handleKeyPressEvent(QKeyEvent* event)
     const bool trigger = currentIndex.isValid()
                          && ((event->key() == Qt::Key_Return)
                             || (event->key() == Qt::Key_Enter))
-                         && (selModel->selectedIndexes().count() > 0);
+                         && !selModel->selectedIndexes().isEmpty();
     if (trigger) {
         const QModelIndexList indexList = selModel->selectedIndexes();
         foreach (const QModelIndex& index, indexList) {
@@ -159,6 +181,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 +206,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 +219,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;
     }
 }