redesign the search Button stylesheet.

added change icon when Friends is not unreachable,

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1726 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/PeersDialog.cpp

@@ -41,7 +41,6 @@
 #include "GenCertDialog.h"
 #include "gui/connect/ConnectFriendWizard.h"
 
-#include <iostream>
 #include <sstream>
 
 #include <QTextCodec>
@@ -74,6 +73,7 @@
 #define IMAGE_OFFLINE            ":/images/user/identityoffline24.png"
 #define IMAGE_OFFLINE2           ":/images/user/identitylightgrey24.png"
 #define IMAGE_AVAIBLE            ":/images/user/identityavaiblecyan24.png"
+#define IMAGE_UNREACHABLE        ":/images/user/identityunreachable24.png"
 #define IMAGE_CONNECT2           ":/images/reload24.png"
 
 
@@ -338,6 +338,8 @@ void  PeersDialog::insertPeers()
 		/* (1) Person */
 		item -> setText( 2, QString::fromStdString(detail.name) + tr(" - ") +
             QString::fromStdString(rsMsgs->getCustomStateString(detail.id)));
+    item -> setToolTip( 2, QString::fromStdString(detail.name) + tr(" - ") +
+            QString::fromStdString(rsMsgs->getCustomStateString(detail.id)));
 
 		/* (2) Auto Connect */
 		//item -> setText(3, QString::fromStdString(detail.autoconnect));
@@ -404,8 +406,11 @@ void  PeersDialog::insertPeers()
 			/* bright green */
 			for(i = 1; i < 8; i++)
 			{
-			  item -> setBackground(i,QBrush(Qt::red));
+			  //item -> setBackground(i,QBrush(Qt::red));
-			  item -> setIcon(0,(QIcon(IMAGE_OFFLINE)));
+			  item -> setTextColor(i,(Qt::darkRed));
+			  QFont font ;
+			  item -> setFont(i,font);
+			  item -> setIcon(0,(QIcon(IMAGE_UNREACHABLE)));
 			}
 		}
 		else if (detail.state & RS_PEER_STATE_ONLINE)

retroshare-gui/src/gui/SearchDialog.ui

@@ -560,10 +560,19 @@ stop:0 #FEFEFE, stop:1 #E8E8E8);
 
 border: 1px solid #CCCCCC;}</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_4">
-      <property name="margin">
+      <property name="leftMargin">
        <number>6</number>
       </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>2</number>
+      </property>
       <item row="0" column="0">
        <widget class="QComboBox" name="FileTypeComboBox">
         <item>
@@ -666,6 +675,11 @@ border: 1px solid #CCCCCC;}</string>
        </spacer>
       </item>
       <item row="0" column="2">
+       <layout class="QGridLayout" name="gridLayout">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item row="0" column="0">
          <widget class="QLineEdit" name="lineEdit">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -673,9 +687,15 @@ border: 1px solid #CCCCCC;}</string>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>23</height>
+           </size>
+          </property>
           <property name="maximumSize">
            <size>
-          <width>558</width>
+            <width>1677777</width>
             <height>16777215</height>
            </size>
           </property>
@@ -687,27 +707,44 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Enter a Keyword here&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="styleSheet">
-         <string notr="true">border: 1px solid #8B8B8B;</string>
+           <string notr="true">border: 1px solid #8B8B8B;
+</string>
           </property>
          </widget>
         </item>
-      <item row="0" column="3">
+        <item row="0" column="1">
-       <spacer>
+         <widget class="QPushButton" name="pushButtonsearch">
-        <property name="orientation">
+          <property name="toolTip">
-         <enum>Qt::Horizontal</enum>
+           <string>Start Search</string>
           </property>
-        <property name="sizeType">
+          <property name="styleSheet">
-         <enum>QSizePolicy::Fixed</enum>
+           <string notr="true">QPushButton { 
+border-image: url(:/images/btn1.png) 4;
+border-width: 4;
+padding: 0px 6px;
+font-size: 12px;
+}
+
+*{
+color: black;
+}
+
+QPushButton:hover {
+border-image: url(:/images/btn2.png) 4;
+}
+
+QPushButton:pressed{
+border-image: url(:/images/btn3.png) 4;
+}</string>
           </property>
-        <property name="sizeHint" stdset="0">
+          <property name="text">
-         <size>
+           <string>Search</string>
-          <width>18</width>
-          <height>32</height>
-         </size>
           </property>
-       </spacer>
+         </widget>
         </item>
-      <item row="0" column="5">
+       </layout>
+      </item>
+      <item row="0" column="3">
        <widget class="QPushButton" name="resetButton">
         <property name="toolTip">
          <string>Reset</string>
@@ -717,11 +754,14 @@ p, li { white-space: pre-wrap; }
         </property>
        </widget>
       </item>
-      <item row="0" column="6">
+      <item row="0" column="4">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Minimum</enum>
+        </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>50</width>
@@ -730,7 +770,7 @@ p, li { white-space: pre-wrap; }
         </property>
        </spacer>
       </item>
-      <item row="0" column="7">
+      <item row="0" column="5">
        <widget class="QPushButton" name="toggleAdvancedSearchBtn">
         <property name="toolTip">
          <string>Advanced Search</string>
@@ -740,16 +780,6 @@ p, li { white-space: pre-wrap; }
         </property>
        </widget>
       </item>
-      <item row="0" column="4">
-       <widget class="QPushButton" name="pushButtonsearch">
-        <property name="toolTip">
-         <string>Start Search</string>
-        </property>
-        <property name="text">
-         <string>Search</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>

retroshare-gui/src/gui/images.qrc

@@ -1,6 +1,10 @@
 <RCC>
     <qresource prefix="/" >
         <file>images/irkick.png</file>
+        <file>images/btn1.png</file>
+        <file>images/btn2.png</file>
+        <file>images/btn3.png</file>
+        <file>images/btn4.png</file>
         <file>images/btn_26.png</file>
         <file>images/btn_26_hover.png</file>
         <file>images/btn_27.png</file>
@@ -355,6 +359,7 @@
         <file>images/user/identityoffline24.png</file>
         <file>images/user/identitylightgrey24.png</file>
         <file>images/user/identityavaiblecyan24.png</file>
+        <file>images/user/identityunreachable24.png</file>
         <file>images/user/agt_forum24.png</file>
         <file>images/user/identity32.png</file>
         <file>images/user/identitygray16.png</file>