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

fresh recompile needed!

Browse source 
TokenQueueV2 added, 
first change to photoshare to deal with gxs backend 
needed to redirect meta types to mine in order to get compilation working and definition fixes 
to rsgenexchange. 
Next step is to get GxsRunner going

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5377 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2012-08-03 06:39:50 +00:00
parent 09b5d7a8c6
commit d220e14c4a
21 changed files with 490 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@
#include <retroshare/rsiface.h>
#include "gui/PhotoShare/PhotoDialog.h"
//#include "gui/PhotoShare/PhotoDialog.h"
#include "gui/WikiPoos/WikiDialog.h"
#include "gui/TheWire/WireDialog.h"
#include "gui/Identity/IdDialog.h"
@ -97,9 +97,9 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
PhotoDialog *photoDialog = NULL;
ui.stackPages->add(photoDialog = new PhotoDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_PHOTO), tr("Photo View"), grp));
//PhotoDialog *photoDialog = NULL;
//ui.stackPages->add(photoDialog = new PhotoDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_PHOTO), tr("Photo View"), grp));
WikiDialog *wikiDialog = NULL;
ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages),