";
html += "
"+article.title() + "
";
@@ -503,11 +514,11 @@ void RSSImp::refreshTextBrowser() {
html += "
"+article.description()+" ";
textBrowser->setHtml(html);
article.markAsRead();
- item->setData(NEWS_TITLE_COL, Qt::ForegroundRole, QVariant(QColor("grey")));
- item->setData(0, Qt::DecorationRole, QVariant(QIcon(":/Icons/sphere.png")));
+ item->setData(Article::ColorRole, QVariant(QColor("grey")));
+ item->setData(Article::IconRole, QVariant(QIcon(":/Icons/sphere.png")));
// Decrement feed nb unread news
updateItemInfos(listStreams->getUnreadItem());
- updateItemInfos(listStreams->getTreeItemFromUrl(item->text(NEWS_URL_COL)));
+ updateItemInfos(listStreams->getTreeItemFromUrl(item->data(Article::FeedUrlRole).toString()));
}
void RSSImp::saveSlidersPosition() {
@@ -605,10 +616,8 @@ RSSImp::RSSImp(QWidget *parent) : QWidget(parent) {
listStreams = new FeedListWidget(splitter_h, rssmanager);
splitter_h->insertWidget(0, listStreams);
- listNews->hideColumn(NEWS_URL_COL);
- listNews->setColumnWidth(0, 16);
- listNews->setSelectionBehavior(QAbstractItemView::SelectItems);
- listNews->setSelectionMode(QAbstractItemView::SingleSelection);
+ listArticles->setSelectionBehavior(QAbstractItemView::SelectItems);
+ listArticles->setSelectionMode(QAbstractItemView::SingleSelection);
rssmanager->loadStreamList();
fillFeedsList();
@@ -619,7 +628,7 @@ RSSImp::RSSImp(QWidget *parent) : QWidget(parent) {
connect(rssmanager, SIGNAL(feedIconChanged(QString, QString)), this, SLOT(updateFeedIcon(QString, QString)));
connect(listStreams, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayRSSListMenu(const QPoint&)));
- connect(listNews, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayItemsListMenu(const QPoint&)));
+ connect(listArticles, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayItemsListMenu(const QPoint&)));
// Feeds list actions
connect(actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedItems()));
@@ -638,8 +647,8 @@ RSSImp::RSSImp(QWidget *parent) : QWidget(parent) {
connect(listStreams, SIGNAL(foldersAltered(QList