Fixed Bug 1833356: connected Search Remove All (now with reset of search ID allocation)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@259 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
libris 2007-11-19 10:56:12 +00:00
parent 6490d67e84
commit dc4cee6f92

View File

@ -163,7 +163,8 @@ void SearchDialog::initialiseFileTypeMappings()
SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_VIDEO, SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_VIDEO,
"3gp asf asx avi mov mp4 mpeg mpg qt rm swf vob wmv"); "3gp asf asx avi mov mp4 mpeg mpg qt rm swf vob wmv");
SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PICTURE, SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PICTURE,
"3dm 3dmf ai bmp drw dxf eps gif ico indd jpe jpeg jpg mng pcx pcc pct pgm pix png psd psp qxd qxprgb sgi svg tga tif tiff xbm xcf"); "3dm 3dmf ai bmp drw dxf eps gif ico indd jpe jpeg jpg mng pcx pcc pct pgm "
"pix png psd psp qxd qxprgb sgi svg tga tif tiff xbm xcf");
SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PROGRAM, SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PROGRAM,
"app bat cgi com bin exe js pif py pl sh vb ws "); "app bat cgi com bin exe js pif py pl sh vb ws ");
SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_ARCHIVE, SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_ARCHIVE,
@ -266,7 +267,7 @@ void SearchDialog::searchtableWidget2CostumPopupMenu( QPoint point )
connect( searchRemoveAct , SIGNAL( triggered() ), this, SLOT( searchRemove() ) ); connect( searchRemoveAct , SIGNAL( triggered() ), this, SLOT( searchRemove() ) );
searchRemoveAllAct = new QAction(QIcon(IMAGE_REMOVEALL), tr( "Remove All" ), this ); searchRemoveAllAct = new QAction(QIcon(IMAGE_REMOVEALL), tr( "Remove All" ), this );
connect( searchRemoveAllAct , SIGNAL( triggered() ), this, SLOT( searchRemoveall() ) ); connect( searchRemoveAllAct , SIGNAL( triggered() ), this, SLOT( searchRemoveAll() ) );
contextMnu2->clear(); contextMnu2->clear();
contextMnu2->addAction( searchRemoveAct); contextMnu2->addAction( searchRemoveAct);
@ -322,12 +323,9 @@ void SearchDialog::searchRemove()
/** remove all search results **/ /** remove all search results **/
void SearchDialog::searchRemoveAll() void SearchDialog::searchRemoveAll()
{ {
/* remove all summaries and results */ ui.searchResultWidget->clear();
ui.searchSummaryWidget->clear(); ui.searchSummaryWidget->clear();
ui.searchResultWidget->clear(); nextSearchId = 1;
//ui.searchResultWidget->update();
//ui.searchSummaryWidget->update();
} }
/* ***************************************************************** /* *****************************************************************