From 70af1eccf5c049d059e654c2e0b4194d913626b3 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Fri, 6 Apr 2012 21:29:09 +0000
Subject: [PATCH] Renamed "Accept Friend Request" Button to "Confirm", set
 correct stylesheet for new forum item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/connect/FriendRequest.ui          | 23 +++++++++++++++----
 retroshare-gui/src/gui/feeds/ForumNewItem.ui  |  5 ++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/connect/FriendRequest.ui b/retroshare-gui/src/gui/connect/FriendRequest.ui
index 99fba563a..1d91f1ced 100644
--- a/retroshare-gui/src/gui/connect/FriendRequest.ui
+++ b/retroshare-gui/src/gui/connect/FriendRequest.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>414</width>
-    <height>359</height>
+    <height>367</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -106,7 +106,7 @@ p, li { white-space: pre-wrap; }
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="0">
+      <item row="1" column="0">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -119,7 +119,7 @@ p, li { white-space: pre-wrap; }
         </property>
        </spacer>
       </item>
-      <item row="0" column="1">
+      <item row="1" column="1">
        <widget class="QPushButton" name="cancelButton">
         <property name="styleSheet">
          <string notr="true">QToolButton, QPushButton, QComboBox { 
@@ -141,7 +141,7 @@ border-image: url(:/images/btn_26_hover.png) 4;
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
+      <item row="1" column="2">
        <widget class="QPushButton" name="applyButton">
         <property name="toolTip">
          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -165,7 +165,7 @@ border-image: url(:/images/btn_blue_hover.png) 4;
 }</string>
         </property>
         <property name="text">
-         <string>Accept Friend Request</string>
+         <string>Confirm</string>
         </property>
         <property name="autoDefault">
          <bool>false</bool>
@@ -175,6 +175,16 @@ border-image: url(:/images/btn_blue_hover.png) 4;
         </property>
        </widget>
       </item>
+      <item row="0" column="0" colspan="3">
+       <widget class="Line" name="line">
+        <property name="windowModality">
+         <enum>Qt::NonModal</enum>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -430,6 +440,9 @@ p, li { white-space: pre-wrap; }
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.ui b/retroshare-gui/src/gui/feeds/ForumNewItem.ui
index 587871415..c53651d30 100644
--- a/retroshare-gui/src/gui/feeds/ForumNewItem.ui
+++ b/retroshare-gui/src/gui/feeds/ForumNewItem.ui
@@ -26,9 +26,9 @@
       </sizepolicy>
      </property>
      <property name="styleSheet">
-      <string notr="true">QFrame#frame{border: 2px solid orange;
+      <string notr="true">QFrame#frame{border: 2px solid #CCCCCC; 
 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                     stop: 0 #F7B552, stop: 1 #FB8428);
+stop: 0 #EEEEEE, stop: 1 #CCCCCC);
 border-radius: 10px}</string>
      </property>
      <property name="frameShape">
@@ -283,6 +283,7 @@ border-radius: 10px}</string>
  </widget>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>