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 d39d58cd03ecff7183a6d976a49ce72ae94b4fa7..3a1572de9d48ee289a2dd59ecbdbe5bd6de98127 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -19,14 +19,13 @@
 
 #include "dolphinfileitemlistwidget.h"
 
 
 #include "dolphinfileitemlistwidget.h"
 

-#include <KIcon>
-#include <KIconLoader>
-#include <QColor>
+#include "dolphindebug.h"

 
 

-#include <KDebug>
+#include <KIconLoader>

 
 

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

 {
 }
 
 {
 }
 


@@ -41,7 +40,7 @@ void DolphinFileItemListWidget::refreshCache()
     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.

-        const KVersionControlPlugin::VersionState version = static_cast<KVersionControlPlugin::VersionState>(values.value("version").toInt());
+        const KVersionControlPlugin::ItemVersion version = static_cast<KVersionControlPlugin::ItemVersion>(values.value("version").toInt());

         const QColor textColor = styleOption().palette.text().color();
         QColor tintColor = textColor;
 
         const QColor textColor = styleOption().palette.text().color();
         QColor tintColor = textColor;
 


@@ -55,8 +54,10 @@ void DolphinFileItemListWidget::refreshCache()
         case KVersionControlPlugin::AddedVersion:                   tintColor = Qt::green; break;
         case KVersionControlPlugin::RemovedVersion:                 tintColor = Qt::darkRed; break;
         case KVersionControlPlugin::ConflictingVersion:             tintColor = Qt::red; 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:             tintColor = Qt::white; break;
+        case KVersionControlPlugin::IgnoredVersion:                 tintColor = Qt::white; break;
+        case KVersionControlPlugin::MissingVersion:                 tintColor = Qt::red; break;

         case KVersionControlPlugin::NormalVersion:
         case KVersionControlPlugin::NormalVersion:

+        case KVersionControlPlugin::UnversionedVersion:

         default:
             break;
         }
         default:
             break;
         }


@@ -74,7 +75,7 @@ void DolphinFileItemListWidget::refreshCache()
     setTextColor(color);
 }
 
     setTextColor(color);
 }
 

-QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::VersionState version, int size)
+QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version, int size)

 {
     int overlayHeight = KIconLoader::SizeSmall;
     if (size >= KIconLoader::SizeEnormous) {
 {
     int overlayHeight = KIconLoader::SizeSmall;
     if (size >= KIconLoader::SizeEnormous) {


@@ -90,34 +91,35 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::Versio
     QString iconName;
     switch (version) {
     case KVersionControlPlugin::NormalVersion:
     QString iconName;
     switch (version) {
     case KVersionControlPlugin::NormalVersion:

-        iconName = "vcs-normal";
+        iconName = QStringLiteral("vcs-normal");

         break;
     case KVersionControlPlugin::UpdateRequiredVersion:
         break;
     case KVersionControlPlugin::UpdateRequiredVersion:

-        iconName = "vcs-update-required";
+        iconName = QStringLiteral("vcs-update-required");

         break;
     case KVersionControlPlugin::LocallyModifiedVersion:
         break;
     case KVersionControlPlugin::LocallyModifiedVersion:

-        iconName = "vcs-locally-modified";
+        iconName = QStringLiteral("vcs-locally-modified");

         break;
     case KVersionControlPlugin::LocallyModifiedUnstagedVersion:
         break;
     case KVersionControlPlugin::LocallyModifiedUnstagedVersion:

-        iconName = "vcs-locally-modified-unstaged";
+        iconName = QStringLiteral("vcs-locally-modified-unstaged");

         break;
     case KVersionControlPlugin::AddedVersion:
         break;
     case KVersionControlPlugin::AddedVersion:

-        iconName = "vcs-added";
+        iconName = QStringLiteral("vcs-added");

         break;
     case KVersionControlPlugin::RemovedVersion:
         break;
     case KVersionControlPlugin::RemovedVersion:

-        iconName = "vcs-removed";
+        iconName = QStringLiteral("vcs-removed");

         break;
     case KVersionControlPlugin::ConflictingVersion:
         break;
     case KVersionControlPlugin::ConflictingVersion:

-        iconName = "vcs-conflicting";
+        iconName = QStringLiteral("vcs-conflicting");

         break;
     case KVersionControlPlugin::UnversionedVersion:
         break;
     case KVersionControlPlugin::UnversionedVersion:

+    case KVersionControlPlugin::IgnoredVersion:
+    case KVersionControlPlugin::MissingVersion:

         break;
     default:
         Q_ASSERT(false);
         break;
     }
 
         break;
     default:
         Q_ASSERT(false);
         break;
     }
 

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

 }
 
 }
 

-#include "dolphinfileitemlistwidget.moc"