kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove filtered children if the parent folder is collapsed

Browse source 
This is analogous to commit e053ecdcd5,
which fixes the same problem for the case that the parent folder is
deleted.

BUG: 316335
FIXED-IN: 4.10.2
REVIEW: 109343
This commit is contained in:
Frank Reininghaus 2013-03-10 18:26:20 +01:00
parent 36510e16f7
commit 9dd728cb98
2 changed files with 73 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/kitemviews/kfileitemmodel.cpp
View file

@ -438,6 +438,29 @@ bool KFileItemModel::setExpanded(int index, bool expanded)
itemsToRemove.append(m_itemData.at(index)->item);
++index;
}
QSet<KUrl> urlsToRemove;
urlsToRemove.reserve(itemsToRemove.count() + 1);
urlsToRemove.insert(url);
foreach (const KFileItem& item, itemsToRemove) {
KUrl url = item.url();
url.adjustPath(KUrl::RemoveTrailingSlash);
urlsToRemove.insert(url);
}
QSet<KFileItem>::iterator it = m_filteredItems.begin();
while (it != m_filteredItems.end()) {
const KUrl url = it->url();
KUrl parentUrl = url.upUrl();
parentUrl.adjustPath(KUrl::RemoveTrailingSlash);
if (urlsToRemove.contains(parentUrl)) {
it = m_filteredItems.erase(it);
} else {
++it;
}
}
removeItems(itemsToRemove);
}

50
src/tests/kfileitemmodeltest.cpp
View file

@ -76,6 +76,7 @@ private slots:
void testNameFilter();
void testEmptyPath();
void testRemoveHiddenItems();
void collapseParentOfHiddenItems();
void removeParentOfHiddenItems();
private:
@ -850,6 +851,55 @@ void KFileItemModelTest::testRemoveHiddenItems()
m_model->setShowHiddenFiles(false);
}
/**
* Verify that filtered items are removed when their parent is collapsed.
*/
void KFileItemModelTest::collapseParentOfHiddenItems()
{
QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
m_model->setRoles(modelRoles);
QStringList files;
files << "a/1" << "a/b/1" << "a/b/c/1" << "a/b/c/d/1";
m_testDir->createFiles(files);
m_model->loadDirectory(m_testDir->url());
QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
QCOMPARE(m_model->count(), 1); // Only "a/"
// Expand "a/".
m_model->setExpanded(0, true);
QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
QCOMPARE(m_model->count(), 3); // 3 items: "a/", "a/b/", "a/1"
// Expand "a/b/".
m_model->setExpanded(1, true);
QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
QCOMPARE(m_model->count(), 5); // 5 items: "a/", "a/b/", "a/b/c", "a/b/1", "a/1"
// Expand "a/b/c/".
m_model->setExpanded(2, true);
QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
QCOMPARE(m_model->count(), 7); // 7 items: "a/", "a/b/", "a/b/c", "a/b/c/d/", "a/b/c/1", "a/b/1", "a/1"
// Set a name filter that matches nothing -> only the expanded folders remain.
m_model->setNameFilter("xyz");
QCOMPARE(m_model->count(), 3);
QCOMPARE(itemsInModel(), QStringList() << "a" << "b" << "c");
// Collapse the folder "a/".
QSignalSpy spyItemsRemoved(m_model, SIGNAL(itemsRemoved(KItemRangeList)));
m_model->setExpanded(0, false);
QCOMPARE(spyItemsRemoved.count(), 1);
QCOMPARE(m_model->count(), 1);
QCOMPARE(itemsInModel(), QStringList() << "a");
// Remove the filter -> no files should appear (and we should not get a crash).
m_model->setNameFilter(QString());
QCOMPARE(m_model->count(), 1);
}
/**
* Verify that filtered items are removed when their parent is deleted.
*/