- Integrated the turtle search and download to the gui. Now the search handles both friend and turtle searching.

- added a console in config->server->F2F routing to be able to visualize turtle routing statistics

WARNING: this is not complete yet. The fllowing still needs to be done:
- detect duplicates in search results between turtle and friends search
- RegExpr search does ot work with turtle (still to code).
- search does not search own files. Is this really needed after all ?



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1540 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/MainWindow.cpp

@@ -43,9 +43,7 @@
 #include "MessengerWindow.h"
 #include "HelpDialog.h"
 
-#ifdef TURTLE_HOPPING
-#include "gui/TurtleSearchDialog.h"
-#endif
+#include "gui/TurtleRouterDialog.h"
 
 #include "statusbar/peerstatus.h"
 #include "statusbar/dhtstatus.h"
@@ -164,10 +162,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     ui.stackPages->add(peersDialog = new PeersDialog(ui.stackPages),
                        createPageAction(QIcon(IMAGE_PEERS), tr("Friends"), grp));
 
-#ifdef TURTLE_HOPPING
-    ui.stackPages->add(turtleDialog = new TurtleSearchDialog(ui.stackPages),
-                       createPageAction(QIcon(IMAGE_TURTLE), tr("Turtle"), grp));
-#endif
+//    ui.stackPages->add(turtleDialog = new TurtleRouterDialog(ui.stackPages), createPageAction(QIcon(IMAGE_TURTLE), tr("Turtle"), grp));
 
     ui.stackPages->add(searchDialog = new SearchDialog(ui.stackPages),
                        createPageAction(QIcon(IMAGE_SEARCH), tr("Search"), grp));