From 99f2813bed917be2957471367c1c81568efee065 Mon Sep 17 00:00:00 2001 From: drbob Date: Thu, 1 Nov 2012 00:19:02 +0000 Subject: [PATCH] Added Identity and Wiki GUIs to RS. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5751 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/unfinished/ApplicationWindow.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index 8011e80e1..c7ec34997 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -26,14 +26,14 @@ #include +#include "gui/Identity/IdDialog.h" #include "gui/PhotoShare/PhotoShare.h" +#include "gui/WikiPoos/WikiDialog.h" #include "gui/Posted/PostedDialog.h" // THESE HAVE TO BE CONVERTED TO VEG FORMAT #if USE_VEG_SERVICE -#include "gui/WikiPoos/WikiDialog.h" #include "gui/TheWire/WireDialog.h" -#include "gui/Identity/IdDialog.h" #include "gui/ForumsV2Dialog.h" #endif @@ -85,12 +85,9 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) //ui.stackPages->add(calDialog = new CalDialog(ui.stackPages), // createPageAction(QIcon(IMAGE_CALENDAR), tr("Shared Calendars"), grp)); -// THESE HAVE TO BE CONVERTED TO VEG FORMAT -#if USE_VEG_SERVICE IdDialog *idDialog = NULL; ui.stackPages->add(idDialog = new IdDialog(ui.stackPages), createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp)); -#endif PhotoShare *photoShare = NULL; ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages), @@ -99,12 +96,13 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) PostedDialog *postedDialog = NULL; ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages), createPageAction(QIcon(IMAGE_LIBRARY), tr("Posted Links"), grp)); -// THESE HAVE TO BE CONVERTED TO VEG FORMAT -#if USE_VEG_SERVICE + WikiDialog *wikiDialog = NULL; ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages), createPageAction(QIcon(IMAGE_LIBRARY), tr("Wiki Pages"), grp)); +// THESE HAVE TO BE CONVERTED TO VEG FORMAT +#if USE_VEG_SERVICE WireDialog *wireDialog = NULL; ui.stackPages->add(wireDialog = new WireDialog(ui.stackPages), createPageAction(QIcon(IMAGE_BWGRAPH), tr("The Wire"), grp));