Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-20 04:14:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

enabled Channels for release

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3299 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-07-17 21:17:14 +00:00
parent 724e6f81a8
commit d92e1911eb
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -197,10 +197,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(messagesDialog = new MessagesDialog(ui.stackPages), ui.stackPages->add(messagesDialog = new MessagesDialog(ui.stackPages),
messageAction = createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp)); messageAction = createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp));
#ifndef RS_RELEASE_VERSION
ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages), ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages),
createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp));
#endif
#ifdef BLOGS #ifdef BLOGS
ui.stackPages->add(blogsFeed = new BlogsDialog(ui.stackPages), ui.stackPages->add(blogsFeed = new BlogsDialog(ui.stackPages),

23
retroshare-gui/src/gui/MainWindow.h
View file

@ -31,10 +31,7 @@
#include "unfinished/ApplicationWindow.h" #include "unfinished/ApplicationWindow.h"
#endif #endif
#ifndef RS_RELEASE_VERSION
#include "ChannelFeed.h" #include "ChannelFeed.h"
#endif
#include "bwgraph/bwgraph.h" #include "bwgraph/bwgraph.h"
#include "help/browser/helpbrowser.h" #include "help/browser/helpbrowser.h"
@ -75,17 +72,17 @@ public:
enum Page { enum Page {
Network = 0, /** Network page. */ Network = 0, /** Network page. */
Friends, /** Peers page. */ Friends, /** Peers page. */
Search, /** Search page. */ Search, /** Search page. */
Transfers, /** Transfers page. */ Transfers, /** Transfers page. */
SharedDirectories, /** Shared Directories page. */ SharedDirectories, /** Shared Directories page. */
Messages, /** Messages page. */ Messages, /** Messages page. */
#ifndef RS_RELEASE_VERSION Channels, /** Channels page. */
Links, /** Links page. */ Forums, /** Forums page. */
Channels, /** Channels page. */
#endif
Forums, /** Forums page. */
#ifdef BLOGS #ifdef BLOGS
Blogs, /** Blogs page. */ Blogs, /** Blogs page. */
#endif
#ifndef RS_RELEASE_VERSION
Links, /** Links page. */
#endif #endif
}; };
@ -117,10 +114,10 @@ public:
SharedFilesDialog *sharedfilesDialog; SharedFilesDialog *sharedfilesDialog;
MessengerWindow *messengerWindow; MessengerWindow *messengerWindow;
ForumsDialog *forumsDialog; ForumsDialog *forumsDialog;
ChannelFeed *channelFeed;
Idle *idle; Idle *idle;
#ifndef RS_RELEASE_VERSION #ifndef RS_RELEASE_VERSION
ChannelFeed *channelFeed;
LinksDialog *linksDialog; LinksDialog *linksDialog;
NewsFeed *newsFeed; NewsFeed *newsFeed;
#endif #endif