X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fc2ab478989fb4effc14c06aa56fdb29d3143b35..e57f6215659ee36877c7c36c9e3fcba0ba5d03a0:/src/kitemviews/kitemlistselectionmanager.cpp diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index ebff1a30e..6f7f0e077 100644 --- a/src/kitemviews/kitemlistselectionmanager.cpp +++ b/src/kitemviews/kitemlistselectionmanager.cpp @@ -1,38 +1,21 @@ -/*************************************************************************** - * 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 * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2011 Peter Penz + * SPDX-FileCopyrightText: 2011 Frank Reininghaus + * + * Based on the Itemviews NG project from Trolltech Labs + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #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) +KItemListSelectionManager::KItemListSelectionManager(QObject *parent) + : QObject(parent) + , m_currentItem(-1) + , m_anchorItem(-1) + , m_selectedItems() + , m_isAnchoredSelectionActive(false) + , m_model(nullptr) { } @@ -52,12 +35,12 @@ void KItemListSelectionManager::setCurrentItem(int current) } if (m_currentItem != previous) { - emit currentChanged(m_currentItem, previous); + Q_EMIT currentChanged(m_currentItem, previous); if (m_isAnchoredSelectionActive) { const KItemSet selection = selectedItems(); if (selection != previousSelection) { - emit selectionChanged(selection, previousSelection); + Q_EMIT selectionChanged(selection, previousSelection); } } } @@ -68,12 +51,12 @@ int KItemListSelectionManager::currentItem() const return m_currentItem; } -void KItemListSelectionManager::setSelectedItems(const KItemSet& items) +void KItemListSelectionManager::setSelectedItems(const KItemSet &items) { if (m_selectedItems != items) { const KItemSet previous = m_selectedItems; m_selectedItems = items; - emit selectionChanged(m_selectedItems, previous); + Q_EMIT selectionChanged(m_selectedItems, previous); } } @@ -131,7 +114,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode count = qMin(count, m_model->count() - index); - const int endIndex = index + count -1; + const int endIndex = index + count - 1; switch (mode) { case Select: for (int i = index; i <= endIndex; ++i) { @@ -162,7 +145,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode const KItemSet selection = selectedItems(); if (selection != previous) { - emit selectionChanged(selection, previous); + Q_EMIT selectionChanged(selection, previous); } } @@ -172,8 +155,18 @@ void KItemListSelectionManager::clearSelection() if (!previous.isEmpty()) { m_selectedItems.clear(); m_isAnchoredSelectionActive = false; - emit selectionChanged(KItemSet(), previous); + Q_EMIT selectionChanged(KItemSet(), previous); + } +} + +void KItemListSelectionManager::replaceSelection(int index, int count) +{ + const KItemSet previous = selectedItems(); + if (!previous.isEmpty()) { + m_selectedItems.clear(); + m_isAnchoredSelectionActive = false; } + setSelected(index, count); } void KItemListSelectionManager::beginAnchoredSelection(int anchor) @@ -205,12 +198,12 @@ bool KItemListSelectionManager::isAnchoredSelectionActive() const return m_isAnchoredSelectionActive; } -KItemModelBase* KItemListSelectionManager::model() const +KItemModelBase *KItemListSelectionManager::model() const { return m_model; } -void KItemListSelectionManager::setModel(KItemModelBase* model) +void KItemListSelectionManager::setModel(KItemModelBase *model) { m_model = model; if (model && model->count() > 0) { @@ -218,7 +211,7 @@ void KItemListSelectionManager::setModel(KItemModelBase* model) } } -void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) +void KItemListSelectionManager::itemsInserted(const KItemRangeList &itemRanges) { // Store the current selection (needed in the selectionChanged() signal) const KItemSet previousSelection = selectedItems(); @@ -229,7 +222,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) } else { const int previousCurrent = m_currentItem; int inc = 0; - foreach (const KItemRange& itemRange, itemRanges) { + for (const KItemRange &itemRange : itemRanges) { if (m_currentItem < itemRange.index) { break; } @@ -238,7 +231,10 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) // 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); + if (m_currentItem >= m_model->count()) { + m_currentItem = -1; + } + Q_EMIT currentChanged(m_currentItem, previousCurrent); } // Update the anchor item @@ -246,7 +242,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) m_anchorItem = 0; } else { int inc = 0; - foreach (const KItemRange& itemRange, itemRanges) { + for (const KItemRange &itemRange : itemRanges) { if (m_anchorItem < itemRange.index) { break; } @@ -260,9 +256,9 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) const KItemSet previous = m_selectedItems; m_selectedItems.clear(); - foreach (int index, previous) { + for (int index : previous) { int inc = 0; - foreach (const KItemRange& itemRange, itemRanges) { + for (const KItemRange &itemRange : itemRanges) { if (index < itemRange.index) { break; } @@ -274,11 +270,11 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) const KItemSet selection = selectedItems(); if (selection != previousSelection) { - emit selectionChanged(selection, previousSelection); + Q_EMIT selectionChanged(selection, previousSelection); } } -void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) +void KItemListSelectionManager::itemsRemoved(const KItemRangeList &itemRanges) { // Store the current selection (needed in the selectionChanged() signal) const KItemSet previousSelection = selectedItems(); @@ -287,12 +283,12 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) // Update the current item m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges, DiscardRemovedIndex); if (m_currentItem != previousCurrent) { - emit currentChanged(m_currentItem, previousCurrent); + Q_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); + Q_EMIT currentChanged(m_currentItem, -1); } } @@ -309,9 +305,9 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) const KItemSet previous = m_selectedItems; m_selectedItems.clear(); - foreach (int oldIndex, previous) { + for (int oldIndex : previous) { const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex); - if (index >= 0) { + if (index >= 0) { m_selectedItems.insert(index); } } @@ -319,18 +315,26 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) const KItemSet selection = selectedItems(); if (selection != previousSelection) { - emit selectionChanged(selection, previousSelection); + Q_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) +void KItemListSelectionManager::itemsMoved(const KItemRange &itemRange, const QList &movedToIndexes) { // Store the current selection (needed in the selectionChanged() signal) const KItemSet previousSelection = selectedItems(); + // Store whether we were doing an anchored selection + const bool wasInAnchoredSelection = isAnchoredSelectionActive(); + + // 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; @@ -339,12 +343,12 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL // 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); + Q_EMIT currentChanged(newCurrentItem, previousCurrentItem); } - // Update the anchor item - if (m_anchorItem >= itemRange.index && m_anchorItem < itemRange.index + itemRange.count) { - m_anchorItem = movedToIndexes.at(m_anchorItem - itemRange.index); + // Start a new anchored selection. + if (wasInAnchoredSelection) { + beginAnchoredSelection(m_currentItem); } // Update the selections @@ -352,11 +356,10 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL const KItemSet previous = m_selectedItems; m_selectedItems.clear(); - foreach (int index, previous) { + for (int index : previous) { if (index >= itemRange.index && index < itemRange.index + itemRange.count) { m_selectedItems.insert(movedToIndexes.at(index - itemRange.index)); - } - else { + } else { m_selectedItems.insert(index); } } @@ -364,15 +367,14 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL const KItemSet selection = selectedItems(); if (selection != previousSelection) { - emit selectionChanged(selection, previousSelection); + Q_EMIT selectionChanged(selection, previousSelection); } } -int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges, - const RangesRemovingBehaviour behaviour) const +int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList &itemRanges, const RangesRemovingBehaviour behaviour) const { int dec = 0; - foreach (const KItemRange& itemRange, itemRanges) { + for (const KItemRange &itemRange : itemRanges) { if (index < itemRange.index) { break; } @@ -393,4 +395,5 @@ int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRa } return qBound(-1, index - dec, m_model->count() - 1); } -#include "kitemlistselectionmanager.moc" + +#include "moc_kitemlistselectionmanager.cpp"