From bea26895ef6e3b907c94c36591f50ae5cb34e73d Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Mon, 17 May 2010 21:20:11 +0000
Subject: [PATCH] set minimum size for channel items to 22 for bether display
 and moved Post Button to top header

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/ChannelFeed.cpp |  6 +-
 retroshare-gui/src/gui/ChannelFeed.ui  | 96 +++++++++++---------------
 2 files changed, 46 insertions(+), 56 deletions(-)

diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index 92e4f298f..cad9d2ac3 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -385,6 +385,7 @@ void ChannelFeed::updateChannelListOwn(std::list<std::string> &ids)
 		QStandardItem *chNameItem = new QStandardItem();
 		QStandardItem *chPopItem = new QStandardItem();
 		QStandardItem *chIdItem = new QStandardItem();
+		chNameItem->setSizeHint( QSize( 22,22 ) ); 
 
 		ChannelInfo ci;
 		if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) {
@@ -459,6 +460,7 @@ void ChannelFeed::updateChannelListSub(std::list<std::string> &ids)
 		QStandardItem *chNameItem = new QStandardItem();
 		QStandardItem *chPopItem = new QStandardItem();
 		QStandardItem *chIdItem = new QStandardItem();
+		chNameItem->setSizeHint( QSize( 22,22 ) ); 
 
 		ChannelInfo ci;
 		if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) {
@@ -495,7 +497,8 @@ void ChannelFeed::updateChannelListSub(std::list<std::string> &ids)
 		        {
 		            chPopItem->setData(QIcon(QString::fromUtf8(":/images/hot_3.png")), Qt::DecorationRole);
 		        }
-		        else if (popcount < 16) {
+		        else if (popcount < 16) 
+		        {
 		            chPopItem->setData(QIcon(QString::fromUtf8(":/images/hot_4.png")), Qt::DecorationRole);
 		        }
 		        else
@@ -534,6 +537,7 @@ void ChannelFeed::updateChannelListPop(std::list<std::string> &ids)
 		QStandardItem *chNameItem = new QStandardItem();
 		QStandardItem *chPopItem = new QStandardItem();
 		QStandardItem *chIdItem = new QStandardItem();
+		chNameItem->setSizeHint( QSize( 22,22 ) ); 
 
 		ChannelInfo ci;
 		if (rsChannels && rsChannels->getChannelInfo(*iit, ci)) {
diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui
index 04d552e2b..1f1e9e1bc 100644
--- a/retroshare-gui/src/gui/ChannelFeed.ui
+++ b/retroshare-gui/src/gui/ChannelFeed.ui
@@ -147,7 +147,7 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </item>
-         <item row="0" column="2">
+         <item row="0" column="3">
           <widget class="QPushButton" name="channelpushButton">
            <property name="enabled">
             <bool>true</bool>
@@ -204,6 +204,44 @@ p, li { white-space: pre-wrap; }
            </property>
           </spacer>
          </item>
+         <item row="0" column="2">
+          <widget class="QToolButton" name="postButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>25</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>26</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Post To Channel</string>
+           </property>
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset resource="images.qrc">
+             <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
@@ -320,58 +358,6 @@ p, li { white-space: pre-wrap; }
           <property name="rightMargin">
            <number>9</number>
           </property>
-          <item row="0" column="0">
-           <widget class="QPushButton" name="postButton">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>26</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>Post To Channel</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QToolButton, QPushButton, QComboBox { 
-border-image: url(:/images/btn_26.png) 4;
-border-width: 4;
-padding: 0px 6px;
-font-size: 12px;
-}
-
-QToolButton:hover, QPushButton:hover, QComboBox:hover { 
-border-image: url(:/images/btn_26_hover.png) 4;
-}
-
-QToolButton:disabled, QPushButton:disabled, QComboBox::disabled {
-color:gray;
-}
-
-QToolButton:pressed, QPushButton:pressed{
-border-image: url(:/images/btn_26_pressed.png) 4;
-}</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="images.qrc">
-              <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="3">
            <widget class="QPushButton" name="unsubscribeButton">
             <property name="sizePolicy">
@@ -527,8 +513,8 @@ border-image: url(:/images/btn_26_pressed.png) 4;
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>425</width>
-             <height>325</height>
+             <width>429</width>
+             <height>331</height>
             </rect>
            </property>
            <property name="styleSheet">