kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify code:

Browse source 
* Use KFileItems for all lists instead a mixture of KFileItemList and QList<KUrl>.
* Use a common helper method for generatePreviews() and resumePreviews() to order the visible items at the beginning of the list.

svn path=/trunk/KDE/kdebase/apps/; revision=819681
This commit is contained in:
Peter Penz 2008-06-11 18:47:32 +00:00
parent 2b21d6a992
commit 628faf4dce
2 changed files with 53 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
dolphin/src/iconmanager.cpp
View file

@ -154,28 +154,11 @@ void IconManager::generatePreviews(const KFileItemList& items)
return;
}
// Order the items in a way that the preview for the visible items
// is generated first, as this improves the feeled performance a lot.
// Implementation note: using KDirModel::itemForUrl() would lead to a more
// readable code, but it is a lot slower in comparison to itemListContains().
const QRect visibleArea = m_view->viewport()->rect();
KFileItemList orderedItems;
const int rowCount = m_proxyModel->rowCount();
for (int row = 0; row < rowCount; ++row) {
const QModelIndex proxyIndex = m_proxyModel->index(row, 0);
const QRect itemRect = m_view->visualRect(proxyIndex);
const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex);
KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
const KUrl url = item.url();
if (itemListContains(items, url)) {
if (itemRect.intersects(visibleArea)) {
orderedItems.insert(0, item);
m_pendingItems.insert(0, url);
} else {
orderedItems.append(item);
m_pendingItems.append(url);
}
}
KFileItemList orderedItems = items;
orderItems(orderedItems);
foreach (const KFileItem& item, orderedItems) {
m_pendingItems.append(item);
}
startPreviewJob(orderedItems);
@ -188,7 +171,7 @@ void IconManager::addToPreviewQueue(const KFileItem& item, const QPixmap& pixmap
preview.pixmap = pixmap;
m_previews.append(preview);
m_dispatchedItems.append(item.url());
m_dispatchedItems.append(item);
}
void IconManager::slotPreviewJobFinished(KJob* job)
@ -269,11 +252,11 @@ void IconManager::resumePreviews()
// queue is usually equal. So even when having a lot of elements the
// nested loop is no performance bottle neck, as the inner loop is only
// entered once in most cases.
foreach (const KUrl& url, m_dispatchedItems) {
QList<KUrl>::iterator begin = m_pendingItems.begin();
QList<KUrl>::iterator end = m_pendingItems.end();
for (QList<KUrl>::iterator it = begin; it != end; ++it) {
if ((*it) == url) {
foreach (const KFileItem& item, m_dispatchedItems) {
KFileItemList::iterator begin = m_pendingItems.begin();
KFileItemList::iterator end = m_pendingItems.end();
for (KFileItemList::iterator it = begin; it != end; ++it) {
if ((*it).url() == item.url()) {
m_pendingItems.erase(it);
break;
}
@ -281,30 +264,8 @@ void IconManager::resumePreviews()
}
m_dispatchedItems.clear();
// Create a new preview job for the remaining items.
// Order the items in a way that the preview for the visible items
// is generated first, as this improves the feeled performance a lot.
// Implementation note: using KDirModel::itemForUrl() would lead to a more
// readable code, but it is a lot slower in comparison
// to m_pendingItems.contains().
const QRect visibleArea = m_view->viewport()->rect();
KFileItemList orderedItems;
const int rowCount = m_proxyModel->rowCount();
for (int row = 0; row < rowCount; ++row) {
const QModelIndex proxyIndex = m_proxyModel->index(row, 0);
const QRect itemRect = m_view->visualRect(proxyIndex);
const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex);
KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
const KUrl url = item.url();
if (m_pendingItems.contains(url)) {
if (itemRect.intersects(visibleArea)) {
orderedItems.insert(0, item);
} else {
orderedItems.append(item);
}
}
}
KFileItemList orderedItems = m_pendingItems;
orderItems(orderedItems);
// Kill all suspended preview jobs. Usually when a preview job
// has been finished, slotPreviewJobFinished() clears all item queues.
@ -520,14 +481,44 @@ void IconManager::killPreviewJobs()
m_previewJobs.clear();
}
bool IconManager::itemListContains(const KFileItemList& items, const KUrl& url) const
void IconManager::orderItems(KFileItemList& items)
{
foreach (const KFileItem& item, items) {
if (url == item.url()) {
return true;
// Order the items in a way that the preview for the visible items
// is generated first, as this improves the feeled performance a lot.
//
// Implementation note: using KDirModel::itemForUrl() would lead to a more
// readable code, but it is slower as iterating all model indicess
// and checking whether the index is part of 'items'.
const int itemCount = items.count();
const QRect visibleArea = m_view->viewport()->rect();
const int rowCount = m_proxyModel->rowCount();
for (int row = 0; row < rowCount; ++row) {
const QModelIndex proxyIndex = m_proxyModel->index(row, 0);
const QRect itemRect = m_view->visualRect(proxyIndex);
const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex);
KFileItem item = m_dolphinModel->itemForIndex(dirIndex); // O(1)
const KUrl url = item.url();
// check whether the item is part of the item list 'items'
int index = -1;
for (int i = 0; i < itemCount; ++i) {
if (items[i].url() == url) {
index = i;
break;
}
}
if ((index > 0) && itemRect.intersects(visibleArea)) {
// The current item is (at least partly) visible. Move it
// to the front of the list, so that the preview is
// generated earlier.
items.removeAt(index);
items.insert(0, item);
}
}
return false;
}
#include "iconmanager.moc"

14
dolphin/src/iconmanager.h
View file

@ -152,11 +152,7 @@ private:
/** Kills all ongoing preview jobs. */
void killPreviewJobs();
/**
* Returns true, if the item list \a items contains an item with the
* URL \a url. This is a helper method for IconManager::generatePreviews().
*/
bool itemListContains(const KFileItemList& items, const KUrl& url) const;
void orderItems(KFileItemList& items);
private:
/** Remembers the pixmap for an item specified by an URL. */
@ -187,16 +183,16 @@ private:
QList<ItemInfo> m_previews;
/**
* Contains the URLs of all items where a preview must be generated, but
* Contains all items where a preview must be generated, but
* where the preview job has not dispatched the items yet.
*/
QList<KUrl> m_pendingItems;
KFileItemList m_pendingItems;
/**
* Contains the URLs of all items, where a preview has already been
* Contains all items, where a preview has already been
* generated by the preview jobs.
*/
QList<KUrl> m_dispatchedItems;
KFileItemList m_dispatchedItems;
};
inline bool IconManager::showPreview() const