X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4b51a27aaabc104cb051376364f7aaa93e9fc68a..13b2fc55704fbc734cd4f9cbae56cfc2ef3ec0ce:/src/iconmanager.cpp diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp index cfdf13a7c..d2169cb9e 100644 --- a/src/iconmanager.cpp +++ b/src/iconmanager.cpp @@ -32,18 +32,23 @@ #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_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 +61,29 @@ 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(); } @@ -83,9 +105,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,60 +119,63 @@ void IconManager::updatePreviews() } generatePreviews(itemList); + updateCutItems(); } -void IconManager::generatePreviews(const KFileItemList &items) +void IconManager::generatePreviews(const KFileItemList& items) { + applyCutItemEffect(); + if (!m_showPreview) { 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. + const QRect visibleArea = m_view->viewport()->rect(); KFileItemList orderedItems; - foreach (KFileItem item, items) { + foreach (const KFileItem& item, items) { const QModelIndex dirIndex = m_dolphinModel->indexForItem(item); const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); const QRect itemRect = m_view->visualRect(proxyIndex); if (itemRect.intersects(visibleArea)) { orderedItems.insert(0, item); + m_pendingItems.insert(0, item.url()); } else { orderedItems.append(item); + m_pendingItems.append(item.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) { - Preview preview; - preview.item = item; + ItemInfo preview; + 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() { // restore the icons of all previously selected items to the // original state... - foreach (CutItem cutItem, m_cutItemsCache) { + foreach (const ItemInfo& cutItem, m_cutItemsCache) { const QModelIndex index = m_dolphinModel->indexForUrl(cutItem.url); if (index.isValid()) { m_dolphinModel->setData(index, QIcon(cutItem.pixmap), Qt::DecorationRole); @@ -169,13 +197,13 @@ void IconManager::dispatchPreviewQueue() // of the view would be triggered for each single preview. int dispatchCount = 30; - if (dispatchCount > m_previews.count()) { - dispatchCount = m_previews.count(); + if (dispatchCount > previewsCount) { + dispatchCount = previewsCount; } for (int i = 0; i < dispatchCount; ++i) { - const Preview& preview = m_previews.first(); - replaceIcon(preview.item, preview.pixmap); + const ItemInfo& preview = m_previews.first(); + replaceIcon(preview.url, preview.pixmap); m_previews.pop_front(); } @@ -193,9 +221,66 @@ void IconManager::dispatchPreviewQueue() } } -void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap) +void IconManager::pausePreviews() +{ + foreach (KJob* job, m_previewJobs) { + Q_ASSERT(job != 0); + job->suspend(); + } + m_scrollAreaTimer->start(); +} + +void IconManager::resumePreviews() { - Q_ASSERT(!item.isNull()); + // 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. + const QRect visibleArea = m_view->viewport()->rect(); + KFileItemList orderedItems; + foreach (const KUrl& url, m_pendingItems) { + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(url); + const KFileItem item = m_dolphinModel->itemForIndex(dirIndex); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + const QRect itemRect = m_view->visualRect(proxyIndex); + 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()); if (!m_showPreview) { // the preview has been canceled in the meantime return; @@ -206,8 +291,8 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap) KDirLister* dirLister = m_dolphinModel->dirLister(); bool isOldPreview = true; const KUrl::List dirs = dirLister->directories(); - const QString itemDir = item.url().directory(); - foreach (KUrl url, dirs) { + const QString itemDir = url.directory(); + foreach (const KUrl& url, dirs) { if (url.path() == itemDir) { isOldPreview = false; break; @@ -217,10 +302,11 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap) return; } - const QModelIndex idx = m_dolphinModel->indexForItem(item); + const QModelIndex idx = m_dolphinModel->indexForUrl(url); if (idx.isValid() && (idx.column() == 0)) { QPixmap icon = pixmap; + const KFileItem item = m_dolphinModel->itemForIndex(idx); const QString mimeType = item.mimetype(); const QString mimeTypeGroup = mimeType.left(mimeType.indexOf('/')); if ((mimeTypeGroup != "image") || !applyImageFrame(icon)) { @@ -229,6 +315,20 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap) const QMimeData* mimeData = QApplication::clipboard()->mimeData(); if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) { + // Remember the current icon in the cache for cut items before + // the disabled effect is applied. This makes it possible restoring + // the uncut version again when cutting other items. + QList::iterator begin = m_cutItemsCache.begin(); + QList::iterator end = m_cutItemsCache.end(); + for (QList::iterator it = begin; it != end; ++it) { + if ((*it).url == item.url()) { + (*it).pixmap = icon; + break; + } + } + + // apply the disabled effect to the icon for marking it as "cut item" + // and apply the icon to the item KIconEffect iconEffect; icon = iconEffect.apply(icon, KIconLoader::Desktop, KIconLoader::DisabledState); m_dolphinModel->setData(idx, QIcon(icon), Qt::DecorationRole); @@ -243,8 +343,8 @@ bool IconManager::isCutItem(const KFileItem& item) const const QMimeData* mimeData = QApplication::clipboard()->mimeData(); const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData); - const KUrl& itemUrl = item.url(); - foreach (KUrl url, cutUrls) { + const KUrl itemUrl = item.url(); + foreach (const KUrl& url, cutUrls) { if (url == itemUrl) { return true; } @@ -263,21 +363,22 @@ void IconManager::applyCutItemEffect() KFileItemList items; KDirLister* dirLister = m_dolphinModel->dirLister(); const KUrl::List dirs = dirLister->directories(); - foreach (KUrl url, dirs) { + foreach (const KUrl& url, dirs) { items << dirLister->itemsForDir(url); } - foreach (KFileItem item, items) { + foreach (const KFileItem& item, items) { if (isCutItem(item)) { const QModelIndex index = m_dolphinModel->indexForItem(item); const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole); if (value.type() == QVariant::Icon) { const QIcon icon(qvariant_cast(value)); - QPixmap pixmap = icon.pixmap(m_view->iconSize()); + const QSize actualSize = icon.actualSize(m_view->iconSize()); + QPixmap pixmap = icon.pixmap(actualSize); // remember current pixmap for the item to be able // to restore it when other items get cut - CutItem cutItem; + ItemInfo cutItem; cutItem.url = item.url(); cutItem.pixmap = pixmap; m_cutItemsCache.append(cutItem); @@ -294,8 +395,12 @@ void IconManager::applyCutItemEffect() bool IconManager::applyImageFrame(QPixmap& icon) { const QSize maxSize = m_view->iconSize(); - if ((maxSize.width() <= 24) || (maxSize.height() <= 24)) { - // the maximum size is too small for a frame + const bool applyFrame = (maxSize.width() > KIconLoader::SizeSmallMedium) && + (maxSize.height() > KIconLoader::SizeSmallMedium) && + ((icon.width() > KIconLoader::SizeLarge) || + (icon.height() > KIconLoader::SizeLarge)); + if (!applyFrame) { + // the maximum size or the image itself is too small for a frame return false; } @@ -350,7 +455,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);