Fix the problem of the palette not being updated... this is a workaround. It should...

[dolphin.git] / src / dolphincategorydrawer.cpp

diff --git a/src/dolphincategorydrawer.cpp b/src/dolphincategorydrawer.cpp
index 8031f79e03dad863ca994d712a8301fc3ee2d770..872a0c3377d45b1b001929b569423f72f5d8db77 100644 (file)
--- a/src/dolphincategorydrawer.cpp
+++ b/src/dolphincategorydrawer.cpp
@@ -1,6 +1,6 @@
 /**
   * This file is part of the KDE project
-  * Copyright (C) 2007 Rafael Fernández López <ereslibre@gmail.com>
+  * Copyright (C) 2007 Rafael Fernández López <ereslibre@kde.org>
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Library General Public
@@ -26,7 +26,7 @@
 
 #include <kiconloader.h>
 #include <kcategorizedsortfilterproxymodel.h>
-#include <kpixmapeffect.h>
+#include <qimageblitz.h>
 #include <kuser.h>
 
 #include <config-nepomuk.h>
@@ -52,8 +52,8 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
 {
     QRect starRect = option.rect;
 
-    int iconSize = KIconLoader::global()->currentSize(K3Icon::Small);
-    QVariant categoryVariant = index.model()->data(index, KCategorizedSortFilterProxyModel::CategoryRole);
+    int iconSize = KIconLoader::global()->currentSize(KIconLoader::Small);
+    QVariant categoryVariant = index.model()->data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
 
     if (!categoryVariant.isValid())
     {
@@ -98,7 +98,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
     }
     else if (option.state & QStyle::State_MouseOver)
     {
-        QColor hover = option.palette.color(QPalette::Highlight).light();
+        QColor hover = option.palette.color(QPalette::Highlight);
         hover.setAlpha(88);
 
         QLinearGradient gradient(option.rect.topLeft(),
@@ -177,7 +177,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
             }
             else
             {
-                icon = KIconLoader::global()->loadIcon("user", K3Icon::NoGroup, option.fontMetrics.height());
+                icon = KIconLoader::global()->loadIcon("user", KIconLoader::NoGroup, option.fontMetrics.height());
             }
 
             opt.rect.setTop(opt.rect.top() - icon.height());
@@ -199,7 +199,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
             // so the group icon drawn is that one particularly. This way assures the drawn
             // icon is the one of the mimetype of the group itself. (ereslibre)
             icon = KIconLoader::global()->loadMimeTypeIcon(item.mimeTypePtr()->iconName(),
-                                                           K3Icon::NoGroup, option.fontMetrics.height());
+                                                           KIconLoader::NoGroup, option.fontMetrics.height());
 
             opt.rect.setTop(opt.rect.top() - icon.height());
 
@@ -214,11 +214,13 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
             starRect.setTop(option.rect.top() + (option.rect.height() / 2) - (iconSize / 2));
             starRect.setSize(QSize(iconSize, iconSize));
 
-            QPixmap pixmap = KIconLoader::global()->loadIcon("rating", K3Icon::Small);
-            QPixmap smallPixmap = KIconLoader::global()->loadIcon("rating", K3Icon::NoGroup, iconSize / 2);
-            QPixmap disabledPixmap = KIconLoader::global()->loadIcon("rating", K3Icon::Small);
+            QPixmap pixmap = KIconLoader::global()->loadIcon("rating", KIconLoader::Small);
+            QPixmap smallPixmap = KIconLoader::global()->loadIcon("rating", KIconLoader::NoGroup, iconSize / 2);
+            QPixmap disabledPixmap = KIconLoader::global()->loadIcon("rating", KIconLoader::Small);
 
-            KPixmapEffect::toGray(disabledPixmap, false);
+            QImage img = disabledPixmap.toImage();
+            Blitz::grayscale(img);
+            disabledPixmap = QPixmap::fromImage(img);
 
             int rating = category.toInt();
 
@@ -328,7 +330,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
 
 int DolphinCategoryDrawer::categoryHeight(const QStyleOption &option) const
 {
-    int iconSize = KIconLoader::global()->currentSize(K3Icon::Small);
+    int iconSize = KIconLoader::global()->currentSize(KIconLoader::Small);
 
     return qMax(option.fontMetrics.height() + (iconSize / 4) * 2 + 2, iconSize + (iconSize / 4) * 2 + 2) /* 2 gradient */;
 }