SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / dolphincategorydrawer.cpp

diff --git a/src/dolphincategorydrawer.cpp b/src/dolphincategorydrawer.cpp
index bd88d5e5cf895c80372fad05b4d70765e0d62c79..8148a7b8ed02f0ab8f1d1bd50cf267998786ab76 100644 (file)
--- a/src/dolphincategorydrawer.cpp
+++ b/src/dolphincategorydrawer.cpp
@@ -19,7 +19,7 @@
   */
 
 #include "dolphincategorydrawer.h"
-
+#include "ratingpainter.h"
 #include <QPainter>
 #include <QFile>
 #include <QDir>
@@ -53,7 +53,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
     QRect starRect = option.rect;
 
     int iconSize = KIconLoader::global()->currentSize(KIconLoader::Small);
-    QVariant categoryVariant = index.model()->data(index, KCategorizedSortFilterProxyModel::CategoryRole);
+    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(),
@@ -118,9 +118,9 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
 
     QPainterPath path;
     path.addRect(option.rect.left(),
-                 option.rect.bottom() - 2,
+                 option.rect.bottom() - 1,
                  option.rect.width(),
-                 2);
+                 1);
 
     QLinearGradient gradient(option.rect.topLeft(),
                              option.rect.bottomRight());
@@ -134,15 +134,15 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
 
     if (option.direction == Qt::LeftToRight)
     {
-        opt.rect.setLeft(opt.rect.left() + (iconSize / 4));
-        starRect.setLeft(starRect.left() + (iconSize / 4));
-        starRect.setRight(starRect.right() + (iconSize / 4));
+        opt.rect.setLeft(opt.rect.left());
+        starRect.setLeft(starRect.left());
+        starRect.setRight(starRect.right());
     }
     else
     {
-        opt.rect.setRight(opt.rect.width() - (iconSize / 4));
-        starRect.setLeft(starRect.width() - iconSize);
-        starRect.setRight(starRect.width() - (iconSize / 4));
+        opt.rect.setRight(opt.rect.width());
+        starRect.setLeft(starRect.width());
+        starRect.setRight(starRect.width());
     }
 
     bool paintIcon = true;
@@ -177,7 +177,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
             }
             else
             {
-                icon = KIconLoader::global()->loadIcon("user", KIconLoader::NoGroup, option.fontMetrics.height());
+                icon = KIconLoader::global()->loadIcon("user-identity", KIconLoader::NoGroup, option.fontMetrics.height());
             }
 
             opt.rect.setTop(opt.rect.top() - icon.height());
@@ -211,80 +211,11 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
             paintText = false;
             paintIcon = false;
 
-            starRect.setTop(option.rect.top() + (option.rect.height() / 2) - (iconSize / 2));
-            starRect.setSize(QSize(iconSize, iconSize));
-
-            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);
-
-            QImage img = disabledPixmap.toImage();
-            Blitz::grayscale(img);
-            disabledPixmap = QPixmap::fromImage(img);
-
-            int rating = category.toInt();
-
-            for (int i = 0; i < rating - (rating % 2); i += 2) {
-                painter->drawPixmap(starRect, pixmap);
-
-                if (option.direction == Qt::LeftToRight)
-                {
-                    starRect.setLeft(starRect.left() + iconSize + (iconSize / 4) /* separator between stars */);
-                    starRect.setRight(starRect.right() + iconSize + (iconSize / 4) /* separator between stars */);
-                }
-                else
-                {
-                    starRect.setLeft(starRect.left() - iconSize - (iconSize / 4) /* separator between stars */);
-                    starRect.setRight(starRect.right() - iconSize - (iconSize / 4) /* separator between stars */);
-                }
-            }
-
-            if (rating && rating % 2) {
-                if (option.direction == Qt::RightToLeft)
-                {
-                    starRect.setLeft(starRect.left() + (iconSize / 2) /* separator between stars */);
-                }
-
-                starRect.setTop(option.rect.top() + (option.rect.height() / 2) - (iconSize / 4));
-                starRect.setSize(QSize(iconSize / 2, iconSize / 2));
-                painter->drawPixmap(starRect, smallPixmap);
-                starRect.setTop(opt.rect.top() + (option.rect.height() / 2) - (iconSize / 2));
-
-                if (option.direction == Qt::LeftToRight)
-                {
-                    starRect.setLeft(starRect.left() + (iconSize / 2) + (iconSize / 4));
-                    starRect.setRight(starRect.right() + (iconSize / 2) + (iconSize / 4));
-                }
-                else
-                {
-                    starRect.setLeft(starRect.left() - (iconSize / 2) - (iconSize / 4));
-                    starRect.setRight(starRect.right() - (iconSize / 2) - (iconSize / 4));
-                }
-
-                if (option.direction == Qt::RightToLeft)
-                {
-                    starRect.setLeft(starRect.left() - (iconSize / 2));
-                    starRect.setRight(starRect.right() - (iconSize / 2));
-                }
-
-                starRect.setSize(QSize(iconSize, iconSize));
-            }
-
-            for (int i = rating; i < 9; i += 2) {
-                painter->drawPixmap(starRect, disabledPixmap);
-
-                if (option.direction == Qt::LeftToRight)
-                {
-                    starRect.setLeft(starRect.left() + iconSize + (iconSize / 4));
-                    starRect.setRight(starRect.right() + iconSize + (iconSize / 4));
-                }
-                else
-                {
-                    starRect.setLeft(starRect.left() - iconSize - (iconSize / 4));
-                    starRect.setRight(starRect.right() - iconSize - (iconSize / 4));
-                }
-            }
-
+            painter->setLayoutDirection( option.direction );
+            QRect ratingRect( option.rect );
+            ratingRect.setTop(option.rect.top() + (option.rect.height() / 2) - (iconSize / 2));
+            ratingRect.setHeight( iconSize );
+            Nepomuk::RatingPainter::drawRating( painter, ratingRect, Qt::AlignLeft, category.toInt() );
             break;
         }
 
@@ -310,14 +241,14 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
 
     if (paintText) {
         opt.rect.setTop(option.rect.top() + (iconSize / 4));
-        opt.rect.setBottom(opt.rect.bottom() - 2);
+        opt.rect.setBottom(opt.rect.bottom() - 1);
         painter->setPen(color);
 
         QRect textRect = opt.rect;
 
         if (option.direction == Qt::RightToLeft)
         {
-            textRect.setWidth(textRect.width() - (paintIcon ? icon.width() + (iconSize / 2)
+            textRect.setWidth(textRect.width() - (paintIcon ? icon.width() + (iconSize / 4)
                                                             : -(iconSize / 4)));
         }
 
@@ -328,9 +259,23 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
     painter->restore();
 }
 
-int DolphinCategoryDrawer::categoryHeight(const QStyleOption &option) const
+int DolphinCategoryDrawer::categoryHeight(const QModelIndex &index, const QStyleOption &option) const
 {
     int iconSize = KIconLoader::global()->currentSize(KIconLoader::Small);
+    int heightWithoutIcon = option.fontMetrics.height() + (iconSize / 4) * 2 + 1; /* 1 pixel-width gradient */
+    bool paintIcon;
+
+    switch (index.column()) {
+        case KDirModel::Owner:
+        case KDirModel::Type:
+            paintIcon = true;
+            break;
+        default:
+            paintIcon = false;
+    }
+
+    if (paintIcon)
+        return qMax(heightWithoutIcon, iconSize + (iconSize / 4) * 2 + 1) /* 1 pixel-width gradient */;
 
-    return qMax(option.fontMetrics.height() + (iconSize / 4) * 2 + 2, iconSize + (iconSize / 4) * 2 + 2) /* 2 gradient */;
+    return heightWithoutIcon;
 }