take care to remove the selection toggle when items have been deleted

svn path=/trunk/KDE/kdebase/apps/; revision=767778

diff --git a/src/selectionmanager.cpp b/src/selectionmanager.cpp
index 31ad70b742906d0ae6843279acb92a695f4ba584..bdb4c5368f20c6a2aed3fbfb9073b8ee3d566e8a 100644 (file)
--- a/src/selectionmanager.cpp
+++ b/src/selectionmanager.cpp
@@ -65,6 +65,9 @@ void SelectionManager::slotEntered(const QModelIndex& index)
     if (index.isValid() && (index.column() == DolphinModel::Name)) {
         m_item = itemForIndex(index);
 
+        connect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
+                this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
+
         const QRect rect = m_view->visualRect(index);
         const int gap = 2;
         const int x = rect.right() - m_button->width() - gap;
@@ -83,13 +86,14 @@ void SelectionManager::slotEntered(const QModelIndex& index)
         m_button->show();
     } else {
         m_item = KFileItem();
+        disconnect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
+                   this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
     }
 }
 
 void SelectionManager::slotViewportEntered()
 {
     m_button->hide();
-    m_item = KFileItem();
 }
 
 void SelectionManager::setItemSelected(bool selected)
@@ -108,6 +112,14 @@ void SelectionManager::setItemSelected(bool selected)
     }
 }
 
+void SelectionManager::slotRowsRemoved(const QModelIndex& parent, int start, int end)
+{
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
+    m_button->hide();
+}
+
 KFileItem SelectionManager::itemForIndex(const QModelIndex& index) const
 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());

diff --git a/src/selectionmanager.h b/src/selectionmanager.h
index 82e505eb6d5684f6b71e31b023c4aaf9b9fb5559..fcc240ff9c4ee8b05ff280f10bbb8b4435738f01 100644 (file)
--- a/src/selectionmanager.h
+++ b/src/selectionmanager.h
@@ -58,6 +58,7 @@ private slots:
     void slotEntered(const QModelIndex& index);
     void slotViewportEntered();
     void setItemSelected(bool selected);
+    void slotRowsRemoved(const QModelIndex& parent, int start, int end);
 
 private:
     KFileItem itemForIndex(const QModelIndex& index) const;