SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index c3a15ea6f4e023b38e27b5dcf01eadf4c3cded4e..7ad242f3f5452a350340987c2cc2581fc62ace8e 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -5,14 +5,14 @@
  */
 
 #include "dolphinfileitemlistwidget.h"
+#include "../kitemviews/private/kitemviewsutils.h"
 
 #include "dolphindebug.h"
 
 #include <KIconLoader>
 
-DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant,
-                                                     QGraphicsItem* parent) :
-    KFileItemListWidget(informant, parent)
+DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent)
+    : KFileItemListWidget(informant, parent)
 {
 }
 
@@ -24,6 +24,7 @@ void DolphinFileItemListWidget::refreshCache()
 {
     QColor color;
     const QHash<QByteArray, QVariant> values = data();
+    QHash<Qt::Corner, QString> overlays;
     if (values.contains("version")) {
         // The item is under version control. Apply the text color corresponding
         // to its version state.
@@ -35,46 +36,63 @@ void DolphinFileItemListWidget::refreshCache()
         // 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::green; 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::IgnoredVersion:                 tintColor = Qt::white; break;
-        case KVersionControlPlugin::MissingVersion:                 tintColor = Qt::red; break;
+        case KVersionControlPlugin::UpdateRequiredVersion:
+            tintColor = Qt::yellow;
+            break;
+        case KVersionControlPlugin::LocallyModifiedUnstagedVersion:
+            tintColor = Qt::green;
+            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::IgnoredVersion:
+            tintColor = Qt::white;
+            break;
+        case KVersionControlPlugin::MissingVersion:
+            tintColor = Qt::red;
+            break;
         case KVersionControlPlugin::NormalVersion:
         case KVersionControlPlugin::UnversionedVersion:
         default:
             break;
         }
 
-        color = QColor((tintColor.red()   + textColor.red())   / 2,
+        color = QColor((tintColor.red() + textColor.red()) / 2,
                        (tintColor.green() + textColor.green()) / 2,
-                       (tintColor.blue()  + textColor.blue())  / 2,
+                       (tintColor.blue() + textColor.blue()) / 2,
                        (tintColor.alpha() + textColor.alpha()) / 2);
 
-        setOverlay(overlayForState(version, styleOption().iconSize));
-    } else if (!overlay().isNull()) {
-        setOverlay(QPixmap());
+        overlays.insert(Qt::Corner::BottomLeftCorner, overlayForState(version));
+    }
+
+    if (values.contains("iconOverlays")) {
+        const auto corners = {Qt::Corner::BottomRightCorner, Qt::Corner::TopLeftCorner, Qt::Corner::TopRightCorner};
+        const auto iconOverlays = values.value("iconOverlays").toStringList();
+        auto overlaysIt = iconOverlays.constBegin();
+        for (const auto &corner : corners) {
+            if (overlaysIt == iconOverlays.constEnd()) {
+                break;
+            }
+            overlays.insert(corner, *overlaysIt);
+            overlaysIt = ++overlaysIt;
+        }
     }
 
+    setOverlays(overlays);
     setTextColor(color);
 }
 
-QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version, int size)
+QString DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version) const
 {
-    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:
@@ -107,6 +125,7 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVe
         break;
     }
 
-    return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight));
+    return iconName;
 }
 
+#include "moc_dolphinfileitemlistwidget.cpp"