Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / selectionmanager.cpp

diff --git a/src/selectionmanager.cpp b/src/selectionmanager.cpp
index 02125d7c9263dcb681e310053d5d0af7ad8e5bda..0d3efae09b6aaa081d1bfd8f325cd29cb947f29a 100644 (file)
--- a/src/selectionmanager.cpp
+++ b/src/selectionmanager.cpp
@@ -27,6 +27,7 @@
 #include <QAbstractButton>
 #include <QAbstractItemView>
 #include <QAbstractProxyModel>
 #include <QAbstractButton>
 #include <QAbstractItemView>
 #include <QAbstractProxyModel>

+#include <QApplication>

 #include <QModelIndex>
 #include <QPainter>
 #include <QPaintEvent>
 #include <QModelIndex>
 #include <QPainter>
 #include <QPaintEvent>


@@ -36,7 +37,8 @@
 SelectionManager::SelectionManager(QAbstractItemView* parent) :
     QObject(parent),
     m_view(parent),
 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&)));
 {
     connect(parent, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));


@@ -61,26 +63,56 @@ void SelectionManager::reset()
 void SelectionManager::slotEntered(const QModelIndex& index)
 {
     m_toggle->hide();
 void SelectionManager::slotEntered(const QModelIndex& index)
 {
     m_toggle->hide();

-    if (index.isValid() && (index.column() == DolphinModel::Name)) {
-        m_toggle->setFileItem(itemForIndex(index));
+    const bool showToggle = index.isValid() &&
+                            (index.column() == DolphinModel::Name) &&
+                            (QApplication::mouseButtons() == Qt::NoButton);
+    if (showToggle) {
+        m_toggle->setUrl(urlForIndex(index));
+
+        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;
+        }

 
 

-        connect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
-                this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
+        // 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 QRect rect = m_view->visualRect(index);
 
         const QRect rect = m_view->visualRect(index);

-
-        const int gap = 2;
-        const int x = rect.left() + gap;
-        const int y = rect.top() + gap;
+        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();
         m_toggle->setChecked(selModel->isSelected(index));
         m_toggle->show();
     } else {
         m_toggle->move(QPoint(x, y));
 
         QItemSelectionModel* selModel = m_view->selectionModel();
         m_toggle->setChecked(selModel->isSelected(index));
         m_toggle->show();
     } else {

-        m_toggle->setFileItem(KFileItem());
+        m_toggle->setUrl(KUrl());

         disconnect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
                    this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
         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;

     }
 }
 
     }
 }
 


@@ -92,15 +124,17 @@ void SelectionManager::slotViewportEntered()
 void SelectionManager::setItemSelected(bool selected)
 {
     emit selectionChanged();
 void SelectionManager::setItemSelected(bool selected)
 {
     emit selectionChanged();

-    Q_ASSERT(!m_toggle->fileItem().isNull());

 
 

-    const QModelIndex index = indexForItem(m_toggle->fileItem());
-    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);

         }
     }
 }
         }
     }
 }


@@ -113,19 +147,39 @@ void SelectionManager::slotRowsRemoved(const QModelIndex& parent, int start, int
     m_toggle->hide();
 }
 
     m_toggle->hide();
 }
 

-KFileItem SelectionManager::itemForIndex(const QModelIndex& index) const
+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());
     KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
     const QModelIndex dirIndex = proxyModel->mapToSource(index);
 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());
     KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
     const QModelIndex dirIndex = proxyModel->mapToSource(index);

-    return dirModel->itemForIndex(dirIndex);
+    return dirModel->itemForIndex(dirIndex).url();

 }
 
 }
 

-const QModelIndex SelectionManager::indexForItem(const KFileItem& item) const
+const QModelIndex SelectionManager::indexForUrl(const KUrl& url) const

 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());
     KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());
     KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());

-    const QModelIndex dirIndex = dirModel->indexForItem(item);
+    const QModelIndex dirIndex = dirModel->indexForUrl(url);

     return proxyModel->mapFromSource(dirIndex);
 }
 
     return proxyModel->mapFromSource(dirIndex);
 }