X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/220355ca8d01f5e17e8b93dfa1a893dc6e20bd8a..7eeb8dba6aeba09aa3dfa7fa5f0b00840d4d8317:/src/dolphinfileitemdelegate.cpp

diff --git a/src/dolphinfileitemdelegate.cpp b/src/dolphinfileitemdelegate.cpp
index cc8c44983..87ea774f8 100644
--- a/src/dolphinfileitemdelegate.cpp
+++ b/src/dolphinfileitemdelegate.cpp
@@ -21,6 +21,8 @@
 
 #include <dolphinmodel.h>
 #include <kfileitem.h>
+#include <kicon.h>
+#include <kiconloader.h>
 
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
@@ -31,7 +33,9 @@
 
 DolphinFileItemDelegate::DolphinFileItemDelegate(QObject* parent) :
     KFileItemDelegate(parent),
-    m_hasMinimizedNameColumn(false)
+    m_hasMinimizedNameColumn(false),
+    m_cachedSize(),
+    m_cachedEmblems()
 {
 }
 
@@ -45,34 +49,33 @@ void DolphinFileItemDelegate::paint(QPainter* painter,
 {
     const QAbstractProxyModel* proxyModel = static_cast<const QAbstractProxyModel*>(index.model());
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(proxyModel->sourceModel());
-    const bool useMinimizedNameColumn = m_hasMinimizedNameColumn && (index.column() == KDirModel::Name);
+    const bool isNameColumn = (index.column() == KDirModel::Name);
 
-    if (dolphinModel->hasRevisionData()) {
+    QStyleOptionViewItemV4 opt(option);
+    if (m_hasMinimizedNameColumn && isNameColumn) {
+        adjustOptionWidth(opt, proxyModel, dolphinModel, index);
+    }
+
+    if (dolphinModel->hasVersionData() && isNameColumn) {
         // The currently shown items are under revision control. Show the current revision
-        // state by adjusting the text color.
+        // state by adding an emblem and changing the text tintColor.
         const QModelIndex dirIndex = proxyModel->mapToSource(index);
-        const QModelIndex revisionIndex = dolphinModel->index(dirIndex.row(), DolphinModel::Revision);
+        const QModelIndex revisionIndex = dolphinModel->index(dirIndex.row(), DolphinModel::Version, dirIndex.parent());
         const QVariant data = dolphinModel->data(revisionIndex, Qt::DecorationRole);
-        const DolphinModel::RevisionState state = static_cast<DolphinModel::RevisionState>(data.toInt());
-
-        if (state != DolphinModel::LocalRevision) {
-            QStyleOptionViewItemV4 opt(option);
-            // TODO: use different colors for different states
-            opt.palette.setColor(QPalette::Text, QColor(40, 150, 40));
-            if (useMinimizedNameColumn) {
-                adjustOptionWidth(opt, proxyModel, dolphinModel, index);
-            }
-            KFileItemDelegate::paint(painter, opt, index);
-            return;
+        const KVersionControlPlugin::VersionState state = static_cast<KVersionControlPlugin::VersionState>(data.toInt());
+
+        adjustOptionTextColor(opt, state);
+
+        KFileItemDelegate::paint(painter, opt, index);
+
+        if (state != KVersionControlPlugin::UnversionedVersion) {
+            const QRect rect = iconRect(option, index);
+            const QPixmap emblem = emblemForState(state, rect.size());
+            painter->drawPixmap(rect.x(), rect.y() + rect.height() - emblem.height(), emblem);
         }
-    } else if (useMinimizedNameColumn) {
-        QStyleOptionViewItemV4 opt(option);
-        adjustOptionWidth(opt, proxyModel, dolphinModel, index);
+    } else {
         KFileItemDelegate::paint(painter, opt, index);
-        return;
     }
-
-    KFileItemDelegate::paint(painter, option, index);
 }
 
 int DolphinFileItemDelegate::nameColumnWidth(const QString& name, const QStyleOptionViewItem& option)
@@ -105,3 +108,72 @@ void DolphinFileItemDelegate::adjustOptionWidth(QStyleOptionViewItemV4& option,
     }
 }
 
+void DolphinFileItemDelegate::adjustOptionTextColor(QStyleOptionViewItemV4& option,
+                                                    KVersionControlPlugin::VersionState state)
+{
+    QColor tintColor;
+
+    // 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 (state) {
+    case KVersionControlPlugin::UpdateRequiredVersion:  tintColor = Qt::yellow; break;
+    case KVersionControlPlugin::LocallyModifiedVersion: tintColor = Qt::green; break;
+    case KVersionControlPlugin::AddedVersion:           tintColor = Qt::darkGreen; 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;
+    }
+
+    QPalette palette = option.palette;
+    const QColor textColor = palette.color(QPalette::Text);
+    tintColor = QColor((tintColor.red()   + textColor.red())   / 2,
+                       (tintColor.green() + textColor.green()) / 2,
+                       (tintColor.blue()  + textColor.blue())  / 2,
+                       (tintColor.alpha() + textColor.alpha()) / 2);
+    palette.setColor(QPalette::Text, tintColor);
+    option.palette = palette;
+}
+
+QPixmap DolphinFileItemDelegate::emblemForState(KVersionControlPlugin::VersionState state, const QSize& size) const
+{
+    Q_ASSERT(state <= KVersionControlPlugin::ConflictingVersion);
+    if (m_cachedSize != size) {
+        m_cachedSize = size;
+
+        const int iconHeight = size.height();
+        int emblemHeight = KIconLoader::SizeSmall;
+        if (iconHeight >= KIconLoader::SizeEnormous) {
+            emblemHeight = KIconLoader::SizeMedium;
+        } else if (iconHeight >= KIconLoader::SizeLarge) {
+            emblemHeight = KIconLoader::SizeSmallMedium;
+        } else if (iconHeight >= KIconLoader::SizeMedium) {
+            emblemHeight = KIconLoader::SizeSmall;
+        } else {
+            emblemHeight = KIconLoader::SizeSmall / 2;
+        }
+
+        const QSize emblemSize(emblemHeight, emblemHeight);
+        for (int i = KVersionControlPlugin::NormalVersion; i <= KVersionControlPlugin::ConflictingVersion; ++i) {
+            QString iconName;
+            switch (i) {
+            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::AddedVersion:           iconName = "vcs-added"; break;
+            case KVersionControlPlugin::RemovedVersion:         iconName = "vcs-removed"; break;
+            case KVersionControlPlugin::ConflictingVersion:     iconName = "vcs-conflicting"; break;
+            case KVersionControlPlugin::UnversionedVersion:
+            default:                                            Q_ASSERT(false); break;
+            }
+
+            m_cachedEmblems[i] = KIcon(iconName).pixmap(emblemSize);
+        }
+    }
+    return m_cachedEmblems[state];
+}
+