mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

no more color highlight on sidebar icons ^_^

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-11-12 17:29:11 +01:00
parent c870d9b99e
commit e82d7e889f
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
YACReaderLibrary/db/folder_model.cpp
View File

@ -54,7 +54,7 @@
#include "folder.h" #include "folder.h"
#include "db_helper.h" #include "db_helper.h"
#include "qnaturalsorting.h" #include "qnaturalsorting.h"
#include "yacreader_global.h"
#include "QsLog.h" #include "QsLog.h"
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@ -161,9 +161,9 @@ QVariant FolderModel::data(const QModelIndex &index, int role) const
} }
#else #else
if(item->data(FolderModel::Finished).toBool()) if(item->data(FolderModel::Finished).toBool())
return QVariant(QIcon(":/images/folder_finished.png")); return QVariant(YACReader::noHighlightedIcon(":/images/folder_finished.png"));
else else
return QVariant(QIcon(":/images/folder.png")); return QVariant(YACReader::noHighlightedIcon(":/images/folder.png"));
#endif #endif
if (role != Qt::DisplayRole) if (role != Qt::DisplayRole)

8
YACReaderLibrary/db/reading_list_item.cpp
View File

@ -34,7 +34,7 @@ QIcon SpecialListItem::getIcon() const
if(itemData.count()>1) if(itemData.count()>1)
{ {
QString id = itemData.at(1).toString(); 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) if(itemData.count()>1)
{ {
QString color = itemData.at(1).toString(); 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 QIcon ReadingListItem::getIcon() const
{ {
if(parent == 0) if(parent == 0)
return QIcon(":/images/lists/list.png"); return YACReader::noHighlightedIcon(":/images/lists/list.png");
else else
return QIcon(":/images/folder.png"); return YACReader::noHighlightedIcon(":/images/folder.png");
} }
int ReadingListItem::childCount() const int ReadingListItem::childCount() const

10
common/yacreader_global.cpp
View File

@ -58,3 +58,13 @@ QString YACReader::colorToName(LabelColors colors)
return "dark"; 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;
}

1
common/yacreader_global.h
View File

@ -131,6 +131,7 @@ QString getSettingsPath();
void addSperator(QWidget * w); void addSperator(QWidget * w);
QAction * createSeparator(); QAction * createSeparator();
QString colorToName(LabelColors colors); QString colorToName(LabelColors colors);
QIcon noHighlightedIcon(const QString & path);
} }
#endif #endif