|
|
@ -44,11 +44,11 @@ |
|
|
|
#include "cookiesdlg.h" |
|
|
|
#include "cookiesdlg.h" |
|
|
|
#include "base/preferences.h" |
|
|
|
#include "base/preferences.h" |
|
|
|
#include "rsssettingsdlg.h" |
|
|
|
#include "rsssettingsdlg.h" |
|
|
|
#include "rssmanager.h" |
|
|
|
#include "base/rss/rssmanager.h" |
|
|
|
#include "rssfolder.h" |
|
|
|
#include "base/rss/rssfolder.h" |
|
|
|
#include "rssarticle.h" |
|
|
|
#include "base/rss/rssarticle.h" |
|
|
|
#include "rssparser.h" |
|
|
|
#include "base/rss/rssparser.h" |
|
|
|
#include "rssfeed.h" |
|
|
|
#include "base/rss/rssfeed.h" |
|
|
|
#include "automatedrssdownloader.h" |
|
|
|
#include "automatedrssdownloader.h" |
|
|
|
#include "guiiconprovider.h" |
|
|
|
#include "guiiconprovider.h" |
|
|
|
#include "autoexpandabledialog.h" |
|
|
|
#include "autoexpandabledialog.h" |
|
|
@ -478,7 +478,7 @@ QTreeWidgetItem* RSSImp::createFolderListItem(const RssFilePtr& rssFile) |
|
|
|
Q_ASSERT(rssFile); |
|
|
|
Q_ASSERT(rssFile); |
|
|
|
QTreeWidgetItem* item = new QTreeWidgetItem; |
|
|
|
QTreeWidgetItem* item = new QTreeWidgetItem; |
|
|
|
item->setData(0, Qt::DisplayRole, QVariant(rssFile->displayName() + QString::fromUtf8(" (") + QString::number(rssFile->unreadCount()) + QString(")"))); |
|
|
|
item->setData(0, Qt::DisplayRole, QVariant(rssFile->displayName() + QString::fromUtf8(" (") + QString::number(rssFile->unreadCount()) + QString(")"))); |
|
|
|
item->setData(0, Qt::DecorationRole, rssFile->icon()); |
|
|
|
item->setData(0, Qt::DecorationRole, QIcon(rssFile->iconPath())); |
|
|
|
|
|
|
|
|
|
|
|
return item; |
|
|
|
return item; |
|
|
|
} |
|
|
|
} |
|
|
@ -680,7 +680,7 @@ void RSSImp::updateFeedInfos(const QString& url, const QString& display_name, ui |
|
|
|
RssFeedPtr stream = qSharedPointerCast<RssFeed>(m_feedList->getRSSItem(item)); |
|
|
|
RssFeedPtr stream = qSharedPointerCast<RssFeed>(m_feedList->getRSSItem(item)); |
|
|
|
item->setText(0, display_name + QString::fromUtf8(" (") + QString::number(nbUnread) + QString(")")); |
|
|
|
item->setText(0, display_name + QString::fromUtf8(" (") + QString::number(nbUnread) + QString(")")); |
|
|
|
if (!stream->isLoading()) |
|
|
|
if (!stream->isLoading()) |
|
|
|
item->setData(0, Qt::DecorationRole, QVariant(stream->icon())); |
|
|
|
item->setData(0, Qt::DecorationRole, QIcon(stream->iconPath())); |
|
|
|
// Update parent
|
|
|
|
// Update parent
|
|
|
|
if (item->parent()) |
|
|
|
if (item->parent()) |
|
|
|
updateItemInfos(item->parent()); |
|
|
|
updateItemInfos(item->parent()); |
|
|
|