From e82d7e889f61be1d2b5b6b2c290cae467fdefdf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 12 Nov 2014 17:29:11 +0100
Subject: [PATCH] no more color highlight on sidebar icons ^_^

---
 YACReaderLibrary/db/folder_model.cpp      |  6 +++---
 YACReaderLibrary/db/reading_list_item.cpp |  8 ++++----
 common/yacreader_global.cpp               | 10 ++++++++++
 common/yacreader_global.h                 |  1 +
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/YACReaderLibrary/db/folder_model.cpp b/YACReaderLibrary/db/folder_model.cpp
index 499aaaec..cdee3fb8 100644
--- a/YACReaderLibrary/db/folder_model.cpp
+++ b/YACReaderLibrary/db/folder_model.cpp
@@ -54,7 +54,7 @@
 #include "folder.h"
 #include "db_helper.h"
 #include "qnaturalsorting.h"
-
+#include "yacreader_global.h"
 #include "QsLog.h"
 
 #ifdef Q_OS_MAC
@@ -161,9 +161,9 @@ QVariant FolderModel::data(const QModelIndex &index, int role) const
         }
 #else
         if(item->data(FolderModel::Finished).toBool())
-            return QVariant(QIcon(":/images/folder_finished.png"));
+            return QVariant(YACReader::noHighlightedIcon(":/images/folder_finished.png"));
         else
-            return QVariant(QIcon(":/images/folder.png"));
+            return QVariant(YACReader::noHighlightedIcon(":/images/folder.png"));
 #endif
 
 	if (role != Qt::DisplayRole)
diff --git a/YACReaderLibrary/db/reading_list_item.cpp b/YACReaderLibrary/db/reading_list_item.cpp
index 9991b62f..ace3b890 100644
--- a/YACReaderLibrary/db/reading_list_item.cpp
+++ b/YACReaderLibrary/db/reading_list_item.cpp
@@ -34,7 +34,7 @@ QIcon SpecialListItem::getIcon() const
     if(itemData.count()>1)
     {
         QString id = itemData.at(1).toString();
-        return QIcon(QString(":/images/lists/default_%1.png").arg(id));
+        return YACReader::noHighlightedIcon(QString(":/images/lists/default_%1.png").arg(id));
     }
 }
 
@@ -51,7 +51,7 @@ QIcon LabelItem::getIcon() const
     if(itemData.count()>1)
     {
         QString color = itemData.at(1).toString();
-        return QIcon(QString(":/images/lists/label_%1.png").arg(color).toLower());
+        return YACReader::noHighlightedIcon(QString(":/images/lists/label_%1.png").arg(color).toLower());
     }
 }
 
@@ -95,9 +95,9 @@ ReadingListItem::ReadingListItem(const QList<QVariant> &data, ReadingListItem *p
 QIcon ReadingListItem::getIcon() const
 {
     if(parent == 0)
-        return QIcon(":/images/lists/list.png");
+        return YACReader::noHighlightedIcon(":/images/lists/list.png");
     else
-        return QIcon(":/images/folder.png");
+        return YACReader::noHighlightedIcon(":/images/folder.png");
 }
 
 int ReadingListItem::childCount() const
diff --git a/common/yacreader_global.cpp b/common/yacreader_global.cpp
index d4ae0dd3..3af8eea5 100644
--- a/common/yacreader_global.cpp
+++ b/common/yacreader_global.cpp
@@ -58,3 +58,13 @@ QString YACReader::colorToName(LabelColors colors)
         return "dark";
     }
 }
+
+
+QIcon YACReader::noHighlightedIcon(const QString &path)
+{
+    QPixmap p(path);
+    QIcon icon;
+    icon.addPixmap(p,QIcon::Normal);
+    icon.addPixmap(p,QIcon::Selected);
+    return icon;
+}
diff --git a/common/yacreader_global.h b/common/yacreader_global.h
index 94799358..c9a8826f 100644
--- a/common/yacreader_global.h
+++ b/common/yacreader_global.h
@@ -131,6 +131,7 @@ QString getSettingsPath();
 void addSperator(QWidget * w);
 QAction * createSeparator();
 QString colorToName(LabelColors colors);
+QIcon noHighlightedIcon(const QString & path);
 }
 #endif