X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bb80d1877a8474ed60d4d0d41c587347fb521c95..7b911df33ec83bb978985d50342ce1c27afb6425:/src/kitemviews/kitemlistselectionmanager.cpp diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index cdc6dbc7d..9aaf22f58 100644 --- a/src/kitemviews/kitemlistselectionmanager.cpp +++ b/src/kitemviews/kitemlistselectionmanager.cpp @@ -1,5 +1,6 @@ /*************************************************************************** * Copyright (C) 2011 by Peter Penz * + * Copyright (C) 2011 by Frank Reininghaus * * * * Based on the Itemviews NG project from Trolltech Labs: * * http://qt.gitorious.org/qt-labs/itemviews-ng * @@ -30,6 +31,7 @@ KItemListSelectionManager::KItemListSelectionManager(QObject* parent) : m_currentItem(-1), m_anchorItem(-1), m_selectedItems(), + m_isAnchoredSelectionActive(false), m_model(0) { } @@ -41,6 +43,8 @@ KItemListSelectionManager::~KItemListSelectionManager() void KItemListSelectionManager::setCurrentItem(int current) { const int previous = m_currentItem; + const QSet previousSelection = selectedItems(); + if (m_model && current >= 0 && current < m_model->count()) { m_currentItem = current; } else { @@ -49,6 +53,13 @@ void KItemListSelectionManager::setCurrentItem(int current) if (m_currentItem != previous) { emit currentChanged(m_currentItem, previous); + + if (m_isAnchoredSelectionActive) { + const QSet selection = selectedItems(); + if (selection != previousSelection) { + emit selectionChanged(selection, previousSelection); + } + } } } @@ -68,12 +79,23 @@ void KItemListSelectionManager::setSelectedItems(const QSet& items) QSet KItemListSelectionManager::selectedItems() const { - return m_selectedItems; + QSet selectedItems = m_selectedItems; + + if (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)) { + const int from = qMin(m_anchorItem, m_currentItem); + const int to = qMax(m_anchorItem, m_currentItem); + + for (int index = from; index <= to; index++) { + selectedItems.insert(index); + } + } + + return selectedItems; } bool KItemListSelectionManager::hasSelection() const { - return !m_selectedItems.isEmpty(); + return !m_selectedItems.isEmpty() || (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)); } void KItemListSelectionManager::setSelected(int index, int count, SelectionMode mode) @@ -82,7 +104,8 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode return; } - const QSet previous = m_selectedItems; + endAnchoredSelection(); + const QSet previous = selectedItems(); count = qMin(count, m_model->count() - index); @@ -115,28 +138,40 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode break; } - if (m_selectedItems != previous) { - emit selectionChanged(m_selectedItems, previous); + const QSet selection = selectedItems(); + if (selection != previous) { + emit selectionChanged(selection, previous); } } void KItemListSelectionManager::clearSelection() { - if (!m_selectedItems.isEmpty()) { - const QSet previous = m_selectedItems; + const QSet previous = selectedItems(); + if (!previous.isEmpty()) { m_selectedItems.clear(); - emit selectionChanged(m_selectedItems, previous); + m_isAnchoredSelectionActive = false; + emit selectionChanged(QSet(), previous); } } -void KItemListSelectionManager::beginAnchoredSelection(int anchor, SelectionMode mode) +void KItemListSelectionManager::beginAnchoredSelection(int anchor) { - Q_UNUSED(anchor); - Q_UNUSED(mode); + m_isAnchoredSelectionActive = true; + setAnchorItem(anchor); } void KItemListSelectionManager::endAnchoredSelection() { + if (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)) { + const int from = qMin(m_anchorItem, m_currentItem); + const int to = qMax(m_anchorItem, m_currentItem); + + for (int index = from; index <= to; index++) { + m_selectedItems.insert(index); + } + } + + m_isAnchoredSelectionActive = false; } void KItemListSelectionManager::setAnchorItem(int anchor) @@ -158,6 +193,16 @@ int KItemListSelectionManager::anchorItem() const return m_anchorItem; } +bool KItemListSelectionManager::isAnchoredSelectionActive() const +{ + return m_isAnchoredSelectionActive; +} + +void KItemListSelectionManager::setAnchoredSelectionActive(bool active) +{ + m_isAnchoredSelectionActive = active; +} + KItemModelBase* KItemListSelectionManager::model() const { return m_model; @@ -173,10 +218,14 @@ void KItemListSelectionManager::setModel(KItemModelBase* model) void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) { + // Store the current selection (needed in the selectionChanged() signal) + const QSet previousSelection = selectedItems(); + // Update the current item if (m_currentItem < 0) { setCurrentItem(0); } else { + const int previousCurrent = m_currentItem; int inc = 0; foreach (const KItemRange& itemRange, itemRanges) { if (m_currentItem < itemRange.index) { @@ -184,13 +233,17 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) } inc += itemRange.count; } - setCurrentItem(m_currentItem + inc); + // Calling setCurrentItem would trigger the selectionChanged signal, but we want to + // emit it only once in this function -> change the current item manually and emit currentChanged + m_currentItem += inc; + emit currentChanged(m_currentItem, previousCurrent); } // Update the anchor item if (m_anchorItem < 0) { setAnchorItem(0); } else { + const int previousAnchor = m_anchorItem; int inc = 0; foreach (const KItemRange& itemRange, itemRanges) { if (m_anchorItem < itemRange.index) { @@ -198,16 +251,15 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) } inc += itemRange.count; } - setAnchorItem(m_anchorItem + inc); + m_anchorItem += inc; + emit anchorChanged(m_anchorItem, previousAnchor); } // Update the selections if (!m_selectedItems.isEmpty()) { const QSet previous = m_selectedItems; - - QSet current; - current.reserve(m_selectedItems.count()); - QSetIterator it(m_selectedItems); + m_selectedItems.clear(); + QSetIterator it(previous); while (it.hasNext()) { const int index = it.next(); int inc = 0; @@ -217,20 +269,24 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) } inc += itemRange.count; } - current.insert(index + inc); + m_selectedItems.insert(index + inc); } + } - if (current != previous) { - m_selectedItems = current; - emit selectionChanged(current, previous); - } + const QSet selection = selectedItems(); + if (selection != previousSelection) { + emit selectionChanged(selection, previousSelection); } } void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) { + // Store the current selection (needed in the selectionChanged() signal) + const QSet previousSelection = selectedItems(); + // Update the current item if (m_currentItem >= 0) { + const int previousCurrent = m_currentItem; int currentItem = m_currentItem; foreach (const KItemRange& itemRange, itemRanges) { if (currentItem < itemRange.index) { @@ -242,11 +298,15 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) currentItem = m_model->count() - 1; } } - setCurrentItem(currentItem); + // Calling setCurrentItem would trigger the selectionChanged signal, but we want to + // emit it only once in this function -> change the current item manually and emit currentChanged + m_currentItem = currentItem; + emit currentChanged(m_currentItem, previousCurrent); } // Update the anchor item if (m_anchorItem >= 0) { + const int previousAnchor = m_anchorItem; int anchorItem = m_anchorItem; foreach (const KItemRange& itemRange, itemRanges) { if (anchorItem < itemRange.index) { @@ -258,16 +318,15 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) anchorItem = m_model->count() - 1; } } - setAnchorItem(anchorItem); + m_anchorItem = anchorItem; + emit anchorChanged(m_anchorItem, previousAnchor); } // Update the selections if (!m_selectedItems.isEmpty()) { const QSet previous = m_selectedItems; - - QSet current; - current.reserve(m_selectedItems.count()); - QSetIterator it(m_selectedItems); + m_selectedItems.clear(); + QSetIterator it(previous); while (it.hasNext()) { int index = it.next(); int dec = 0; @@ -287,14 +346,14 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) } index -= dec; if (index >= 0) { - current.insert(index); + m_selectedItems.insert(index); } } + } - if (current != previous) { - m_selectedItems = current; - emit selectionChanged(current, previous); - } + const QSet selection = selectedItems(); + if (selection != previousSelection) { + emit selectionChanged(selection, previousSelection); } }