diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 1ed8fd481..e10562efd 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -27,6 +27,7 @@ #include #include +#include "ChannelFeed.h" #include "LinksDialog.h" #include "GamesDialog.h" #include "PhotoDialog.h" @@ -99,6 +100,8 @@ * #define RS_RELEASE_VERSION 1 ****/ +#define RS_RELEASE_VERSION 1 + /** Constructor */ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) @@ -178,16 +181,23 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp)); LinksDialog *linksDialog = NULL; - ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), grp)); #ifdef RS_RELEASE_VERSION channelsDialog = NULL; + + ChannelFeed *channelFeed = NULL; + ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages), + createPageAction(QIcon(IMAGE_CHANNELS), tr("Channel Feed"), grp)); + #else channelsDialog = NULL; -// ui.stackPages->add(channelsDialog = new ChannelsDialog(ui.stackPages), -// createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); + ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages), + createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), grp)); + + ui.stackPages->add(channelsDialog = new ChannelsDialog(ui.stackPages), + createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); + #endif //ui.stackPages->add(new HelpDialog(ui.stackPages), diff --git a/retroshare-gui/src/gui/feeds/BlogMsgItem.cpp b/retroshare-gui/src/gui/feeds/BlogMsgItem.cpp index 8391d343e..de1bc5dd3 100644 --- a/retroshare-gui/src/gui/feeds/BlogMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/BlogMsgItem.cpp @@ -69,6 +69,8 @@ void BlogMsgItem::updateItemStatic() int total = (int) (10.0 * (rand() / (RAND_MAX + 1.0))); int i; + total = 0; + for(i = 0; i < total; i++) { /* add file */