Assure that automatically expanding of a folder also works when the new folder has...

[dolphin.git] / src / selectionmanager.cpp

diff --git a/src/selectionmanager.cpp b/src/selectionmanager.cpp
index fecbcbb721e533d56a5c94bc7268393ea7a74b70..26ea3626a983433e10b35e7f55107f4e3c06ffa0 100644 (file)
--- a/src/selectionmanager.cpp
+++ b/src/selectionmanager.cpp
@@ -36,7 +36,8 @@
 SelectionManager::SelectionManager(QAbstractItemView* parent) :
     QObject(parent),
     m_view(parent),
-    m_toggle(0)
+    m_toggle(0),
+    m_connected(false)
 {
     connect(parent, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));
@@ -64,8 +65,15 @@ void SelectionManager::slotEntered(const QModelIndex& index)
     if (index.isValid() && (index.column() == DolphinModel::Name)) {
         m_toggle->setUrl(urlForIndex(index));
 
-        connect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
-                this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
+        if (!m_connected) {
+            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&)));
+            m_connected = true;
+        }
 
         const QRect rect = m_view->visualRect(index);
 
@@ -81,6 +89,11 @@ 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&)));
+        m_connected = false;
     }
 }
 
@@ -101,6 +114,7 @@ void SelectionManager::setItemSelected(bool selected)
         } else {
             selModel->select(index, QItemSelectionModel::Deselect);
         }
+        selModel->setCurrentIndex(index, QItemSelectionModel::Current);
     }
 }
 
@@ -112,6 +126,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());