]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/kitemviews/kitemlistcontroller.cpp
projects / dolphin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Load KFileItemAction plugins with json metadata
[dolphin.git] / src / kitemviews / kitemlistcontroller.cpp
diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 15aab28d50ec3cdcf8ef307a60699d0d954b8c14..1c86ff03ff9b0b12bb0d2927f8e4ed1e0b67b38d 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
+ *   Copyright (C) 2012 by Frank Reininghaus <frank78ac@googlemail.com>    *
  *                                                                         *
  *   Based on the Itemviews NG project from Trolltech Labs:                *
  *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
  *                                                                         *
  *   Based on the Itemviews NG project from Trolltech Labs:                *
  *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
@@ -22,38 +23,63 @@
 
 #include "kitemlistcontroller.h"
 
 
 #include "kitemlistcontroller.h"
 
+
 #include "kitemlistview.h"
 #include "kitemlistview.h"
-#include "kitemlistrubberband_p.h"
 #include "kitemlistselectionmanager.h"
 
 #include "kitemlistselectionmanager.h"
 
-// TODO: Remove after moving mimeData() and createDropPixmap() into
-// KFileItemModel/KFileItemListView
-#include "kfileitemmodel.h"
-#include <KIcon>
+#include "private/kitemlistrubberband.h"
+#include "private/kitemlistkeyboardsearchmanager.h"
 
 #include <QApplication>
 #include <QDrag>
 #include <QEvent>
 
 #include <QApplication>
 #include <QDrag>
 #include <QEvent>
+#include <QGraphicsScene>
 #include <QGraphicsSceneEvent>
 #include <QGraphicsSceneEvent>
+#include <QGraphicsView>
 #include <QMimeData>
 #include <QMimeData>
+#include <QTimer>
+#include <QAccessible>
 
 
-#include <KDebug>
-
-KItemListController::KItemListController(QObject* parent) :
+KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
     QObject(parent),
     QObject(parent),
-    m_dragging(false),
+    m_singleClickActivationEnforced(false),
+    m_selectionTogglePressed(false),
+    m_clearSelectionIfItemsAreNotDragged(false),
     m_selectionBehavior(NoSelection),
     m_selectionBehavior(NoSelection),
+    m_autoActivationBehavior(ActivationAndExpansion),
+    m_mouseDoubleClickAction(ActivateItemOnly),
     m_model(0),
     m_view(0),
     m_selectionManager(new KItemListSelectionManager(this)),
     m_model(0),
     m_view(0),
     m_selectionManager(new KItemListSelectionManager(this)),
+    m_keyboardManager(new KItemListKeyboardSearchManager(this)),
     m_pressedIndex(-1),
     m_pressedMousePos(),
     m_pressedIndex(-1),
     m_pressedMousePos(),
-    m_oldSelection()
+    m_autoActivationTimer(0),
+    m_oldSelection(),
+    m_keyboardAnchorIndex(-1),
+    m_keyboardAnchorPos(0)
 {
 {
+    connect(m_keyboardManager, &KItemListKeyboardSearchManager::changeCurrentItem,
+            this, &KItemListController::slotChangeCurrentItem);
+    connect(m_selectionManager, &KItemListSelectionManager::currentChanged,
+            m_keyboardManager, &KItemListKeyboardSearchManager::slotCurrentChanged);
+
+    m_autoActivationTimer = new QTimer(this);
+    m_autoActivationTimer->setSingleShot(true);
+    m_autoActivationTimer->setInterval(-1);
+    connect(m_autoActivationTimer, &QTimer::timeout, this, &KItemListController::slotAutoActivationTimeout);
+
+    setModel(model);
+    setView(view);
 }
 
 KItemListController::~KItemListController()
 {
 }
 
 KItemListController::~KItemListController()
 {
+    setView(0);
+    Q_ASSERT(!m_view);
+
+    setModel(0);
+    Q_ASSERT(!m_model);
 }
 
 void KItemListController::setModel(KItemModelBase* model)
 }
 
 void KItemListController::setModel(KItemModelBase* model)
@@ -63,7 +89,14 @@ void KItemListController::setModel(KItemModelBase* model)
     }
 
     KItemModelBase* oldModel = m_model;
     }
 
     KItemModelBase* oldModel = m_model;
+    if (oldModel) {
+        oldModel->deleteLater();
+    }
+
     m_model = model;
     m_model = model;
+    if (m_model) {
+        m_model->setParent(this);
+    }
 
     if (m_view) {
         m_view->setModel(m_model);
 
     if (m_view) {
         m_view->setModel(m_model);
@@ -92,15 +125,18 @@ void KItemListController::setView(KItemListView* view)
 
     KItemListView* oldView = m_view;
     if (oldView) {
 
     KItemListView* oldView = m_view;
     if (oldView) {
-        disconnect(oldView, SIGNAL(offsetChanged(qreal,qreal)), this, SLOT(slotViewOffsetChanged(qreal,qreal)));
+        disconnect(oldView, &KItemListView::scrollOffsetChanged, this, &KItemListController::slotViewScrollOffsetChanged);
+        oldView->deleteLater();
     }
 
     m_view = view;
 
     if (m_view) {
     }
 
     m_view = view;
 
     if (m_view) {
+        m_view->setParent(this);
         m_view->setController(this);
         m_view->setModel(m_model);
         m_view->setController(this);
         m_view->setModel(m_model);
-        connect(m_view, SIGNAL(offsetChanged(qreal,qreal)), this, SLOT(slotViewOffsetChanged(qreal,qreal)));
+        connect(m_view, &KItemListView::scrollOffsetChanged, this, &KItemListController::slotViewScrollOffsetChanged);
+        updateExtendedSelectionRegion();
     }
 
     emit viewChanged(m_view, oldView);
     }
 
     emit viewChanged(m_view, oldView);
@@ -114,6 +150,7 @@ KItemListView* KItemListController::view() const
 void KItemListController::setSelectionBehavior(SelectionBehavior behavior)
 {
     m_selectionBehavior = behavior;
 void KItemListController::setSelectionBehavior(SelectionBehavior behavior)
 {
     m_selectionBehavior = behavior;
+    updateExtendedSelectionRegion();
 }
 
 KItemListController::SelectionBehavior KItemListController::selectionBehavior() const
 }
 
 KItemListController::SelectionBehavior KItemListController::selectionBehavior() const
@@ -121,6 +158,46 @@ KItemListController::SelectionBehavior KItemListController::selectionBehavior()
     return m_selectionBehavior;
 }
 
     return m_selectionBehavior;
 }
 
+void KItemListController::setAutoActivationBehavior(AutoActivationBehavior behavior)
+{
+    m_autoActivationBehavior = behavior;
+}
+
+KItemListController::AutoActivationBehavior KItemListController::autoActivationBehavior() const
+{
+    return m_autoActivationBehavior;
+}
+
+void KItemListController::setMouseDoubleClickAction(MouseDoubleClickAction action)
+{
+    m_mouseDoubleClickAction = action;
+}
+
+KItemListController::MouseDoubleClickAction KItemListController::mouseDoubleClickAction() const
+{
+    return m_mouseDoubleClickAction;
+}
+
+void KItemListController::setAutoActivationDelay(int delay)
+{
+    m_autoActivationTimer->setInterval(delay);
+}
+
+int KItemListController::autoActivationDelay() const
+{
+    return m_autoActivationTimer->interval();
+}
+
+void KItemListController::setSingleClickActivationEnforced(bool singleClick)
+{
+    m_singleClickActivationEnforced = singleClick;
+}
+
+bool KItemListController::singleClickActivationEnforced() const
+{
+    return m_singleClickActivationEnforced;
+}
+
 bool KItemListController::showEvent(QShowEvent* event)
 {
     Q_UNUSED(event);
 bool KItemListController::showEvent(QShowEvent* event)
 {
     Q_UNUSED(event);
@@ -135,17 +212,30 @@ bool KItemListController::hideEvent(QHideEvent* event)
 
 bool KItemListController::keyPressEvent(QKeyEvent* event)
 {
 
 bool KItemListController::keyPressEvent(QKeyEvent* event)
 {
+    int index = m_selectionManager->currentItem();
+    int key = event->key();
+
+    // Handle the expanding/collapsing of items
+    if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
+        if (key == Qt::Key_Right) {
+            if (m_model->setExpanded(index, true)) {
+                return true;
+            }
+        } else if (key == Qt::Key_Left) {
+            if (m_model->setExpanded(index, false)) {
+                return true;
+            }
+        }
+    }
+
     const bool shiftPressed = event->modifiers() & Qt::ShiftModifier;
     const bool controlPressed = event->modifiers() & Qt::ControlModifier;
     const bool shiftOrControlPressed = shiftPressed || controlPressed;
 
     const bool shiftPressed = event->modifiers() & Qt::ShiftModifier;
     const bool controlPressed = event->modifiers() & Qt::ControlModifier;
     const bool shiftOrControlPressed = shiftPressed || controlPressed;
 
-    int index = m_selectionManager->currentItem();
     const int itemCount = m_model->count();
     const int itemCount = m_model->count();
-    const int itemsPerRow = m_view->itemsPerOffset();
 
     // For horizontal scroll orientation, transform
     // the arrow keys to simplify the event handling.
 
     // For horizontal scroll orientation, transform
     // the arrow keys to simplify the event handling.
-    int key = event->key();
     if (m_view->scrollOrientation() == Qt::Horizontal) {
         switch (key) {
         case Qt::Key_Up:    key = Qt::Key_Left; break;
     if (m_view->scrollOrientation() == Qt::Horizontal) {
         switch (key) {
         case Qt::Key_Up:    key = Qt::Key_Left; break;
@@ -156,79 +246,278 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         }
     }
 
         }
     }
 
+    const bool selectSingleItem = m_selectionBehavior != NoSelection &&
+                                  itemCount == 1 &&
+                                  (key == Qt::Key_Home || key == Qt::Key_End  ||
+                                   key == Qt::Key_Up   || key == Qt::Key_Down ||
+                                   key == Qt::Key_Left || key == Qt::Key_Right);
+    if (selectSingleItem) {
+        const int current = m_selectionManager->currentItem();
+        m_selectionManager->setSelected(current);
+        return true;
+    }
+
     switch (key) {
     case Qt::Key_Home:
         index = 0;
     switch (key) {
     case Qt::Key_Home:
         index = 0;
+        m_keyboardAnchorIndex = index;
+        m_keyboardAnchorPos = keyboardAnchorPos(index);
         break;
 
     case Qt::Key_End:
         index = itemCount - 1;
         break;
 
     case Qt::Key_End:
         index = itemCount - 1;
+        m_keyboardAnchorIndex = index;
+        m_keyboardAnchorPos = keyboardAnchorPos(index);
         break;
 
     case Qt::Key_Left:
         if (index > 0) {
         break;
 
     case Qt::Key_Left:
         if (index > 0) {
-            index--;
+            const int expandedParentsCount = m_model->expandedParentsCount(index);
+            if (expandedParentsCount == 0) {
+                --index;
+            } else {
+                // Go to the parent of the current item.
+                do {
+                    --index;
+                } while (index > 0 && m_model->expandedParentsCount(index) == expandedParentsCount);
+            }
+            m_keyboardAnchorIndex = index;
+            m_keyboardAnchorPos = keyboardAnchorPos(index);
         }
         break;
 
     case Qt::Key_Right:
         if (index < itemCount - 1) {
         }
         break;
 
     case Qt::Key_Right:
         if (index < itemCount - 1) {
-            index++;
+            ++index;
+            m_keyboardAnchorIndex = index;
+            m_keyboardAnchorPos = keyboardAnchorPos(index);
         }
         break;
 
     case Qt::Key_Up:
         }
         break;
 
     case Qt::Key_Up:
-        if (index >= itemsPerRow) {
-            index -= itemsPerRow;
-        }
+        updateKeyboardAnchor();
+        index = previousRowIndex(index);
         break;
 
     case Qt::Key_Down:
         break;
 
     case Qt::Key_Down:
-        if (index + itemsPerRow < itemCount) {
-            // We are not in the last row yet.
-            index += itemsPerRow;
-        }
-        else {
-            // We are either in the last row already, or we are in the second-last row,
-            // and there is no item below the current item.
-            // In the latter case, we jump to the very last item.
-            const int currentColumn = index % itemsPerRow;
-            const int lastItemColumn = (itemCount - 1) % itemsPerRow;
-            const bool inLastRow = currentColumn < lastItemColumn;
-            if (!inLastRow) {
-                index = itemCount - 1;
+        updateKeyboardAnchor();
+        index = nextRowIndex(index);
+        break;
+
+    case Qt::Key_PageUp:
+        if (m_view->scrollOrientation() == Qt::Horizontal) {
+            // The new current index should correspond to the first item in the current column.
+            int newIndex = qMax(index - 1, 0);
+            while (newIndex != index && m_view->itemRect(newIndex).topLeft().y() < m_view->itemRect(index).topLeft().y()) {
+                index = newIndex;
+                newIndex = qMax(index - 1, 0);
             }
             }
+            m_keyboardAnchorIndex = index;
+            m_keyboardAnchorPos = keyboardAnchorPos(index);
+        } else {
+            const qreal currentItemBottom = m_view->itemRect(index).bottomLeft().y();
+            const qreal height = m_view->geometry().height();
+
+            // The new current item should be the first item in the current
+            // column whose itemRect's top coordinate is larger than targetY.
+            const qreal targetY = currentItemBottom - height;
+
+            updateKeyboardAnchor();
+            int newIndex = previousRowIndex(index);
+            do {
+                index = newIndex;
+                updateKeyboardAnchor();
+                newIndex = previousRowIndex(index);
+            } while (m_view->itemRect(newIndex).topLeft().y() > targetY && newIndex != index);
         }
         break;
 
         }
         break;
 
+    case Qt::Key_PageDown:
+        if (m_view->scrollOrientation() == Qt::Horizontal) {
+            // The new current index should correspond to the last item in the current column.
+            int newIndex = qMin(index + 1, m_model->count() - 1);
+            while (newIndex != index && m_view->itemRect(newIndex).topLeft().y() > m_view->itemRect(index).topLeft().y()) {
+                index = newIndex;
+                newIndex = qMin(index + 1, m_model->count() - 1);
+            }
+            m_keyboardAnchorIndex = index;
+            m_keyboardAnchorPos = keyboardAnchorPos(index);
+        } else {
+            const qreal currentItemTop = m_view->itemRect(index).topLeft().y();
+            const qreal height = m_view->geometry().height();
+
+            // The new current item should be the last item in the current
+            // column whose itemRect's bottom coordinate is smaller than targetY.
+            const qreal targetY = currentItemTop + height;
+
+            updateKeyboardAnchor();
+            int newIndex = nextRowIndex(index);
+            do {
+                index = newIndex;
+                updateKeyboardAnchor();
+                newIndex = nextRowIndex(index);
+            } while (m_view->itemRect(newIndex).bottomLeft().y() < targetY && newIndex != index);
+        }
+        break;
+
+    case Qt::Key_Enter:
+    case Qt::Key_Return: {
+        const KItemSet selectedItems = m_selectionManager->selectedItems();
+        if (selectedItems.count() >= 2) {
+            emit itemsActivated(selectedItems);
+        } else if (selectedItems.count() == 1) {
+            emit itemActivated(selectedItems.first());
+        } else {
+            emit itemActivated(index);
+        }
+        break;
+    }
+
+    case Qt::Key_Menu: {
+        // Emit the signal itemContextMenuRequested() in case if at least one
+        // item is selected. Otherwise the signal viewContextMenuRequested() will be emitted.
+        const KItemSet selectedItems = m_selectionManager->selectedItems();
+        int index = -1;
+        if (selectedItems.count() >= 2) {
+            const int currentItemIndex = m_selectionManager->currentItem();
+            index = selectedItems.contains(currentItemIndex)
+                    ? currentItemIndex : selectedItems.first();
+        } else if (selectedItems.count() == 1) {
+            index = selectedItems.first();
+        }
+
+        if (index >= 0) {
+            const QRectF contextRect = m_view->itemContextRect(index);
+            const QPointF pos(m_view->scene()->views().first()->mapToGlobal(contextRect.bottomRight().toPoint()));
+            emit itemContextMenuRequested(index, pos);
+        } else {
+            emit viewContextMenuRequested(QCursor::pos());
+        }
+        break;
+    }
+
+    case Qt::Key_Escape:
+        if (m_selectionBehavior != SingleSelection) {
+            m_selectionManager->clearSelection();
+        }
+        m_keyboardManager->cancelSearch();
+        emit escapePressed();
+        break;
+
     case Qt::Key_Space:
     case Qt::Key_Space:
-        if (controlPressed) {
-            m_selectionManager->endAnchoredSelection();
-            m_selectionManager->setSelected(index, 1, KItemListSelectionManager::Toggle);
-            m_selectionManager->beginAnchoredSelection(index);
+        if (m_selectionBehavior == MultiSelection) {
+            if (controlPressed) {
+                // Toggle the selection state of the current item.
+                m_selectionManager->endAnchoredSelection();
+                m_selectionManager->setSelected(index, 1, KItemListSelectionManager::Toggle);
+                m_selectionManager->beginAnchoredSelection(index);
+                break;
+            } else {
+                // Select the current item if it is not selected yet.
+                const int current = m_selectionManager->currentItem();
+                if (!m_selectionManager->isSelected(current)) {
+                    m_selectionManager->setSelected(current);
+                    break;
+                }
+            }
         }
         }
+        // Fall through to the default case and add the Space to the current search string.
 
     default:
 
     default:
-        break;
+        m_keyboardManager->addKeys(event->text());
+        // Make sure unconsumed events get propagated up the chain. #302329
+        event->ignore();
+        return false;
     }
 
     if (m_selectionManager->currentItem() != index) {
     }
 
     if (m_selectionManager->currentItem() != index) {
-        if (controlPressed) {
-            m_selectionManager->endAnchoredSelection();
+        switch (m_selectionBehavior) {
+        case NoSelection:
+            m_selectionManager->setCurrentItem(index);
+            break;
+
+        case SingleSelection:
+            m_selectionManager->setCurrentItem(index);
+            m_selectionManager->clearSelection();
+            m_selectionManager->setSelected(index, 1);
+            break;
+
+        case MultiSelection:
+            if (controlPressed) {
+                m_selectionManager->endAnchoredSelection();
+            }
+
+            m_selectionManager->setCurrentItem(index);
+
+            if (!shiftOrControlPressed) {
+                m_selectionManager->clearSelection();
+                m_selectionManager->setSelected(index, 1);
+            }
+
+            if (!shiftPressed) {
+                m_selectionManager->beginAnchoredSelection(index);
+            }
+            break;
         }
 
         }
 
+        m_view->scrollToItem(index);
+    }
+    return true;
+}
+
+void KItemListController::slotChangeCurrentItem(const QString& text, bool searchFromNextItem)
+{
+    if (!m_model || m_model->count() == 0) {
+        return;
+    }
+    const int currentIndex = m_selectionManager->currentItem();
+    int index;
+    if (searchFromNextItem) {
+        index = m_model->indexForKeyboardSearch(text, (currentIndex + 1) % m_model->count());
+    } else {
+        index = m_model->indexForKeyboardSearch(text, currentIndex);
+    }
+    if (index >= 0) {
         m_selectionManager->setCurrentItem(index);
 
         m_selectionManager->setCurrentItem(index);
 
-        if (!shiftOrControlPressed || m_selectionBehavior == SingleSelection) {
+        if (m_selectionBehavior != NoSelection) {
             m_selectionManager->clearSelection();
             m_selectionManager->setSelected(index, 1);
             m_selectionManager->clearSelection();
             m_selectionManager->setSelected(index, 1);
+            m_selectionManager->beginAnchoredSelection(index);
         }
 
         }
 
-        if (!shiftPressed) {
-            m_selectionManager->beginAnchoredSelection(index);
+        m_view->scrollToItem(index);
+    }
+}
+
+void KItemListController::slotAutoActivationTimeout()
+{
+    if (!m_model || !m_view) {
+        return;
+    }
+
+    const int index = m_autoActivationTimer->property("index").toInt();
+    if (index < 0 || index >= m_model->count()) {
+        return;
+    }
+
+    /* m_view->isUnderMouse() fixes a bug in the Folder-View-Panel and in the
+     * Places-Panel.
+     *
+     * Bug: When you drag a file onto a Folder-View-Item or a Places-Item and
+     * then move away before the auto-activation timeout triggers, than the
+     * item still becomes activated/expanded.
+     *
+     * See Bug 293200 and 305783
+     */
+    if (m_model->supportsDropping(index) && m_view->isUnderMouse()) {
+        if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
+            const bool expanded = m_model->isExpanded(index);
+            m_model->setExpanded(index, !expanded);
+        } else if (m_autoActivationBehavior != ExpansionOnly) {
+            emit itemActivated(index);
         }
     }
         }
     }
-    return true;
 }
 
 bool KItemListController::inputMethodEvent(QInputMethodEvent* event)
 }
 
 bool KItemListController::inputMethodEvent(QInputMethodEvent* event)
@@ -245,17 +534,55 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
 
     m_pressedMousePos = transform.map(event->pos());
     m_pressedIndex = m_view->itemAt(m_pressedMousePos);
 
     m_pressedMousePos = transform.map(event->pos());
     m_pressedIndex = m_view->itemAt(m_pressedMousePos);
+    emit mouseButtonPressed(m_pressedIndex, event->buttons());
+
+    if (event->buttons() & (Qt::BackButton | Qt::ForwardButton)) {
+        // Do not select items when clicking the back/forward buttons, see
+        // https://bugs.kde.org/show_bug.cgi?id=327412.
+        return true;
+    }
 
     if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
 
     if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
+        m_selectionManager->endAnchoredSelection();
+        m_selectionManager->setCurrentItem(m_pressedIndex);
+        m_selectionManager->beginAnchoredSelection(m_pressedIndex);
+        return true;
+    }
+
+    m_selectionTogglePressed = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos);
+    if (m_selectionTogglePressed) {
+        m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
+        // The previous anchored selection has been finished already in
+        // KItemListSelectionManager::setSelected(). We can safely change
+        // the current item and start a new anchored selection now.
+        m_selectionManager->setCurrentItem(m_pressedIndex);
+        m_selectionManager->beginAnchoredSelection(m_pressedIndex);
         return true;
     }
 
     const bool shiftPressed = event->modifiers() & Qt::ShiftModifier;
     const bool controlPressed = event->modifiers() & Qt::ControlModifier;
         return true;
     }
 
     const bool shiftPressed = event->modifiers() & Qt::ShiftModifier;
     const bool controlPressed = event->modifiers() & Qt::ControlModifier;
-    const bool shiftOrControlPressed = shiftPressed || controlPressed;
 
 
-    if (!shiftOrControlPressed || m_selectionBehavior == SingleSelection) {
+    // The previous selection is cleared if either
+    // 1. The selection mode is SingleSelection, or
+    // 2. the selection mode is MultiSelection, and *none* of the following conditions are met:
+    //    a) Shift or Control are pressed.
+    //    b) The clicked item is selected already. In that case, the user might want to:
+    //       - start dragging multiple items, or
+    //       - open the context menu and perform an action for all selected items.
+    const bool shiftOrControlPressed = shiftPressed || controlPressed;
+    const bool pressedItemAlreadySelected = m_pressedIndex >= 0 && m_selectionManager->isSelected(m_pressedIndex);
+    const bool clearSelection = m_selectionBehavior == SingleSelection ||
+                                (!shiftOrControlPressed && !pressedItemAlreadySelected);
+    if (clearSelection) {
         m_selectionManager->clearSelection();
         m_selectionManager->clearSelection();
+    } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
+        // The user might want to start dragging multiple items, but if he clicks the item
+        // in order to trigger it instead, the other selected items must be deselected.
+        // However, we do not know yet what the user is going to do.
+        // -> remember that the user pressed an item which had been selected already and
+        //    clear the selection in mouseReleaseEvent(), unless the items are dragged.
+        m_clearSelectionIfItemsAreNotDragged = true;
     }
 
     if (!shiftPressed) {
     }
 
     if (!shiftPressed) {
@@ -275,7 +602,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
             break;
 
         case MultiSelection:
             break;
 
         case MultiSelection:
-            if (controlPressed) {
+            if (controlPressed && !shiftPressed) {
                 m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
                 m_selectionManager->beginAnchoredSelection(m_pressedIndex);
             } else if (!shiftPressed || !m_selectionManager->isAnchoredSelectionActive()) {
                 m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
                 m_selectionManager->beginAnchoredSelection(m_pressedIndex);
             } else if (!shiftPressed || !m_selectionManager->isAnchoredSelectionActive()) {
@@ -290,26 +617,43 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
             break;
         }
 
             break;
         }
 
+        if (event->buttons() & Qt::RightButton) {
+            emit itemContextMenuRequested(m_pressedIndex, event->screenPos());
+        }
+
         return true;
         return true;
-    } else {
-        KItemListRubberBand* rubberBand = m_view->rubberBand();
+    }
+
+    if (event->buttons() & Qt::RightButton) {
+        const QRectF headerBounds = m_view->headerBoundaries();
+        if (headerBounds.contains(event->pos())) {
+            emit headerContextMenuRequested(event->screenPos());
+        } else {
+            emit viewContextMenuRequested(event->screenPos());
+        }
+        return true;
+    }
+
+    if (m_selectionBehavior == MultiSelection) {
         QPointF startPos = m_pressedMousePos;
         if (m_view->scrollOrientation() == Qt::Vertical) {
         QPointF startPos = m_pressedMousePos;
         if (m_view->scrollOrientation() == Qt::Vertical) {
-            startPos.ry() += m_view->offset();
+            startPos.ry() += m_view->scrollOffset();
             if (m_view->itemSize().width() < 0) {
                 // Use a special rubberband for views that have only one column and
                 // expand the rubberband to use the whole width of the view.
                 startPos.setX(0);
             }
         } else {
             if (m_view->itemSize().width() < 0) {
                 // Use a special rubberband for views that have only one column and
                 // expand the rubberband to use the whole width of the view.
                 startPos.setX(0);
             }
         } else {
-            startPos.rx() += m_view->offset();
+            startPos.rx() += m_view->scrollOffset();
         }
 
         m_oldSelection = m_selectionManager->selectedItems();
         }
 
         m_oldSelection = m_selectionManager->selectedItems();
+        KItemListRubberBand* rubberBand = m_view->rubberBand();
         rubberBand->setStartPosition(startPos);
         rubberBand->setEndPosition(startPos);
         rubberBand->setActive(true);
         rubberBand->setStartPosition(startPos);
         rubberBand->setEndPosition(startPos);
         rubberBand->setActive(true);
-        connect(rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandChanged()));
+        connect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged);
+        m_view->setAutoScroll(true);
     }
 
     return false;
     }
 
     return false;
@@ -323,12 +667,20 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const
 
     if (m_pressedIndex >= 0) {
         // Check whether a dragging should be started
 
     if (m_pressedIndex >= 0) {
         // Check whether a dragging should be started
-        if (!m_dragging) {
+        if (event->buttons() & Qt::LeftButton) {
             const QPointF pos = transform.map(event->pos());
             const QPointF pos = transform.map(event->pos());
-            const qreal minDragDiff = 4;
-            m_dragging = qAbs(pos.x() - m_pressedMousePos.x()) >= minDragDiff ||
-                         qAbs(pos.y() - m_pressedMousePos.y()) >= minDragDiff;
-            if (m_dragging) {
+            if ((pos - m_pressedMousePos).manhattanLength() >= QApplication::startDragDistance()) {
+                if (!m_selectionManager->isSelected(m_pressedIndex)) {
+                    // Always assure that the dragged item gets selected. Usually this is already
+                    // done on the mouse-press event, but when using the selection-toggle on a
+                    // selected item the dragged item is not selected yet.
+                    m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
+                } else {
+                    // A selected item has been clicked to drag all selected items
+                    // -> the selection should not be cleared when the mouse button is released.
+                    m_clearSelectionIfItemsAreNotDragged = false;
+                }
+
                 startDragging();
             }
         }
                 startDragging();
             }
         }
@@ -336,15 +688,25 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const
         KItemListRubberBand* rubberBand = m_view->rubberBand();
         if (rubberBand->isActive()) {
             QPointF endPos = transform.map(event->pos());
         KItemListRubberBand* rubberBand = m_view->rubberBand();
         if (rubberBand->isActive()) {
             QPointF endPos = transform.map(event->pos());
+
+            // Update the current item.
+            const int newCurrent = m_view->itemAt(endPos);
+            if (newCurrent >= 0) {
+                // It's expected that the new current index is also the new anchor (bug 163451).
+                m_selectionManager->endAnchoredSelection();
+                m_selectionManager->setCurrentItem(newCurrent);
+                m_selectionManager->beginAnchoredSelection(newCurrent);
+            }
+
             if (m_view->scrollOrientation() == Qt::Vertical) {
             if (m_view->scrollOrientation() == Qt::Vertical) {
-                endPos.ry() += m_view->offset();
+                endPos.ry() += m_view->scrollOffset();
                 if (m_view->itemSize().width() < 0) {
                     // Use a special rubberband for views that have only one column and
                     // expand the rubberband to use the whole width of the view.
                     endPos.setX(m_view->size().width());
                 }
             } else {
                 if (m_view->itemSize().width() < 0) {
                     // Use a special rubberband for views that have only one column and
                     // expand the rubberband to use the whole width of the view.
                     endPos.setX(m_view->size().width());
                 }
             } else {
-                endPos.rx() += m_view->offset();
+                endPos.rx() += m_view->scrollOffset();
             }
             rubberBand->setEndPosition(endPos);
         }
             }
             rubberBand->setEndPosition(endPos);
         }
@@ -359,48 +721,92 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
         return false;
     }
 
         return false;
     }
 
+    emit mouseButtonReleased(m_pressedIndex, event->buttons());
+
+    const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos);
+    if (isAboveSelectionToggle) {
+        m_selectionTogglePressed = false;
+        return true;
+    }
+
+    if (!isAboveSelectionToggle && m_selectionTogglePressed) {
+        m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
+        m_selectionTogglePressed = false;
+        return true;
+    }
+
+    const bool shiftOrControlPressed = event->modifiers() & Qt::ShiftModifier ||
+                                       event->modifiers() & Qt::ControlModifier;
+
     KItemListRubberBand* rubberBand = m_view->rubberBand();
     if (rubberBand->isActive()) {
     KItemListRubberBand* rubberBand = m_view->rubberBand();
     if (rubberBand->isActive()) {
-        disconnect(rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandChanged()));
+        disconnect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged);
         rubberBand->setActive(false);
         m_oldSelection.clear();
         rubberBand->setActive(false);
         m_oldSelection.clear();
-    } else {
-        const QPointF pos = transform.map(event->pos());
-        const int index = m_view->itemAt(pos);
-        const bool shiftOrControlPressed = event->modifiers() & Qt::ShiftModifier ||
-                                           event->modifiers() & Qt::ControlModifier;
-
-        if (index >= 0 && index == m_pressedIndex) {
-            // The release event is done above the same item as the press event
-            bool emitItemClicked = true;
-            if (event->button() & Qt::LeftButton) {
-                if (m_view->isAboveExpansionToggle(index, pos)) {
-                    emit itemExpansionToggleClicked(index);
-                    emitItemClicked = false;
-                } else if (shiftOrControlPressed) {
-                    // The mouse click should only update the selection, not trigger the item
-                    emitItemClicked = false;
-                }
-            }
+        m_view->setAutoScroll(false);
+    }
 
 
-            if (emitItemClicked) {
-                emit itemClicked(index, event->button());
-            }
-        } else if (!shiftOrControlPressed) {
+    const QPointF pos = transform.map(event->pos());
+    const int index = m_view->itemAt(pos);
+
+    if (index >= 0 && index == m_pressedIndex) {
+        // The release event is done above the same item as the press event
+
+        if (m_clearSelectionIfItemsAreNotDragged) {
+            // A selected item has been clicked, but no drag operation has been started
+            // -> clear the rest of the selection.
             m_selectionManager->clearSelection();
             m_selectionManager->clearSelection();
+            m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select);
+            m_selectionManager->beginAnchoredSelection(m_pressedIndex);
+        }
+
+        if (event->button() & Qt::LeftButton) {
+            bool emitItemActivated = true;
+            if (m_view->isAboveExpansionToggle(index, pos)) {
+                const bool expanded = m_model->isExpanded(index);
+                m_model->setExpanded(index, !expanded);
+
+                emit itemExpansionToggleClicked(index);
+                emitItemActivated = false;
+            } else if (shiftOrControlPressed) {
+                // The mouse click should only update the selection, not trigger the item
+                emitItemActivated = false;
+            } else if (!(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced)) {
+                emitItemActivated = false;
+            }
+            if (emitItemActivated) {
+                emit itemActivated(index);
+            }
+        } else if (event->button() & Qt::MidButton) {
+            emit itemMiddleClicked(index);
         }
     }
 
         }
     }
 
-    m_dragging = false;
     m_pressedMousePos = QPointF();
     m_pressedIndex = -1;
     m_pressedMousePos = QPointF();
     m_pressedIndex = -1;
+    m_clearSelectionIfItemsAreNotDragged = false;
     return false;
 }
 
 bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform)
 {
     return false;
 }
 
 bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform)
 {
-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    const QPointF pos = transform.map(event->pos());
+    const int index = m_view->itemAt(pos);
+
+    // Expand item if desired - See Bug 295573
+    if (m_mouseDoubleClickAction != ActivateItemOnly) {
+        if (m_view && m_model && m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
+            const bool expanded = m_model->isExpanded(index);
+            m_model->setExpanded(index, !expanded);
+        }
+    }
+
+    bool emitItemActivated = !(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced) &&
+                             (event->button() & Qt::LeftButton) &&
+                             index >= 0 && index < m_model->count();
+    if (emitItemActivated) {
+        emit itemActivated(index);
+    }
     return false;
 }
 
     return false;
 }
 
@@ -415,23 +821,106 @@ bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, con
 {
     Q_UNUSED(event);
     Q_UNUSED(transform);
 {
     Q_UNUSED(event);
     Q_UNUSED(transform);
+
+    m_view->setAutoScroll(false);
+    m_view->hideDropIndicator();
+
+    KItemListWidget* widget = hoveredWidget();
+    if (widget) {
+        widget->setHovered(false);
+        emit itemUnhovered(widget->index());
+    }
     return false;
 }
 
 bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
     return false;
 }
 
 bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    if (!m_model || !m_view) {
+        return false;
+    }
+
+    event->acceptProposedAction();
+
+    KItemListWidget* oldHoveredWidget = hoveredWidget();
+
+    const QPointF pos = transform.map(event->pos());
+    KItemListWidget* newHoveredWidget = widgetForPos(pos);
+
+    if (oldHoveredWidget != newHoveredWidget) {
+        m_autoActivationTimer->stop();
+
+        if (oldHoveredWidget) {
+            oldHoveredWidget->setHovered(false);
+            emit itemUnhovered(oldHoveredWidget->index());
+        }
+    }
+
+    if (newHoveredWidget) {
+        bool droppingBetweenItems = false;
+        if (m_model->sortRole().isEmpty()) {
+            // The model supports inserting items between other items.
+            droppingBetweenItems = (m_view->showDropIndicator(pos) >= 0);
+        }
+
+        const int index = newHoveredWidget->index();
+        if (!droppingBetweenItems) {
+            if (m_model->supportsDropping(index)) {
+                // Something has been dragged on an item.
+                m_view->hideDropIndicator();
+                if (!newHoveredWidget->isHovered()) {
+                    newHoveredWidget->setHovered(true);
+                    emit itemHovered(index);
+                }
+
+                if (!m_autoActivationTimer->isActive() && m_autoActivationTimer->interval() >= 0) {
+                    m_autoActivationTimer->setProperty("index", index);
+                    m_autoActivationTimer->start();
+                }
+            }
+        } else {
+            m_autoActivationTimer->stop();
+            if (newHoveredWidget && newHoveredWidget->isHovered()) {
+                newHoveredWidget->setHovered(false);
+                emit itemUnhovered(index);
+            }
+        }
+    } else {
+        m_view->hideDropIndicator();
+    }
+
     return false;
 }
 
 bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
     return false;
 }
 
 bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    if (!m_view) {
+        return false;
+    }
 
 
-    m_dragging = false;
-    return false;
+    m_autoActivationTimer->stop();
+    m_view->setAutoScroll(false);
+
+    const QPointF pos = transform.map(event->pos());
+
+    int dropAboveIndex = -1;
+    if (m_model->sortRole().isEmpty()) {
+        // The model supports inserting of items between other items.
+        dropAboveIndex = m_view->showDropIndicator(pos);
+    }
+
+    if (dropAboveIndex >= 0) {
+        // Something has been dropped between two items.
+        m_view->hideDropIndicator();
+        emit aboveItemDropEvent(dropAboveIndex, event);
+    } else {
+        // Something has been dropped on an item or on an empty part of the view.
+        emit itemDropEvent(m_view->itemAt(pos), event);
+    }
+
+    QAccessibleEvent accessibilityEvent(view(), QAccessible::DragDropEnd);
+    QAccessible::updateAccessibility(&accessibilityEvent);
+
+    return true;
 }
 
 bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 }
 
 bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
@@ -443,47 +932,30 @@ bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent* event, const
 
 bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 {
 
 bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 {
-    // The implementation assumes that only one item can get hovered no matter
-    // whether they overlap or not.
-
     Q_UNUSED(transform);
     if (!m_model || !m_view) {
         return false;
     }
 
     Q_UNUSED(transform);
     if (!m_model || !m_view) {
         return false;
     }
 
-    // Search the previously hovered item that might get unhovered
-    KItemListWidget* unhoveredWidget = 0;
-    foreach (KItemListWidget* widget, m_view->visibleItemListWidgets()) {
-        if (widget->isHovered()) {
-            unhoveredWidget = widget;
-            break;
-        }
-    }
-
-    // Search the currently hovered item
-    KItemListWidget* hoveredWidget = 0;
-    foreach (KItemListWidget* widget, m_view->visibleItemListWidgets()) {
-        const QPointF mappedPos = widget->mapFromItem(m_view, event->pos());
-
-        const bool hovered = widget->contains(mappedPos) &&
-                             !widget->expansionToggleRect().contains(mappedPos) &&
-                             !widget->selectionToggleRect().contains(mappedPos);
-        if (hovered) {
-            hoveredWidget = widget;
-            break;
-        }
-    }
+    KItemListWidget* oldHoveredWidget = hoveredWidget();
+    const QPointF pos = transform.map(event->pos());
+    KItemListWidget* newHoveredWidget = widgetForPos(pos);
 
 
-    if (unhoveredWidget != hoveredWidget) {
-        if (unhoveredWidget) {
-            unhoveredWidget->setHovered(false);
-            emit itemUnhovered(unhoveredWidget->index());
+    if (oldHoveredWidget != newHoveredWidget) {
+        if (oldHoveredWidget) {
+            oldHoveredWidget->setHovered(false);
+            emit itemUnhovered(oldHoveredWidget->index());
         }
 
         }
 
-        if (hoveredWidget) {
-            hoveredWidget->setHovered(true);
-            emit itemHovered(hoveredWidget->index());
+        if (newHoveredWidget) {
+            newHoveredWidget->setHovered(true);
+            const QPointF mappedPos = newHoveredWidget->mapFromItem(m_view, pos);
+            newHoveredWidget->setHoverPosition(mappedPos);
+            emit itemHovered(newHoveredWidget->index());
         }
         }
+    } else if (oldHoveredWidget) {
+        const QPointF mappedPos = oldHoveredWidget->mapFromItem(m_view, pos);
+        oldHoveredWidget->setHoverPosition(mappedPos);
     }
 
     return false;
     }
 
     return false;
@@ -538,6 +1010,8 @@ bool KItemListController::processEvent(QEvent* event, const QTransform& transfor
         return mouseMoveEvent(static_cast<QGraphicsSceneMouseEvent*>(event), QTransform());
     case QEvent::GraphicsSceneMouseRelease:
         return mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(event), QTransform());
         return mouseMoveEvent(static_cast<QGraphicsSceneMouseEvent*>(event), QTransform());
     case QEvent::GraphicsSceneMouseRelease:
         return mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(event), QTransform());
+    case QEvent::GraphicsSceneMouseDoubleClick:
+        return mouseDoubleClickEvent(static_cast<QGraphicsSceneMouseEvent*>(event), QTransform());
     case QEvent::GraphicsSceneWheel:
          return wheelEvent(static_cast<QGraphicsSceneWheelEvent*>(event), QTransform());
     case QEvent::GraphicsSceneDragEnter:
     case QEvent::GraphicsSceneWheel:
          return wheelEvent(static_cast<QGraphicsSceneWheelEvent*>(event), QTransform());
     case QEvent::GraphicsSceneDragEnter:
@@ -563,7 +1037,7 @@ bool KItemListController::processEvent(QEvent* event, const QTransform& transfor
     return false;
 }
 
     return false;
 }
 
-void KItemListController::slotViewOffsetChanged(qreal current, qreal previous)
+void KItemListController::slotViewScrollOffsetChanged(qreal current, qreal previous)
 {
     if (!m_view) {
         return;
 {
     if (!m_view) {
         return;
@@ -600,9 +1074,9 @@ void KItemListController::slotRubberBandChanged()
 
     const bool scrollVertical = (m_view->scrollOrientation() == Qt::Vertical);
     if (scrollVertical) {
 
     const bool scrollVertical = (m_view->scrollOrientation() == Qt::Vertical);
     if (scrollVertical) {
-        rubberBandRect.translate(0, -m_view->offset());
+        rubberBandRect.translate(0, -m_view->scrollOffset());
     } else {
     } else {
-        rubberBandRect.translate(-m_view->offset(), 0);
+        rubberBandRect.translate(-m_view->scrollOffset(), 0);
     }
 
     if (!m_oldSelection.isEmpty()) {
     }
 
     if (!m_oldSelection.isEmpty()) {
@@ -615,16 +1089,16 @@ void KItemListController::slotRubberBandChanged()
         }
     }
 
         }
     }
 
-    QSet<int> selectedItems;
+    KItemSet selectedItems;
 
     // Select all visible items that intersect with the rubberband
     foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {
         const int index = widget->index();
 
 
     // Select all visible items that intersect with the rubberband
     foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {
         const int index = widget->index();
 
-        const QRectF widgetRect = m_view->itemBoundingRect(index);
+        const QRectF widgetRect = m_view->itemRect(index);
         if (widgetRect.intersects(rubberBandRect)) {
         if (widgetRect.intersects(rubberBandRect)) {
-            const QRectF iconRect = widget->iconBoundingRect().translated(widgetRect.topLeft());
-            const QRectF textRect = widget->textBoundingRect().translated(widgetRect.topLeft());
+            const QRectF iconRect = widget->iconRect().translated(widgetRect.topLeft());
+            const QRectF textRect = widget->textRect().translated(widgetRect.topLeft());
             if (iconRect.intersects(rubberBandRect) || textRect.intersects(rubberBandRect)) {
                 selectedItems.insert(index);
             }
             if (iconRect.intersects(rubberBandRect) || textRect.intersects(rubberBandRect)) {
                 selectedItems.insert(index);
             }
@@ -640,7 +1114,7 @@ void KItemListController::slotRubberBandChanged()
     int index = increaseIndex ? m_view->lastVisibleIndex() + 1 : m_view->firstVisibleIndex() - 1;
     bool selectionFinished = false;
     do {
     int index = increaseIndex ? m_view->lastVisibleIndex() + 1 : m_view->firstVisibleIndex() - 1;
     bool selectionFinished = false;
     do {
-        const QRectF widgetRect = m_view->itemBoundingRect(index);
+        const QRectF widgetRect = m_view->itemRect(index);
         if (widgetRect.intersects(rubberBandRect)) {
             selectedItems.insert(index);
         }
         if (widgetRect.intersects(rubberBandRect)) {
             selectedItems.insert(index);
         }
@@ -658,74 +1132,181 @@ void KItemListController::slotRubberBandChanged()
         }
     } while (!selectionFinished);
 
         }
     } while (!selectionFinished);
 
-    m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);
+    if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
+        // If Control is pressed, the selection state of all items in the rubberband is toggled.
+        // Therefore, the new selection contains:
+        // 1. All previously selected items which are not inside the rubberband, and
+        // 2. all items inside the rubberband which have not been selected previously.
+        m_selectionManager->setSelectedItems(m_oldSelection ^ selectedItems);
+    }
+    else {
+        m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);
+    }
 }
 
 }
 
-QPixmap KItemListController::createDragPixmap(const QSet<int>& indexes) const
+void KItemListController::startDragging()
 {
 {
-    if (!m_model || !m_view) {
-        return QPixmap();
+    if (!m_view || !m_model) {
+        return;
+    }
+
+    const KItemSet selectedItems = m_selectionManager->selectedItems();
+    if (selectedItems.isEmpty()) {
+        return;
+    }
+
+    QMimeData* data = m_model->createMimeData(selectedItems);
+    if (!data) {
+        return;
+    }
+
+    // The created drag object will be owned and deleted
+    // by QApplication::activeWindow().
+    QDrag* drag = new QDrag(QApplication::activeWindow());
+    drag->setMimeData(data);
+
+    const QPixmap pixmap = m_view->createDragPixmap(selectedItems);
+    drag->setPixmap(pixmap);
+
+    const QPoint hotSpot((pixmap.width() / pixmap.devicePixelRatio()) / 2, 0);
+    drag->setHotSpot(hotSpot);
+
+    drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::CopyAction);
+
+    QAccessibleEvent accessibilityEvent(view(), QAccessible::DragDropStart);
+    QAccessible::updateAccessibility(&accessibilityEvent);
+}
+
+KItemListWidget* KItemListController::hoveredWidget() const
+{
+    Q_ASSERT(m_view);
+
+    foreach (KItemListWidget* widget, m_view->visibleItemListWidgets()) {
+        if (widget->isHovered()) {
+            return widget;
+        }
     }
 
     }
 
-    // TODO: The current hack assumes a property "iconPixmap" in the model. The method
-    // will get an interface of KFileItemList later.
-    QSetIterator<int> it(indexes);
-    while (it.hasNext()) {
-        const int index = it.next();
-        // TODO: Only one item is considered currently
-        QPixmap pixmap = m_model->data(index).value("iconPixmap").value<QPixmap>();
-        if (pixmap.isNull()) {
-            KIcon icon(m_model->data(index).value("iconName").toString());
-            const QSizeF size = m_view->itemSize();
-            pixmap = icon.pixmap(size.toSize());
+    return 0;
+}
+
+KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const
+{
+    Q_ASSERT(m_view);
+
+    foreach (KItemListWidget* widget, m_view->visibleItemListWidgets()) {
+        const QPointF mappedPos = widget->mapFromItem(m_view, pos);
+
+        const bool hovered = widget->contains(mappedPos) &&
+                             !widget->expansionToggleRect().contains(mappedPos);
+        if (hovered) {
+            return widget;
         }
         }
-        return pixmap;
     }
 
     }
 
-    return QPixmap();
+    return 0;
 }
 
 }
 
-QMimeData* KItemListController::createMimeData(const QSet<int>& indexes) const
+void KItemListController::updateKeyboardAnchor()
 {
 {
-    if (!m_model) {
-        return 0;
+    const bool validAnchor = m_keyboardAnchorIndex >= 0 &&
+                             m_keyboardAnchorIndex < m_model->count() &&
+                             keyboardAnchorPos(m_keyboardAnchorIndex) == m_keyboardAnchorPos;
+    if (!validAnchor) {
+        const int index = m_selectionManager->currentItem();
+        m_keyboardAnchorIndex = index;
+        m_keyboardAnchorPos = keyboardAnchorPos(index);
     }
     }
+}
 
 
-    QMimeData* data = new QMimeData();
+int KItemListController::nextRowIndex(int index) const
+{
+    if (m_keyboardAnchorIndex < 0) {
+        return index;
+    }
 
 
-    // TODO: Check KDirModel::mimeData() for a good reference implementation
-    KUrl::List urls;
-    QSetIterator<int> it(indexes);
-    while (it.hasNext()) {
-        const int index = it.next();
-        // TODO: Big hack to use KFileItemModel here. Remove after moving mimeData()
-        // into KFileItemModel.
-        KFileItemModel* model = qobject_cast<KFileItemModel*>(m_model);
-        Q_ASSERT(model);
-        const KUrl url = model->fileItem(index).url();
-        urls.append(url);
+    const int maxIndex = m_model->count() - 1;
+    if (index == maxIndex) {
+        return index;
     }
 
     }
 
-    urls.populateMimeData(data);
+    // Calculate the index of the last column inside the row of the current index
+    int lastColumnIndex = index;
+    while (keyboardAnchorPos(lastColumnIndex + 1) > keyboardAnchorPos(lastColumnIndex)) {
+        ++lastColumnIndex;
+        if (lastColumnIndex >= maxIndex) {
+            return index;
+        }
+    }
 
 
-    return data;
+    // Based on the last column index go to the next row and calculate the nearest index
+    // that is below the current index
+    int nextRowIndex = lastColumnIndex + 1;
+    int searchIndex = nextRowIndex;
+    qreal minDiff = qAbs(m_keyboardAnchorPos - keyboardAnchorPos(nextRowIndex));
+    while (searchIndex < maxIndex && keyboardAnchorPos(searchIndex + 1) > keyboardAnchorPos(searchIndex)) {
+        ++searchIndex;
+        const qreal searchDiff = qAbs(m_keyboardAnchorPos - keyboardAnchorPos(searchIndex));
+        if (searchDiff < minDiff) {
+            minDiff = searchDiff;
+            nextRowIndex = searchIndex;
+        }
+    }
+
+    return nextRowIndex;
 }
 
 }
 
-void KItemListController::startDragging()
+int KItemListController::previousRowIndex(int index) const
 {
 {
-    // The created drag object will be owned and deleted
-    // by QApplication::activeWindow().
-    QDrag* drag = new QDrag(QApplication::activeWindow());
+    if (m_keyboardAnchorIndex < 0 || index == 0) {
+        return index;
+    }
 
 
-    const QSet<int> selectedItems = m_selectionManager->selectedItems();
+    // Calculate the index of the first column inside the row of the current index
+    int firstColumnIndex = index;
+    while (keyboardAnchorPos(firstColumnIndex - 1) < keyboardAnchorPos(firstColumnIndex)) {
+        --firstColumnIndex;
+        if (firstColumnIndex <= 0) {
+            return index;
+        }
+    }
 
 
-    const QPixmap pixmap = createDragPixmap(selectedItems);
-    drag->setPixmap(pixmap);
+    // Based on the first column index go to the previous row and calculate the nearest index
+    // that is above the current index
+    int previousRowIndex = firstColumnIndex - 1;
+    int searchIndex = previousRowIndex;
+    qreal minDiff = qAbs(m_keyboardAnchorPos - keyboardAnchorPos(previousRowIndex));
+    while (searchIndex > 0 && keyboardAnchorPos(searchIndex - 1) < keyboardAnchorPos(searchIndex)) {
+        --searchIndex;
+        const qreal searchDiff = qAbs(m_keyboardAnchorPos - keyboardAnchorPos(searchIndex));
+        if (searchDiff < minDiff) {
+            minDiff = searchDiff;
+            previousRowIndex = searchIndex;
+        }
+    }
 
 
-    QMimeData* data = createMimeData(selectedItems);
-    drag->setMimeData(data);
+    return previousRowIndex;
+}
 
 
-    drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::IgnoreAction);
+qreal KItemListController::keyboardAnchorPos(int index) const
+{
+    const QRectF itemRect = m_view->itemRect(index);
+    if (!itemRect.isEmpty()) {
+        return (m_view->scrollOrientation() == Qt::Vertical) ? itemRect.x() : itemRect.y();
+    }
+
+    return 0;
+}
+
+void KItemListController::updateExtendedSelectionRegion()
+{
+    if (m_view) {
+        const bool extend = (m_selectionBehavior != MultiSelection);
+        KItemListStyleOption option = m_view->styleOption();
+        if (option.extendedSelectionRegion != extend) {
+            option.extendedSelectionRegion = extend;
+            m_view->setStyleOption(option);
+        }
+    }
 }
 
 }
 
-#include "kitemlistcontroller.moc"