Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-20 13:19:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #66 from RetroShare/master

Browse source 
update to master
This commit is contained in:
defnax 2020-02-15 15:04:17 +01:00 • committed by GitHub
commit 3eec7922f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
82 changed files with 1054 additions and 641 deletions
Download patch file Download diff file Expand all files Collapse all files

17
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -104,6 +104,12 @@
#ifdef RS_USE_WIKI
#include "gui/WikiPoos/WikiDialog.h"
#endif
#ifdef RS_USE_WIRE
#include "gui/TheWire/WireDialog.h"
#endif
#ifdef RS_USE_PHOTO
#include "gui/PhotoShare/PhotoShare.h"
#endif
#include "gui/Posted/PostedDialog.h"
#include "gui/statistics/StatisticsWindow.h"
@ -426,6 +432,17 @@ void MainWindow::initStackedPage()
addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify);
#endif
#ifdef RS_USE_WIRE
WireDialog *wireDialog = NULL;
addPage(wireDialog = new WireDialog(ui->stackPages), grp, &notify);
#endif
#ifdef RS_USE_PHOTO
PhotoShare *photoDialog = NULL;
addPage(photoDialog = new PhotoShare(ui->stackPages), grp, &notify);
#endif
std::cerr << "Looking for interfaces in existing plugins:" << std::endl;
for(int i = 0;i<rsPlugins->nbPlugins();++i)
{