2 files changed, 28 insertions, 0 deletions

diff --git a/src/selectionmanager.cpp b/src/selectionmanager.cpp
index fecbcbb72..248b4288d 100644
--- a/src/selectionmanager.cpp
+++ b/src/selectionmanager.cpp
@@ -66,6 +66,10 @@ void SelectionManager::slotEntered(const QModelIndex& index)
 
         connect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
                 this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
+        connect(m_view->selectionModel(),
+                SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+                this,
+                SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&)));
 
         const QRect rect = m_view->visualRect(index);
 
@@ -81,6 +85,10 @@ void SelectionManager::slotEntered(const QModelIndex& index)
         m_toggle->setUrl(KUrl());
         disconnect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
                    this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
+        disconnect(m_view->selectionModel(),
+                   SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+                   this,
+                   SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&)));
     }
 }
 
@@ -112,6 +120,24 @@ void SelectionManager::slotRowsRemoved(const QModelIndex& parent, int start, int
     m_toggle->hide();
 }
 
+void SelectionManager::slotSelectionChanged(const QItemSelection& selected,
+                                            const QItemSelection& deselected)
+{
+    // The selection has been changed outside the scope of the selection manager
+    // (e. g. by the rubberband or the "Select All" action). Take care updating
+    // the state of the toggle button.
+    const QModelIndex index = indexForUrl(m_toggle->url());
+    if (index.isValid()) {
+        if (selected.contains(index)) {
+            m_toggle->setChecked(true);
+        }
+
+        if (deselected.contains(index)) {
+            m_toggle->setChecked(false);
+        }
+    }
+}
+
 KUrl SelectionManager::urlForIndex(const QModelIndex& index) const
 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());
diff --git a/src/selectionmanager.h b/src/selectionmanager.h
index c263da3ea..66a511a87 100644
--- a/src/selectionmanager.h
+++ b/src/selectionmanager.h
@@ -28,6 +28,7 @@ class DolphinSortFilterProxyModel;
 class QAbstractItemView;
 class QModelIndex;
 class QAbstractButton;
+class QItemSelection;
 class SelectionToggle;
 
 /**
@@ -60,6 +61,7 @@ private slots:
     void slotViewportEntered();
     void setItemSelected(bool selected);
     void slotRowsRemoved(const QModelIndex& parent, int start, int end);
+    void slotSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
 
 private:
     KUrl urlForIndex(const QModelIndex& index) const;