From c4a3792500ceb635ee63e52f7942da58bd1550a7 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Sun, 17 Aug 2008 14:13:09 +0000
Subject: [PATCH] * added for expandButtons correct hide/show icons + ToolTips
 * added some Vertikal Spacer to put each new Widget on Top for News Feed *
 added icons for typeComboBox

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@697 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/GeneralMsgDialog.cpp   |  8 ++--
 retroshare-gui/src/gui/feeds/ChanNewItem.cpp  |  4 ++
 retroshare-gui/src/gui/feeds/ChanNewItem.ui   | 45 +++++++++++--------
 retroshare-gui/src/gui/feeds/ForumMsgItem.cpp |  4 ++
 retroshare-gui/src/gui/feeds/ForumMsgItem.ui  | 32 +++++++------
 retroshare-gui/src/gui/feeds/ForumNewItem.cpp |  4 ++
 retroshare-gui/src/gui/feeds/ForumNewItem.ui  | 45 +++++++++++--------
 retroshare-gui/src/gui/feeds/PeerItem.cpp     |  4 ++
 8 files changed, 90 insertions(+), 56 deletions(-)

diff --git a/retroshare-gui/src/gui/GeneralMsgDialog.cpp b/retroshare-gui/src/gui/GeneralMsgDialog.cpp
index 4d34fb7ad..f1be76291 100644
--- a/retroshare-gui/src/gui/GeneralMsgDialog.cpp
+++ b/retroshare-gui/src/gui/GeneralMsgDialog.cpp
@@ -55,10 +55,10 @@ GeneralMsgDialog::GeneralMsgDialog(QWidget *parent, uint32_t type)
 	 * */
 
 	typeComboBox->clear();
-	typeComboBox->addItem("Message");
-	typeComboBox->addItem("Forum");
-	typeComboBox->addItem("Channel");
-	typeComboBox->addItem("Blog");
+	typeComboBox->addItem(QIcon(QString(":/images/evolution.png")),tr("Message"));
+	typeComboBox->addItem(QIcon(QString(":/images/konversation16.png")),tr("Forum"));
+	typeComboBox->addItem(QIcon(QString(":/images/channels16.png")),tr("Channel"));
+	typeComboBox->addItem(QIcon(QString(":/images/kblogger.png")),tr("Blog"));
 
 	typeComboBox->setCurrentIndex(type);
 
diff --git a/retroshare-gui/src/gui/feeds/ChanNewItem.cpp b/retroshare-gui/src/gui/feeds/ChanNewItem.cpp
index c95efd594..b1fd3a4e7 100644
--- a/retroshare-gui/src/gui/feeds/ChanNewItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChanNewItem.cpp
@@ -132,10 +132,14 @@ void ChanNewItem::toggle()
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
+		expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+	    expandButton->setToolTip("Hide");
 	}
 	else
 	{
 		expandFrame->hide();
+		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+	    expandButton->setToolTip("Expand");
 	}
 }
 
diff --git a/retroshare-gui/src/gui/feeds/ChanNewItem.ui b/retroshare-gui/src/gui/feeds/ChanNewItem.ui
index 3bb4578a2..00ecf94e7 100644
--- a/retroshare-gui/src/gui/feeds/ChanNewItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChanNewItem.ui
@@ -57,7 +57,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/close_normal.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
           </property>
          </widget>
         </item>
@@ -69,7 +70,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Preferred</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>16</width>
             <height>26</height>
@@ -105,7 +106,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Fixed</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>20</width>
             <height>20</height>
@@ -128,7 +129,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Expanding</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>500</width>
             <height>20</height>
@@ -151,7 +152,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/directoryadd_24x24_shadow.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
           </property>
          </widget>
         </item>
@@ -163,7 +165,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Fixed</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>20</width>
             <height>20</height>
@@ -186,7 +188,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/add_24x24.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
           </property>
          </widget>
         </item>
@@ -204,16 +207,7 @@
          <property name="spacing" >
           <number>0</number>
          </property>
-         <property name="leftMargin" >
-          <number>0</number>
-         </property>
-         <property name="topMargin" >
-          <number>0</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
+         <property name="margin" >
           <number>0</number>
          </property>
          <item>
@@ -224,7 +218,7 @@
               <string/>
              </property>
              <property name="pixmap" >
-              <pixmap resource="images.qrc" >:/images/contacts24.png</pixmap>
+              <pixmap resource="../images.qrc" >:/images/contacts24.png</pixmap>
              </property>
             </widget>
            </item>
@@ -247,13 +241,26 @@
         </layout>
        </widget>
       </item>
+      <item>
+       <spacer name="verticalSpacer" >
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <resources>
-  <include location="images.qrc" />
+  <include location="../images.qrc" />
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
index 44c2f11aa..8f3e38535 100644
--- a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
@@ -177,6 +177,8 @@ void ForumMsgItem::toggle()
 	if (prevFrame->isHidden())
 	{
 		prevFrame->show();
+		expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+	    expandButton->setToolTip("Hide");
 		if (!mIsTop)
 		{
 			nextFrame->show();
@@ -186,6 +188,8 @@ void ForumMsgItem::toggle()
 	{
 		prevFrame->hide();
 		nextFrame->hide();
+		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+	    expandButton->setToolTip("Expand");
 	}
 }
 
diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.ui b/retroshare-gui/src/gui/feeds/ForumMsgItem.ui
index 0f6929375..fdde07a0f 100644
--- a/retroshare-gui/src/gui/feeds/ForumMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.ui
@@ -57,7 +57,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/close_normal.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
           </property>
          </widget>
         </item>
@@ -69,7 +70,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Preferred</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>16</width>
             <height>26</height>
@@ -105,7 +106,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Preferred</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>500</width>
             <height>20</height>
@@ -128,7 +129,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/add_24x24.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
           </property>
          </widget>
         </item>
@@ -164,7 +166,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Expanding</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>200</width>
             <height>20</height>
@@ -187,7 +189,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Preferred</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>200</width>
             <height>20</height>
@@ -210,7 +212,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/mail_delete.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
           </property>
          </widget>
         </item>
@@ -222,7 +225,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Fixed</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>20</width>
             <height>20</height>
@@ -245,7 +248,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/replymail24.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/replymail24.png</normaloff>:/images/replymail24.png</iconset>
           </property>
          </widget>
         </item>
@@ -302,7 +306,7 @@
              <property name="sizeType" >
               <enum>QSizePolicy::Preferred</enum>
              </property>
-             <property name="sizeHint" >
+             <property name="sizeHint" stdset="0" >
               <size>
                <width>40</width>
                <height>20</height>
@@ -335,7 +339,7 @@
              <property name="sizeType" >
               <enum>QSizePolicy::Preferred</enum>
              </property>
-             <property name="sizeHint" >
+             <property name="sizeHint" stdset="0" >
               <size>
                <width>40</width>
                <height>20</height>
@@ -367,7 +371,7 @@
              <property name="sizeType" >
               <enum>QSizePolicy::Preferred</enum>
              </property>
-             <property name="sizeHint" >
+             <property name="sizeHint" stdset="0" >
               <size>
                <width>40</width>
                <height>20</height>
@@ -419,7 +423,7 @@
              <property name="sizeType" >
               <enum>QSizePolicy::Preferred</enum>
              </property>
-             <property name="sizeHint" >
+             <property name="sizeHint" stdset="0" >
               <size>
                <width>40</width>
                <height>20</height>
@@ -451,7 +455,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="images.qrc" />
+  <include location="../images.qrc" />
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp
index 704c34611..9b31601ca 100644
--- a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp
@@ -134,10 +134,14 @@ void ForumNewItem::toggle()
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
+		expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+	    expandButton->setToolTip("Hide");
 	}
 	else
 	{
 		expandFrame->hide();
+		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+	    expandButton->setToolTip("Expand");
 	}
 }
 
diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.ui b/retroshare-gui/src/gui/feeds/ForumNewItem.ui
index 8f3ee6b6a..a21fe66d0 100644
--- a/retroshare-gui/src/gui/feeds/ForumNewItem.ui
+++ b/retroshare-gui/src/gui/feeds/ForumNewItem.ui
@@ -57,7 +57,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/close_normal.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
           </property>
          </widget>
         </item>
@@ -69,7 +70,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Preferred</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>16</width>
             <height>26</height>
@@ -105,7 +106,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Fixed</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>20</width>
             <height>20</height>
@@ -128,7 +129,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Expanding</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>500</width>
             <height>20</height>
@@ -151,7 +152,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/directoryadd_24x24_shadow.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
           </property>
          </widget>
         </item>
@@ -163,7 +165,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Fixed</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>20</width>
             <height>20</height>
@@ -186,7 +188,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/add_24x24.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
           </property>
          </widget>
         </item>
@@ -204,16 +207,7 @@
          <property name="spacing" >
           <number>0</number>
          </property>
-         <property name="leftMargin" >
-          <number>0</number>
-         </property>
-         <property name="topMargin" >
-          <number>0</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
+         <property name="margin" >
           <number>0</number>
          </property>
          <item>
@@ -224,7 +218,7 @@
               <string/>
              </property>
              <property name="pixmap" >
-              <pixmap resource="images.qrc" >:/images/contacts24.png</pixmap>
+              <pixmap resource="../images.qrc" >:/images/contacts24.png</pixmap>
              </property>
             </widget>
            </item>
@@ -244,6 +238,19 @@
            </item>
           </layout>
          </item>
+         <item>
+          <spacer name="verticalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
       </item>
@@ -253,7 +260,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="images.qrc" />
+  <include location="../images.qrc" />
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp
index 5c3a9e4ce..d45e2618f 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.cpp
+++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp
@@ -213,10 +213,14 @@ void PeerItem::toggle()
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
+		expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+	    expandButton->setToolTip("Hide");
 	}
 	else
 	{
 		expandFrame->hide();
+		expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+	    expandButton->setToolTip("Expand");
 	}
 }