Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2026-01-03 17:45:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

replaced a bunch of explicit icons, mostly in abstract items models, by cached ones

Browse source
This commit is contained in:
csoler 2020-04-19 17:41:13 +02:00
parent c84016c3b0
commit 02e939ac8f
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
6 changed files with 92 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

38
retroshare-gui/src/gui/RemoteDirModel.cpp
View file

@ -100,11 +100,9 @@ static bool isNewerThanEpoque(uint32_t ts)
void RetroshareDirModel::treeStyle()
{
categoryIcon.addPixmap(QPixmap(":/icons/folder.png"),
QIcon::Normal, QIcon::Off);
categoryIcon.addPixmap(QPixmap(":/icons/folderopen.png"),
QIcon::Normal, QIcon::On);
peerIcon = QIcon(":/images/user/identity16.png");
categoryIcon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/folder.png"), QIcon::Normal, QIcon::Off);
categoryIcon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/folderopen.png"), QIcon::Normal, QIcon::On);
peerIcon = FilesDefs::getIconFromQtResourcePath(":/images/user/identity16.png");
}
void TreeStyle_RDM::update()
{
@ -349,19 +347,19 @@ const QIcon& RetroshareDirModel::getFlagsIcon(FileStorageFlags flags)
QList<QIcon> icons ;
if(flags & DIR_FLAGS_ANONYMOUS_SEARCH)
icons.push_back(QIcon(":icons/search_red_128.png")) ;
icons.push_back(FilesDefs::getIconFromQtResourcePath(":icons/search_red_128.png")) ;
else
icons.push_back(QIcon(":icons/void_128.png")) ;
icons.push_back(FilesDefs::getIconFromQtResourcePath(":icons/void_128.png")) ;
if(flags & DIR_FLAGS_ANONYMOUS_DOWNLOAD)
icons.push_back(QIcon(":icons/anonymous_blue_128.png")) ;
icons.push_back(FilesDefs::getIconFromQtResourcePath(":icons/anonymous_blue_128.png")) ;
else
icons.push_back(QIcon(":icons/void_128.png")) ;
icons.push_back(FilesDefs::getIconFromQtResourcePath(":icons/void_128.png")) ;
if(flags & DIR_FLAGS_BROWSABLE)
icons.push_back(QIcon(":icons/browsable_green_128.png")) ;
icons.push_back(FilesDefs::getIconFromQtResourcePath(":icons/browsable_green_128.png")) ;
else
icons.push_back(QIcon(":icons/void_128.png")) ;
icons.push_back(FilesDefs::getIconFromQtResourcePath(":icons/void_128.png")) ;
QPixmap pix ;
GxsIdDetails::GenerateCombinedPixmap(pix, icons, 128);
@ -399,13 +397,13 @@ QVariant RetroshareDirModel::decorationRole(const DirDetails& details,int coln)
time_t now = time(NULL) ;
if(ageIndicator != IND_ALWAYS && now > details.max_mtime + ageIndicator)
return QIcon(":/images/folder_grey.png");
return FilesDefs::getIconFromQtResourcePath(":/images/folder_grey.png");
else if (ageIndicator == IND_LAST_DAY )
return QIcon(":/images/folder_green.png");
return FilesDefs::getIconFromQtResourcePath(":/images/folder_green.png");
else if (ageIndicator == IND_LAST_WEEK )
return QIcon(":/images/folder_yellow.png");
return FilesDefs::getIconFromQtResourcePath(":/images/folder_yellow.png");
else if (ageIndicator == IND_LAST_MONTH )
return QIcon(":/images/folder_red.png");
return FilesDefs::getIconFromQtResourcePath(":/images/folder_red.png");
else
return (QIcon(peerIcon));
}
@ -414,13 +412,13 @@ QVariant RetroshareDirModel::decorationRole(const DirDetails& details,int coln)
time_t now = time(NULL) ;
if(ageIndicator != IND_ALWAYS && now > details.max_mtime + ageIndicator)
return QIcon(":/images/folder_grey.png");
return FilesDefs::getIconFromQtResourcePath(":/images/folder_grey.png");
else if (ageIndicator == IND_LAST_DAY )
return QIcon(":/images/folder_green.png");
return FilesDefs::getIconFromQtResourcePath(":/images/folder_green.png");
else if (ageIndicator == IND_LAST_WEEK )
return QIcon(":/images/folder_yellow.png");
return FilesDefs::getIconFromQtResourcePath(":/images/folder_yellow.png");
else if (ageIndicator == IND_LAST_MONTH )
return QIcon(":/images/folder_red.png");
return FilesDefs::getIconFromQtResourcePath(":/images/folder_red.png");
else
return QIcon(categoryIcon);
}
@ -428,7 +426,7 @@ QVariant RetroshareDirModel::decorationRole(const DirDetails& details,int coln)
{
// extensions predefined
if(details.hash.isNull())
return QIcon(":/images/reset.png") ; // file is being hashed
return FilesDefs::getIconFromQtResourcePath(":/images/reset.png") ; // file is being hashed
else
return FilesDefs::getIconFromFileType(QString::fromUtf8(details.name.c_str()));
}