mirror of
https://github.com/YACReader/yacreader
synced 2025-07-18 21:14:33 -04:00
More left side bar png to svg assets conversion
This commit is contained in:
@ -54,7 +54,7 @@ void drawMacOSXFinishedFolderIcon()
|
||||
#define ROOT 1
|
||||
|
||||
FolderModel::FolderModel(QObject *parent)
|
||||
: QAbstractItemModel(parent), isSubfolder(false), rootItem(nullptr)
|
||||
: QAbstractItemModel(parent), isSubfolder(false), rootItem(nullptr), folderIcon(YACReader::noHighlightedIcon(":/images/sidebar/folder.svg")), folderFinishedIcon(YACReader::noHighlightedIcon(":/images/sidebar/folder_finished.svg"))
|
||||
{
|
||||
}
|
||||
|
||||
@ -138,9 +138,9 @@ QVariant FolderModel::data(const QModelIndex &index, int role) const
|
||||
}
|
||||
#else
|
||||
if (item->data(FolderModel::Finished).toBool())
|
||||
return QVariant(YACReader::noHighlightedIcon(":/images/sidebar/folder_finished.png"));
|
||||
return QVariant(folderFinishedIcon);
|
||||
else
|
||||
return QVariant(YACReader::noHighlightedIcon(":/images/sidebar/folder.png"));
|
||||
return QVariant(folderIcon);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include <QSqlQuery>
|
||||
#include <QSqlDatabase>
|
||||
#include <QUrl>
|
||||
#include <QIcon>
|
||||
|
||||
#include "folder.h"
|
||||
#include "folder_query_result_processor.h"
|
||||
@ -117,6 +118,9 @@ private:
|
||||
QMap<unsigned long long int, FolderItem *> items; // relación entre folders
|
||||
|
||||
QString _databasePath;
|
||||
|
||||
QIcon folderIcon;
|
||||
QIcon folderFinishedIcon;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -36,7 +36,7 @@ QIcon SpecialListItem::getIcon() const
|
||||
{
|
||||
if (itemData.count() > Id) {
|
||||
QString id = itemData.at(Id).toString();
|
||||
return YACReader::noHighlightedIcon(QString(":/images/lists/default_%1.png").arg(id));
|
||||
return YACReader::noHighlightedIcon(QString(":/images/lists/default_%1.svg").arg(id));
|
||||
}
|
||||
|
||||
QLOG_WARN() << "Icon for SpecialListItem not available";
|
||||
@ -76,7 +76,7 @@ QIcon LabelItem::getIcon() const
|
||||
{
|
||||
if (itemData.count() > Color) {
|
||||
QString color = itemData.at(Color).toString();
|
||||
return YACReader::noHighlightedIcon(QString(":/images/lists/label_%1.png").arg(color).toLower());
|
||||
return YACReader::noHighlightedIcon(QString(":/images/lists/label_%1.svg").arg(color).toLower());
|
||||
}
|
||||
|
||||
QLOG_WARN() << "Icon for label item not available";
|
||||
@ -127,19 +127,19 @@ qulonglong LabelItem::getId() const
|
||||
//------------------------------------------------------
|
||||
|
||||
ReadingListItem::ReadingListItem(const QList<QVariant> &data, ReadingListItem *p)
|
||||
: ListItem(data), parent(p)
|
||||
: ListItem(data), parent(p), list(YACReader::noHighlightedIcon(":/images/lists/list.svg")), folder(YACReader::noHighlightedIcon(":/images/sidebar/folder.svg"))
|
||||
{
|
||||
}
|
||||
|
||||
QIcon ReadingListItem::getIcon() const
|
||||
{
|
||||
if (parent->getId() == 0)
|
||||
return YACReader::noHighlightedIcon(":/images/lists/list.png"); // top level list
|
||||
return list; // top level list
|
||||
else
|
||||
#ifdef Q_OS_MAC
|
||||
return QFileIconProvider().icon(QFileIconProvider::Folder);
|
||||
#else
|
||||
return YACReader::noHighlightedIcon(":/images/sidebar/folder.png"); // sublist
|
||||
return folder; // sublist
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -82,6 +82,9 @@ public:
|
||||
private:
|
||||
QList<ReadingListItem *> childItems;
|
||||
|
||||
QIcon list;
|
||||
QIcon folder;
|
||||
|
||||
enum DataIndexes {
|
||||
Name,
|
||||
Id,
|
||||
|
Reference in New Issue
Block a user