From c94e1e1cd6753b2d8f4ebb942b744be1a62c887d Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Mon, 3 Oct 2011 16:12:18 +0200 Subject: Keep current item and selection when resorting, part 2 This commit adds the missing pieces to KItemListView and makes KFileItemModel::resortAllItems() only emit the itemsMoved() signal. --- src/kitemviews/kfileitemmodel.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/kitemviews/kfileitemmodel.cpp') diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 0d6f60336..ddb89533c 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -733,26 +733,26 @@ void KFileItemModel::resortAllItems() } const KFileItemList oldSortedItems = m_sortedItems; + const QHash oldItems = m_items; + const QList > oldData = m_data; - KFileItemList sortedItems = m_sortedItems; - m_sortedItems.clear(); m_items.clear(); m_data.clear(); - emit itemsRemoved(KItemRangeList() << KItemRange(0, itemCount)); - sort(sortedItems.begin(), sortedItems.end()); + sort(m_sortedItems.begin(), m_sortedItems.end()); int index = 0; - foreach (const KFileItem& item, sortedItems) { - m_sortedItems.append(item); + foreach (const KFileItem& item, m_sortedItems) { m_items.insert(item.url(), index); - m_data.append(retrieveData(item)); + + const int oldItemIndex = oldItems.value(item.url()); + m_data.append(oldData.at(oldItemIndex)); ++index; } bool emitItemsMoved = false; QList movedToIndexes; - movedToIndexes.reserve(sortedItems.count()); + movedToIndexes.reserve(m_sortedItems.count()); for (int i = 0; i < itemCount; i++) { const int newIndex = m_items.value(oldSortedItems.at(i).url()); movedToIndexes.append(newIndex); @@ -762,12 +762,8 @@ void KFileItemModel::resortAllItems() } if (emitItemsMoved) { - // TODO: - // * Implement KItemListView::slotItemsMoved() (which should call KItemListSelectionManager::itemsMoved()) - // * Do not emit itemsRemoved()/itemsInserted() here. emit itemsMoved(KItemRange(0, itemCount), movedToIndexes); } - emit itemsInserted(KItemRangeList() << KItemRange(0, itemCount)); } void KFileItemModel::removeExpandedItems() -- cgit v1.3