From 358c425986dff309ef83ada84da5abdd0cefb330 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Fri, 13 Aug 2010 22:38:14 +0000
Subject: [PATCH] Redesign the Private Chat Window, moved Avatars to left side,
 and Buttons to the Bottom.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3367 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/chat/PopupChatDialog.ui           | 229 +++++++++---------
 1 file changed, 111 insertions(+), 118 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
index 952aacd76..af13213a9 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui
@@ -2,12 +2,15 @@
 <ui version="4.0">
  <class>PopupChatDialog</class>
  <widget class="QMainWindow" name="PopupChatDialog">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>542</width>
-    <height>418</height>
+    <width>553</width>
+    <height>414</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,17 +20,20 @@
    <string notr="true">QToolBar#toolBar{background-image: url(:/images/connect/connectFriendBanner.png)}</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout_2">
-    <property name="rightMargin">
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="leftMargin">
      <number>0</number>
     </property>
+    <property name="rightMargin">
+     <number>9</number>
+    </property>
     <property name="bottomMargin">
      <number>0</number>
     </property>
-    <property name="spacing">
+    <property name="horizontalSpacing">
      <number>0</number>
     </property>
-    <item row="0" column="0">
+    <item row="0" column="2">
      <widget class="QSplitter" name="chatsplitter">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
@@ -70,6 +76,22 @@ p, li { white-space: pre-wrap; }
         <property name="spacing">
          <number>0</number>
         </property>
+        <item>
+         <widget class="QTextEdit" name="chattextEdit">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QFrame" name="Chatbuttonframe">
           <property name="minimumSize">
@@ -104,19 +126,6 @@ border: 1px solid #CCCCCC;}</string>
            <property name="horizontalSpacing">
             <number>6</number>
            </property>
-           <item row="0" column="0">
-            <spacer>
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>190</width>
-               <height>25</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
            <item row="0" column="1">
             <widget class="QPushButton" name="emoteiconButton">
              <property name="sizePolicy">
@@ -431,25 +440,44 @@ border: 1px solid #CCCCCC;
              </property>
             </widget>
            </item>
+           <item row="0" column="11">
+            <spacer>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>190</width>
+               <height>25</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="0" column="12">
+            <widget class="QPushButton" name="sendButton">
+             <property name="text">
+              <string>Send</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
-        <item>
-         <widget class="QTextEdit" name="chattextEdit">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
      </widget>
     </item>
-    <item row="0" column="1" rowspan="3">
+    <item row="1" column="2">
+     <layout class="QVBoxLayout" name="vboxLayout"/>
+    </item>
+    <item row="0" column="1">
      <widget class="QFrame" name="avatarframe">
+      <property name="maximumSize">
+       <size>
+        <width>118</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -461,7 +489,7 @@ border: 1px solid #CCCCCC;
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>9</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
@@ -538,18 +566,64 @@ border-image: url(:/images/mystatus_bg.png);
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+      </layout>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QFrame" name="frame">
+      <property name="maximumSize">
+       <size>
+        <width>14</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QPushButton" name="avatarFrameButton">
+         <property name="minimumSize">
+          <size>
+           <width>14</width>
+           <height>31</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>14</width>
+           <height>31</height>
+          </size>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>16</width>
+           <height>31</height>
+          </size>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>61</width>
-           <height>30</height>
+           <width>13</width>
+           <height>335</height>
           </size>
          </property>
         </spacer>
@@ -557,87 +631,6 @@ border-image: url(:/images/mystatus_bg.png);
       </layout>
      </widget>
     </item>
-    <item row="0" column="2" rowspan="2">
-     <layout class="QGridLayout">
-      <item row="0" column="0">
-       <widget class="QPushButton" name="avatarFrameButton">
-        <property name="minimumSize">
-         <size>
-          <width>14</width>
-          <height>31</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>14</width>
-          <height>31</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>16</width>
-          <height>31</height>
-         </size>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>14</width>
-          <height>321</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </item>
-    <item row="1" column="0">
-     <layout class="QHBoxLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
-       <number>2</number>
-      </property>
-      <item>
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>331</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="sendButton">
-        <property name="text">
-         <string>Send</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item row="2" column="0">
-     <layout class="QVBoxLayout" name="vboxLayout"/>
-    </item>
    </layout>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>