Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 07:29:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compile with disabled Circles and PhotoShare.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-04-15 09:23:24 +00:00
parent 35994e7197
commit 6590167475
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View File

@ -27,8 +27,12 @@
#include <retroshare/rsiface.h> #include <retroshare/rsiface.h>
#include "gui/Identity/IdDialog.h" #include "gui/Identity/IdDialog.h"
#ifdef RS_USE_CIRCLES
#include "gui/Circles/CirclesDialog.h" #include "gui/Circles/CirclesDialog.h"
#endif
#ifdef RS_USE_PHOTOSHARE
#include "gui/PhotoShare/PhotoShare.h" #include "gui/PhotoShare/PhotoShare.h"
#endif
#include "gui/WikiPoos/WikiDialog.h" #include "gui/WikiPoos/WikiDialog.h"
#include "gui/Posted/PostedDialog.h" #include "gui/Posted/PostedDialog.h"
#include "gui/GxsForumsDialog.h" #include "gui/GxsForumsDialog.h"
@ -56,9 +60,9 @@
#define IMAGE_LIBRARY ":/images/library.png" #define IMAGE_LIBRARY ":/images/library.png"
#define IMAGE_PLUGINS ":/images/extension_32.png" #define IMAGE_PLUGINS ":/images/extension_32.png"
#define IMAGE_GXSFORUMS ":/images/konversation.png" #define IMAGE_GXSFORUMS ":/images/konversation.png"
#define IMAGE_WIKI ":/images/wikibook_32.png" #define IMAGE_WIKI ":/images/wikibook_32.png"
#define IMAGE_POSTED ":/images/posted_32.png" #define IMAGE_POSTED ":/images/posted_32.png"
#define IMAGE_GXSCHANNELS ":/images/channels.png" #define IMAGE_GXSCHANNELS ":/images/channels.png"
/** Constructor */ /** Constructor */
ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags) ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
@ -93,13 +97,17 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(idDialog = new IdDialog(ui.stackPages), ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp)); createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
// CirclesDialog *circlesDialog = NULL; #ifdef RS_USE_CIRCLES
// ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages), CirclesDialog *circlesDialog = NULL;
// createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp)); ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
#endif
// PhotoShare *photoShare = NULL; #ifdef RS_USE_PHOTOSHARE
// ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages), PhotoShare *photoShare = NULL;
// createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp)); ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
#endif
PostedDialog *postedDialog = NULL; PostedDialog *postedDialog = NULL;
ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages), ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages),

6
retroshare-gui/src/retroshare-gui.pro
View File

@ -920,7 +920,8 @@ unfinished {
photoshare { photoshare {
DEFINES += RS_USE_PHOTOSHARE
HEADERS += \ HEADERS += \
gui/PhotoShare/PhotoDrop.h \ gui/PhotoShare/PhotoDrop.h \
gui/PhotoShare/AlbumItem.h \ gui/PhotoShare/AlbumItem.h \
@ -1016,7 +1017,8 @@ identities {
} }
circles { circles {
DEFINES += RS_USE_CIRCLES
HEADERS += \ HEADERS += \
gui/Circles/CirclesDialog.h \ gui/Circles/CirclesDialog.h \
gui/Circles/CreateCircleDialog.h \ gui/Circles/CreateCircleDialog.h \