Add needed method for keyboard navigation

[dolphin.git] / src / klistview.cpp

diff --git a/src/klistview.cpp b/src/klistview.cpp
index 0c65b9141f4409f471dcfa89f9f8ba9687d6b36c..e484c3fb31174e7281561a417e0480e454add4a7 100644 (file)
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -79,6 +79,8 @@ KListView::Private::Private(KListView *listView)
     : listView(listView)
     , itemCategorizer(0)
     , mouseButtonPressed(false)
+    , isDragging(false)
+    , dragLeftViewport(false)
     , proxyModel(0)
     , lastIndex(QModelIndex())
 {
@@ -392,6 +394,22 @@ void KListView::Private::updateScrollbars()
     listView->verticalScrollBar()->setRange(0, lastItemBottom);
 }
 
+void KListView::Private::drawDraggedItems(QPainter *painter)
+{
+    QStyleOptionViewItemV3 option = listView->viewOptions();
+    option.state &= ~QStyle::State_MouseOver;
+    foreach (const QModelIndex &index, listView->selectionModel()->selectedIndexes())
+    {
+        int dx = mousePosition.x() - initialPressPosition.x() + listView->horizontalOffset();
+        int dy = mousePosition.y() - initialPressPosition.y() + listView->verticalOffset();
+
+        option.rect = visualRect(index);
+        option.rect.adjust(dx, dy, dx, dy);
+
+        listView->itemDelegate(index)->paint(painter, option, index);
+    }
+}
+
 
 //==============================================================================
 
@@ -438,7 +456,7 @@ void KListView::setModel(QAbstractItemModel *model)
 
 QRect KListView::visualRect(const QModelIndex &index) const
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return QListView::visualRect(index);
@@ -494,7 +512,7 @@ void KListView::setItemCategorizer(KItemCategorizer *itemCategorizer)
 
 QModelIndex KListView::indexAt(const QPoint &point) const
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return QListView::indexAt(point);
@@ -518,7 +536,7 @@ void KListView::reset()
 {
     QListView::reset();
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -538,7 +556,7 @@ void KListView::reset()
 
 void KListView::paintEvent(QPaintEvent *event)
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         QListView::paintEvent(event);
@@ -609,7 +627,7 @@ void KListView::paintEvent(QPaintEvent *event)
         }
     }
 
-    if (d->mouseButtonPressed)
+    if (d->mouseButtonPressed && !d->isDragging)
     {
         QPoint start, end, initialPressPosition;
 
@@ -640,6 +658,12 @@ void KListView::paintEvent(QPaintEvent *event)
         painter.restore();
     }
 
+    if (d->isDragging && !d->dragLeftViewport)
+    {
+        painter.setOpacity(0.5);
+        d->drawDraggedItems(&painter);
+    }
+
     painter.restore();
 }
 
@@ -647,7 +671,7 @@ void KListView::resizeEvent(QResizeEvent *event)
 {
     QListView::resizeEvent(event);
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -663,55 +687,83 @@ void KListView::resizeEvent(QResizeEvent *event)
 void KListView::setSelection(const QRect &rect,
                              QItemSelectionModel::SelectionFlags flags)
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         QListView::setSelection(rect, flags);
         return;
     }
 
-    // FIXME: I have to rethink and rewrite this method (ereslibre)
+    if (!flags)
+        return;
+
+    selectionModel()->clear();
+
+    if (flags & QItemSelectionModel::Clear)
+    {
+        d->lastSelection = QItemSelection();
+    }
 
     QModelIndexList dirtyIndexes = d->intersectionSet(rect);
-    foreach (const QModelIndex &index, dirtyIndexes)
+    QItemSelection selection;
+
+    if (!dirtyIndexes.count())
     {
-        if (!d->mouseButtonPressed && rect.intersects(visualRect(index)))
+        if (d->lastSelection.count())
         {
-            selectionModel()->select(index, flags);
+            selectionModel()->select(d->lastSelection, flags);
         }
-        else
-        {
-            selectionModel()->select(index, QItemSelectionModel::Select);
 
-            if (d->mouseButtonPressed)
-                d->tempSelected.append(index);
-        }
+        return;
     }
 
-    if (d->mouseButtonPressed)
+    if (!d->mouseButtonPressed)
     {
-        foreach (const QModelIndex &index, selectionModel()->selectedIndexes())
+        selection = QItemSelection(dirtyIndexes[0], dirtyIndexes[0]);
+    }
+    else
+    {
+        QModelIndex first = dirtyIndexes[0];
+        QModelIndex last;
+        foreach (const QModelIndex &index, dirtyIndexes)
         {
-            if (!rect.intersects(visualRect(index)))
+            if (last.isValid() && last.row() + 1 != index.row())
             {
-                selectionModel()->select(index, QItemSelectionModel::Deselect);
+                QItemSelectionRange range(first, last);
+
+                selection << range;
 
-                if (d->mouseButtonPressed)
-                {
-                    d->tempSelected.removeAll(index);
-                }
+                first = index;
             }
+
+            last = index;
         }
+
+        if (last.isValid())
+            selection << QItemSelectionRange(first, last);
+    }
+
+    if (d->lastSelection.count() && !d->mouseButtonPressed)
+    {
+        selection.merge(d->lastSelection, flags);
+    }
+    else if (d->lastSelection.count())
+    {
+        selection.merge(d->lastSelection, QItemSelectionModel::Select);
     }
+
+    selectionModel()->select(selection, flags);
+
+    viewport()->update();
 }
 
 void KListView::mouseMoveEvent(QMouseEvent *event)
 {
-    QListView::mouseMoveEvent(event);
-
     d->mousePosition = event->pos();
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    QListView::mouseMoveEvent(event);
+
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -726,9 +778,7 @@ void KListView::mousePressEvent(QMouseEvent *event)
 {
     QListView::mousePressEvent(event);
 
-    d->tempSelected.clear();
-
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -736,6 +786,8 @@ void KListView::mousePressEvent(QMouseEvent *event)
 
     event->accept();
 
+    d->dragLeftViewport = false;
+
     if (event->button() == Qt::LeftButton)
     {
         d->mouseButtonPressed = true;
@@ -754,9 +806,7 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
 {
     QListView::mouseReleaseEvent(event);
 
-    d->mouseButtonPressed = false;
-
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -764,40 +814,34 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
 
     event->accept();
 
-    // FIXME: I have to rethink and rewrite this method (ereslibre)
+    d->mouseButtonPressed = false;
 
     QPoint initialPressPosition = viewport()->mapFromGlobal(QCursor::pos());
     initialPressPosition.setY(initialPressPosition.y() + verticalOffset());
     initialPressPosition.setX(initialPressPosition.x() + horizontalOffset());
 
+    QItemSelection selection;
+
     if (initialPressPosition == d->initialPressPosition)
     {
         foreach(const QString &category, d->categories)
         {
             if (d->categoryVisualRect(category).contains(event->pos()))
             {
-                QModelIndex index;
-                QItemSelectionModel::SelectionFlag flag;
-                foreach (const QModelIndex &mappedIndex,
-                         d->categoriesIndexes[category])
-                {
-                    index = d->proxyModel->mapFromSource(mappedIndex);
-
-                    if (selectionModel()->selectedIndexes().contains(index))
-                    {
-                        flag = QItemSelectionModel::Deselect;
-                    }
-                    else
-                    {
-                        flag = QItemSelectionModel::Select;
-                    }
-
-                    selectionModel()->select(index, flag);
-                }
+                QItemSelectionRange selectionRange(d->proxyModel->mapFromSource(d->categoriesIndexes[category][0]),
+                                                   d->proxyModel->mapFromSource(d->categoriesIndexes[category][d->categoriesIndexes[category].count() - 1]));
+
+                selection << selectionRange;
+
+                selectionModel()->select(selection, QItemSelectionModel::Select);
+
+                break;
             }
         }
     }
 
+    d->lastSelection = selectionModel()->selection();
+
     viewport()->update();
 }
 
@@ -807,7 +851,7 @@ void KListView::leaveEvent(QEvent *event)
 
     d->hovered = QModelIndex();
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -820,9 +864,67 @@ void KListView::leaveEvent(QEvent *event)
 
 void KListView::startDrag(Qt::DropActions supportedActions)
 {
+    QListView::startDrag(supportedActions);
+
+    d->isDragging = false;
     d->mouseButtonPressed = false;
+}
 
-    QListView::startDrag(supportedActions);
+void KListView::dragMoveEvent(QDragMoveEvent *event)
+{
+    QListView::dragMoveEvent(event);
+
+    d->mousePosition = event->pos();
+
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+        !d->itemCategorizer)
+    {
+        return;
+    }
+
+    if (d->mouseButtonPressed)
+    {
+        d->isDragging = true;
+    }
+    else
+    {
+        d->isDragging = false;
+    }
+
+    d->dragLeftViewport = false;
+
+    event->accept();
+
+    viewport()->update();
+}
+
+void KListView::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    QListView::dragLeaveEvent(event);
+
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+        !d->itemCategorizer)
+    {
+        return;
+    }
+
+    d->dragLeftViewport = true;
+
+    event->accept();
+
+    viewport()->update();
+}
+
+QModelIndex KListView::moveCursor(CursorAction cursorAction,
+                                  Qt::KeyboardModifiers modifiers)
+{
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+        !d->itemCategorizer)
+    {
+        return QListView::moveCursor(cursorAction, modifiers);
+    }
+
+    return QListView::moveCursor(cursorAction, modifiers);
 }
 
 void KListView::rowsInserted(const QModelIndex &parent,
@@ -831,7 +933,7 @@ void KListView::rowsInserted(const QModelIndex &parent,
 {
     QListView::rowsInserted(parent, start, end);
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -841,9 +943,10 @@ void KListView::rowsInserted(const QModelIndex &parent,
 }
 
 void KListView::rowsInsertedArtifficial(const QModelIndex &parent,
-                                                int start,
-                                                int end)
+                                        int start,
+                                        int end)
 {
+    d->lastSelection = QItemSelection();
     d->elementsInfo.clear();
     d->elementsPosition.clear();
     d->elementDictionary.clear();
@@ -947,7 +1050,8 @@ void KListView::rowsRemoved(const QModelIndex &parent,
                             int start,
                             int end)
 {
-    if (d->proxyModel)
+    if ((viewMode() == KListView::IconMode) && d->proxyModel &&
+        d->itemCategorizer)
     {
         // Force the view to update all elements
         rowsInsertedArtifficial(parent, start, end);
@@ -956,7 +1060,7 @@ void KListView::rowsRemoved(const QModelIndex &parent,
 
 void KListView::updateGeometries()
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         QListView::updateGeometries();