Merged v0.5-netupgrade branch back into the trunk ( --- Merging r4410 through r4465 into '.' )

This brings lots of improvements:
 * UDP Connection Code - this it the majority of the new code.
 * Simplification of p3ConnectMgr => p3LinkMgr, p3PeerMgr & p3NetMgr.
 * Notifications of Failed Connection Attempts
 * Addition of a "Getting Started Guide".
 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-07-18 09:25:15 +00:00
commit 69c14461cb
108 changed files with 16142 additions and 5985 deletions

View file

@ -59,6 +59,11 @@
#include "unfinished/ApplicationWindow.h"
#endif
#define GETSTARTED_GUI 1
#ifdef GETSTARTED_GUI
#include "gui/GetStartedDialog.h"
#endif
#include "gui/TurtleRouterDialog.h"
#include "idle/idle.h"
@ -92,6 +97,7 @@
* #define USE_DHTWINDOW 1
*
****/
#define USE_DHTWINDOW 1
#ifdef USE_DHTWINDOW
#include "dht/DhtWindow.h"
@ -286,6 +292,13 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
#endif
#endif
#ifdef GETSTARTED_GUI
MainPage *getStartedPage = NULL;
ui.stackPages->add(getStartedPage = new GetStartedDialog(ui.stackPages),
createPageAction(QIcon(IMG_HELP), tr("Getting Started"), grp));
#endif
/* Create the toolbar */
ui.toolBar->addActions(grp->actions());