From e972ddea3ed824c90210606905fd3fdfec2aafba Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Fri, 4 Feb 2011 00:53:44 +0000
Subject: [PATCH] Removed maximum size of the splitter in ForumsDialog and
 ChannelFeed. Save and load the splitter state of the ChannelFeed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/ChannelFeed.cpp        | 11 +++
 retroshare-gui/src/gui/ChannelFeed.ui         | 81 +++++--------------
 retroshare-gui/src/gui/ForumsDialog.cpp       |  5 ++
 retroshare-gui/src/gui/ForumsDialog.ui        | 34 +-------
 .../src/gui/common/GroupTreeWidget.ui         | 23 ++----
 5 files changed, 43 insertions(+), 111 deletions(-)

diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index 51569c788..6e911d6f2 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -71,6 +71,11 @@ ChannelFeed::ChannelFeed(QWidget *parent)
 
     mChannelId.clear();
 
+    /* Set initial size the splitter */
+    QList<int> sizes;
+    sizes << 300 << width(); // Qt calculates the right sizes
+    splitter->setSizes(sizes);
+
     /* Initialize group tree */
     treeWidget->initDisplayMenu(displayButton);
 
@@ -109,8 +114,14 @@ void ChannelFeed::processSettings(bool load)
 
     if (load) {
         // load settings
+
+        // state of splitter
+        splitter->restoreState(Settings->value("Splitter").toByteArray());
     } else {
         // save settings
+
+        // state of splitter
+        Settings->setValue("Splitter", splitter->saveState());
     }
 
     treeWidget->processSettings(Settings, load);
diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui
index 8e35a7329..f267ec062 100644
--- a/retroshare-gui/src/gui/ChannelFeed.ui
+++ b/retroshare-gui/src/gui/ChannelFeed.ui
@@ -35,30 +35,6 @@
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>240</width>
-        <height>16777215</height>
-       </size>
-      </property>
-      <property name="sizeIncrement">
-       <size>
-        <width>0</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="baseSize">
-       <size>
-        <width>221</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="styleSheet">
        <string notr="true">QFrame#chanFrame{border: none;}</string>
       </property>
@@ -81,30 +57,19 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="GroupTreeWidget" name="treeWidget" native="true"/>
+          <widget class="GroupTreeWidget" name="treeWidget" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>
        <item row="0" column="0">
         <widget class="QFrame" name="chheaderframe">
-         <property name="minimumSize">
-          <size>
-           <width>220</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>240</width>
-           <height>38</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>220</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="styleSheet">
           <string notr="true"> QFrame#chheaderframe{
 background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
@@ -389,14 +354,14 @@ p, li { white-space: pre-wrap; }
             <item row="0" column="3">
              <widget class="QPushButton" name="unsubscribeButton">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="minimumSize">
                <size>
-                <width>26</width>
+                <width>0</width>
                 <height>26</height>
                </size>
               </property>
@@ -431,14 +396,14 @@ border-image: url(:/images/btn_26_pressed.png) 4;
             <item row="0" column="2">
              <widget class="QPushButton" name="subscribeButton">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="minimumSize">
                <size>
-                <width>26</width>
+                <width>0</width>
                 <height>26</height>
                </size>
               </property>
@@ -495,9 +460,15 @@ border-image: url(:/images/btn_26_pressed.png) 4;
             </item>
             <item row="0" column="4">
              <widget class="QToolButton" name="setAllAsReadButton">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="minimumSize">
                <size>
-                <width>26</width>
+                <width>0</width>
                 <height>26</height>
                </size>
               </property>
@@ -533,18 +504,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
        </item>
        <item row="1" column="0">
         <widget class="QFrame" name="msgFrame">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>1</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="sizeIncrement">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="styleSheet">
           <string notr="true"/>
          </property>
@@ -574,7 +533,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>412</width>
+               <width>404</width>
                <height>331</height>
               </rect>
              </property>
diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp
index 3c6d998cd..5a3c1bd1a 100644
--- a/retroshare-gui/src/gui/ForumsDialog.cpp
+++ b/retroshare-gui/src/gui/ForumsDialog.cpp
@@ -150,6 +150,11 @@ ForumsDialog::ForumsDialog(QWidget *parent)
     connect(ui.filterPatternLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterRegExpChanged()));
     connect(ui.filterColumnComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterColumnChanged()));
 
+    /* Set initial size the splitter */
+    QList<int> sizes;
+    sizes << 300 << width(); // Qt calculates the right sizes
+    ui.splitter->setSizes(sizes);
+
     /* Set own item delegate */
     RSItemDelegate *itemDelegate = new RSItemDelegate(this);
     itemDelegate->removeFocusRect(COLUMN_THREAD_READ);
diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui
index 7a856f6bb..3f0aefaad 100644
--- a/retroshare-gui/src/gui/ForumsDialog.ui
+++ b/retroshare-gui/src/gui/ForumsDialog.ui
@@ -518,16 +518,10 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <widget class="QFrame" name="frame">
-      <property name="maximumSize">
-       <size>
-        <width>300</width>
-        <height>16777215</height>
-       </size>
-      </property>
       <property name="baseSize">
        <size>
-        <width>220</width>
-        <height>0</height>
+        <width>300</width>
+        <height>300</height>
        </size>
       </property>
       <property name="styleSheet">
@@ -548,24 +542,6 @@
        </property>
        <item row="0" column="0">
         <widget class="QFrame" name="chheaderframe">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="styleSheet">
           <string notr="true"> QFrame#chheaderframe{
 background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
@@ -739,12 +715,6 @@ p, li { white-space: pre-wrap; }
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="baseSize">
-          <size>
-           <width>300</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="font">
           <font>
            <pointsize>9</pointsize>
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.ui b/retroshare-gui/src/gui/common/GroupTreeWidget.ui
index 833f7b4c4..8436fa84e 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.ui
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.ui
@@ -190,24 +190,6 @@ border-image: url(:/images/closepressed.png)
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="sizeIncrement">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="baseSize">
-      <size>
-       <width>300</width>
-       <height>0</height>
-      </size>
-     </property>
      <property name="font">
       <font>
        <pointsize>9</pointsize>
@@ -237,6 +219,11 @@ border-image: url(:/images/closepressed.png)
      <attribute name="headerStretchLastSection">
       <bool>false</bool>
      </attribute>
+     <column>
+      <property name="text">
+       <string notr="true">1</string>
+      </property>
+     </column>
     </widget>
    </item>
   </layout>