From 4a5bd6088054796be701ac80207032b3da0fdffd Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Tue, 16 Feb 2010 20:02:46 +0000
Subject: [PATCH] added a search icon into the search frame

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2343 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/SearchDialog.ui    |  89 ++++++++++++----------
 retroshare-gui/src/gui/images.qrc         |   1 +
 retroshare-gui/src/gui/images/find-16.png | Bin 0 -> 848 bytes
 3 files changed, 48 insertions(+), 42 deletions(-)
 create mode 100644 retroshare-gui/src/gui/images/find-16.png

diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui
index 13a4c0e72..59ae2c3a3 100644
--- a/retroshare-gui/src/gui/SearchDialog.ui
+++ b/retroshare-gui/src/gui/SearchDialog.ui
@@ -526,13 +526,13 @@ border: 1px solid #CCCCCC;}</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <property name="leftMargin">
-       <number>2</number>
+       <number>3</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>2</number>
+       <number>3</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
@@ -543,41 +543,7 @@ border: 1px solid #CCCCCC;}</string>
       <property name="verticalSpacing">
        <number>0</number>
       </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="maximumSize">
-         <size>
-          <width>22</width>
-          <height>22</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="images.qrc">:/images/filefind.png</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="label_2">
-        <property name="font">
-         <font>
-          <family>Arial</family>
-          <pointsize>10</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Search</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
        <widget class="QComboBox" name="FileTypeComboBox">
         <property name="styleSheet">
          <string notr="true">QToolButton, QPushButton, QComboBox { 
@@ -704,7 +670,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
         </item>
        </widget>
       </item>
-      <item row="0" column="3">
+      <item row="0" column="2">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -720,7 +686,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
         </property>
        </spacer>
       </item>
-      <item row="0" column="4">
+      <item row="0" column="3">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <property name="spacing">
          <number>0</number>
@@ -744,10 +710,16 @@ background: white;</string>
            <enum>QFrame::Raised</enum>
           </property>
           <layout class="QGridLayout" name="gridLayout">
+           <property name="horizontalSpacing">
+            <number>0</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>1</number>
+           </property>
            <property name="margin">
             <number>0</number>
            </property>
-           <item row="0" column="0">
+           <item row="0" column="1">
             <widget class="QLineEdit" name="lineEdit">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -781,7 +753,7 @@ border: none;}
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
+           <item row="0" column="2">
             <widget class="QPushButton" name="resetButton">
              <property name="minimumSize">
               <size>
@@ -818,6 +790,39 @@ border-image: url(:/images/closepressed.png)
              </property>
             </widget>
            </item>
+           <item row="0" column="0">
+            <widget class="QPushButton" name="pushButton">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16</width>
+               <height>16</height>
+              </size>
+             </property>
+             <property name="styleSheet">
+              <string notr="true">QPushButton#pushButton{background: transparent;
+border: none;}</string>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="icon">
+              <iconset resource="images.qrc">
+               <normaloff>:/images/find-16.png</normaloff>:/images/find-16.png</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>16</width>
+               <height>16</height>
+              </size>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -853,7 +858,7 @@ border-image: url(:/images/btn3.png) 4;
         </item>
        </layout>
       </item>
-      <item row="0" column="5">
+      <item row="0" column="4">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -869,7 +874,7 @@ border-image: url(:/images/btn3.png) 4;
         </property>
        </spacer>
       </item>
-      <item row="0" column="6">
+      <item row="0" column="5">
        <widget class="QPushButton" name="toggleAdvancedSearchBtn">
         <property name="toolTip">
          <string>Advanced Search</string>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index a3a1d6b9d..b44001d7c 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -151,6 +151,7 @@
         <file>images/fileshare24.png</file>
         <file>images/fileshare48.png</file>
         <file>images/find.png</file>
+        <file>images/find-16.png</file>
         <file>images/emoticons/kopete/kopete020.png</file>
         <file>images/flags/af.png</file>
         <file>images/flags/cn.png</file>
diff --git a/retroshare-gui/src/gui/images/find-16.png b/retroshare-gui/src/gui/images/find-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..81cfa5ef81229799cf087173872226791533da7a
GIT binary patch
literal 848
zcmV-W1F!svP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U00P2EL_t(I%YBpEOB7)k#-DHIo72v=
zhp9B&%5XKz1BL4Ww7n22x`^x#Ftil<6Z#*#2#TbOke~~#ZUPMq?8ZcdR#y^T7tF)O
z*t(l&ySmKI?96;!q~)m|cz7=!`0>6EyaaoC`TQxCmzU)$we^*Xs+L%0VS8n1X{qym
z=We8>72DY?P7-&oqXUdF@QT{dcKhzDU{&2m8VbKZRZ%k<X}|Su^2^MPootpo=;}HV
zKt@MLv99Y)q02R|9Z#UzB^($4mjOH&#6oT(^=<J{cX#)2Yilc}rlt-7c!`6jIokfj
zTY5fPs`=sf$nYxCpUFvzmx5IdyyzbeS5@UFCMFI6XhTzTy(bX7eopg476mvi0|SF;
zJFp!WvLJwIr|U0;E1Ls>z{t@Ps31xqQ51a+16;<y0OZXgb_*69mx1Rvh>|R+Uhjp9
zaQIjUG?&X|iR+k_<I0v{0st5T6j1;HAo3h`jjX%7lgsM5ejKo{Fh5^+^;)vDEY!mB
z6l}j;Fi-*z#-MLz^wrh1=~Qat7=VvWPv<|3j2N2VceCW|8A%ldNIVBw;6Vwnwz7=3
zLxWqN$H#})*Vn%XgF&Rz>A!%vxjB3q8(Rzp0zX{GuH^~*j$I@_x3^d_v6y)?G-xIg
zi84xQqix$URaG~9J|8lf%-*H|s;jG!OeRThPfz8=^75#nC?V4{H+5Z~jK|}ZilRKD
zl!k2Ej$4-1E6eh1I-N!$k@yYxmm-k}W@cv4*4EY`Nm4(hG*m1W<Ap+@*W>Zb>bm}a
z001;LHX;^_AsUT#D2mcA2tvrRthiwq4|$&dx(^@#cmToyQvlpv?gA)AB9S|qruB)U
zSeno0A8VS{$L~KC011EszyrX0!0KKmrc$XTzu&*eaonn57z3)R=8m2~PVl}M0GANr
zavVnhFvoH53p$<|UjmCSg8%>kB6?I<bW?9;ba!ELWdHzp+AA+F*UQYyE>2D?NY%?P
aN(TTo*alb-Q_5Tb0000<MNUMnLSTZr_j8T_

literal 0
HcmV?d00001