Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-12 11:02:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved forums and channels into main window

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-26 16:32:33 +00:00
parent c6059906d0
commit 75188fb6f0
4 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View file

@ -120,7 +120,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
WikiDialog *wikiDialog = NULL;
ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_WIKI), tr("Wiki Pages"), grp));
#if 0
GxsForumsDialog *gxsforumsDialog = NULL;
ui.stackPages->add(gxsforumsDialog = new GxsForumsDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_GXSFORUMS), tr("GxsForums"), grp));
@ -129,6 +129,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
ui.stackPages->add(gxschannelDialog = new ChannelDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_GXSCHANNELS), tr("GxsChannels"), grp));
gxschannelDialog->setup();
#endif
// THESE HAVE TO BE CONVERTED TO VEG FORMAT
#if USE_VEG_SERVICE