Merge branch 'KDE/4.14'

[dolphin.git] / src / kitemviews / kitemlistcontroller.cpp

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 7798fc364df5d57cfab67271f6d07f927b4708cf..8e2ef5ef3b91b27543afbf5a96531fb1ad3825de 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,10 +23,14 @@
 
 #include "kitemlistcontroller.h"
 
 
 #include "kitemlistcontroller.h"
 

+#include <KGlobalSettings>
+#include <KDebug>
+

 #include "kitemlistview.h"
 #include "kitemlistview.h"

-#include "kitemlistrubberband_p.h"

 #include "kitemlistselectionmanager.h"
 #include "kitemlistselectionmanager.h"

-#include "kitemlistkeyboardsearchmanager_p.h"
+
+#include "private/kitemlistrubberband.h"
+#include "private/kitemlistkeyboardsearchmanager.h"

 
 #include <QApplication>
 #include <QDrag>
 
 #include <QApplication>
 #include <QDrag>


@@ -35,14 +40,16 @@
 #include <QGraphicsView>
 #include <QMimeData>
 #include <QTimer>
 #include <QGraphicsView>
 #include <QMimeData>
 #include <QTimer>

+#include <QAccessible>

 
 

-#include <KGlobalSettings>
-#include <KDebug>
-
-KItemListController::KItemListController(QObject* parent) :
+KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :

     QObject(parent),
     QObject(parent),

+    m_singleClickActivationEnforced(false),

     m_selectionTogglePressed(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)),


@@ -56,15 +63,25 @@ KItemListController::KItemListController(QObject* parent) :
 {
     connect(m_keyboardManager, SIGNAL(changeCurrentItem(QString,bool)),
             this, SLOT(slotChangeCurrentItem(QString,bool)));
 {
     connect(m_keyboardManager, SIGNAL(changeCurrentItem(QString,bool)),
             this, SLOT(slotChangeCurrentItem(QString,bool)));

+    connect(m_selectionManager, SIGNAL(currentChanged(int,int)),
+            m_keyboardManager, SLOT(slotCurrentChanged(int,int)));

 
     m_autoActivationTimer = new QTimer(this);
     m_autoActivationTimer->setSingleShot(true);
     m_autoActivationTimer->setInterval(-1);
     connect(m_autoActivationTimer, SIGNAL(timeout()), this, SLOT(slotAutoActivationTimeout()));
 
     m_autoActivationTimer = new QTimer(this);
     m_autoActivationTimer->setSingleShot(true);
     m_autoActivationTimer->setInterval(-1);
     connect(m_autoActivationTimer, SIGNAL(timeout()), this, SLOT(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)


@@ -74,7 +91,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);


@@ -104,14 +128,17 @@ void KItemListController::setView(KItemListView* view)
     KItemListView* oldView = m_view;
     if (oldView) {
         disconnect(oldView, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(slotViewScrollOffsetChanged(qreal,qreal)));
     KItemListView* oldView = m_view;
     if (oldView) {
         disconnect(oldView, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(slotViewScrollOffsetChanged(qreal,qreal)));

+        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);
         connect(m_view, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(slotViewScrollOffsetChanged(qreal,qreal)));
         m_view->setController(this);
         m_view->setModel(m_model);
         connect(m_view, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(slotViewScrollOffsetChanged(qreal,qreal)));

+        updateExtendedSelectionRegion();

     }
 
     emit viewChanged(m_view, oldView);
     }
 
     emit viewChanged(m_view, oldView);


@@ -125,6 +152,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


@@ -132,6 +160,26 @@ 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);
 void KItemListController::setAutoActivationDelay(int delay)
 {
     m_autoActivationTimer->setInterval(delay);


@@ -142,6 +190,16 @@ int KItemListController::autoActivationDelay() const
     return m_autoActivationTimer->interval();
 }
 
     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);


@@ -189,8 +247,9 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         default:            break;
         }
     }
         default:            break;
         }
     }

-    
-    const bool selectSingleItem = itemCount == 1 &&
+
+    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);
                                   (key == Qt::Key_Home || key == Qt::Key_End  ||
                                    key == Qt::Key_Up   || key == Qt::Key_Down ||
                                    key == Qt::Key_Left || key == Qt::Key_Right);


@@ -203,15 +262,27 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
     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);
         }
             m_keyboardAnchorIndex = index;
             m_keyboardAnchorPos = keyboardAnchorPos(index);
         }


@@ -227,49 +298,94 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
 
     case Qt::Key_Up:
         updateKeyboardAnchor();
 
     case Qt::Key_Up:
         updateKeyboardAnchor();

-        index = previousRowIndex();
+        index = previousRowIndex(index);

         break;
 
     case Qt::Key_Down:
         updateKeyboardAnchor();
         break;
 
     case Qt::Key_Down:
         updateKeyboardAnchor();

-        index = nextRowIndex();
+        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;
+
+    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: {
         break;
 
     case Qt::Key_Enter:
     case Qt::Key_Return: {

-        const QSet<int> selectedItems = m_selectionManager->selectedItems();
+        const KItemSet selectedItems = m_selectionManager->selectedItems();

         if (selectedItems.count() >= 2) {
             emit itemsActivated(selectedItems);
         } else if (selectedItems.count() == 1) {
         if (selectedItems.count() >= 2) {
             emit itemsActivated(selectedItems);
         } else if (selectedItems.count() == 1) {

-            emit itemActivated(selectedItems.toList().first());
+            emit itemActivated(selectedItems.first());

         } else {
             emit itemActivated(index);
         }
         break;
     }
 
         } 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 {
-            const int current = m_selectionManager->currentItem();
-            m_selectionManager->setSelected(current);
-        }
-        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.
     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();
+        const KItemSet selectedItems = m_selectionManager->selectedItems();

         int index = -1;
         if (selectedItems.count() >= 2) {
             const int currentItemIndex = m_selectionManager->currentItem();
             index = selectedItems.contains(currentItemIndex)
         int index = -1;
         if (selectedItems.count() >= 2) {
             const int currentItemIndex = m_selectionManager->currentItem();
             index = selectedItems.contains(currentItemIndex)

-                    ? currentItemIndex : selectedItems.toList().first();
+                    ? currentItemIndex : selectedItems.first();

         } else if (selectedItems.count() == 1) {
         } else if (selectedItems.count() == 1) {

-            index = selectedItems.toList().first();
+            index = selectedItems.first();

         }
 
         if (index >= 0) {
         }
 
         if (index >= 0) {


@@ -282,25 +398,68 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         break;
     }
 
         break;
     }
 

+    case Qt::Key_Escape:
+        if (m_selectionBehavior != SingleSelection) {
+            m_selectionManager->clearSelection();
+        }
+        m_keyboardManager->cancelSearch();
+        emit escapePressed();
+        break;
+
+    case Qt::Key_Space:
+        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:
         m_keyboardManager->addKeys(event->text());
     default:
         m_keyboardManager->addKeys(event->text());

+        // Make sure unconsumed events get propagated up the chain. #302329
+        event->ignore();

         return false;
     }
 
     if (m_selectionManager->currentItem() != index) {
         return false;
     }
 
     if (m_selectionManager->currentItem() != index) {

-        if (controlPressed) {
-            m_selectionManager->endAnchoredSelection();
-        }
-
-        m_selectionManager->setCurrentItem(index);
+        switch (m_selectionBehavior) {
+        case NoSelection:
+            m_selectionManager->setCurrentItem(index);
+            break;

 
 

-        if (!shiftOrControlPressed || m_selectionBehavior == SingleSelection) {
+        case SingleSelection:
+            m_selectionManager->setCurrentItem(index);

             m_selectionManager->clearSelection();
             m_selectionManager->setSelected(index, 1);
             m_selectionManager->clearSelection();
             m_selectionManager->setSelected(index, 1);

-        }
+            break;

 
 

-        if (!shiftPressed) {
-            m_selectionManager->beginAnchoredSelection(index);
+        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);
         }
 
         m_view->scrollToItem(index);


@@ -322,9 +481,13 @@ void KItemListController::slotChangeCurrentItem(const QString& text, bool search
     }
     if (index >= 0) {
         m_selectionManager->setCurrentItem(index);
     }
     if (index >= 0) {
         m_selectionManager->setCurrentItem(index);

-        m_selectionManager->clearSelection();
-        m_selectionManager->setSelected(index, 1);
-        m_selectionManager->beginAnchoredSelection(index);
+
+        if (m_selectionBehavior != NoSelection) {
+            m_selectionManager->clearSelection();
+            m_selectionManager->setSelected(index, 1);
+            m_selectionManager->beginAnchoredSelection(index);
+        }
+

         m_view->scrollToItem(index);
     }
 }
         m_view->scrollToItem(index);
     }
 }


@@ -340,11 +503,20 @@ void KItemListController::slotAutoActivationTimeout()
         return;
     }
 
         return;
     }
 

-    if (m_model->supportsDropping(index)) {
+    /* 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);
         if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
             const bool expanded = m_model->isExpanded(index);
             m_model->setExpanded(index, !expanded);

-        } else {
+        } else if (m_autoActivationBehavior != ExpansionOnly) {

             emit itemActivated(index);
         }
     }
             emit itemActivated(index);
         }
     }


@@ -364,12 +536,19 @@ 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);

-    if (m_pressedIndex >= 0) {
-        emit itemPressed(m_pressedIndex, event->button());
+    emit mouseButtonPressed(m_pressedIndex, event->buttons());
+
+    // TODO: Qt5: Replace Qt::XButton1 by Qt::BackButton and Qt::XButton2 by Qt::ForwardButton
+    if (event->buttons() & (Qt::XButton1 | Qt::XButton2)) {
+        // 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->setCurrentItem(m_pressedIndex);

+        m_selectionManager->beginAnchoredSelection(m_pressedIndex);

         return true;
     }
 
         return true;
     }
 


@@ -400,6 +579,13 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
                                 (!shiftOrControlPressed && !pressedItemAlreadySelected);
     if (clearSelection) {
         m_selectionManager->clearSelection();
                                 (!shiftOrControlPressed && !pressedItemAlreadySelected);
     if (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) {


@@ -419,7 +605,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()) {


@@ -492,7 +678,12 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const
                     // 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);
                     // 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();
             }
         }


@@ -533,9 +724,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
         return false;
     }
 
         return false;
     }
 

-    if (m_pressedIndex >= 0) {
-        emit itemReleased(m_pressedIndex, event->button());
-    }
+    emit mouseButtonReleased(m_pressedIndex, event->buttons());

 
     const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos);
     if (isAboveSelectionToggle) {
 
     const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos);
     if (isAboveSelectionToggle) {


@@ -566,6 +755,14 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
     if (index >= 0 && index == m_pressedIndex) {
         // The release event is done above the same item as the press event
 
     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->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)) {
         if (event->button() & Qt::LeftButton) {
             bool emitItemActivated = true;
             if (m_view->isAboveExpansionToggle(index, pos)) {


@@ -577,7 +774,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
             } else if (shiftOrControlPressed) {
                 // The mouse click should only update the selection, not trigger the item
                 emitItemActivated = false;
             } else if (shiftOrControlPressed) {
                 // The mouse click should only update the selection, not trigger the item
                 emitItemActivated = false;

-            } else if (!KGlobalSettings::singleClick()) {
+            } else if (!(KGlobalSettings::singleClick() || m_singleClickActivationEnforced)) {

                 emitItemActivated = false;
             }
             if (emitItemActivated) {
                 emitItemActivated = false;
             }
             if (emitItemActivated) {


@@ -590,6 +787,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
 
     m_pressedMousePos = QPointF();
     m_pressedIndex = -1;
 
     m_pressedMousePos = QPointF();
     m_pressedIndex = -1;

+    m_clearSelectionIfItemsAreNotDragged = false;

     return false;
 }
 
     return false;
 }
 


@@ -598,7 +796,15 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event,
     const QPointF pos = transform.map(event->pos());
     const int index = m_view->itemAt(pos);
 
     const QPointF pos = transform.map(event->pos());
     const int index = m_view->itemAt(pos);
 

-    bool emitItemActivated = !KGlobalSettings::singleClick() &&
+    // 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 = !(KGlobalSettings::singleClick() || m_singleClickActivationEnforced) &&

                              (event->button() & Qt::LeftButton) &&
                              index >= 0 && index < m_model->count();
     if (emitItemActivated) {
                              (event->button() & Qt::LeftButton) &&
                              index >= 0 && index < m_model->count();
     if (emitItemActivated) {


@@ -618,16 +824,26 @@ 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(transform);

     if (!m_model || !m_view) {
         return false;
     }
 
     if (!m_model || !m_view) {
         return false;
     }
 

+    event->acceptProposedAction();
+

     KItemListWidget* oldHoveredWidget = hoveredWidget();
 
     const QPointF pos = transform.map(event->pos());
     KItemListWidget* oldHoveredWidget = hoveredWidget();
 
     const QPointF pos = transform.map(event->pos());


@@ -640,19 +856,39 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
             oldHoveredWidget->setHovered(false);
             emit itemUnhovered(oldHoveredWidget->index());
         }
             oldHoveredWidget->setHovered(false);
             emit itemUnhovered(oldHoveredWidget->index());
         }

+    }

 
 

-        if (newHoveredWidget) {
-            const int index = newHoveredWidget->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)) {
             if (m_model->supportsDropping(index)) {

-                newHoveredWidget->setHovered(true);
-            }
-            emit itemHovered(index);
+                // Something has been dragged on an item.
+                m_view->hideDropIndicator();
+                if (!newHoveredWidget->isHovered()) {
+                    newHoveredWidget->setHovered(true);
+                    emit itemHovered(index);
+                }

 
 

-            if (m_autoActivationTimer->interval() >= 0) {
-                m_autoActivationTimer->setProperty("index", index);
-                m_autoActivationTimer->start();
+                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;
     }
 
     return false;


@@ -660,16 +896,31 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
 
 bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
 
 bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {

-    Q_UNUSED(transform)

     if (!m_view) {
         return false;
     }
 
     m_autoActivationTimer->stop();
     if (!m_view) {
         return false;
     }
 
     m_autoActivationTimer->stop();

+    m_view->setAutoScroll(false);

 
     const QPointF pos = transform.map(event->pos());
 
     const QPointF pos = transform.map(event->pos());

-    const int index = m_view->itemAt(pos);
-    emit itemDropEvent(index, event);
+
+    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);
+    }
+
+    QAccessible::updateAccessibility(view(), 0, QAccessible::DragDropEnd);

 
     return true;
 }
 
     return true;
 }


@@ -700,8 +951,13 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const
 
         if (newHoveredWidget) {
             newHoveredWidget->setHovered(true);
 
         if (newHoveredWidget) {
             newHoveredWidget->setHovered(true);

+            const QPointF mappedPos = newHoveredWidget->mapFromItem(m_view, pos);
+            newHoveredWidget->setHoverPosition(mappedPos);

             emit itemHovered(newHoveredWidget->index());
         }
             emit itemHovered(newHoveredWidget->index());
         }

+    } else if (oldHoveredWidget) {
+        const QPointF mappedPos = oldHoveredWidget->mapFromItem(m_view, pos);
+        oldHoveredWidget->setHoverPosition(mappedPos);

     }
 
     return false;
     }
 
     return false;


@@ -835,7 +1091,7 @@ void KItemListController::slotRubberBandChanged()
         }
     }
 
         }
     }
 

-    QSet<int> selectedItems;
+    KItemSet selectedItems;

 
     // Select all visible items that intersect with the rubberband
     foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {
 
     // Select all visible items that intersect with the rubberband
     foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {


@@ -883,7 +1139,7 @@ void KItemListController::slotRubberBandChanged()
         // 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.
         // 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));
+        m_selectionManager->setSelectedItems(m_oldSelection ^ selectedItems);

     }
     else {
         m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);
     }
     else {
         m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);


@@ -896,7 +1152,7 @@ void KItemListController::startDragging()
         return;
     }
 
         return;
     }
 

-    const QSet<int> selectedItems = m_selectionManager->selectedItems();
+    const KItemSet selectedItems = m_selectionManager->selectedItems();

     if (selectedItems.isEmpty()) {
         return;
     }
     if (selectedItems.isEmpty()) {
         return;
     }


@@ -914,7 +1170,11 @@ void KItemListController::startDragging()
     const QPixmap pixmap = m_view->createDragPixmap(selectedItems);
     drag->setPixmap(pixmap);
 
     const QPixmap pixmap = m_view->createDragPixmap(selectedItems);
     drag->setPixmap(pixmap);
 

-    drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::IgnoreAction);
+    const QPoint hotSpot(pixmap.width() / 2, 0);
+    drag->setHotSpot(hotSpot);
+
+    drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::CopyAction);
+    QAccessible::updateAccessibility(view(), 0, QAccessible::DragDropStart);

 }
 
 KItemListWidget* KItemListController::hoveredWidget() const
 }
 
 KItemListWidget* KItemListController::hoveredWidget() const


@@ -959,24 +1219,23 @@ void KItemListController::updateKeyboardAnchor()
     }
 }
 
     }
 }
 

-int KItemListController::nextRowIndex() const
+int KItemListController::nextRowIndex(int index) const

 {
 {

-    const int currentIndex = m_selectionManager->currentItem();

     if (m_keyboardAnchorIndex < 0) {
     if (m_keyboardAnchorIndex < 0) {

-        return currentIndex;
+        return index;

     }
 
     const int maxIndex = m_model->count() - 1;
     }
 
     const int maxIndex = m_model->count() - 1;

-    if (currentIndex == maxIndex) {
-        return currentIndex;
+    if (index == maxIndex) {
+        return index;

     }
 
     // Calculate the index of the last column inside the row of the current index
     }
 
     // Calculate the index of the last column inside the row of the current index

-    int lastColumnIndex = currentIndex;
+    int lastColumnIndex = index;

     while (keyboardAnchorPos(lastColumnIndex + 1) > keyboardAnchorPos(lastColumnIndex)) {
         ++lastColumnIndex;
         if (lastColumnIndex >= maxIndex) {
     while (keyboardAnchorPos(lastColumnIndex + 1) > keyboardAnchorPos(lastColumnIndex)) {
         ++lastColumnIndex;
         if (lastColumnIndex >= maxIndex) {

-            return currentIndex;
+            return index;

         }
     }
 
         }
     }
 


@@ -997,19 +1256,18 @@ int KItemListController::nextRowIndex() const
     return nextRowIndex;
 }
 
     return nextRowIndex;
 }
 

-int KItemListController::previousRowIndex() const
+int KItemListController::previousRowIndex(int index) const

 {
 {

-    const int currentIndex = m_selectionManager->currentItem();
-    if (m_keyboardAnchorIndex < 0 || currentIndex == 0) {
-        return currentIndex;
+    if (m_keyboardAnchorIndex < 0 || index == 0) {
+        return index;

     }
 
     // Calculate the index of the first column inside the row of the current index
     }
 
     // Calculate the index of the first column inside the row of the current index

-    int firstColumnIndex = currentIndex;
+    int firstColumnIndex = index;

     while (keyboardAnchorPos(firstColumnIndex - 1) < keyboardAnchorPos(firstColumnIndex)) {
         --firstColumnIndex;
         if (firstColumnIndex <= 0) {
     while (keyboardAnchorPos(firstColumnIndex - 1) < keyboardAnchorPos(firstColumnIndex)) {
         --firstColumnIndex;
         if (firstColumnIndex <= 0) {

-            return currentIndex;
+            return index;

         }
     }
 
         }
     }
 


@@ -1040,4 +1298,16 @@ qreal KItemListController::keyboardAnchorPos(int index) const
     return 0;
 }
 
     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"
 #include "kitemlistcontroller.moc"