X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7b6ace6466cf349a4ce7a080d5e978aa0a7043e2..d324e790d62c8a341abd06e845f8fe8d64aa8ef3:/src/dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index cfa0d62c8..89d6509ca 100644
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -31,9 +31,11 @@ Qt::MouseButtons DolphinController::m_mouseButtons = Qt::NoButton;
 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
     m_zoomLevel(0),
+    m_nameFilter(),
     m_url(),
     m_dolphinView(dolphinView),
-    m_itemView(0)
+    m_itemView(0),
+    m_versionControlActions()
 {
 }
 
@@ -45,10 +47,16 @@ void DolphinController::setUrl(const KUrl& url)
 {
     if (m_url != url) {
         m_url = url;
+        emit cancelPreviews();
         emit urlChanged(url);
     }
 }
 
+void DolphinController::redirectToUrl(const KUrl& url)
+{
+    m_url = url;
+}
+
 void DolphinController::setItemView(QAbstractItemView* view)
 {
     if (m_itemView != 0) {
@@ -104,6 +112,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);
@@ -114,6 +127,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());
@@ -124,9 +150,18 @@ void DolphinController::setZoomLevel(int level)
     }
 }
 
-void DolphinController::triggerScrollToCurrentItem()
+void DolphinController::setVersionControlActions(QList<QAction*> actions)
 {
-    emit scrollToCurrentItem();
+    m_versionControlActions = actions;
+}
+
+QList<QAction*> DolphinController::versionControlActions(const KFileItemList& items)
+{
+    emit requestVersionControlActions(items);
+    // All view implementations are connected with the signal requestVersionControlActions()
+    // (see ViewExtensionFactory) and will invoke DolphinController::setVersionControlActions(),
+    // so that the context dependent actions can be returned.
+    return m_versionControlActions;
 }
 
 void DolphinController::handleKeyPressEvent(QKeyEvent* event)
@@ -138,7 +173,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) {
@@ -220,6 +255,11 @@ void DolphinController::emitViewportEntered()
     emit viewportEntered();
 }
 
+void DolphinController::emitSelectionChanged()
+{
+    emit selectionChanged();
+}
+
 void DolphinController::updateMouseButtonState()
 {
     m_mouseButtons = QApplication::mouseButtons();