From 51ed2ca9f9e409341e9cfc0b209db84e26a22f4f Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 27 Dec 2013 18:24:13 +0000 Subject: [PATCH] * Changed the logo size for some news feed items to use same size for better look. * Added to display blue/black forum message icons for the forum feeds, when forum is anon or signed. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6966 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/feeds/ChanNewItem.ui | 12 +- retroshare-gui/src/gui/feeds/ForumMsgItem.cpp | 6 + retroshare-gui/src/gui/feeds/ForumMsgItem.ui | 10 +- retroshare-gui/src/gui/feeds/ForumNewItem.cpp | 6 + retroshare-gui/src/gui/feeds/ForumNewItem.ui | 320 +++++++++--------- retroshare-gui/src/gui/images.qrc | 1 + .../src/gui/images/konv_message64.png | Bin 0 -> 5309 bytes .../src/gui/qss/stylesheet/Standard.qss | 2 +- 8 files changed, 181 insertions(+), 176 deletions(-) create mode 100644 retroshare-gui/src/gui/images/konv_message64.png diff --git a/retroshare-gui/src/gui/feeds/ChanNewItem.ui b/retroshare-gui/src/gui/feeds/ChanNewItem.ui index 4f8379de9..e06a99ea3 100644 --- a/retroshare-gui/src/gui/feeds/ChanNewItem.ui +++ b/retroshare-gui/src/gui/feeds/ChanNewItem.ui @@ -7,7 +7,7 @@ 0 0 643 - 155 + 157 @@ -75,18 +75,18 @@ - 64 - 64 + 70 + 70 - 64 - 64 + 70 + 70 - true + false diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp index 2a4fadde6..aad27911b 100644 --- a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp @@ -120,6 +120,12 @@ void ForumMsgItem::updateItemStatic() { titleLabel->setText(tr("Unknown Forum Post")); } + + if (fi.forumFlags & RS_DISTRIB_AUTHEN_REQ) { + iconLabel->setPixmap(QPixmap(":/images/konv_message64.png")); + } else { + iconLabel->setPixmap(QPixmap(":/images/konversation64.png")); + } /* get actual Message */ ForumMsgInfo msg; diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.ui b/retroshare-gui/src/gui/feeds/ForumMsgItem.ui index 46494cae1..694d93796 100644 --- a/retroshare-gui/src/gui/feeds/ForumMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.ui @@ -75,18 +75,18 @@ - 48 - 48 + 70 + 70 - 48 - 48 + 70 + 70 - :/images/konversation.png + :/images/konversation64.png Qt::AlignCenter diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp index 87534b34a..3c475d3fa 100644 --- a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp +++ b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp @@ -86,6 +86,12 @@ void ForumNewItem::updateItemStatic() subscribeButton->setEnabled(true); postButton->setEnabled(false); } + + if (fi.forumFlags & RS_DISTRIB_AUTHEN_REQ) { + forumlogo_label->setPixmap(QPixmap(":/images/konv_message64.png")); + } else { + forumlogo_label->setPixmap(QPixmap(":/images/konversation64.png")); + } /* should also check the other flags */ } diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.ui b/retroshare-gui/src/gui/feeds/ForumNewItem.ui index 87983df57..1a222ca54 100644 --- a/retroshare-gui/src/gui/feeds/ForumNewItem.ui +++ b/retroshare-gui/src/gui/feeds/ForumNewItem.ui @@ -7,7 +7,7 @@ 0 0 618 - 117 + 157 @@ -95,180 +95,172 @@ QFrame::Sunken - - - 9 - - - 6 - - - 6 - - - - - + + + + + + + + 70 + 70 + + + + + 70 + 70 + + - :/images/konversation.png + :/images/konversation64.png - - - - - 0 - 0 - - - - - 75 - true - true - - - - Forum - - + + + + + + + 0 + 0 + + + + + 75 + true + true + + + + Forum + + + + + + + name + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - name - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 500 - 20 - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - Subscribe to Forum - - - - :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png - - - - - - - Qt::NoFocus - - - - :/images/mail_new.png:/images/mail_new.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - Expand - - - - :/images/edit_add24.png:/images/edit_add24.png - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - Remove Item - - - - :/images/close_normal.png:/images/close_normal.png - - + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 254 + 28 + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + Subscribe to Forum + + + + :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png + + + + + + + Qt::NoFocus + + + + :/images/mail_new.png:/images/mail_new.png + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + Expand + + + + :/images/edit_add24.png:/images/edit_add24.png + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + Remove Item + + + + :/images/close_normal.png:/images/close_normal.png + + + + - + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 020093d6f..33fbf1963 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -305,6 +305,7 @@ images/konversation16.png images/konversation128.png images/konv_message2.png + images/konv_message64.png images/konversation64.png images/forums_new.png images/ksysguard.png diff --git a/retroshare-gui/src/gui/images/konv_message64.png b/retroshare-gui/src/gui/images/konv_message64.png new file mode 100644 index 0000000000000000000000000000000000000000..edecbfc42899ce1f0150c545d84c5ba3e341dfca GIT binary patch literal 5309 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 P00000NkvXXu0mjfavFQK literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 1584c8964..e310306a7 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -401,7 +401,7 @@ ForumNewItem > QLabel#nextNameLabel, ForumMsgItem > QLabel#nameLabel { } ForumMsgItem QLabel#iconLabel { - border: 2px solid black; + border: 2px solid #CCCCCC; background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC); border-radius: 10px }