Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 10:54:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show Stats 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),
messageAction = createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp));
#ifndef RS_RELEASE_VERSION
ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages),
createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp));
#endif
#ifdef BLOGS
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"
#endif
#ifndef RS_RELEASE_VERSION
#include "ChannelFeed.h"
#endif
#include "bwgraph/bwgraph.h"
#include "help/browser/helpbrowser.h"
@ -75,18 +72,18 @@ public:
enum Page {
Network = 0, /** Network page. */
Friends, /** Peers page. */
Search, /** Search page. */
Transfers, /** Transfers page. */
Search, /** Search page. */
Transfers, /** Transfers page. */
SharedDirectories, /** Shared Directories page. */
Messages, /** Messages page. */
#ifndef RS_RELEASE_VERSION
Links, /** Links page. */
Channels, /** Channels page. */
#endif
Forums, /** Forums page. */
Messages, /** Messages page. */
Channels, /** Channels page. */
Forums, /** Forums page. */
#ifdef BLOGS
Blogs, /** Blogs page. */
Blogs, /** Blogs page. */
#endif
#ifndef RS_RELEASE_VERSION
Links, /** Links page. */
#endif
};
/** Create main window */
@ -117,10 +114,10 @@ public:
SharedFilesDialog *sharedfilesDialog;
MessengerWindow *messengerWindow;
ForumsDialog *forumsDialog;
ChannelFeed *channelFeed;
Idle *idle;
#ifndef RS_RELEASE_VERSION
ChannelFeed *channelFeed;
LinksDialog *linksDialog;
NewsFeed *newsFeed;
#endif