squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-22 08:27:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10734 from Chocobo1/folder

Browse Source 
Use native folder icon in content tree
This commit is contained in:
Mike Tzou
2019-06-02 09:40:17 +08:00
committed by GitHub
parent 84e683cc99 f52dcc08eb
commit 87dcbbbd23
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/torrentcontentmodel.cpp
View File

@@ -30,7 +30,6 @@
#include <algorithm> #include <algorithm>
#include <QDir>
#include <QFileIconProvider> #include <QFileIconProvider>
#include <QFileInfo> #include <QFileInfo>
#include <QIcon> #include <QIcon>
@@ -51,8 +50,8 @@
#include "base/bittorrent/downloadpriority.h" #include "base/bittorrent/downloadpriority.h"
#include "base/global.h" #include "base/global.h"
#include "base/utils/misc.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
#include "base/utils/misc.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
#include "torrentcontentmodelfile.h" #include "torrentcontentmodelfile.h"
#include "torrentcontentmodelfolder.h" #include "torrentcontentmodelfolder.h"
@@ -64,12 +63,6 @@
namespace namespace
{ {
QIcon getDirectoryIcon()
{
static QIcon cached = GuiIconProvider::instance()->getIcon("inode-directory");
return cached;
}
class UnifiedFileIconProvider : public QFileIconProvider class UnifiedFileIconProvider : public QFileIconProvider
{ {
public: public:
@@ -359,7 +352,7 @@ QVariant TorrentContentModel::data(const QModelIndex &index, int role) const
if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::DecorationRole)) { if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::DecorationRole)) {
if (item->itemType() == TorrentContentModelItem::FolderType) if (item->itemType() == TorrentContentModelItem::FolderType)
return getDirectoryIcon(); return m_fileIconProvider->icon(QFileIconProvider::Folder);
return m_fileIconProvider->icon(QFileInfo(item->name())); return m_fileIconProvider->icon(QFileInfo(item->name()));
} }