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 @@
0
0
515
- 207
+ 213
@@ -80,9 +80,9 @@ border-radius: 10px;}
- -
+
-
-
-
+
-
@@ -107,7 +107,7 @@ p, li { white-space: pre-wrap; }
- -
+
-
@@ -116,11 +116,22 @@ p, li { white-space: pre-wrap; }
- Channel Description
+ Short Description
-
+
+
+ Download
+
+
+
+ :/images/download16.png:/images/download16.png
+
+
+
+ -
Qt::Horizontal
@@ -130,13 +141,73 @@ p, li { white-space: pre-wrap; }
- 358
- 20
+ 18
+ 21
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Unsubscribe From Channel
+
+
+
+
+
+
+ :/images/mail_delete.png:/images/mail_delete.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Remove Item
+
+
+
+
+
+
+ :/images/close_normal.png:/images/close_normal.png
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Play Media
+
+
+
+
+
+
+ :/images/player_play.png:/images/player_play.png
+
+
+
+ -
@@ -159,72 +230,15 @@ p, li { white-space: pre-wrap; }
- -
-
-
-
- 0
- 0
-
-
-
- Play Media
-
-
-
-
-
-
- :/images/player_play.png:/images/player_play.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Remove Item
-
-
-
-
-
-
- :/images/close_normal.png:/images/close_normal.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Unsubscribe From Channel
-
-
-
-
-
-
- :/images/mail_delete.png:/images/mail_delete.png
-
-
-
- -
+
-
- QFrame#expandFrame{ border: none;}
+ 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;}
QFrame::StyledPanel
@@ -281,6 +295,9 @@ p, li { white-space: pre-wrap; }
+
+
+