diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui index dc4368992..f8b19650c 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.ui +++ b/retroshare-gui/src/gui/Posted/PostedItem.ui @@ -18,16 +18,16 @@ - 6 + 1 - 0 + 1 - 6 + 1 - 0 + 1 0 @@ -563,7 +563,7 @@ - :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg + :/icons/png/exit2.png:/icons/png/exit2.png diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.cpp b/retroshare-gui/src/gui/Posted/PostedListWidget.cpp index 7450680bc..780846507 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.cpp +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.cpp @@ -23,6 +23,7 @@ #include "PostedListWidget.h" #include "ui_PostedListWidget.h" +#include "gui/gxs/GxsIdDetails.h" #include "PostedCreatePostDialog.h" #include "PostedItem.h" #include "gui/common/UIStateHelper.h" @@ -36,6 +37,8 @@ #define POSTED_DEFAULT_LISTING_LENGTH 10 #define POSTED_MAX_INDEX 10000 +#define TOPIC_DEFAULT_IMAGE ":/icons/png/posted.png" + /** Constructor */ PostedListWidget::PostedListWidget(const RsGxsGroupId &postedId, QWidget *parent) : GxsMessageFramePostWidget(rsPosted, parent), @@ -81,7 +84,7 @@ PostedListWidget::PostedListWidget(const RsGxsGroupId &postedId, QWidget *parent available posts from your subscribed friends, and make the \ links visible to all other friends.

Afterwards you can unsubscribe from the context menu of the links list at left.

")); - ui->infoframe->hide(); + ui->infoframe->hide(); /* load settings */ processSettings(true); @@ -311,6 +314,15 @@ void PostedListWidget::insertPostedDetails(const RsPostedGroup &group) mStateHelper->setWidgetEnabled(ui->submitPostButton, IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags)); ui->subscribeToolButton->setSubscribed(IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags)); ui->subscribeToolButton->setHidden(IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags)) ; + + /* IMAGE */ + QPixmap topicImage; + if (group.mGroupImage.mData != NULL) { + GxsIdDetails::loadPixmapFromData(group.mGroupImage.mData, group.mGroupImage.mSize, topicImage,GxsIdDetails::ORIGINAL); + } else { + topicImage = QPixmap(TOPIC_DEFAULT_IMAGE); + } + ui->logoLabel->setPixmap(topicImage); RetroShareLink link; @@ -341,6 +353,8 @@ void PostedListWidget::insertPostedDetails(const RsPostedGroup &group) link = RetroShareLink::createMessage(group.mMeta.mAuthorId, ""); ui->infoAdministrator->setText(link.toHtml()); + ui->createdinfolabel->setText(DateTime::formatLongDateTime(group.mMeta.mPublishTs)); + QString distrib_string ( "[unknown]" ); switch(group.mMeta.mCircleType) @@ -527,7 +541,8 @@ void PostedListWidget::applyRanking() void PostedListWidget::blank() { - clearPosts(); + clearPosts(); + ui->infoframe->hide(); } void PostedListWidget::clearPosts() { diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.ui b/retroshare-gui/src/gui/Posted/PostedListWidget.ui index 13b3e208d..a5f84439c 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.ui +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.ui @@ -6,7 +6,7 @@ 0 0 - 761 + 616 428 @@ -246,22 +246,6 @@ - - 6 - - - - - - 75 - true - - - - Administrator: - - - @@ -281,6 +265,52 @@ + + + + 0 + + + + + + + + + + 64 + 64 + + + + + 64 + 64 + + + + :/icons/png/postedlinks.png + + + true + + + + + + + Qt::Vertical + + + + 20 + 28 + + + + + + @@ -300,28 +330,15 @@ - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Description</span></p></body></html> - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - true - - - true + + + + unknown - - + + 75 @@ -329,7 +346,7 @@ p, li { white-space: pre-wrap; } - Description: + Administrator: @@ -343,20 +360,6 @@ p, li { white-space: pre-wrap; } - - - - 0 - - - - - - - unknown - - - @@ -377,8 +380,61 @@ p, li { white-space: pre-wrap; } + + + + + 75 + true + + + + Created: + + + + + + + unknown + + + + + + + + 75 + true + + + + Description: + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html> + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + true + + + true + + + @@ -395,7 +451,7 @@ p, li { white-space: pre-wrap; } 0 0 - 759 + 614 16 @@ -428,6 +484,11 @@ p, li { white-space: pre-wrap; } + + GxsIdLabel + QLabel +
gui/gxs/GxsIdLabel.h
+ SubscribeToolButton QToolButton @@ -438,11 +499,6 @@ p, li { white-space: pre-wrap; } QComboBox
gui/gxs/GxsIdChooser.h
 - - GxsIdLabel - QLabel -
gui/gxs/GxsIdLabel.h
- diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui index 2a00b14b0..c9188d54b 100644 --- a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui @@ -6,8 +6,8 @@ 0 0 - 543 - 208 + 565 + 209 @@ -41,10 +41,7 @@ QFrame::Sunken - - 6 - - + @@ -122,7 +119,7 @@ - + @@ -150,7 +147,7 @@ - + @@ -308,7 +305,7 @@ - + diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui index df863f40b..8baa1c832 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.ui +++ b/retroshare-gui/src/gui/feeds/PeerItem.ui @@ -150,22 +150,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 388 - 21 - - - - @@ -215,6 +199,22 @@ + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 388 + 21 + + + + diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index fb50f9acc..c2d8b86e0 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -468,6 +468,8 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description) else ui.lastpostline->setText(DateTime::formatLongDateTime(mGrpMeta.mLastPost)); ui.authorLabel->setId(mGrpMeta.mAuthorId); + + ui.createdline->setText(DateTime::formatLongDateTime(mGrpMeta.mPublishTs)); link = RetroShareLink::createMessage(mGrpMeta.mAuthorId, ""); ui.authorLabel->setText(link.toHtml()); diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 6a0da2fc2..00e49d8b3 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -621,27 +621,10 @@ - - + + - Distribution: - - - - - - - TextLabel - - - true - - - - - - - Name + Author @@ -652,6 +635,13 @@ + + + + Name + + + @@ -659,6 +649,75 @@ + + + + TextLabel + + + + + + + Anti Spam: + + + + + + + true + + + + + + + TextLabel + + + true + + + + + + + Comments: + + + + + + + GxsIdLabel + + + true + + + + + + + ID + + + + + + + true + + + + + + + Posts + + + @@ -669,63 +728,7 @@ - - - - true - - - - - - - Posts - - - - - - - Moderators: - - - - - - - true - - - - - - - true - - - - - - - ID - - - - - - - Comments: - - - - - - - Anti Spam: - - - - + @@ -746,29 +749,36 @@ - - + + - Author + Distribution: - - - - TextLabel - - - - - + + true - - + + + + true + + + + + + + Moderators: + + + + + TextLabel @@ -777,13 +787,13 @@ - - + + + + + - GxsIdLabel - - - true + Created diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp index 7ab315da4..9a3afbc3c 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp @@ -300,6 +300,8 @@ void GxsChannelPostsWidget::insertChannelDetails(const RsGxsChannelGroup &group) link = RetroShareLink::createMessage(group.mMeta.mAuthorId, ""); ui->infoAdministrator->setText(link.toHtml()); + ui->infoCreated->setText(DateTime::formatLongDateTime(group.mMeta.mPublishTs)); + QString distrib_string ( "[unknown]" ); switch(group.mMeta.mCircleType) diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui index 850f81c8f..59703a0d7 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui @@ -344,6 +344,71 @@ 9 + + + + + 0 + 0 + + + + + 75 + true + + + + Last Post: + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html> + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + true + + + true + + + + + + + + 75 + true + + + + Description: + + + + + + + + 75 + true + + + + Created: + + + @@ -376,82 +441,6 @@ - - - - - 0 - 0 - - - - - 75 - true - - - - Last Post: - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Description</span></p></body></html> - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - true - - - true - - - - - - - - 75 - true - - - - Description: - - - - - - - unknown - - - true - - - - - - - 0 - - - - - - - unknown - - - @@ -465,13 +454,44 @@ p, li { white-space: pre-wrap; } - + + + + unknown + + + + unknown + + + + unknown + + + true + + + + + + + unknown + + + + + + + 0 + + + @@ -532,16 +552,16 @@ p, li { white-space: pre-wrap; } infoWidget - - SubscribeToolButton - QToolButton -
gui/common/SubscribeToolButton.h
- GxsIdLabel QLabel
gui/gxs/GxsIdLabel.h
 + + SubscribeToolButton + QToolButton +
gui/common/SubscribeToolButton.h
+ StyledElidedLabel QLabel