Fix for crash which was introduced by commit

[dolphin.git] / src / views / dolphinfileitemlistwidget.cpp

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index c3ec2b8ded80eb39d80640fb6c19b6b8b4d252d7..de927d91fcae721dfa3bd6fb3604dee36fabd3b7 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -19,13 +19,16 @@
 
 #include "dolphinfileitemlistwidget.h"
 
 
 #include "dolphinfileitemlistwidget.h"
 

-#include <kversioncontrolplugin.h>
+#include <QIcon>
+#include <KIconLoader>
+#include <kversioncontrolplugin2.h>

 #include <QColor>
 
 #include <KDebug>
 
 #include <QColor>
 
 #include <KDebug>
 

-DolphinFileItemListWidget::DolphinFileItemListWidget(QGraphicsItem* parent) :
-    KFileItemListWidget(parent)
+DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant,
+                                                     QGraphicsItem* parent) :
+    KFileItemListWidget(informant, parent)

 {
 }
 
 {
 }
 


@@ -33,44 +36,93 @@ DolphinFileItemListWidget::~DolphinFileItemListWidget()
 {
 }
 
 {
 }
 

-void DolphinFileItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles)
+void DolphinFileItemListWidget::refreshCache()

 {
 {

-    KFileItemListWidget::dataChanged(current, roles);
-

     QColor color;
     QColor color;

-    if (roles.contains("version")) {
+    const QHash<QByteArray, QVariant> values = data();
+    if (values.contains("version")) {

         // The item is under version control. Apply the text color corresponding
         // to its version state.
         // The item is under version control. Apply the text color corresponding
         // to its version state.

-        const KVersionControlPlugin::VersionState version = static_cast<KVersionControlPlugin::VersionState>(current.value("version").toInt());
-        if (version != KVersionControlPlugin::UnversionedVersion) {
-            const QColor textColor = styleOption().palette.text().color();
-            QColor tintColor = textColor;
-
-            // Using hardcoded colors is generally a bad idea. In this case the colors just act
-            // as tint colors and are mixed with the current set text color. The tint colors
-            // have been optimized for the base colors of the corresponding Oxygen emblems.
-            switch (version) {
-            case KVersionControlPlugin::UpdateRequiredVersion:          tintColor = Qt::yellow; break;
-            case KVersionControlPlugin::LocallyModifiedUnstagedVersion: tintColor = Qt::darkGreen; break;
-            case KVersionControlPlugin::LocallyModifiedVersion:         tintColor = Qt::green; break;
-            case KVersionControlPlugin::AddedVersion:                   tintColor = Qt::green; break;
-            case KVersionControlPlugin::RemovedVersion:                 tintColor = Qt::darkRed; break;
-            case KVersionControlPlugin::ConflictingVersion:             tintColor = Qt::red; break;
-            case KVersionControlPlugin::UnversionedVersion:
-            case KVersionControlPlugin::NormalVersion:
-            default:
-                 // use the default text color
-                 return;
-            }
+        const KVersionControlPlugin2::ItemVersion version = static_cast<KVersionControlPlugin2::ItemVersion>(values.value("version").toInt());
+        const QColor textColor = styleOption().palette.text().color();
+        QColor tintColor = textColor;

 
 

-            color = QColor((tintColor.red()   + textColor.red())   / 2,
-                           (tintColor.green() + textColor.green()) / 2,
-                           (tintColor.blue()  + textColor.blue())  / 2,
-                           (tintColor.alpha() + textColor.alpha()) / 2);
+        // Using hardcoded colors is generally a bad idea. In this case the colors just act
+        // as tint colors and are mixed with the current set text color. The tint colors
+        // have been optimized for the base colors of the corresponding Oxygen emblems.
+        switch (version) {
+        case KVersionControlPlugin2::UpdateRequiredVersion:          tintColor = Qt::yellow; break;
+        case KVersionControlPlugin2::LocallyModifiedUnstagedVersion: tintColor = Qt::green; break;
+        case KVersionControlPlugin2::LocallyModifiedVersion:         tintColor = Qt::green; break;
+        case KVersionControlPlugin2::AddedVersion:                   tintColor = Qt::green; break;
+        case KVersionControlPlugin2::RemovedVersion:                 tintColor = Qt::darkRed; break;
+        case KVersionControlPlugin2::ConflictingVersion:             tintColor = Qt::red; break;
+        case KVersionControlPlugin2::IgnoredVersion:                 tintColor = Qt::white; break;
+        case KVersionControlPlugin2::MissingVersion:                 tintColor = Qt::red; break;
+        case KVersionControlPlugin2::NormalVersion:
+        case KVersionControlPlugin2::UnversionedVersion:
+        default:
+            break;

         }
         }

+
+        color = QColor((tintColor.red()   + textColor.red())   / 2,
+                       (tintColor.green() + textColor.green()) / 2,
+                       (tintColor.blue()  + textColor.blue())  / 2,
+                       (tintColor.alpha() + textColor.alpha()) / 2);
+
+        setOverlay(overlayForState(version, styleOption().iconSize));
+    } else if (!overlay().isNull()) {
+        setOverlay(QPixmap());

     }
 
     setTextColor(color);
 }
 
     }
 
     setTextColor(color);
 }
 

-#include "dolphinfileitemlistwidget.moc"
+QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin2::ItemVersion version, int size)
+{
+    int overlayHeight = KIconLoader::SizeSmall;
+    if (size >= KIconLoader::SizeEnormous) {
+        overlayHeight = KIconLoader::SizeMedium;
+    } else if (size >= KIconLoader::SizeLarge) {
+        overlayHeight = KIconLoader::SizeSmallMedium;
+    } else if (size >= KIconLoader::SizeMedium) {
+        overlayHeight = KIconLoader::SizeSmall;
+    } else {
+        overlayHeight = KIconLoader::SizeSmall / 2;
+    }
+
+    QString iconName;
+    switch (version) {
+    case KVersionControlPlugin::NormalVersion:
+        iconName = "vcs-normal";
+        break;
+    case KVersionControlPlugin::UpdateRequiredVersion:
+        iconName = "vcs-update-required";
+        break;
+    case KVersionControlPlugin::LocallyModifiedVersion:
+        iconName = "vcs-locally-modified";
+        break;
+    case KVersionControlPlugin::LocallyModifiedUnstagedVersion:
+        iconName = "vcs-locally-modified-unstaged";
+        break;
+    case KVersionControlPlugin::AddedVersion:
+        iconName = "vcs-added";
+        break;
+    case KVersionControlPlugin::RemovedVersion:
+        iconName = "vcs-removed";
+        break;
+    case KVersionControlPlugin::ConflictingVersion:
+        iconName = "vcs-conflicting";
+        break;
+    case KVersionControlPlugin::UnversionedVersion:
+    case KVersionControlPlugin2::IgnoredVersion:
+    case KVersionControlPlugin2::MissingVersion:
+        break;
+    default:
+        Q_ASSERT(false);
+        break;
+    }
+
+    return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight));
+}
+