diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp
index c686cca9b..6e516b45d 100644
--- a/retroshare-gui/src/gui/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/SearchDialog.cpp
@@ -91,23 +91,26 @@ SearchDialog::SearchDialog(QWidget *parent)
/* initialise the filetypes mapping */
if (!SearchDialog::initialised)
{
- initialiseFileTypeMappings();
+ initialiseFileTypeMappings();
}
/* Advanced search panel specifica */
RshareSettings rsharesettings;
QString key (UI_PREF_ADVANCED_SEARCH);
bool useAdvanced = rsharesettings.value(key, QVariant(false)).toBool();
- if (useAdvanced)
+ /*if (useAdvanced)
{
ui.toggleAdvancedSearchBtn->setChecked(true);
ui.SimpleSearchPanel->hide();
} else {
ui.AdvancedSearchPanel->hide();
- }
+ }*/
- connect(ui.toggleAdvancedSearchBtn, SIGNAL(toggled(bool)), this, SLOT(toggleAdvancedSearchDialog(bool)));
- connect(ui.focusAdvSearchDialogBtn, SIGNAL(clicked()), this, SLOT(showAdvSearchDialog()));
+ //connect(ui.toggleAdvancedSearchBtn, SIGNAL(toggled(bool)), this, SLOT(toggleAdvancedSearchDialog(bool)));
+ //connect(ui.focusAdvSearchDialogBtn, SIGNAL(clicked()), this, SLOT(showAdvSearchDialog()));
+ connect(ui.toggleAdvancedSearchBtn, SIGNAL(clicked()), this, SLOT(showAdvSearchDialog()));
+ connect(ui.cloaseallsearchresultsButton, SIGNAL(clicked()), this, SLOT(searchRemoveAll()));
+ connect(ui.resetButton, SIGNAL(clicked()), this, SLOT(clearKeyword()));
/* End Advanced Search Panel specifics */
@@ -144,8 +147,8 @@ SearchDialog::SearchDialog(QWidget *parent)
_smheader->setResizeMode (2, QHeaderView::Interactive);
_smheader->resizeSection ( 0, 80 );
- _smheader->resizeSection ( 1, 75 );
- _smheader->resizeSection ( 2, 75 );
+ _smheader->resizeSection ( 1, 60 );
+ _smheader->resizeSection ( 2, 30 );
ui.searchResultWidget->setColumnCount(6);
_smheader = ui.searchResultWidget->header () ;
@@ -362,6 +365,12 @@ void SearchDialog::searchRemoveAll()
nextSearchId = 1;
}
+/** clear keywords **/
+void SearchDialog::clearKeyword()
+{
+ ui.lineEdit->clear();
+}
+
/* *****************************************************************
Advanced search implementation
*******************************************************************/
diff --git a/retroshare-gui/src/gui/SearchDialog.h b/retroshare-gui/src/gui/SearchDialog.h
index 4e7fa576c..308d70d94 100644
--- a/retroshare-gui/src/gui/SearchDialog.h
+++ b/retroshare-gui/src/gui/SearchDialog.h
@@ -66,6 +66,9 @@ private slots:
void searchRemoveAll();
void searchKeywords();
+
+ void clearKeyword();
+
/** management of the adv search dialog object when switching search modes */
void toggleAdvancedSearchDialog(bool);
diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui
index 565af914d..4afc6463c 100644
--- a/retroshare-gui/src/gui/SearchDialog.ui
+++ b/retroshare-gui/src/gui/SearchDialog.ui
@@ -5,16 +5,28 @@
0
0
- 661
- 289
+ 685
+ 474
- 1
- 1
+ 0
+ 0
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
@@ -498,689 +510,505 @@
Qt::NoContextMenu
-
-
- 6
-
-
- 0
-
-
- 6
-
-
- 0
-
-
- 1
-
+
0
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- 6
+
+
-
+
+
+
+ 24
+ 24
+
-
- 0
+
+
+ 24
+ 24
+
-
- 0
+
+
-
- 0
+
+ :/images/find.png
-
- 0
+
+ true
-
-
-
-
- 6
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 34
- 34
-
-
-
-
- 34
- 34
-
-
-
- Toggle advanced searching on and off.
-
-
-
-
-
- :/images/advsearch_24x24.png
-
-
-
- 24
- 24
-
-
-
- true
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 0
-
-
-
-
-
-
- -
-
-
-
- 255
- 0
-
-
-
-
- 390
- 24
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- 6
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Plain
-
-
- <h3>Simple Search:</h3>
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 10
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Keywords
-
-
-
- -
-
-
-
- 3
- 0
-
-
-
-
- 558
- 16777215
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 16
- 32
-
-
-
-
- -
-
-
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 16777215
+ 32
+
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Format</p></body></html>
-
-
-
- -
-
-
-
-
- Any
-
-
- :/images/FileTypeAny.png
-
-
- -
-
- Archive
-
-
- :/images/FileTypeArchive.png
-
-
- -
-
- Audio
-
-
- :/images/FileTypeAudio.png
-
-
- -
-
- CD-Image
-
-
- :/images/FileTypeCDImage.png
-
-
- -
-
- Document
-
-
- :/images/FileTypeDocument.png
-
-
- -
-
- Picture
-
-
- :/images/FileTypePicture.png
-
-
- -
-
- Program
-
-
- :/images/FileTypeProgram.png
-
-
- -
-
- Video
-
-
- :/images/FileTypeVideo.png
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 16
- 20
-
-
-
-
- -
-
-
-
- 34
- 34
-
-
-
-
- 34
- 34
-
-
-
- Perform simple search
-
-
-
-
-
- :/images/find.png
-
-
-
- 24
- 24
-
-
-
-
-
-
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- 6
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- <h3>Advanced Search:</h3>
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Expanding
-
-
-
- 50
- 20
-
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
- Show Advanced Search Tool
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- 6
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
-
-
+</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Search</span></p></body></html>
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 220
+ 0
+
+
+
+
+ 220
+ 150
+
+
+
+ 0
+
+
+
+
+ 0
+ 0
+ 220
+ 121
+
+
+
+ Keyword Search
+
+
+
-
+
+
-
+
+
+ Type your Search here
+
+
+
+ -
+
-
- 0
+
+ 3
0
-
-
- 34
- 34
-
-
- 34
- 34
-
-
-
- Download
-
-
-
-
-
- :/images/down_24x24.png
-
-
-
- 24
- 24
+ 558
+ 16777215
- -
-
-
- Qt::Vertical
-
-
+
-
+
+
-
+
+ Any
+
+
+
+ :/images/FileTypeAny.png:/images/FileTypeAny.png
+
+
+ -
+
+ Archive
+
+
+
+ :/images/FileTypeArchive.png:/images/FileTypeArchive.png
+
+
+ -
+
+ Audio
+
+
+
+ :/images/FileTypeAudio.png:/images/FileTypeAudio.png
+
+
+ -
+
+ CD-Image
+
+
+
+ :/images/FileTypeCDImage.png:/images/FileTypeCDImage.png
+
+
+ -
+
+ Document
+
+
+
+ :/images/FileTypeDocument.png:/images/FileTypeDocument.png
+
+
+ -
+
+ Picture
+
+
+
+ :/images/FileTypePicture.png:/images/FileTypePicture.png
+
+
+ -
+
+ Program
+
+
+
+ :/images/FileTypeProgram.png:/images/FileTypeProgram.png
+
+
+ -
+
+ Video
+
+
+
+ :/images/FileTypeVideo.png:/images/FileTypeVideo.png
+
+
+
+
+ -
+
+
- 20
+ 0
0
+
+
+ 200
+ 200
+
+
+
+ Perform simple search
+
+
+ Search
+
+
+
+ :/images/find.png:/images/find.png
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 88
+ 20
+
+
+ -
+
+
+ Reset
+
+
+
-
- -
-
+
+
+
+ -
+
+
-
+
-
- 0
- 1
+
+ 1
+ 0
+
+ Qt::CustomContextMenu
+
+
+ true
+
+
+ QAbstractItemView::DragOnly
+
+
+ true
+
+
+
+
+
+
+
+
+ Filename
+
+
+
+
+ Size
+
+
+
+
+ Sources
+
+
+
+
+ Type
+
+
+
+
+ Hash
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 120
+ 25
+
+
+
+ Download
+
+
+ Download
+
+
+
+ :/images/down_24x24.png:/images/down_24x24.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
Qt::Horizontal
-
-
-
- 1
- 0
-
-
-
- Qt::CustomContextMenu
-
-
- true
-
-
- QAbstractItemView::DragOnly
-
-
- true
-
-
-
-
-
-
-
-
- Filename
-
-
-
-
- Size
-
-
-
-
- Sources
-
-
-
-
- Type
-
-
-
-
- Hash
-
-
-
-
-
-
- 0
- 1
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
- true
-
-
- Qt::CustomContextMenu
-
-
- true
-
-
-
- KeyWords
-
-
-
-
- Results
-
-
-
-
- Search Id
-
-
-
+
+
+ 158
+ 31
+
+
+
+
+ -
+
+
+
+ 0
+ 25
+
+
+
+ Close All Search Results
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 34
+ 24
+
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">advanced searching</p></body></html>
+
+
+
+
+
+
+ :/images/advsearch_24x24.png:/images/advsearch_24x24.png
+
+
+
+ 16
+ 16
+
+
+
+ false
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 220
+ 0
+
+
+
+
+ 220
+ 16777215
+
+
+
+ 0
+
+
+
+
+ 0
+ 0
+ 220
+ 251
+
+
+
+ Search Activity
+
+
+
-
+
+
+
+ 0
+ 1
+
+
+
+
+ 200
+ 16777215
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ true
+
+
+ Qt::CustomContextMenu
+
+
+ true
+
+
+
+ KeyWords
+
+
+
+
+ Results
+
+
+
+
+ Search Id
+
+
+
+
+
+
+
+
@@ -1193,38 +1021,5 @@ p, li { white-space: pre-wrap; }
-
-
- toggleAdvancedSearchBtn
- toggled(bool)
- SimpleSearchPanel
- setHidden(bool)
-
-
- 29
- 35
-
-
- 72
- 43
-
-
-
-
- toggleAdvancedSearchBtn
- toggled(bool)
- AdvancedSearchPanel
- setVisible(bool)
-
-
- 28
- 29
-
-
- 80
- 64
-
-
-
-
+