- 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
This commit is contained in:
csoler 2009-08-16 20:10:53 +00:00
parent 44efa071f4
commit a293a39d1b
17 changed files with 384 additions and 160 deletions

View file

@ -29,13 +29,12 @@
//#include <config/rsharesettings.h>
#include <rsiface/rsfiles.h>
#include "mainpage.h"
#include "ui_SearchDialog.h"
#include "advsearch/advancedsearchdialog.h"
#include "Preferences/rsharesettings.h"
class FileDetail;
class SearchDialog : public MainPage
{
Q_OBJECT
@ -46,6 +45,9 @@ class SearchDialog : public MainPage
/** Default Destructor */
public slots:
void updateFiles(qulonglong request_id,FileDetail file) ;
private slots:
/** Create the context popup menu and it's submenus */
@ -84,7 +86,9 @@ private slots:
private:
/** render the results to the tree widget display */
void resultsToTree(std::string, std::list<FileDetail>);
void resultsToTree(std::string,qulonglong searchId, const std::list<FileDetail>&);
void insertFile(const std::string& txt,qulonglong searchId, const FileDetail& file) ;
/** the advanced search dialog instance */
AdvancedSearchDialog * advSearchDialog;