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

Big Chunk of GUI work.

Browse source 
- Ported Forums to GxsForums. Not functioning yet, waiting on some GXS core functions.
 - Fixed up plumbing in Wiki.
 - Minor fixes to TokenQueue



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-11-12 20:47:55 +00:00
parent d8dc2a0420
commit 8d556955c5
30 changed files with 6823 additions and 510 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,12 +30,11 @@
#include "gui/PhotoShare/PhotoShare.h"
#include "gui/WikiPoos/WikiDialog.h"
#include "gui/Posted/PostedDialog.h"
#include "gui/GxsForumsDialog.h"
// THESE HAVE TO BE CONVERTED TO VEG FORMAT
#if USE_VEG_SERVICE
#include "gui/TheWire/WireDialog.h"
#include "gui/ForumsV2Dialog.h"
#endif
//#include "GamesDialog.h"
@ -54,7 +53,7 @@
#define IMAGE_CALENDAR ":/images/calendar.png"
#define IMAGE_LIBRARY ":/images/library.png"
#define IMAGE_PLUGINS ":/images/extension_32.png"
#define IMAGE_FORUMSV2 ":/images/konversation.png"
#define IMAGE_GXSFORUMS ":/images/konversation.png"
/** Constructor */
ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
@ -97,9 +96,13 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Posted Links"), grp));
// WikiDialog *wikiDialog = NULL;
// ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_LIBRARY), tr("Wiki Pages"), grp));
WikiDialog *wikiDialog = NULL;
ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Wiki Pages"), grp));
GxsForumsDialog *gxsforumsDialog = NULL;
ui.stackPages->add(gxsforumsDialog = new GxsForumsDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_GXSFORUMS), tr("GxsForums"), grp));
// THESE HAVE TO BE CONVERTED TO VEG FORMAT
#if USE_VEG_SERVICE
@ -107,11 +110,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(wireDialog = new WireDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_BWGRAPH), tr("The Wire"), grp));
ForumsV2Dialog *forumsV2Dialog = NULL;
ui.stackPages->add(forumsV2Dialog = new ForumsV2Dialog(ui.stackPages),
createPageAction(QIcon(IMAGE_FORUMSV2), tr("ForumsV2"), grp));
#endif
/* Create the toolbar */