X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/740e9569327c0026257dfcea38ab2efac4a29d67..c8d8556950005dfd96ebdb41d2f43ad90356367c:/src/kitemviews/kfileitemlistview.cpp diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index 68bd7bde9..86db28d3d 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -19,20 +19,22 @@ #include "kfileitemlistview.h" -#include "kitemlistgroupheader.h" +#include "kfileitemlistgroupheader.h" #include "kfileitemmodelrolesupdater.h" #include "kfileitemlistwidget.h" #include "kfileitemmodel.h" +#include "kpixmapmodifier_p.h" #include #include #include #include +#include #include #include -#define KFILEITEMLISTVIEW_DEBUG +// #define KFILEITEMLISTVIEW_DEBUG namespace { const int ShortInterval = 50; @@ -51,7 +53,7 @@ KFileItemListView::KFileItemListView(QGraphicsWidget* parent) : setScrollOrientation(Qt::Vertical); setWidgetCreator(new KItemListWidgetCreator()); - setGroupHeaderCreator(new KItemListGroupHeaderCreator()); + setGroupHeaderCreator(new KItemListGroupHeaderCreator()); m_updateVisibleIndexRangeTimer = new QTimer(this); m_updateVisibleIndexRangeTimer->setSingleShot(true); @@ -63,13 +65,18 @@ KFileItemListView::KFileItemListView(QGraphicsWidget* parent) : m_updateIconSizeTimer->setInterval(ShortInterval); connect(m_updateIconSizeTimer, SIGNAL(timeout()), this, SLOT(updateIconSize())); + setVisibleRoles(QList() << "name"); + updateMinimumRolesWidths(); } KFileItemListView::~KFileItemListView() { - delete widgetCreator(); + // The group headers are children of the widgets created by + // widgetCreator(). So it is mandatory to delete the group headers + // first. delete groupHeaderCreator(); + delete widgetCreator(); delete m_modelRolesUpdater; m_modelRolesUpdater = 0; @@ -100,6 +107,18 @@ KFileItemListView::Layout KFileItemListView::itemLayout() const return m_itemLayout; } +void KFileItemListView::setEnabledPlugins(const QStringList& list) +{ + if (m_modelRolesUpdater) { + m_modelRolesUpdater->setEnabledPlugins(list); + } +} + +QStringList KFileItemListView::enabledPlugins() const +{ + return m_modelRolesUpdater ? m_modelRolesUpdater->enabledPlugins() : QStringList(); +} + QSizeF KFileItemListView::itemSizeHint(int index) const { const QHash values = model()->data(index); @@ -167,75 +186,128 @@ QSizeF KFileItemListView::itemSizeHint(int index) const return QSize(); } -QHash KFileItemListView::visibleRoleSizes() const +QHash KFileItemListView::visibleRolesSizes(const KItemRangeList& itemRanges) const { QElapsedTimer timer; timer.start(); QHash sizes; - const int itemCount = model()->count(); - for (int i = 0; i < itemCount; ++i) { - foreach (const QByteArray& visibleRole, visibleRoles()) { - QSizeF maxSize = sizes.value(visibleRole, QSizeF(0, 0)); - const QSizeF itemSize = visibleRoleSizeHint(i, visibleRole); - maxSize = maxSize.expandedTo(itemSize); - sizes.insert(visibleRole, maxSize); - } + int calculatedItemCount = 0; + bool maxTimeExceeded = false; + foreach (const KItemRange& itemRange, itemRanges) { + const int startIndex = itemRange.index; + const int endIndex = startIndex + itemRange.count - 1; + + for (int i = startIndex; i <= endIndex; ++i) { + foreach (const QByteArray& visibleRole, visibleRoles()) { + QSizeF maxSize = sizes.value(visibleRole, QSizeF(0, 0)); + const QSizeF itemSize = visibleRoleSizeHint(i, visibleRole); + maxSize = maxSize.expandedTo(itemSize); + sizes.insert(visibleRole, maxSize); + } - if (i > 100 && timer.elapsed() > 200) { - // When having several thousands of items calculating the sizes can get - // very expensive. We accept a possibly too small role-size in favour - // of having no blocking user interface. - #ifdef KFILEITEMLISTVIEW_DEBUG - kDebug() << "Timer exceeded, stopped after" << i << "items"; - #endif + if (calculatedItemCount > 100 && timer.elapsed() > 200) { + // When having several thousands of items calculating the sizes can get + // very expensive. We accept a possibly too small role-size in favour + // of having no blocking user interface. + #ifdef KFILEITEMLISTVIEW_DEBUG + kDebug() << "Timer exceeded, stopped after" << calculatedItemCount << "items"; + #endif + maxTimeExceeded = true; + break; + } + ++calculatedItemCount; + } + if (maxTimeExceeded) { break; } } - // Stretch the width of the first role so that the full visible view-width - // is used to show all roles. - const qreal availableWidth = size().width(); - - qreal usedWidth = 0; - QHashIterator it(sizes); - while (it.hasNext()) { - it.next(); - usedWidth += it.value().width(); - } - - if (usedWidth < availableWidth) { - const QByteArray role = visibleRoles().first(); - QSizeF firstRoleSize = sizes.value(role); - firstRoleSize.rwidth() += availableWidth - usedWidth; - sizes.insert(role, firstRoleSize); - } - #ifdef KFILEITEMLISTVIEW_DEBUG - kDebug() << "[TIME] Calculated dynamic item size for " << itemCount << "items:" << timer.elapsed(); + int rangesItemCount = 0; + foreach (const KItemRange& itemRange, itemRanges) { + rangesItemCount += itemRange.count; + } + kDebug() << "[TIME] Calculated dynamic item size for " << rangesItemCount << "items:" << timer.elapsed(); #endif return sizes; } +bool KFileItemListView::supportsItemExpanding() const +{ + return m_itemLayout == DetailsLayout; +} + QPixmap KFileItemListView::createDragPixmap(const QSet& indexes) const { - QPixmap pixmap; - - if (model()) { - QSetIterator it(indexes); - while (it.hasNext()) { - const int index = it.next(); - // TODO: Only one item is considered currently - pixmap = model()->data(index).value("iconPixmap").value(); - if (pixmap.isNull()) { - KIcon icon(model()->data(index).value("iconName").toString()); - pixmap = icon.pixmap(itemSize().toSize()); - } + if (!model()) { + return QPixmap(); + } + + const int itemCount = indexes.count(); + Q_ASSERT(itemCount > 0); + + // If more than one item is dragged, align the items inside a + // rectangular grid. The maximum grid size is limited to 5 x 5 items. + int xCount; + int size; + if (itemCount > 16) { + xCount = 5; + size = KIconLoader::SizeSmall; + } else if (itemCount > 9) { + xCount = 4; + size = KIconLoader::SizeSmallMedium; + } else { + xCount = 3; + size = KIconLoader::SizeMedium; + } + + if (itemCount < xCount) { + xCount = itemCount; + } + + int yCount = itemCount / xCount; + if (itemCount % xCount != 0) { + ++yCount; + } + if (yCount > xCount) { + yCount = xCount; + } + + // Draw the selected items into the grid cells. + QPixmap dragPixmap(xCount * size + xCount, yCount * size + yCount); + dragPixmap.fill(Qt::transparent); + + QPainter painter(&dragPixmap); + int x = 0; + int y = 0; + QSetIterator it(indexes); + while (it.hasNext()) { + const int index = it.next(); + + QPixmap pixmap = model()->data(index).value("iconPixmap").value(); + if (pixmap.isNull()) { + KIcon icon(model()->data(index).value("iconName").toString()); + pixmap = icon.pixmap(size, size); + } else { + KPixmapModifier::scale(pixmap, QSize(size, size)); + } + + painter.drawPixmap(x, y, pixmap); + + x += size + 1; + if (x >= dragPixmap.width()) { + x = 0; + y += size + 1; + } + + if (y >= dragPixmap.height()) { + break; } } - return pixmap; + return dragPixmap; } void KFileItemListView::initializeItemListWidget(KItemListWidget* item) @@ -248,6 +320,9 @@ void KFileItemListView::initializeItemListWidget(KItemListWidget* item) case DetailsLayout: fileItemListWidget->setLayout(KFileItemListWidget::DetailsLayout); break; default: Q_ASSERT(false); break; } + + fileItemListWidget->setAlternatingBackgroundColors(m_itemLayout == DetailsLayout && + visibleRoles().count() > 1); } bool KFileItemListView::itemSizeHintUpdateRequired(const QSet& changedRoles) const @@ -270,13 +345,12 @@ void KFileItemListView::onModelChanged(KItemModelBase* current, KItemModelBase* Q_UNUSED(previous); Q_ASSERT(qobject_cast(current)); - if (m_modelRolesUpdater) { - delete m_modelRolesUpdater; - } - + delete m_modelRolesUpdater; m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast(current), this); const int size = styleOption().iconSize; m_modelRolesUpdater->setIconSize(QSize(size, size)); + + applyRolesToModel(); } void KFileItemListView::onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) @@ -293,7 +367,7 @@ void KFileItemListView::onItemSizeChanged(const QSizeF& current, const QSizeF& p triggerVisibleIndexRangeUpdate(); } -void KFileItemListView::onOffsetChanged(qreal current, qreal previous) +void KFileItemListView::onScrollOffsetChanged(qreal current, qreal previous) { Q_UNUSED(current); Q_UNUSED(previous); @@ -302,27 +376,22 @@ void KFileItemListView::onOffsetChanged(qreal current, qreal previous) void KFileItemListView::onVisibleRolesChanged(const QList& current, const QList& previous) { + Q_UNUSED(current); Q_UNUSED(previous); + applyRolesToModel(); - Q_ASSERT(qobject_cast(model())); - KFileItemModel* fileItemModel = static_cast(model()); - - // KFileItemModel does not distinct between "visible" and "invisible" roles. - // Add all roles that are mandatory for having a working KFileItemListView: - QSet keys = current.toSet(); - QSet roles = keys; - roles.insert("iconPixmap"); - roles.insert("iconName"); - roles.insert("name"); // TODO: just don't allow to disable it - roles.insert("isDir"); if (m_itemLayout == DetailsLayout) { - roles.insert("isExpanded"); - roles.insert("expansionLevel"); + // Only enable the alternating background colors if more than one role + // is visible + const int previousCount = previous.count(); + const int currentCount = current.count(); + if ((previousCount <= 1 && currentCount > 1) || (previousCount > 1 && currentCount <= 1)) { + const bool enabled = (currentCount > 1); + foreach (KItemListWidget* widget, visibleItemListWidgets()) { + widget->setAlternatingBackgroundColors(enabled); + } + } } - - fileItemModel->setRoles(roles); - - m_modelRolesUpdater->setRoles(keys); } void KFileItemListView::onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) @@ -353,7 +422,6 @@ void KFileItemListView::resizeEvent(QGraphicsSceneResizeEvent* event) { KItemListView::resizeEvent(event); triggerVisibleIndexRangeUpdate(); - markVisibleRolesSizesAsDirty(); } void KFileItemListView::slotItemsRemoved(const KItemRangeList& itemRanges) @@ -362,8 +430,21 @@ void KFileItemListView::slotItemsRemoved(const KItemRangeList& itemRanges) updateTimersInterval(); } +void KFileItemListView::slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) +{ + const QByteArray sortRole = model()->sortRole(); + if (!visibleRoles().contains(sortRole)) { + applyRolesToModel(); + } + + KItemListView::slotSortRoleChanged(current, previous); +} + void KFileItemListView::triggerVisibleIndexRangeUpdate() { + if (!model()) { + return; + } m_modelRolesUpdater->setPaused(true); m_updateVisibleIndexRangeTimer->start(); } @@ -393,6 +474,9 @@ void KFileItemListView::updateVisibleIndexRange() void KFileItemListView::triggerIconSizeUpdate() { + if (!model()) { + return; + } m_modelRolesUpdater->setPaused(true); m_updateIconSizeTimer->start(); } @@ -435,8 +519,6 @@ QSizeF KFileItemListView::visibleRoleSizeHint(int index, const QByteArray& role) } if (role == "name") { - Q_ASSERT(values.contains("expansionLevel")); - // Increase the width by the expansion-toggle and the current expansion level const int expansionLevel = values.value("expansionLevel", 0).toInt(); width += option.margin + expansionLevel * itemSize().height() + KIconLoader::SizeSmall; @@ -450,6 +532,10 @@ QSizeF KFileItemListView::visibleRoleSizeHint(int index, const QByteArray& role) void KFileItemListView::updateLayoutOfVisibleItems() { + if (!model()) { + return; + } + foreach (KItemListWidget* widget, visibleItemListWidgets()) { initializeItemListWidget(widget); } @@ -482,4 +568,33 @@ void KFileItemListView::updateMinimumRolesWidths() m_minimumRolesWidths.insert("size", option.fontMetrics.width(sizeText)); } +void KFileItemListView::applyRolesToModel() +{ + if (!model()) { + return; + } + + Q_ASSERT(qobject_cast(model())); + KFileItemModel* fileItemModel = static_cast(model()); + + // KFileItemModel does not distinct between "visible" and "invisible" roles. + // Add all roles that are mandatory for having a working KFileItemListView: + QSet roles = visibleRoles().toSet(); + roles.insert("iconPixmap"); + roles.insert("iconName"); + roles.insert("name"); + roles.insert("isDir"); + if (m_itemLayout == DetailsLayout) { + roles.insert("isExpanded"); + roles.insert("isExpandable"); + roles.insert("expansionLevel"); + } + + // Assure that the role that is used for sorting will be determined + roles.insert(fileItemModel->sortRole()); + + fileItemModel->setRoles(roles); + m_modelRolesUpdater->setRoles(roles); +} + #include "kfileitemlistview.moc"