diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp index 74600ec5f..71a3b82fd 100644 --- a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp @@ -27,6 +27,7 @@ #include "FeedHolder.h" #include "SubFileItem.h" #include "gui/notifyqt.h" +#include "util/misc.h" #include @@ -65,6 +66,7 @@ ChanMsgItem::ChanMsgItem(FeedHolder *parent, uint32_t feedId, std::string chanId playButton->hide(); titleLabel->setMinimumWidth(100); + subjectLabel->setMinimumWidth(100); small(); updateItemStatic(); @@ -160,7 +162,7 @@ void ChanMsgItem::updateItemStatic() { std::ostringstream out; out << "(" << cmi.count << " Files)"; - filelabel->setText(QString::fromStdString(out.str())); + filelabel->setText(QString::fromStdString(out.str()) + " " + misc::friendlyUnit(cmi.size)); } diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui index 7ba08e8a2..81fcf328f 100644 --- a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui @@ -6,8 +6,8 @@ 0 0 - 557 - 198 + 518 + 208 @@ -33,21 +33,21 @@ QToolButton:pressed, QPushButton:pressed{ border-image: url(:/images/btn_26_pressed.png) 4; } - + 6 - 2 + 1 6 - 2 + 1 - 0 + 6 1 @@ -60,6 +60,12 @@ border-image: url(:/images/btn_26_pressed.png) 4; 0 + + + 16777215 + 140 + + QFrame#frame{border: 3px solid #D3D3D3; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, @@ -72,7 +78,7 @@ border-radius: 10px;} QFrame::Raised - + @@ -117,10 +123,7 @@ border-radius: 10px;} 4 - - 6 - - + @@ -149,7 +152,7 @@ p, li { white-space: pre-wrap; } - + @@ -167,7 +170,22 @@ p, li { white-space: pre-wrap; } - + + + + + PreferAntialias + + + + fileLabel + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + + @@ -193,145 +211,7 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - - - 24 - 16777215 - - - - Unsubscribe From Channel - - - - - - - :/images/mail_delete.png:/images/mail_delete.png - - - - - - - - 0 - 0 - - - - - 24 - 16777215 - - - - Remove Item - - - - - - - :/images/close_normal.png:/images/close_normal.png - - - - - - - - 0 - 0 - - - - - 24 - 16777215 - - - - Expand - - - - - - - - - - :/images/edit_add24.png:/images/edit_add24.png - - - - - - - fileLabel - - - - - - - - -1 - PreferAntialias - - - - Download - - - - :/images/download16.png:/images/download16.png - - - - - - - - -1 - PreferAntialias - - - - Play - - - - :/images/player_play.png:/images/player_play.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 5 - 21 - - - - - + @@ -361,7 +241,7 @@ p, li { white-space: pre-wrap; } - + @@ -385,27 +265,140 @@ border-radius: 3px} + + + + + -1 + + + + Download + + + + :/images/download16.png:/images/download16.png + + + + + + + + -1 + + + + Play + + + + :/images/player_play.png:/images/player_play.png + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 13 + 21 + + + + + + + + + 0 + 0 + + + + + 24 + 16777215 + + + + Unsubscribe From Channel + + + + + + + :/images/mail_delete.png:/images/mail_delete.png + + + + + + + + 0 + 0 + + + + + 24 + 16777215 + + + + Remove Item + + + + + + + :/images/close_normal.png:/images/close_normal.png + + + + + + + + 0 + 0 + + + + + 24 + 16777215 + + + + Expand + + + + + + + + + + :/images/edit_add24.png:/images/edit_add24.png + + + - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 3 - - - - @@ -447,6 +440,19 @@ border-radius: 10px;} + + + + Qt::Vertical + + + + 20 + 5 + + + + @@ -462,6 +468,10 @@ border-radius: 10px;} + + + +