X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fcfb63bb9dfebfa09d0f255412f02855d5e88893..c8d8556950005dfd96ebdb41d2f43ad90356367c:/src/kitemviews/kfileitemlistview.cpp

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index a7fa27f0d..86db28d3d 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -34,7 +34,7 @@
 #include <QTextLine>
 #include <QTimer>
 
-#define KFILEITEMLISTVIEW_DEBUG
+// #define KFILEITEMLISTVIEW_DEBUG
 
 namespace {
     const int ShortInterval = 50;
@@ -65,6 +65,8 @@ KFileItemListView::KFileItemListView(QGraphicsWidget* parent) :
     m_updateIconSizeTimer->setInterval(ShortInterval);
     connect(m_updateIconSizeTimer, SIGNAL(timeout()), this, SLOT(updateIconSize()));
 
+    setVisibleRoles(QList<QByteArray>() << "name");
+
     updateMinimumRolesWidths();
 }
 
@@ -105,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<QByteArray, QVariant> values = model()->data(index);
@@ -220,6 +234,11 @@ QHash<QByteArray, QSizeF> KFileItemListView::visibleRolesSizes(const KItemRangeL
     return sizes;
 }
 
+bool KFileItemListView::supportsItemExpanding() const
+{
+    return m_itemLayout == DetailsLayout;
+}
+
 QPixmap KFileItemListView::createDragPixmap(const QSet<int>& indexes) const
 {
     if (!model()) {
@@ -302,7 +321,8 @@ void KFileItemListView::initializeItemListWidget(KItemListWidget* item)
     default:            Q_ASSERT(false); break;
     }
 
-    fileItemListWidget->setAlternatingBackgroundColors(m_itemLayout == DetailsLayout);
+    fileItemListWidget->setAlternatingBackgroundColors(m_itemLayout == DetailsLayout &&
+                                                       visibleRoles().count() > 1);
 }
 
 bool KFileItemListView::itemSizeHintUpdateRequired(const QSet<QByteArray>& changedRoles) const
@@ -325,13 +345,12 @@ void KFileItemListView::onModelChanged(KItemModelBase* current, KItemModelBase*
     Q_UNUSED(previous);
     Q_ASSERT(qobject_cast<KFileItemModel*>(current));
 
-    if (m_modelRolesUpdater) {
-        delete m_modelRolesUpdater;
-    }
-
+    delete m_modelRolesUpdater;
     m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast<KFileItemModel*>(current), this);
     const int size = styleOption().iconSize;
     m_modelRolesUpdater->setIconSize(QSize(size, size));
+
+    applyRolesToModel();
 }
 
 void KFileItemListView::onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
@@ -360,6 +379,19 @@ void KFileItemListView::onVisibleRolesChanged(const QList<QByteArray>& current,
     Q_UNUSED(current);
     Q_UNUSED(previous);
     applyRolesToModel();
+
+    if (m_itemLayout == DetailsLayout) {
+        // 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);
+            }
+        }
+    }
 }
 
 void KFileItemListView::onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous)
@@ -410,6 +442,9 @@ void KFileItemListView::slotSortRoleChanged(const QByteArray& current, const QBy
 
 void KFileItemListView::triggerVisibleIndexRangeUpdate()
 {
+    if (!model()) {
+        return;
+    }
     m_modelRolesUpdater->setPaused(true);
     m_updateVisibleIndexRangeTimer->start();
 }
@@ -439,6 +474,9 @@ void KFileItemListView::updateVisibleIndexRange()
 
 void KFileItemListView::triggerIconSizeUpdate()
 {
+    if (!model()) {
+        return;
+    }
     m_modelRolesUpdater->setPaused(true);
     m_updateIconSizeTimer->start();
 }
@@ -494,6 +532,10 @@ QSizeF KFileItemListView::visibleRoleSizeHint(int index, const QByteArray& role)
 
 void KFileItemListView::updateLayoutOfVisibleItems()
 {
+    if (!model()) {
+        return;
+    }
+
     foreach (KItemListWidget* widget, visibleItemListWidgets()) {
         initializeItemListWidget(widget);
     }
@@ -528,6 +570,10 @@ void KFileItemListView::updateMinimumRolesWidths()
 
 void KFileItemListView::applyRolesToModel()
 {
+    if (!model()) {
+        return;
+    }
+
     Q_ASSERT(qobject_cast<KFileItemModel*>(model()));
     KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(model());
 
@@ -540,6 +586,7 @@ void KFileItemListView::applyRolesToModel()
     roles.insert("isDir");
     if (m_itemLayout == DetailsLayout) {
         roles.insert("isExpanded");
+        roles.insert("isExpandable");
         roles.insert("expansionLevel");
     }