From cb2640237fe1da21f06ad1028d8b725b58473d25 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Sun, 17 Jan 2010 19:13:07 +0000
Subject: [PATCH] added Download Button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/feeds/ChanMsgItem.cpp |   6 +-
 retroshare-gui/src/gui/feeds/ChanMsgItem.ui  | 155 ++++++++++---------
 2 files changed, 89 insertions(+), 72 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
index aed93061c..046ab1ecb 100644
--- a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
@@ -53,6 +53,7 @@ ChanMsgItem::ChanMsgItem(FeedHolder *parent, uint32_t feedId, std::string chanId
   small();
   updateItemStatic();
   updateItem();
+
 }
 
 
@@ -87,7 +88,7 @@ void ChanMsgItem::updateItemStatic()
 	{
 		/* subject */
 		titleLabel->setText(QString::fromStdWString(cmi.subject));
-		subjectLabel->setText(QString::fromStdWString(cmi.subject));
+		subjectLabel->setText(QString::fromStdWString(cmi.msg));
 	}
 		
 	msgLabel->setText(QString::fromStdWString(cmi.msg));
@@ -118,7 +119,7 @@ void ChanMsgItem::updateItemStatic()
 
 	/* don't really want this at all! */
 	unsubscribeButton->hide();
-	playButton->hide();
+	//playButton->hide();
 }
 
 
@@ -220,4 +221,3 @@ void ChanMsgItem::playMedia()
 }
 
 
-
diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
index 8828173fe..c24d1468a 100644
--- a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>515</width>
-    <height>207</height>
+    <height>213</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -80,9 +80,9 @@ border-radius: 10px;}</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" rowspan="2">
+      <item row="0" column="1">
        <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0" colspan="5">
+        <item row="0" column="0" colspan="6">
          <widget class="QLabel" name="titleLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -107,7 +107,7 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="1" column="0" colspan="5">
+        <item row="1" column="0" colspan="6">
          <widget class="QLabel" name="subjectLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
@@ -116,11 +116,22 @@ p, li { white-space: pre-wrap; }
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Channel Description</string>
+           <string>Short Description</string>
           </property>
          </widget>
         </item>
         <item row="2" column="0">
+         <widget class="QPushButton" name="downloadButton">
+          <property name="text">
+           <string>Download</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../images.qrc">
+            <normaloff>:/images/download16.png</normaloff>:/images/download16.png</iconset>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
          <spacer>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -130,13 +141,73 @@ p, li { white-space: pre-wrap; }
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>358</width>
-            <height>20</height>
+            <width>18</width>
+            <height>21</height>
            </size>
           </property>
          </spacer>
         </item>
+        <item row="2" column="2">
+         <widget class="QPushButton" name="unsubscribeButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Unsubscribe From Channel</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../images.qrc">
+            <normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="3">
+         <widget class="QPushButton" name="clearButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Remove Item</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../images.qrc">
+            <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
+          </property>
+         </widget>
+        </item>
         <item row="2" column="4">
+         <widget class="QPushButton" name="playButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Play Media</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../images.qrc">
+            <normaloff>:/images/player_play.png</normaloff>:/images/player_play.png</iconset>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="5">
          <widget class="QPushButton" name="expandButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -159,72 +230,15 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="2" column="3">
-         <widget class="QPushButton" name="playButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Play Media</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/player_play.png</normaloff>:/images/player_play.png</iconset>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2">
-         <widget class="QPushButton" name="clearButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Remove Item</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QPushButton" name="unsubscribeButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Unsubscribe From Channel</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
-      <item row="2" column="0" colspan="2">
+      <item row="1" column="0" colspan="2">
        <widget class="QFrame" name="expandFrame">
         <property name="styleSheet">
-         <string notr="true">QFrame#expandFrame{ border: none;}</string>
+         <string notr="true">QFrame#expandFrame{border: 2px solid #D3D3D3;
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, 
+stop:0 #FFFFFF, stop:1 #F2F2F2);;
+border-radius: 10px;}</string>
         </property>
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
@@ -281,6 +295,9 @@ p, li { white-space: pre-wrap; }
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>