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 000000000..edecbfc42 Binary files /dev/null and b/retroshare-gui/src/gui/images/konv_message64.png differ 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 }