X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bb80d1877a8474ed60d4d0d41c587347fb521c95..86d2aa321d54bf3ae6c95476d649634fd0ff68d5:/src/kitemviews/kitemlistselectionmanager.cpp diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index cdc6dbc7d..46ffe7c13 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 * @@ -23,13 +24,13 @@ #include "kitemlistselectionmanager.h" #include "kitemmodelbase.h" -#include KItemListSelectionManager::KItemListSelectionManager(QObject* parent) : QObject(parent), m_currentItem(-1), m_anchorItem(-1), m_selectedItems(), + m_isAnchoredSelectionActive(false), m_model(0) { } @@ -41,6 +42,8 @@ KItemListSelectionManager::~KItemListSelectionManager() void KItemListSelectionManager::setCurrentItem(int current) { const int previous = m_currentItem; + const KItemSet previousSelection = selectedItems(); + if (m_model && current >= 0 && current < m_model->count()) { m_currentItem = current; } else { @@ -49,6 +52,13 @@ void KItemListSelectionManager::setCurrentItem(int current) if (m_currentItem != previous) { emit currentChanged(m_currentItem, previous); + + if (m_isAnchoredSelectionActive) { + const KItemSet selection = selectedItems(); + if (selection != previousSelection) { + emit selectionChanged(selection, previousSelection); + } + } } } @@ -57,23 +67,56 @@ int KItemListSelectionManager::currentItem() const return m_currentItem; } -void KItemListSelectionManager::setSelectedItems(const QSet& items) +void KItemListSelectionManager::setSelectedItems(const KItemSet& items) { if (m_selectedItems != items) { - const QSet previous = m_selectedItems; + const KItemSet previous = m_selectedItems; m_selectedItems = items; emit selectionChanged(m_selectedItems, previous); } } -QSet KItemListSelectionManager::selectedItems() const +KItemSet KItemListSelectionManager::selectedItems() const +{ + KItemSet selectedItems = m_selectedItems; + + if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) { + Q_ASSERT(m_anchorItem >= 0); + Q_ASSERT(m_currentItem >= 0); + 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::isSelected(int index) const { - return m_selectedItems; + if (m_selectedItems.contains(index)) { + return true; + } + + if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) { + Q_ASSERT(m_anchorItem >= 0); + Q_ASSERT(m_currentItem >= 0); + const int from = qMin(m_anchorItem, m_currentItem); + const int to = qMax(m_anchorItem, m_currentItem); + + if (from <= index && index <= to) { + return true; + } + } + + return false; } 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 +125,8 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode return; } - const QSet previous = m_selectedItems; + endAnchoredSelection(); + const KItemSet previous = selectedItems(); count = qMin(count, m_model->count() - index); @@ -115,47 +159,49 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode break; } - if (m_selectedItems != previous) { - emit selectionChanged(m_selectedItems, previous); + const KItemSet selection = selectedItems(); + if (selection != previous) { + emit selectionChanged(selection, previous); } } void KItemListSelectionManager::clearSelection() { - if (!m_selectedItems.isEmpty()) { - const QSet previous = m_selectedItems; + const KItemSet previous = selectedItems(); + if (!previous.isEmpty()) { m_selectedItems.clear(); - emit selectionChanged(m_selectedItems, previous); + m_isAnchoredSelectionActive = false; + emit selectionChanged(KItemSet(), previous); } } -void KItemListSelectionManager::beginAnchoredSelection(int anchor, SelectionMode mode) +void KItemListSelectionManager::beginAnchoredSelection(int anchor) { - Q_UNUSED(anchor); - Q_UNUSED(mode); + if (anchor >= 0 && m_model && anchor < m_model->count()) { + m_isAnchoredSelectionActive = true; + m_anchorItem = anchor; + } } void KItemListSelectionManager::endAnchoredSelection() { -} - -void KItemListSelectionManager::setAnchorItem(int anchor) -{ - const int previous = m_anchorItem; - if (m_model && anchor < m_model->count()) { - m_anchorItem = anchor; - } else { - m_anchorItem = -1; + if (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)) { + Q_ASSERT(m_anchorItem >= 0); + Q_ASSERT(m_currentItem >= 0); + 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); + } } - if (m_anchorItem != previous) { - emit anchorChanged(m_anchorItem, previous); - } + m_isAnchoredSelectionActive = false; } -int KItemListSelectionManager::anchorItem() const +bool KItemListSelectionManager::isAnchoredSelectionActive() const { - return m_anchorItem; + return m_isAnchoredSelectionActive; } KItemModelBase* KItemListSelectionManager::model() const @@ -173,10 +219,14 @@ void KItemListSelectionManager::setModel(KItemModelBase* model) void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) { + // Store the current selection (needed in the selectionChanged() signal) + const KItemSet 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,12 +234,15 @@ 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); + m_anchorItem = 0; } else { int inc = 0; foreach (const KItemRange& itemRange, itemRanges) { @@ -198,18 +251,15 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) } inc += itemRange.count; } - setAnchorItem(m_anchorItem + inc); + m_anchorItem += inc; } // Update the selections if (!m_selectedItems.isEmpty()) { - const QSet previous = m_selectedItems; + const KItemSet previous = m_selectedItems; + m_selectedItems.clear(); - QSet current; - current.reserve(m_selectedItems.count()); - QSetIterator it(m_selectedItems); - while (it.hasNext()) { - const int index = it.next(); + for (int index: previous) { int inc = 0; foreach (const KItemRange& itemRange, itemRanges) { if (index < itemRange.index) { @@ -217,85 +267,132 @@ 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 KItemSet 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 KItemSet previousSelection = selectedItems(); + const int previousCurrent = m_currentItem; + // Update the current item - if (m_currentItem >= 0) { - int currentItem = m_currentItem; - foreach (const KItemRange& itemRange, itemRanges) { - if (currentItem < itemRange.index) { - break; - } - if (currentItem >= itemRange.index + itemRange.count) { - currentItem -= itemRange.count; - } else if (currentItem >= m_model->count()) { - currentItem = m_model->count() - 1; - } + m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges, DiscardRemovedIndex); + if (m_currentItem != previousCurrent) { + emit currentChanged(m_currentItem, previousCurrent); + if (m_currentItem < 0) { + // 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 = indexAfterRangesRemoving(previousCurrent, itemRanges, AdjustRemovedIndex); + emit currentChanged(m_currentItem, -1); } - setCurrentItem(currentItem); } // Update the anchor item if (m_anchorItem >= 0) { - int anchorItem = m_anchorItem; - foreach (const KItemRange& itemRange, itemRanges) { - if (anchorItem < itemRange.index) { - break; - } - if (anchorItem >= itemRange.index + itemRange.count) { - anchorItem -= itemRange.count; - } else if (anchorItem >= m_model->count()) { - anchorItem = m_model->count() - 1; + m_anchorItem = indexAfterRangesRemoving(m_anchorItem, itemRanges, DiscardRemovedIndex); + if (m_anchorItem < 0) { + m_isAnchoredSelectionActive = false; + } + } + + // Update the selections and the anchor item + if (!m_selectedItems.isEmpty()) { + const KItemSet previous = m_selectedItems; + m_selectedItems.clear(); + + for (int oldIndex : previous) { + const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex); + if (index >= 0) { + m_selectedItems.insert(index); } } - setAnchorItem(anchorItem); } + const KItemSet selection = selectedItems(); + if (selection != previousSelection) { + emit selectionChanged(selection, previousSelection); + } + + Q_ASSERT(m_currentItem < m_model->count()); + Q_ASSERT(m_anchorItem < m_model->count()); +} + +void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QList& movedToIndexes) +{ + // Store the current selection (needed in the selectionChanged() signal) + const KItemSet previousSelection = selectedItems(); + + // endAnchoredSelection() adds all items between m_currentItem and + // m_anchorItem to m_selectedItems. They can then be moved + // individually later in this function. + endAnchoredSelection(); + + // Update the current item + if (m_currentItem >= itemRange.index && m_currentItem < itemRange.index + itemRange.count) { + const int previousCurrentItem = m_currentItem; + const int newCurrentItem = movedToIndexes.at(previousCurrentItem - itemRange.index); + + // 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 = newCurrentItem; + emit currentChanged(newCurrentItem, previousCurrentItem); + } + + // Start a new anchored selection. + beginAnchoredSelection(m_currentItem); + // Update the selections if (!m_selectedItems.isEmpty()) { - const QSet previous = m_selectedItems; - - QSet current; - current.reserve(m_selectedItems.count()); - QSetIterator it(m_selectedItems); - while (it.hasNext()) { - int index = it.next(); - int dec = 0; - foreach (const KItemRange& itemRange, itemRanges) { - if (index < itemRange.index) { - break; - } - - if (index < itemRange.index + itemRange.count) { - // The selection is part of the removed range - // and will get deleted - index = -1; - break; - } + const KItemSet previous = m_selectedItems; + m_selectedItems.clear(); - dec += itemRange.count; + for (int index : previous) { + if (index >= itemRange.index && index < itemRange.index + itemRange.count) { + m_selectedItems.insert(movedToIndexes.at(index - itemRange.index)); } - index -= dec; - if (index >= 0) { - current.insert(index); + else { + m_selectedItems.insert(index); } } + } + + const KItemSet selection = selectedItems(); + if (selection != previousSelection) { + emit selectionChanged(selection, previousSelection); + } +} + +int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges, + const RangesRemovingBehaviour behaviour) const +{ + int dec = 0; + foreach (const KItemRange& itemRange, itemRanges) { + if (index < itemRange.index) { + break; + } + + dec += itemRange.count; - if (current != previous) { - m_selectedItems = current; - emit selectionChanged(current, previous); + const int firstIndexAfterRange = itemRange.index + itemRange.count; + if (index < firstIndexAfterRange) { + // The index is part of the removed range + if (behaviour == DiscardRemovedIndex) { + return -1; + } else { + // Use the first item after the range as new index + index = firstIndexAfterRange; + break; + } } } + return qBound(-1, index - dec, m_model->count() - 1); } -#include "kitemlistselectionmanager.moc"