diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp
index cf3616728..9831d7f98 100644
--- a/retroshare-gui/src/gui/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/SearchDialog.cpp
@@ -168,13 +168,18 @@ SearchDialog::SearchDialog(QWidget *parent)
// set header text aligment
- QTreeWidgetItem * headerItem = ui.searchResultWidget->headerItem();
- headerItem->setTextAlignment(1, Qt::AlignRight | Qt::AlignRight);
- headerItem->setTextAlignment(2, Qt::AlignRight | Qt::AlignRight);
+ QTreeWidgetItem * headerItem = ui.searchResultWidget->headerItem();
+ headerItem->setTextAlignment(1, Qt::AlignRight | Qt::AlignRight);
+ headerItem->setTextAlignment(2, Qt::AlignRight | Qt::AlignRight);
- ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder);
+ ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder);
- ui.resetButton->hide();
+ ui.resetButton->hide();
+
+ ui._ownFiles_CB->setMinimumWidth(20);
+ ui._friendListsearch_SB->setMinimumWidth(20);
+ ui._anonF2Fsearch_CB->setMinimumWidth(20);
+ ui.label->setMinimumWidth(20);
/* Hide platform specific features */
#ifdef Q_WS_WIN
diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui
index ee3d18343..4e1ce45b1 100644
--- a/retroshare-gui/src/gui/SearchDialog.ui
+++ b/retroshare-gui/src/gui/SearchDialog.ui
@@ -6,7 +6,7 @@
0
0
- 1064
+ 559
340
@@ -502,8 +502,11 @@
-
- -
+
+
+ 0
+
+
-
@@ -923,7 +926,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
- -
+
-
Qt::Horizontal
@@ -1034,160 +1037,149 @@ border-image: url(:/images/btn_26_pressed.png) 4;
- -
-
-
-
-
-
- <!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;"><span style=" font-size:9pt;">Close all Search Resullts</span></p></body></html>
-
-
- QToolButton, QPushButton, QComboBox {
-border-image: url(:/images/btn_26.png) 4;
-border-width: 4;
-padding: 0px 6px;
-font-size: 12px;
-}
+
-
+
+
+
+ 16777215
+ 48
+
+
+
+ QFrame#frame_3{
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+stop:0 #FEFEFE, stop:1 #E8E8E8);
-*{
-color: black;
-}
-
-QComboBox QAbstractItemView {
-background-color:white;
-}
-
-QComboBox::down-arrow {
-image: url(:/images/combobox_arrow.png);
-}
-
-QComboBox:drop-down
-{
-subcontrol-origin: padding;
-subcontrol-position: top right;
-border-left-style: none;
-border-top-right-radius: 1px;
-border-bottom-right-radius: 1px;
-}
-
-QToolButton:hover, QPushButton:hover, QComboBox:hover {
-border-image: url(:/images/btn_26_hover.png) 4;
-}
-
-QToolButton:disabled, QPushButton:disabled, QComboBox::disabled {
-color:gray;
-}
-
-QToolButton:pressed, QPushButton:pressed{
-border-image: url(:/images/btn_26_pressed.png) 4;
-}
-
-
-
- Clear All Search Results
-
-
-
- -
-
-
- Include files from your own file list in the search result
-
-
- Include own files
-
-
-
- -
-
-
- Search inside "browsable" files of your friends
-
-
- Search in friends lists
-
-
- true
-
-
-
- -
-
-
- Multi-hop search at distance 6 in the network
+border: 1px solid #CCCCCC;}
+
+
+
+ 6
+
+
+ 1
+
+
+ 2
+
+
-
+
+
+ Search inside "browsable" files of your friends
+
+
+ Search in friends lists
+
+
+ true
+
+
+
+ -
+
+
+ Multi-hop search at distance 6 in the network
(always reports available files)
-
-
- F2F search
-
-
- true
-
-
-
- -
-
-
- Limit number of results to :
-
-
-
- -
-
-
- 100
-
-
- 5000
-
-
- 100
-
-
- 1000
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 218
- 21
-
-
-
-
- -
-
-
-
- 120
- 0
-
-
-
-
- 16777215
- 26
-
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+
+
+ F2F search
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Include files from your own file list in the search result
+
+
+ Include own files
+
+
+
+ -
+
+
+ Limit number of results to :
+
+
+
+ -
+
+
+
+
+
+ 100
+
+
+ 5000
+
+
+ 100
+
+
+ 1000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 5
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 120
+ 0
+
+
+
+
+ 16777215
+ 26
+
+
+
+ <!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;"><span style=" font-size:9pt;">Download Selected</span></p></body></html>
-
-
- QToolButton, QPushButton, QComboBox {
+
+
+ QToolButton, QPushButton, QComboBox {
border-image: url(:/images/btn_26.png) 4;
border-width: 4;
padding: 0px 6px;
@@ -1227,17 +1219,74 @@ QToolButton:pressed, QPushButton:pressed{
border-image: url(:/images/btn_26_pressed.png) 4;
}
-
-
- Download
-
-
-
- :/images/download16.png:/images/download16.png
-
-
-
-
+
+
+ Download
+
+
+
+ :/images/download16.png:/images/download16.png
+
+
+
+ -
+
+
+ <!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;"><span style=" font-size:9pt;">Close all Search Resullts</span></p></body></html>
+
+
+ QToolButton, QPushButton, QComboBox {
+border-image: url(:/images/btn_26.png) 4;
+border-width: 4;
+padding: 0px 6px;
+font-size: 12px;
+}
+
+*{
+color: black;
+}
+
+QComboBox QAbstractItemView {
+background-color:white;
+}
+
+QComboBox::down-arrow {
+image: url(:/images/combobox_arrow.png);
+}
+
+QComboBox:drop-down
+{
+subcontrol-origin: padding;
+subcontrol-position: top right;
+border-left-style: none;
+border-top-right-radius: 1px;
+border-bottom-right-radius: 1px;
+}
+
+QToolButton:hover, QPushButton:hover, QComboBox:hover {
+border-image: url(:/images/btn_26_hover.png) 4;
+}
+
+QToolButton:disabled, QPushButton:disabled, QComboBox::disabled {
+color:gray;
+}
+
+QToolButton:pressed, QPushButton:pressed{
+border-image: url(:/images/btn_26_pressed.png) 4;
+}
+
+
+
+ Clear
+
+
+
+
+