Forwardport 773570:

[dolphin.git] / src / selectionmanager.cpp

diff --git a/src/selectionmanager.cpp b/src/selectionmanager.cpp
index 1f9d99b85db7a9e5eab1ba48713e3dc1665a381c..02125d7c9263dcb681e310053d5d0af7ad8e5bda 100644 (file)
--- a/src/selectionmanager.cpp
+++ b/src/selectionmanager.cpp
@@ -31,78 +31,70 @@
 #include <QPainter>
 #include <QPaintEvent>
 #include <QRect>
+#include <QTimeLine>
 
 SelectionManager::SelectionManager(QAbstractItemView* parent) :
     QObject(parent),
     m_view(parent),
-    m_button(0),
-    m_item()
+    m_toggle(0)
 {
     connect(parent, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));
     connect(parent, SIGNAL(viewportEntered()),
             this, SLOT(slotViewportEntered()));
-    m_button = new SelectionToggle(m_view->viewport());
-    m_button->setCheckable(true);
-    m_button->hide();
-    connect(m_button, SIGNAL(clicked(bool)),
+    m_toggle = new SelectionToggle(m_view->viewport());
+    m_toggle->setCheckable(true);
+    m_toggle->hide();
+    connect(m_toggle, SIGNAL(clicked(bool)),
             this, SLOT(setItemSelected(bool)));
-    connect(m_view->selectionModel(), SIGNAL(selectionChanged()),
-            this, SLOT(slotSelectionChanged()));
 }
 
 SelectionManager::~SelectionManager()
 {
 }
 
+void SelectionManager::reset()
+{
+    m_toggle->reset();
+}
+
 void SelectionManager::slotEntered(const QModelIndex& index)
 {
-    m_button->hide();
+    m_toggle->hide();
     if (index.isValid() && (index.column() == DolphinModel::Name)) {
-        m_item = itemForIndex(index);
+        m_toggle->setFileItem(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;
-        int y = rect.top();
-        if (rect.height() <= m_button->height() * 2) {
-            // center the button vertically
-            y += (rect.height() - m_button->height()) / 2;
-        } else {
-            y += gap;
-        }
 
-        m_button->move(QPoint(x, y));
+        const int gap = 2;
+        const int x = rect.left() + gap;
+        const int y = rect.top() + gap;
+        m_toggle->move(QPoint(x, y));
 
         QItemSelectionModel* selModel = m_view->selectionModel();
-        m_button->setChecked(selModel->isSelected(index));
-        m_button->show();
+        m_toggle->setChecked(selModel->isSelected(index));
+        m_toggle->show();
     } else {
-        m_item = KFileItem();
+        m_toggle->setFileItem(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::slotSelectionChanged()
-{
-    const QModelIndex index = indexForItem(m_item);
-    if (index.isValid()) {
-        QItemSelectionModel* selModel = m_view->selectionModel();
-        m_button->setChecked(selModel->isSelected(index));
-    }
+    m_toggle->hide();
 }
 
 void SelectionManager::setItemSelected(bool selected)
 {
     emit selectionChanged();
-    Q_ASSERT(!m_item.isNull());
+    Q_ASSERT(!m_toggle->fileItem().isNull());
 
-    const QModelIndex index = indexForItem(m_item);
+    const QModelIndex index = indexForItem(m_toggle->fileItem());
     if (index.isValid()) {
         QItemSelectionModel* selModel = m_view->selectionModel();
         if (selected) {
@@ -113,6 +105,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_toggle->hide();
+}
+
 KFileItem SelectionManager::itemForIndex(const QModelIndex& index) const
 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());