X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2f0ceedae088158b8af24a5e94500a7d1c0edecb..dbfba7dfedc979469ec2be072c63d0dfcf7970ee:/src/kitemviews/kitemlistcontroller.cpp

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 92a14b23d..2ff8068ab 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -25,21 +25,40 @@
 #include "kitemlistview.h"
 #include "kitemlistrubberband_p.h"
 #include "kitemlistselectionmanager.h"
+#include "kitemlistkeyboardsearchmanager_p.h"
 
 #include <QApplication>
+#include <QDrag>
 #include <QEvent>
+#include <QGraphicsScene>
 #include <QGraphicsSceneEvent>
+#include <QGraphicsView>
+#include <QMimeData>
+#include <QTimer>
 
+#include <KGlobalSettings>
 #include <KDebug>
 
 KItemListController::KItemListController(QObject* parent) :
     QObject(parent),
+    m_selectionTogglePressed(false),
     m_selectionBehavior(NoSelection),
     m_model(0),
     m_view(0),
     m_selectionManager(new KItemListSelectionManager(this)),
-    m_pressedIndex(-1)
+    m_keyboardManager(new KItemListKeyboardSearchManager(this)),
+    m_pressedIndex(-1),
+    m_pressedMousePos(),
+    m_autoActivationTimer(0),
+    m_oldSelection()
 {
+    connect(m_keyboardManager, SIGNAL(changeCurrentItem(QString,bool)),
+            this, SLOT(slotChangeCurrentItem(QString,bool)));
+
+    m_autoActivationTimer = new QTimer(this);
+    m_autoActivationTimer->setSingleShot(true);
+    m_autoActivationTimer->setInterval(-1);
+    connect(m_autoActivationTimer, SIGNAL(timeout()), this, SLOT(slotAutoActivationTimeout()));
 }
 
 KItemListController::~KItemListController()
@@ -82,7 +101,7 @@ void KItemListController::setView(KItemListView* view)
 
     KItemListView* oldView = m_view;
     if (oldView) {
-        disconnect(oldView, SIGNAL(offsetChanged(qreal,qreal)), this, SLOT(slotViewOffsetChanged(qreal,qreal)));
+        disconnect(oldView, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(slotViewScrollOffsetChanged(qreal,qreal)));
     }
 
     m_view = view;
@@ -90,7 +109,7 @@ void KItemListController::setView(KItemListView* view)
     if (m_view) {
         m_view->setController(this);
         m_view->setModel(m_model);
-        connect(m_view, SIGNAL(offsetChanged(qreal,qreal)), this, SLOT(slotViewOffsetChanged(qreal,qreal)));
+        connect(m_view, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(slotViewScrollOffsetChanged(qreal,qreal)));
     }
 
     emit viewChanged(m_view, oldView);
@@ -111,6 +130,16 @@ KItemListController::SelectionBehavior KItemListController::selectionBehavior()
     return m_selectionBehavior;
 }
 
+void KItemListController::setAutoActivationDelay(int delay)
+{
+    m_autoActivationTimer->setInterval(delay);
+}
+
+int KItemListController::autoActivationDelay() const
+{
+    return m_autoActivationTimer->interval();
+}
+
 bool KItemListController::showEvent(QShowEvent* event)
 {
     Q_UNUSED(event);
@@ -125,17 +154,31 @@ bool KItemListController::hideEvent(QHideEvent* 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;
 
-    int index = m_selectionManager->currentItem();
     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.
-    int key = event->key();
     if (m_view->scrollOrientation() == Qt::Horizontal) {
         switch (key) {
         case Qt::Key_Up:    key = Qt::Key_Left; break;
@@ -177,8 +220,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         if (index + itemsPerRow < itemCount) {
             // We are not in the last row yet.
             index += itemsPerRow;
-        }
-        else {
+        } 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.
@@ -191,17 +233,57 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         }
         break;
 
+    case Qt::Key_Enter:
+    case Qt::Key_Return: {
+        const QSet<int> selectedItems = m_selectionManager->selectedItems();
+        if (selectedItems.count() >= 2) {
+            emit itemsActivated(selectedItems);
+        } else if (selectedItems.count() == 1) {
+            emit itemActivated(selectedItems.toList().first());
+        } else {
+            emit itemActivated(index);
+        }
+        break;
+    }
+
     case Qt::Key_Space:
         if (controlPressed) {
             m_selectionManager->endAnchoredSelection();
             m_selectionManager->setSelected(index, 1, KItemListSelectionManager::Toggle);
             m_selectionManager->beginAnchoredSelection(index);
+        } else {
+            m_keyboardManager->addKeys(event->text());
         }
+        break;
 
-    default:
+    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 QSet<int> selectedItems = m_selectionManager->selectedItems();
+        int index = -1;
+        if (selectedItems.count() >= 2) {
+            const int currentItemIndex = m_selectionManager->currentItem();
+            index = selectedItems.contains(currentItemIndex)
+                    ? currentItemIndex : selectedItems.toList().first();
+        } else if (selectedItems.count() == 1) {
+            index = selectedItems.toList().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;
     }
 
+    default:
+        m_keyboardManager->addKeys(event->text());
+        return false;
+    }
+
     if (m_selectionManager->currentItem() != index) {
         if (controlPressed) {
             m_selectionManager->endAnchoredSelection();
@@ -217,10 +299,54 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         if (!shiftPressed) {
             m_selectionManager->beginAnchoredSelection(index);
         }
+
+        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->clearSelection();
+        m_selectionManager->setSelected(index, 1);
+        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;
+    }
+
+    if (m_model->supportsDropping(index)) {
+        if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
+            const bool expanded = m_model->isExpanded(index);
+            m_model->setExpanded(index, !expanded);
+        } else {
+            emit itemActivated(index);
+        }
+    }
+}
+
 bool KItemListController::inputMethodEvent(QInputMethodEvent* event)
 {
     Q_UNUSED(event);
@@ -233,18 +359,40 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
         return false;
     }
 
-    const QPointF pos = transform.map(event->pos());
-    m_pressedIndex = m_view->itemAt(pos);
+    m_pressedMousePos = transform.map(event->pos());
+    m_pressedIndex = m_view->itemAt(m_pressedMousePos);
 
-    if (m_view->isAboveExpansionToggle(m_pressedIndex, pos)) {
+    if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
+        m_selectionManager->setCurrentItem(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;
-    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();
     }
 
@@ -280,24 +428,43 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
             break;
         }
 
+        if (event->buttons() & Qt::RightButton) {
+            emit itemContextMenuRequested(m_pressedIndex, event->screenPos());
+        }
+
         return true;
-    } else {
-        KItemListRubberBand* rubberBand = m_view->rubberBand();
-        QPointF startPos = pos;
+    }
+
+    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) {
-            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 {
-            startPos.rx() += m_view->offset();
+            startPos.rx() += m_view->scrollOffset();
         }
+
+        m_oldSelection = m_selectionManager->selectedItems();
+        KItemListRubberBand* rubberBand = m_view->rubberBand();
         rubberBand->setStartPosition(startPos);
         rubberBand->setEndPosition(startPos);
         rubberBand->setActive(true);
         connect(rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandChanged()));
+        m_view->setAutoScroll(true);
     }
 
     return false;
@@ -309,20 +476,46 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const
         return false;
     }
 
-    KItemListRubberBand* rubberBand = m_view->rubberBand();
-    if (rubberBand->isActive()) {
-        QPointF endPos = transform.map(event->pos());
-        if (m_view->scrollOrientation() == Qt::Vertical) {
-            endPos.ry() += m_view->offset();
-            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());
+    if (m_pressedIndex >= 0) {
+        // Check whether a dragging should be started
+        if (event->buttons() & Qt::LeftButton) {
+            const QPointF pos = transform.map(event->pos());
+            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);
+                }
+                startDragging();
             }
-        } else {
-            endPos.rx() += m_view->offset();
         }
-        rubberBand->setEndPosition(endPos);
+    } else {
+        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) {
+                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 {
+                endPos.rx() += m_view->scrollOffset();
+            }
+            rubberBand->setEndPosition(endPos);
+        }
     }
 
     return false;
@@ -334,47 +527,73 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
         return false;
     }
 
+    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()) {
         disconnect(rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandChanged()));
         rubberBand->setActive(false);
-        m_pressedIndex = -1;
-        return false;
+        m_oldSelection.clear();
+        m_view->setAutoScroll(false);
     }
 
     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) {
+            bool emitItemActivated = true;
             if (m_view->isAboveExpansionToggle(index, pos)) {
+                const bool expanded = m_model->isExpanded(index);
+                m_model->setExpanded(index, !expanded);
+
                 emit itemExpansionToggleClicked(index);
-                emitItemClicked = false;
-            }
-            else if (shiftOrControlPressed) {
+                emitItemActivated = false;
+            } else if (shiftOrControlPressed) {
                 // The mouse click should only update the selection, not trigger the item
-                emitItemClicked = false;
+                emitItemActivated = false;
+            } else if (!KGlobalSettings::singleClick()) {
+                emitItemActivated = false;
             }
+            if (emitItemActivated) {
+                emit itemActivated(index);
+            }
+        } else if (event->button() & Qt::MidButton) {
+            emit itemMiddleClicked(index);
         }
-
-        if (emitItemClicked) {
-            emit itemClicked(index, event->button());
-        }
-    } else if (!shiftOrControlPressed) {
-        m_selectionManager->clearSelection();
     }
 
+    m_pressedMousePos = QPointF();
     m_pressedIndex = -1;
     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);
+
+    bool emitItemActivated = !KGlobalSettings::singleClick() &&
+                             (event->button() & Qt::LeftButton) &&
+                             index >= 0 && index < m_model->count();
+    if (emitItemActivated) {
+        emit itemActivated(index);
+    }
     return false;
 }
 
@@ -394,16 +613,55 @@ bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, con
 
 bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
-    Q_UNUSED(event);
     Q_UNUSED(transform);
+    if (!m_model || !m_view) {
+        return false;
+    }
+
+    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) {
+            const int index = newHoveredWidget->index();
+            if (m_model->supportsDropping(index)) {
+                newHoveredWidget->setHovered(true);
+            }
+            emit itemHovered(index);
+
+            if (m_autoActivationTimer->interval() >= 0) {
+                m_autoActivationTimer->setProperty("index", index);
+                m_autoActivationTimer->start();
+            }
+        }
+    }
+
     return false;
 }
 
 bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
-    Q_UNUSED(event);
-    Q_UNUSED(transform);
-    return false;
+    Q_UNUSED(transform)
+    if (!m_view) {
+        return false;
+    }
+
+    m_autoActivationTimer->stop();
+
+    const QPointF pos = transform.map(event->pos());
+    const int index = m_view->itemAt(pos);
+    emit itemDropEvent(index, event);
+
+    return true;
 }
 
 bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
@@ -415,46 +673,24 @@ bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent* event, const
 
 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;
     }
 
-    // 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);
+            emit itemHovered(newHoveredWidget->index());
         }
     }
 
@@ -510,6 +746,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());
+    case QEvent::GraphicsSceneMouseDoubleClick:
+        return mouseDoubleClickEvent(static_cast<QGraphicsSceneMouseEvent*>(event), QTransform());
     case QEvent::GraphicsSceneWheel:
          return wheelEvent(static_cast<QGraphicsSceneWheelEvent*>(event), QTransform());
     case QEvent::GraphicsSceneDragEnter:
@@ -535,7 +773,7 @@ bool KItemListController::processEvent(QEvent* event, const QTransform& transfor
     return false;
 }
 
-void KItemListController::slotViewOffsetChanged(qreal current, qreal previous)
+void KItemListController::slotViewScrollOffsetChanged(qreal current, qreal previous)
 {
     if (!m_view) {
         return;
@@ -572,19 +810,18 @@ void KItemListController::slotRubberBandChanged()
 
     const bool scrollVertical = (m_view->scrollOrientation() == Qt::Vertical);
     if (scrollVertical) {
-        rubberBandRect.translate(0, -m_view->offset());
+        rubberBandRect.translate(0, -m_view->scrollOffset());
     } else {
-        rubberBandRect.translate(-m_view->offset(), 0);
+        rubberBandRect.translate(-m_view->scrollOffset(), 0);
     }
 
-    QSet<int> previousSelectedItems;
-    if (m_selectionManager->hasSelection()) {
-        // Don't clear the current selection in case if the user pressed the
-        // Shift- or Control-key during the rubberband selection
+    if (!m_oldSelection.isEmpty()) {
+        // Clear the old selection that was available before the rubberband has
+        // been activated in case if no Shift- or Control-key are pressed
         const bool shiftOrControlPressed = QApplication::keyboardModifiers() & Qt::ShiftModifier ||
                                            QApplication::keyboardModifiers() & Qt::ControlModifier;
-        if (shiftOrControlPressed) {
-            previousSelectedItems = m_selectionManager->selectedItems();
+        if (!shiftOrControlPressed) {
+            m_oldSelection.clear();
         }
     }
 
@@ -594,10 +831,10 @@ void KItemListController::slotRubberBandChanged()
     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)) {
-            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);
             }
@@ -613,7 +850,7 @@ void KItemListController::slotRubberBandChanged()
     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);
         }
@@ -631,7 +868,73 @@ void KItemListController::slotRubberBandChanged()
         }
     } while (!selectionFinished);
 
-    m_selectionManager->setSelectedItems(selectedItems + previousSelectedItems);
+    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) + (selectedItems - m_oldSelection));
+    }
+    else {
+        m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);
+    }
+}
+
+void KItemListController::startDragging()
+{
+    if (!m_view || !m_model) {
+        return;
+    }
+
+    const QSet<int> 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);
+
+    drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::IgnoreAction);
+}
+
+KItemListWidget* KItemListController::hoveredWidget() const
+{
+    Q_ASSERT(m_view);
+
+    foreach (KItemListWidget* widget, m_view->visibleItemListWidgets()) {
+        if (widget->isHovered()) {
+            return widget;
+        }
+    }
+
+    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 0;
 }
 
 #include "kitemlistcontroller.moc"