X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fa9da5cbaff25d2f599d27105e25ec7451477df3..817f3952e2bed820ea3b50dfdfe91ccb99dcb748:/src/iconmanager.cpp diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp index 97dac53b7..6cf6f001c 100644 --- a/src/iconmanager.cpp +++ b/src/iconmanager.cpp @@ -19,12 +19,11 @@ #include "iconmanager.h" -#include "dolphinmodel.h" -#include "dolphinsortfilterproxymodel.h" - #include #include #include +#include +#include #include #include @@ -81,15 +80,17 @@ private: QListView* m_view; }; -IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel* model) : +IconManager::IconManager(QAbstractItemView* parent, KDirSortFilterProxyModel* model) : QObject(parent), m_showPreview(false), m_clearItemQueues(true), + m_hasCutSelection(false), + m_pendingVisiblePreviews(0), m_view(parent), m_previewTimer(0), m_scrollAreaTimer(0), m_previewJobs(), - m_dolphinModel(0), + m_dirModel(0), m_proxyModel(model), m_mimeTypeResolver(0), m_cutItemsCache(), @@ -99,8 +100,8 @@ IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel* { Q_ASSERT(m_view->iconSize().isValid()); // each view must provide its current icon size - m_dolphinModel = static_cast(m_proxyModel->sourceModel()); - connect(m_dolphinModel->dirLister(), SIGNAL(newItems(const KFileItemList&)), + m_dirModel = static_cast(m_proxyModel->sourceModel()); + connect(m_dirModel->dirLister(), SIGNAL(newItems(const KFileItemList&)), this, SLOT(generatePreviews(const KFileItemList&))); QClipboard* clipboard = QApplication::clipboard(); @@ -137,7 +138,6 @@ IconManager::~IconManager() } } - void IconManager::setShowPreview(bool show) { if (m_showPreview != show) { @@ -156,7 +156,7 @@ void IconManager::setShowPreview(bool show) } 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); + m_mimeTypeResolver = new KMimeTypeResolver(m_view, m_dirModel); } } @@ -172,10 +172,10 @@ void IconManager::updatePreviews() m_dispatchedItems.clear(); KFileItemList itemList; - const int rowCount = m_dolphinModel->rowCount(); + const int rowCount = m_dirModel->rowCount(); for (int row = 0; row < rowCount; ++row) { - const QModelIndex index = m_dolphinModel->index(row, 0); - KFileItem item = m_dolphinModel->itemForIndex(index); + const QModelIndex index = m_dirModel->index(row, 0); + KFileItem item = m_dirModel->itemForIndex(index); itemList.append(item); } @@ -211,9 +211,60 @@ void IconManager::generatePreviews(const KFileItemList& items) void IconManager::addToPreviewQueue(const KFileItem& item, const QPixmap& pixmap) { + if (!m_showPreview) { + // the preview has been canceled in the meantime + return; + } + const KUrl url = item.url(); + + // check whether the item is part of the directory lister (it is possible + // that a preview from an old directory lister is received) + KDirLister* dirLister = m_dirModel->dirLister(); + bool isOldPreview = true; + const KUrl::List dirs = dirLister->directories(); + const QString itemDir = url.directory(); + foreach (const KUrl& url, dirs) { + if (url.path() == itemDir) { + isOldPreview = false; + break; + } + } + if (isOldPreview) { + return; + } + + QPixmap icon = pixmap; + + const QString mimeType = item.mimetype(); + const QString mimeTypeGroup = mimeType.left(mimeType.indexOf('/')); + if ((mimeTypeGroup != "image") || !applyImageFrame(icon)) { + limitToSize(icon, m_view->iconSize()); + } + + if (m_hasCutSelection && 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); + } + + // remember the preview and URL, so that it can be applied to the model + // in IconManager::dispatchPreviewQueue() ItemInfo preview; - preview.url = item.url(); - preview.pixmap = pixmap; + preview.url = url; + preview.pixmap = icon; m_previews.append(preview); m_dispatchedItems.append(item); @@ -227,6 +278,8 @@ void IconManager::slotPreviewJobFinished(KJob* job) if ((m_previewJobs.count() == 0) && m_clearItemQueues) { m_pendingItems.clear(); m_dispatchedItems.clear(); + m_pendingVisiblePreviews = 0; + QMetaObject::invokeMethod(this, "dispatchPreviewQueue", Qt::QueuedConnection); } } @@ -235,9 +288,9 @@ void IconManager::updateCutItems() // restore the icons of all previously selected items to the // original state... foreach (const ItemInfo& cutItem, m_cutItemsCache) { - const QModelIndex index = m_dolphinModel->indexForUrl(cutItem.url); + const QModelIndex index = m_dirModel->indexForUrl(cutItem.url); if (index.isValid()) { - m_dolphinModel->setData(index, QIcon(cutItem.pixmap), Qt::DecorationRole); + m_dirModel->setData(index, QIcon(cutItem.pixmap), Qt::DecorationRole); } } m_cutItemsCache.clear(); @@ -248,36 +301,33 @@ void IconManager::updateCutItems() void IconManager::dispatchPreviewQueue() { - int previewsCount = m_previews.count(); + const int previewsCount = m_previews.count(); if (previewsCount > 0) { // Applying the previews to the model must be done step by step // in larger blocks: Applying a preview immediately when getting the signal // 'gotPreview()' from the PreviewJob is too expensive, as a relayout // of the view would be triggered for each single preview. - - int dispatchCount = 30; - if (dispatchCount > previewsCount) { - dispatchCount = previewsCount; - } - LayoutBlocker blocker(m_view); - for (int i = 0; i < dispatchCount; ++i) { + for (int i = 0; i < previewsCount; ++i) { const ItemInfo& preview = m_previews.first(); - replaceIcon(preview.url, preview.pixmap); + + const QModelIndex idx = m_dirModel->indexForUrl(preview.url); + if (idx.isValid() && (idx.column() == 0)) { + m_dirModel->setData(idx, QIcon(preview.pixmap), Qt::DecorationRole); + } + m_previews.pop_front(); + if (m_pendingVisiblePreviews > 0) { + --m_pendingVisiblePreviews; + } } - - previewsCount = m_previews.count(); } - const bool workingPreviewJobs = (m_previewJobs.count() > 0); - if (workingPreviewJobs) { - // poll for previews as long as not all preview jobs are finished + if (m_pendingVisiblePreviews > 0) { + // As long as there are pending previews for visible items, poll + // the preview queue each 200 ms. If there are no pending previews, + // the queue is dispatched in slotPreviewJobFinished(). m_previewTimer->start(200); - } else if (previewsCount > 0) { - // all preview jobs are finished but there are still pending previews - // in the queue -> poll more aggressively - m_previewTimer->start(10); } } @@ -310,6 +360,9 @@ void IconManager::resumePreviews() } m_dispatchedItems.clear(); + m_pendingVisiblePreviews = 0; + dispatchPreviewQueue(); + KFileItemList orderedItems = m_pendingItems; orderItems(orderedItems); @@ -324,66 +377,6 @@ void IconManager::resumePreviews() 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; - } - - // check whether the item is part of the directory lister (it is possible - // that a preview from an old directory lister is received) - KDirLister* dirLister = m_dolphinModel->dirLister(); - bool isOldPreview = true; - const KUrl::List dirs = dirLister->directories(); - const QString itemDir = url.directory(); - foreach (const KUrl& url, dirs) { - if (url.path() == itemDir) { - isOldPreview = false; - break; - } - } - if (isOldPreview) { - return; - } - - 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)) { - limitToSize(icon, m_view->iconSize()); - } - - 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); - } else { - m_dolphinModel->setData(idx, QIcon(icon), Qt::DecorationRole); - } - } -} - bool IconManager::isCutItem(const KFileItem& item) const { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); @@ -402,12 +395,13 @@ bool IconManager::isCutItem(const KFileItem& item) const void IconManager::applyCutItemEffect() { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); - if (!KonqMimeData::decodeIsCutSelection(mimeData)) { + m_hasCutSelection = KonqMimeData::decodeIsCutSelection(mimeData); + if (!m_hasCutSelection) { return; } KFileItemList items; - KDirLister* dirLister = m_dolphinModel->dirLister(); + KDirLister* dirLister = m_dirModel->dirLister(); const KUrl::List dirs = dirLister->directories(); foreach (const KUrl& url, dirs) { items << dirLister->itemsForDir(url); @@ -415,8 +409,8 @@ void IconManager::applyCutItemEffect() foreach (const KFileItem& item, items) { if (isCutItem(item)) { - const QModelIndex index = m_dolphinModel->indexForItem(item); - const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole); + const QModelIndex index = m_dirModel->indexForItem(item); + const QVariant value = m_dirModel->data(index, Qt::DecorationRole); if (value.type() == QVariant::Icon) { const QIcon icon(qvariant_cast(value)); const QSize actualSize = icon.actualSize(m_view->iconSize()); @@ -432,7 +426,7 @@ void IconManager::applyCutItemEffect() // apply icon effect to the cut item KIconEffect iconEffect; pixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState); - m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole); + m_dirModel->setData(index, QIcon(pixmap), Qt::DecorationRole); } } } @@ -497,7 +491,7 @@ bool IconManager::applyImageFrame(QPixmap& icon) void IconManager::limitToSize(QPixmap& icon, const QSize& maxSize) { if ((icon.width() > maxSize.width()) || (icon.height() > maxSize.height())) { - icon = icon.scaled(maxSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); + icon = icon.scaled(maxSize, Qt::KeepAspectRatio, Qt::FastTransformation); } } @@ -507,8 +501,18 @@ void IconManager::startPreviewJob(const KFileItemList& items) return; } + const QMimeData* mimeData = QApplication::clipboard()->mimeData(); + m_hasCutSelection = KonqMimeData::decodeIsCutSelection(mimeData); + const QSize size = m_view->iconSize(); - KIO::PreviewJob* job = KIO::filePreview(items, 128, 128); + + // PreviewJob internally caches items always with the size of + // 128 x 128 pixels or 256 x 256 pixels. A downscaling is done + // by PreviewJob if a smaller size is requested. As the IconManager must + // do a downscaling anyhow because of the frame, only the provided + // cache sizes are requested. + const int cacheSize = (size.width() > 128) || (size.height() > 128) ? 256 : 128; + KIO::PreviewJob* job = KIO::filePreview(items, cacheSize, cacheSize); connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), this, SLOT(addToPreviewQueue(const KFileItem&, const QPixmap&))); connect(job, SIGNAL(finished(KJob*)), @@ -543,6 +547,7 @@ void IconManager::orderItems(KFileItemList& items) const int rowCount = m_proxyModel->rowCount(); const QRect visibleArea = m_view->viewport()->rect(); + int insertPos = 0; if (itemCount * 10 > rowCount) { // Algorithm 1: The number of items is > 10 % of the row count. Parse all rows // and check whether the received row is part of the item list. @@ -551,7 +556,7 @@ void IconManager::orderItems(KFileItemList& items) const QRect itemRect = m_view->visualRect(proxyIndex); const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex); - KFileItem item = m_dolphinModel->itemForIndex(dirIndex); // O(1) + KFileItem item = m_dirModel->itemForIndex(dirIndex); // O(1) const KUrl url = item.url(); // check whether the item is part of the item list 'items' @@ -568,14 +573,16 @@ void IconManager::orderItems(KFileItemList& items) // to the front of the list, so that the preview is // generated earlier. items.removeAt(index); - items.insert(0, item); + items.insert(insertPos, item); + ++insertPos; + ++m_pendingVisiblePreviews; } } } else { // Algorithm 2: The number of items is <= 10 % of the row count. In this case iterate // all items and receive the corresponding row from the item. for (int i = 0; i < itemCount; ++i) { - const QModelIndex dirIndex = m_dolphinModel->indexForItem(items[i]); // O(n) (n = number of rows) + const QModelIndex dirIndex = m_dirModel->indexForItem(items[i]); // O(n) (n = number of rows) const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); const QRect itemRect = m_view->visualRect(proxyIndex); @@ -583,8 +590,10 @@ void IconManager::orderItems(KFileItemList& items) // The current item is (at least partly) visible. Move it // to the front of the list, so that the preview is // generated earlier. - items.insert(0, items[i]); + items.insert(insertPos, items[i]); items.removeAt(i + 1); + ++insertPos; + ++m_pendingVisiblePreviews; } } }