X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3d4e6938f57fcf010b4fda7255384098327eb67d..803c460d3f9921669906d06e2802981faa1e43d1:/src/selectionmanager.cpp

diff --git a/src/selectionmanager.cpp b/src/selectionmanager.cpp
index fecbcbb72..0d3efae09 100644
--- a/src/selectionmanager.cpp
+++ b/src/selectionmanager.cpp
@@ -27,6 +27,7 @@
 #include <QAbstractButton>
 #include <QAbstractItemView>
 #include <QAbstractProxyModel>
+#include <QApplication>
 #include <QModelIndex>
 #include <QPainter>
 #include <QPaintEvent>
@@ -36,7 +37,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&)));
@@ -61,17 +63,42 @@ void SelectionManager::reset()
 void SelectionManager::slotEntered(const QModelIndex& index)
 {
     m_toggle->hide();
-    if (index.isValid() && (index.column() == DolphinModel::Name)) {
+    const bool showToggle = index.isValid() &&
+                            (index.column() == DolphinModel::Name) &&
+                            (QApplication::mouseButtons() == Qt::NoButton);
+    if (showToggle) {
         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);
+        // increase the size of the toggle for large items
+        const int height = m_view->iconSize().height();
+        if (height >= KIconLoader::SizeEnormous) {
+            m_toggle->resize(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
+        } else if (height >= KIconLoader::SizeLarge) {
+            m_toggle->resize(KIconLoader::SizeSmallMedium, KIconLoader::SizeSmallMedium);
+        } else {
+            m_toggle->resize(KIconLoader::SizeSmall, KIconLoader::SizeSmall);
+        }
 
-        const int gap = 2;
-        const int x = rect.left() + gap;
-        const int y = rect.top() + gap;
+        const QRect rect = m_view->visualRect(index);
+        int x = rect.left();
+        int y = rect.top();
+        if (height < KIconLoader::SizeSmallMedium) {
+            // The height is nearly equal to the smallest toggle height.
+            // Assure that the toggle is vertically centered instead
+            // of aligned on the top and gets more horizontal gap.
+            x += 2;
+            y += (rect.height() - m_toggle->height()) / 2;
+        }
         m_toggle->move(QPoint(x, y));
 
         QItemSelectionModel* selModel = m_view->selectionModel();
@@ -81,6 +108,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;
     }
 }
 
@@ -93,13 +125,16 @@ void SelectionManager::setItemSelected(bool selected)
 {
     emit selectionChanged();
 
-    const QModelIndex index = indexForUrl(m_toggle->url());
-    if (index.isValid()) {
-        QItemSelectionModel* selModel = m_view->selectionModel();
-        if (selected) {
-            selModel->select(index, QItemSelectionModel::Select);
-        } else {
-            selModel->select(index, QItemSelectionModel::Deselect);
+    if (!m_toggle->url().isEmpty()) {
+        const QModelIndex index = indexForUrl(m_toggle->url());
+        if (index.isValid()) {
+            QItemSelectionModel* selModel = m_view->selectionModel();
+            if (selected) {
+                selModel->select(index, QItemSelectionModel::Select);
+            } else {
+                selModel->select(index, QItemSelectionModel::Deselect);
+            }
+            selModel->setCurrentIndex(index, QItemSelectionModel::Current);
         }
     }
 }
@@ -112,6 +147,26 @@ 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.
+    if (!m_toggle->url().isEmpty()) {
+        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());