- Fixed fill of news feed.

- Added display of feed count in main action.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-06-22 00:05:02 +00:00
parent 0a10092816
commit 766bd9c6ae
8 changed files with 118 additions and 11 deletions

View file

@ -153,7 +153,7 @@
#define IMAGE_ONEONLINE ":/images/rstray1.png"
#define IMAGE_TWOONLINE ":/images/rstray2.png"
#define IMAGE_BLOGS ":/images/kblogger.png"
#define IMAGE_DHT ":/images/dht16.png"
#define IMAGE_DHT ":/images/dht16.png"
#define IMAGE_CHATLOBBY ":/images/user/agt_forum32.png"
/*static*/ MainWindow *MainWindow::_instance = NULL;
@ -242,7 +242,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
QAction *action;
ui->stackPages->add(newsFeed = new NewsFeed(ui->stackPages),
createPageAction(QIcon(IMAGE_NEWSFEED), tr("News feed"), grp));
action = createPageAction(QIcon(IMAGE_NEWSFEED), tr("News feed"), grp));
notify.push_back(QPair<MainPage*, QAction*>(newsFeed, action));
// ui->stackPages->add(networkDialog = new NetworkDialog(ui->stackPages),
// createPageAction(QIcon(IMAGE_NETWORK2), tr("Network"), grp));