From f8b418cac11ceb9b7b6f353dea2a66c8a79cd53e Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Sat, 10 Jan 2009 01:56:13 +0000
Subject: [PATCH] * little redesign Online Toaster

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@925 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/images.qrc             |   5 +-
 .../src/gui/images/user/personal64.png        | Bin 0 -> 4666 bytes
 .../src/gui/toaster/OnlineToaster.ui          | 209 +++++++++++-------
 3 files changed, 134 insertions(+), 80 deletions(-)
 create mode 100755 retroshare-gui/src/gui/images/user/personal64.png

diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index f48783b9d..5f6d3653e 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -14,7 +14,7 @@
         <file>images/backgroundl.png</file>
         <file>images/blockdevice.png</file>
         <file>images/blockdevice2.png</file>
-        <file>images/channels.png</file>        
+        <file>images/channels.png</file>
         <file>images/channeldelete.png</file>
         <file>images/channelsubscribe.png</file>
         <file>images/channels16.png</file>
@@ -277,7 +277,8 @@
         <file>images/user/identitylightgrey24.png</file>
         <file>images/user/agt_forum24.png</file>
         <file>images/user/identity32.png</file>
-        <file>images/user/add_user16.png</file>g
+        <file>images/user/add_user16.png</file>
+        <file>images/user/personal64.png</file>
         <file>images/up.png</file>
         <file>images/underconstruction.png</file>
         <file>images/user.png</file>
diff --git a/retroshare-gui/src/gui/images/user/personal64.png b/retroshare-gui/src/gui/images/user/personal64.png
new file mode 100755
index 0000000000000000000000000000000000000000..00b640003f42ce6116f5bb9fe9617050cee42264
GIT binary patch
literal 4666
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

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/toaster/OnlineToaster.ui b/retroshare-gui/src/gui/toaster/OnlineToaster.ui
index 8c002e447..415098c8a 100644
--- a/retroshare-gui/src/gui/toaster/OnlineToaster.ui
+++ b/retroshare-gui/src/gui/toaster/OnlineToaster.ui
@@ -5,15 +5,27 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>388</width>
-    <height>221</height>
+    <width>330</width>
+    <height>168</height>
    </rect>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
+   <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" >
@@ -24,19 +36,43 @@
      <property name="frameShadow" >
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2" >
-      <property name="verticalSpacing" >
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
        <number>0</number>
       </property>
-      <property name="margin" >
+      <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" >
        <layout class="QGridLayout" >
-        <property name="margin" >
+        <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="2" >
@@ -54,8 +90,7 @@
            </size>
           </property>
           <property name="icon" >
-           <iconset resource="../images.qrc" >
-            <normaloff>:/images/close-down.png</normaloff>:/images/close-down.png</iconset>
+           <iconset resource="../images.qrc" >:/images/close-down.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -73,7 +108,7 @@
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" >
            <size>
             <width>225</width>
             <height>22</height>
@@ -85,33 +120,101 @@
       </item>
       <item row="1" column="0" >
        <layout class="QGridLayout" >
-        <property name="spacing" >
+        <property name="leftMargin" >
+         <number>4</number>
+        </property>
+        <property name="rightMargin" >
+         <number>4</number>
+        </property>
+        <property name="horizontalSpacing" >
          <number>0</number>
         </property>
+        <property name="verticalSpacing" >
+         <number>0</number>
+        </property>
+        <item rowspan="3" row="0" column="0" >
+         <widget class="QLabel" name="pixmaplabel" >
+          <property name="minimumSize" >
+           <size>
+            <width>74</width>
+            <height>74</height>
+           </size>
+          </property>
+          <property name="maximumSize" >
+           <size>
+            <width>74</width>
+            <height>74</height>
+           </size>
+          </property>
+          <property name="styleSheet" >
+           <string>border-image: url(:/images/avatar_background.png);</string>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="../images.qrc" >:/images/user/personal64.png</pixmap>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>121</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QPushButton" name="messageButton" >
+          <property name="text" >
+           <string>Peer Online</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1" >
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>121</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0" >
+       <layout class="QGridLayout" >
+        <property name="topMargin" >
+         <number>6</number>
+        </property>
         <item row="0" column="0" >
          <spacer>
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" >
            <size>
-            <width>121</width>
-            <height>48</height>
+            <width>81</width>
+            <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item row="0" column="1" >
-         <widget class="QLabel" name="pixmaplabel" >
+         <widget class="QLabel" name="messageLabel" >
           <property name="text" >
            <string/>
           </property>
-          <property name="pixmap" >
-           <pixmap resource="../images.qrc" >:/images/user/identity32.png</pixmap>
-          </property>
          </widget>
         </item>
         <item row="0" column="2" >
@@ -119,74 +222,24 @@
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" >
            <size>
-            <width>111</width>
-            <height>48</height>
+            <width>131</width>
+            <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
        </layout>
       </item>
-      <item row="2" column="0" >
-       <layout class="QGridLayout" name="gridLayout" >
-        <property name="horizontalSpacing" >
-         <number>6</number>
-        </property>
-        <item rowspan="2" row="0" column="0" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
-           <size>
-            <width>137</width>
-            <height>58</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="1" >
-         <widget class="QPushButton" name="messageButton" >
-          <property name="text" >
-           <string>Peer Online</string>
-          </property>
-         </widget>
-        </item>
-        <item rowspan="2" row="0" column="2" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
-           <size>
-            <width>136</width>
-            <height>58</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="1" >
-         <widget class="QLabel" name="messageLabel" >
-          <property name="text" >
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
       <item row="3" column="0" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" >
          <size>
-          <width>368</width>
+          <width>384</width>
           <height>61</height>
          </size>
         </property>