From 935a52dee35897ea9ed9b1f108ec19d0b285b1c3 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Wed, 7 Jan 2009 01:56:09 +0000
Subject: [PATCH] * set for the Avatar Button a Background image * set for
 Avatar Pictures to use IgnoreAspectRatio

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/MessengerWindow.cpp |   2 +-
 retroshare-gui/src/gui/MessengerWindow.ui  | 128 ++++++++++++++-------
 2 files changed, 86 insertions(+), 44 deletions(-)

diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp
index 0705cdc55..6736e551f 100644
--- a/retroshare-gui/src/gui/MessengerWindow.cpp
+++ b/retroshare-gui/src/gui/MessengerWindow.cpp
@@ -539,7 +539,7 @@ void MessengerWindow::getPicture()
 							"Pictures (*.png *.xpm *.jpg)");
 	if(!fileName.isEmpty())
 	{
-		picture = QPixmap(fileName).scaled(72,72, Qt::KeepAspectRatio);
+		picture = QPixmap(fileName).scaled(53,53, Qt::IgnoreAspectRatio);
 		ui.avatarButton->setIcon(picture);
 	}
 }
diff --git a/retroshare-gui/src/gui/MessengerWindow.ui b/retroshare-gui/src/gui/MessengerWindow.ui
index 51b85b86b..e04a9b26d 100644
--- a/retroshare-gui/src/gui/MessengerWindow.ui
+++ b/retroshare-gui/src/gui/MessengerWindow.ui
@@ -13,23 +13,26 @@
    <string>RetroShare  Messenger</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="images.qrc" >
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+   <iconset resource="images.qrc" >:/images/rstray3.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>23</y>
-     <width>282</width>
-     <height>511</height>
-    </rect>
-   </property>
-   <layout class="QGridLayout" name="gridLayout_2" >
-    <property name="margin" >
+   <layout class="QGridLayout" >
+    <property name="leftMargin" >
      <number>0</number>
     </property>
-    <property name="spacing" >
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <property name="horizontalSpacing" >
+     <number>0</number>
+    </property>
+    <property name="verticalSpacing" >
      <number>0</number>
     </property>
     <item row="0" column="0" >
@@ -40,16 +43,37 @@
       <property name="frameShadow" >
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QGridLayout" name="gridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout" >
+       <property name="leftMargin" >
+        <number>0</number>
+       </property>
+       <property name="topMargin" >
+        <number>0</number>
+       </property>
+       <property name="rightMargin" >
+        <number>0</number>
+       </property>
+       <property name="bottomMargin" >
         <number>0</number>
        </property>
        <item row="0" column="0" >
-        <layout class="QGridLayout" name="gridlayouttop" >
-         <property name="margin" >
+        <layout class="QGridLayout" >
+         <property name="leftMargin" >
           <number>4</number>
          </property>
-         <property name="spacing" >
+         <property name="topMargin" >
+          <number>4</number>
+         </property>
+         <property name="rightMargin" >
+          <number>4</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>4</number>
+         </property>
+         <property name="horizontalSpacing" >
+          <number>6</number>
+         </property>
+         <property name="verticalSpacing" >
           <number>6</number>
          </property>
          <item row="0" column="0" >
@@ -60,9 +84,11 @@ p, li { white-space: pre-wrap; }&#xd;
 &lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&#xd;
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Click to change your avatar&lt;/p>&lt;/body>&lt;/html></string>
            </property>
+           <property name="styleSheet" >
+            <string>border-image: url(:/images/mystatus_bg.png);</string>
+           </property>
            <property name="icon" >
-            <iconset resource="images.qrc" >
-             <normaloff>:/images/retrosharelogo1.png</normaloff>:/images/retrosharelogo1.png</iconset>
+            <iconset resource="images.qrc" >:/images/retrosharelogo1.png</iconset>
            </property>
            <property name="iconSize" >
             <size>
@@ -76,11 +102,23 @@ p, li { white-space: pre-wrap; }&#xd;
           </widget>
          </item>
          <item row="0" column="1" >
-          <layout class="QGridLayout" name="_2" >
-           <property name="margin" >
+          <layout class="QGridLayout" >
+           <property name="leftMargin" >
             <number>4</number>
            </property>
-           <property name="spacing" >
+           <property name="topMargin" >
+            <number>4</number>
+           </property>
+           <property name="rightMargin" >
+            <number>4</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>4</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>6</number>
+           </property>
+           <property name="verticalSpacing" >
             <number>6</number>
            </property>
            <item row="0" column="0" >
@@ -109,8 +147,7 @@ p, li { white-space: pre-wrap; }
                <string>Online</string>
               </property>
               <property name="icon" >
-               <iconset resource="images.qrc" >
-                <normaloff>:/images/donline.png</normaloff>:/images/donline.png</iconset>
+               <iconset resource="images.qrc" >:/images/donline.png</iconset>
               </property>
              </item>
              <item>
@@ -118,8 +155,7 @@ p, li { white-space: pre-wrap; }
                <string>Busy</string>
               </property>
               <property name="icon" >
-               <iconset resource="images.qrc" >
-                <normaloff>:/images/dbusy.png</normaloff>:/images/dbusy.png</iconset>
+               <iconset resource="images.qrc" >:/images/dbusy.png</iconset>
               </property>
              </item>
              <item>
@@ -127,8 +163,7 @@ p, li { white-space: pre-wrap; }
                <string>Be right Back</string>
               </property>
               <property name="icon" >
-               <iconset resource="images.qrc" >
-                <normaloff>:/images/dbrb.png</normaloff>:/images/dbrb.png</iconset>
+               <iconset resource="images.qrc" >:/images/dbrb.png</iconset>
               </property>
              </item>
              <item>
@@ -136,8 +171,7 @@ p, li { white-space: pre-wrap; }
                <string>Away</string>
               </property>
               <property name="icon" >
-               <iconset resource="images.qrc" >
-                <normaloff>:/images/daway.png</normaloff>:/images/daway.png</iconset>
+               <iconset resource="images.qrc" >:/images/daway.png</iconset>
               </property>
              </item>
              <item>
@@ -145,8 +179,7 @@ p, li { white-space: pre-wrap; }
                <string>In a Call</string>
               </property>
               <property name="icon" >
-               <iconset resource="images.qrc" >
-                <normaloff>:/images/dphone.png</normaloff>:/images/dphone.png</iconset>
+               <iconset resource="images.qrc" >:/images/dphone.png</iconset>
               </property>
              </item>
              <item>
@@ -154,8 +187,7 @@ p, li { white-space: pre-wrap; }
                <string>Out of lunch</string>
               </property>
               <property name="icon" >
-               <iconset resource="images.qrc" >
-                <normaloff>:/images/dlunch.png</normaloff>:/images/dlunch.png</iconset>
+               <iconset resource="images.qrc" >:/images/dlunch.png</iconset>
               </property>
              </item>
              <item>
@@ -163,8 +195,7 @@ p, li { white-space: pre-wrap; }
                <string>Apear Offline</string>
               </property>
               <property name="icon" >
-               <iconset resource="images.qrc" >
-                <normaloff>:/images/dhidden.png</normaloff>:/images/dhidden.png</iconset>
+               <iconset resource="images.qrc" >:/images/dhidden.png</iconset>
               </property>
              </item>
             </widget>
@@ -190,11 +221,23 @@ p, li { white-space: pre-wrap; }
      </widget>
     </item>
     <item row="1" column="0" >
-     <layout class="QGridLayout" name="_3" >
-      <property name="margin" >
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
        <number>6</number>
       </property>
       <item row="1" column="0" colspan="2" >
@@ -228,8 +271,7 @@ p, li { white-space: pre-wrap; }
          <string/>
         </property>
         <property name="icon" >
-         <iconset resource="images.qrc" >
-          <normaloff>:/images/dadd.png</normaloff>:/images/dadd.png</iconset>
+         <iconset resource="images.qrc" >:/images/dadd.png</iconset>
         </property>
         <property name="iconSize" >
          <size>
@@ -265,7 +307,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>282</width>
-     <height>23</height>
+     <height>30</height>
     </rect>
    </property>
   </widget>