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 921baf73fe47ba4b74fabce992790a1524c3d408..7ad242f3f5452a350340987c2cc2581fc62ace8e 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -5,6 +5,7 @@
  */
 
 #include "dolphinfileitemlistwidget.h"
  */
 
 #include "dolphinfileitemlistwidget.h"

+#include "../kitemviews/private/kitemviewsutils.h"

 
 #include "dolphindebug.h"
 
 
 #include "dolphindebug.h"
 


@@ -23,6 +24,7 @@ void DolphinFileItemListWidget::refreshCache()
 {
     QColor color;
     const QHash<QByteArray, QVariant> values = data();
 {
     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.
     if (values.contains("version")) {
         // The item is under version control. Apply the text color corresponding
         // to its version state.


@@ -69,27 +71,28 @@ void DolphinFileItemListWidget::refreshCache()
                        (tintColor.blue() + textColor.blue()) / 2,
                        (tintColor.alpha() + textColor.alpha()) / 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);
 }
 
     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:
     QString iconName;
     switch (version) {
     case KVersionControlPlugin::NormalVersion:


@@ -122,7 +125,7 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVe
         break;
     }
 
         break;
     }
 

-    return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight));
+    return iconName;

 }
 
 #include "moc_dolphinfileitemlistwidget.cpp"
 }
 
 #include "moc_dolphinfileitemlistwidget.cpp"