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

Fixed compile with deactivated modules

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-09-10 08:37:27 +00:00
parent c1bc38ab25
commit 938b95c8fe
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/FriendsDialog.cpp
View File

@ -55,8 +55,9 @@
#include "NetworkView.h"
#include "NetworkDialog.h"
#include "gui/Identity/IdDialog.h"
#ifdef RS_USE_CIRCLES
#include "gui/Circles/CirclesDialog.h"
#endif
/* Images for Newsfeed icons */
//#define IMAGE_NEWSFEED ""
//#define IMAGE_NEWSFEED_NEW ":/images/message-state-new.png"
@ -258,8 +259,10 @@ void FriendsDialog::activatePage(FriendsDialog::Page page)
{
case FriendsDialog::IdTab: ui.tabWidget->setCurrentWidget(idDialog) ;
break ;
#ifdef RS_USE_CIRCLES
case FriendsDialog::CirclesTab: ui.tabWidget->setCurrentWidget(circlesDialog) ;
break ;
#endif
case FriendsDialog::NetworkTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
break ;
case FriendsDialog::BroadcastTab: ui.tabWidget->setCurrentWidget(networkDialog) ;

4
retroshare-gui/src/gui/FriendsDialog.h
View File

@ -47,7 +47,9 @@ public:
enum Page {
/* Fixed numbers for load and save the last page */
IdTab = 0, /** Identities page. */
#ifdef RS_USE_CIRCLES
CirclesTab = 1, /** Circles page. */
#endif
NetworkTab = 2, /** Network page. */
NetworkViewTab = 3, /** Network new graph. */
BroadcastTab = 4 /** Old group chat page. */
@ -75,7 +77,9 @@ public:
NetworkDialog *networkDialog ;
NetworkView *networkView ;
#ifdef RS_USE_CIRCLES
CirclesDialog *circlesDialog;
#endif
IdDialog *idDialog;
public slots:

10
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -93,8 +93,12 @@
#include "gui/gxschannels/GxsChannelDialog.h"
#include "gui/gxsforums/GxsForumsDialog.h"
#include "gui/Identity/IdDialog.h"
#ifdef RS_USE_CIRCLES
#include "gui/Circles/CirclesDialog.h"
#endif
#ifdef RS_USE_WIKI
#include "gui/WikiPoos/WikiDialog.h"
#endif
#include "gui/Posted/PostedDialog.h"
#include "gui/statistics/StatisticsWindow.h"
@ -350,8 +354,8 @@ void MainWindow::initStackedPage()
//notify.push_back(QPair<MainPage*, QAction*>(friendsDialog, action));
addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
PeopleDialog *peopleDialog = NULL;
#ifdef RS_USE_CIRCLES
PeopleDialog *peopleDialog = NULL;
//ui->stackPages->add(peopleDialog = new PeopleDialog(ui->stackPages),
// action = createPageAction(QIcon(IMAGE_IDENTITY), tr("People"), grp));
//notify.push_back(QPair<MainPage*, QAction*>(peopleDialog, action));
@ -364,8 +368,8 @@ void MainWindow::initStackedPage()
//notify.push_back(QPair<MainPage*, QAction*>(idDialog, action));
addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
CirclesDialog *circlesDialog = NULL;
#ifdef RS_USE_CIRCLES
CirclesDialog *circlesDialog = NULL;
//ui->stackPages->add(circlesDialog = new CirclesDialog(ui->stackPages),
// action = createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
//notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));
@ -399,8 +403,8 @@ void MainWindow::initStackedPage()
addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify);
WikiDialog *wikiDialog = NULL;
#ifdef RS_USE_WIKI
WikiDialog *wikiDialog = NULL;
addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify);
#endif