X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8931e14eec50cd8a4693460839edfde8690ca297..629ec98952bcf38bc99f2b11bc37bdc2ec7aabcc:/src/iconmanager.cpp diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp index 2a3827134..002f4e86d 100644 --- a/src/iconmanager.cpp +++ b/src/iconmanager.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -32,18 +33,24 @@ #include #include #include +#include #include IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel* model) : QObject(parent), m_showPreview(false), + m_clearItemQueues(true), m_view(parent), m_previewTimer(0), + m_scrollAreaTimer(0), m_previewJobs(), m_dolphinModel(0), m_proxyModel(model), + m_mimeTypeResolver(0), m_cutItemsCache(), - m_previews() + m_previews(), + m_pendingItems(), + m_dispatchedItems() { Q_ASSERT(m_view->iconSize().isValid()); // each view must provide its current icon size @@ -56,12 +63,33 @@ IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel* this, SLOT(updateCutItems())); m_previewTimer = new QTimer(this); + m_previewTimer->setSingleShot(true); connect(m_previewTimer, SIGNAL(timeout()), this, SLOT(dispatchPreviewQueue())); + + // Whenever the scrollbar values have been changed, the pending previews should + // be reordered in a way that the previews for the visible items are generated + // first. The reordering is done with a small delay, so that during moving the + // scrollbars the CPU load is kept low. + m_scrollAreaTimer = new QTimer(this); + m_scrollAreaTimer->setSingleShot(true); + m_scrollAreaTimer->setInterval(200); + connect(m_scrollAreaTimer, SIGNAL(timeout()), + this, SLOT(resumePreviews())); + connect(m_view->horizontalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(pausePreviews())); + connect(m_view->verticalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(pausePreviews())); } IconManager::~IconManager() { - killJobs(); + killPreviewJobs(); + m_pendingItems.clear(); + m_dispatchedItems.clear(); + if (m_mimeTypeResolver != 0) { + m_mimeTypeResolver->deleteLater(); + m_mimeTypeResolver = 0; + } } @@ -75,6 +103,16 @@ void IconManager::setShowPreview(bool show) updatePreviews(); } } + + if (show && (m_mimeTypeResolver != 0)) { + // don't resolve the MIME types if the preview is turned on + m_mimeTypeResolver->deleteLater(); + m_mimeTypeResolver = 0; + } else if (!show && (m_mimeTypeResolver == 0)) { + // the preview is turned off: resolve the MIME-types so that + // the icons gets updated + m_mimeTypeResolver = new KMimeTypeResolver(m_view, m_dolphinModel); + } } void IconManager::updatePreviews() @@ -83,9 +121,12 @@ void IconManager::updatePreviews() return; } - killJobs(); - KFileItemList itemList; + killPreviewJobs(); + m_cutItemsCache.clear(); + m_pendingItems.clear(); + m_dispatchedItems.clear(); + KFileItemList itemList; const int rowCount = m_dolphinModel->rowCount(); for (int row = 0; row < rowCount; ++row) { const QModelIndex index = m_dolphinModel->index(row, 0); @@ -94,6 +135,15 @@ void IconManager::updatePreviews() } generatePreviews(itemList); + updateCutItems(); +} + +void IconManager::cancelPreviews() +{ + killPreviewJobs(); + m_cutItemsCache.clear(); + m_pendingItems.clear(); + m_dispatchedItems.clear(); } void IconManager::generatePreviews(const KFileItemList& items) @@ -104,31 +154,31 @@ void IconManager::generatePreviews(const KFileItemList& items) return; } - const QRect visibleArea = m_view->viewport()->rect(); - // 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; - foreach (const KFileItem &item, items) { - const QModelIndex dirIndex = m_dolphinModel->indexForItem(item); - const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + 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); - if (itemRect.intersects(visibleArea)) { - orderedItems.insert(0, item); - } else { - orderedItems.append(item); + 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); + } } } - const QSize size = m_view->iconSize(); - KIO::PreviewJob* job = KIO::filePreview(orderedItems, 128, 128); - connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), - this, SLOT(addToPreviewQueue(const KFileItem&, const QPixmap&))); - connect(job, SIGNAL(finished(KJob*)), - this, SLOT(slotPreviewJobFinished(KJob*))); - - m_previewJobs.append(job); - m_previewTimer->start(200); + startPreviewJob(orderedItems); } void IconManager::addToPreviewQueue(const KFileItem& item, const QPixmap& pixmap) @@ -137,12 +187,19 @@ void IconManager::addToPreviewQueue(const KFileItem& item, const QPixmap& pixmap preview.url = item.url(); preview.pixmap = pixmap; m_previews.append(preview); + + m_dispatchedItems.append(item.url()); } void IconManager::slotPreviewJobFinished(KJob* job) { const int index = m_previewJobs.indexOf(job); m_previewJobs.removeAt(index); + + if ((m_previewJobs.count() == 0) && m_clearItemQueues) { + m_pendingItems.clear(); + m_dispatchedItems.clear(); + } } void IconManager::updateCutItems() @@ -195,6 +252,71 @@ void IconManager::dispatchPreviewQueue() } } +void IconManager::pausePreviews() +{ + foreach (KJob* job, m_previewJobs) { + Q_ASSERT(job != 0); + job->suspend(); + } + m_scrollAreaTimer->start(); +} + +void IconManager::resumePreviews() +{ + // Before creating new preview jobs the m_pendingItems queue must be + // cleaned up by removing the already dispatched items. Implementation + // note: The order of the m_dispatchedItems queue and the m_pendingItems + // 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::iterator begin = m_pendingItems.begin(); + QList::iterator end = m_pendingItems.end(); + for (QList::iterator it = begin; it != end; ++it) { + if ((*it) == url) { + m_pendingItems.erase(it); + break; + } + } + } + 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); + } + } + } + + // Kill all suspended preview jobs. Usually when a preview job + // has been finished, slotPreviewJobFinished() clears all item queues. + // This is not wanted in this case, as a new job is created afterwards + // for m_pendingItems. + m_clearItemQueues = false; + killPreviewJobs(); + m_clearItemQueues = true; + + startPreviewJob(orderedItems); +} + void IconManager::replaceIcon(const KUrl& url, const QPixmap& pixmap) { Q_ASSERT(url.isValid()); @@ -372,7 +494,24 @@ void IconManager::limitToSize(QPixmap& icon, const QSize& maxSize) } } -void IconManager::killJobs() +void IconManager::startPreviewJob(const KFileItemList& items) +{ + if (items.count() == 0) { + return; + } + + const QSize size = m_view->iconSize(); + KIO::PreviewJob* job = KIO::filePreview(items, 128, 128); + connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), + this, SLOT(addToPreviewQueue(const KFileItem&, const QPixmap&))); + connect(job, SIGNAL(finished(KJob*)), + this, SLOT(slotPreviewJobFinished(KJob*))); + + m_previewJobs.append(job); + m_previewTimer->start(200); +} + +void IconManager::killPreviewJobs() { foreach (KJob* job, m_previewJobs) { Q_ASSERT(job != 0); @@ -381,4 +520,14 @@ void IconManager::killJobs() m_previewJobs.clear(); } +bool IconManager::itemListContains(const KFileItemList& items, const KUrl& url) const +{ + foreach (const KFileItem& item, items) { + if (url == item.url()) { + return true; + } + } + return false; +} + #include "iconmanager.moc"