From fd04d386ced3c313b77ccf7c03799117a1d45a51 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 3 Dec 2019 23:59:40 +0100 Subject: [PATCH 1/5] Added to display the created time to display & feed ui fixes --- retroshare-gui/src/gui/Posted/PostedItem.ui | 10 +- .../src/gui/Posted/PostedListWidget.cpp | 19 +- .../src/gui/Posted/PostedListWidget.ui | 170 ++++++++++----- retroshare-gui/src/gui/feeds/ChatMsgItem.ui | 15 +- retroshare-gui/src/gui/feeds/PeerItem.ui | 32 +-- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 2 + retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 204 +++++++++--------- .../gui/gxschannels/GxsChannelPostsWidget.cpp | 2 + .../gui/gxschannels/GxsChannelPostsWidget.ui | 184 +++++++++------- 9 files changed, 370 insertions(+), 268 deletions(-) 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 From d2ae01ab503419d30f60fe144cfec83f77a91306 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 4 Dec 2019 21:49:59 +0100 Subject: [PATCH 2/5] update some icons --- retroshare-gui/src/gui/ChatLobbyWidget.cpp | 3 ++- .../src/gui/feeds/GxsChannelPostItem.ui | 4 ++++ retroshare-gui/src/gui/icons.qrc | 5 ++++- .../src/gui/icons/png/chats-private.png | Bin 3699 -> 3752 bytes .../src/gui/icons/png/chats-signed.png | Bin 0 -> 3699 bytes retroshare-gui/src/gui/icons/png/comment.png | Bin 1161 -> 4820 bytes .../src/gui/icons/png/pencil-edit-button.png | Bin 0 -> 1396 bytes retroshare-gui/src/gui/icons/png/typing.png | Bin 0 -> 2084 bytes retroshare-gui/src/gui/icons/question.png | Bin 0 -> 5089 bytes 9 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/png/chats-signed.png create mode 100644 retroshare-gui/src/gui/icons/png/pencil-edit-button.png create mode 100644 retroshare-gui/src/gui/icons/png/typing.png create mode 100644 retroshare-gui/src/gui/icons/question.png diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 884355d87..1c5201343 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -71,11 +71,12 @@ #define IMAGE_CREATE "" #define IMAGE_PUBLIC ":/icons/png/chats.png" #define IMAGE_PRIVATE ":/icons/png/chats-private.png" +#define IMAGE_SIGNED ":/icons/png/chats-signed.png" #define IMAGE_SUBSCRIBE ":/icons/png/enter.png" #define IMAGE_UNSUBSCRIBE ":/icons/png/leave2.png" #define IMAGE_PEER_ENTERING ":images/user/add_user24.png" #define IMAGE_PEER_LEAVING ":images/user/remove_user24.png" -#define IMAGE_TYPING ":images/typing.png" +#define IMAGE_TYPING ":icons/png/typing.png" #define IMAGE_MESSAGE ":images/chat.png" #define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png" #define IMAGE_COPYRSLINK ":/icons/png/copy.png" diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui index 0e0b7b57c..3747fc5db 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui @@ -347,6 +347,10 @@ Edit + + + :/icons/png/pencil-edit-button.png:/icons/png/pencil-edit-button.png + diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 99b277b2f..cdf09929b 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -67,6 +67,7 @@ icons/mail_red_128.png icons/newsfeed128.png icons/outlook.png + icons/question.png icons/plugins_128.png icons/png/add.png icons/png/attach-image.png @@ -115,6 +116,7 @@ icons/png/newsfeed-notify.png icons/png/newsfeed.png icons/png/options.png + icons/png/pencil-edit-button.png icons/png/people-notify.png icons/png/people.png icons/png/person.png @@ -132,6 +134,7 @@ icons/png/thumbs-down.png icons/png/thumbs-neutral.png icons/png/thumbs-up.png + icons/png/typing.png icons/png/video.png icons/posted_128.png icons/posted_red_128.png @@ -277,6 +280,7 @@ icons/png/comment.png icons/png/chats.png icons/png/chats-private.png + icons/png/chats-signed.png icons/png/fileshare.png icons/png/forum.png icons/png/message.png @@ -284,7 +288,6 @@ icons/png/postedlinks.png icons/png/people2.png icons/png/bandwidth.png - icons/png/netgraph2.png icons/png/options2.png icons/png/exit2.png diff --git a/retroshare-gui/src/gui/icons/png/chats-private.png b/retroshare-gui/src/gui/icons/png/chats-private.png index 039cc2b2dab158b62f87a67561c1b91e04f47966..72937c09fb38e02a47bc7162613e9423b3bc61e8 100644 GIT binary patch delta 3678 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 diff --git a/retroshare-gui/src/gui/icons/png/pencil-edit-button.png b/retroshare-gui/src/gui/icons/png/pencil-edit-button.png new file mode 100644 index 0000000000000000000000000000000000000000..5a1f8dffef40a74853513d0b69725ffca88167c0 GIT binary patch literal 1396 zcmZ`%Yfuwc7`?mMB@l!%T6DCnMy*I|AqhT!fH5#(1m$I*jtCfD5tM3DjRqZ+6d%Qk zf(Yf2Kx{`*p&GS1nxJ5P)(4`71S%r5Jc0=F3?VVFy=w+%`lB;@?{~lRopbKlojn{G zzS4;{iv|F23JK=%VU>}~o&xugw&P}4u+)IC001uKI$9HP*wd4P`C$O;c7wbF09Z(V zHvl`B0Q4jPz%B-0hFGCl;|~Dh6&V^G1POp3@G>nb*HKD!6u8TEm|PFfK-mf^b?77r zaUj>?WeqkCh2-e5$tjQ#lu|8JK?Ez+Qxtko^qlmBs#AW%k?_N#0J0?G#5qM)h`rsG z4rBfd#;cJHYmP*}M?;Hs$Kt1Jdz{j*cbeB4VyuU5ONY;^9ll*xD7bc&IyN`F{PFU# zovKyqOZ}f%I2W5%#<4B-VtXT0ode#4&@;Bspa zXUz+q%FX_B0UaxtZ|@$!Jp1`Px_cW!J3Bs6PmeuED@n=ST2*aWZK8CTT0?eLpnuVy z75}XF+ag_Tdf8u<7N&h}29?^vx?KaqEn>grH+v@T%obOuf*Si7+&d|=&Bh&$zwW8a zN)xE)PaD6^HtnG0?>U;4BB-I)6?q1mgpPJDoLkB2cwg^q2iaWp0`BxFk6m+elF;%T z^M?K3t3li!2NFO}e8!`rU5C?|4|^kAEoteI9mX@Mp!~SL&9^$@o8r!RqUXre*9U!{ z_B-g_o;i;g&{vkRtX=oDX^(sfasTbW!}Wsid@@;hKBt1Kk6`4DYH1zg9jMcabKD2H zjAujbv=M7J8n&X6+bHsE8xfqWA+9gfPHk_cu^L;i*yZduo~8}dgd+Ef+)tXVc(k$_ zND1}ty+#YN*8dgJB^TA0yX5t6k|&4+^7Ns#VJx+$h8S{H&cXVsI4UBOc75+=q&8wv z-oRJ57pF$1W%$*4#L4fD{bmx3UX7B)P+l7a)Xj)Wpo!VO9vL=>=I^QVK7hWf&&1R4 zUQ?@E9&N0jn8$Oy5w9D1e6{iZr}n*>{jx~>`Y zb4f)~SyUW*Is9iANP^Z$QW7OXcJekMEWnG&^7UYOc`%nmvzD=!ve+!&MNB4}$$WeB z+3EiXwun+TZQS+$g3`9MnNTp3ydg@oQ6f#;CInKc)N|9;^zF%sVxgyKTdMq>|13xX NAwl813xNq){{l2Rc;^5B literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/typing.png b/retroshare-gui/src/gui/icons/png/typing.png new file mode 100644 index 0000000000000000000000000000000000000000..4f08a38075b1ad41e0134a8d12fd7d02cb630eaa GIT binary patch literal 2084 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 Date: Sat, 7 Dec 2019 16:39:00 +0100 Subject: [PATCH 3/5] improved Node page look & feel --- .../src/gui/settings/CryptoPage.cpp | 17 +- retroshare-gui/src/gui/settings/CryptoPage.ui | 681 ++++++++++-------- 2 files changed, 410 insertions(+), 288 deletions(-) diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 3ac626834..df444323e 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -57,7 +57,8 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags) // hide profile manager as it causes bugs when generating a new profile. //ui.profile_Button->hide() ; - connect(ui.createNewNode_PB,SIGNAL(clicked()), this, SLOT(profilemanager())); + connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager())); + ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime())); } @@ -78,6 +79,10 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ ) ui.pgpid->setText(QString::fromStdString(detail.gpg_id.toStdString())); ui.pgpfingerprint->setText(misc::fingerPrintStyleSplit(QString::fromStdString(detail.fpr.toStdString()))); + std::string invite ; + rsPeers->getShortInvite(invite,rsPeers->getOwnId(),true,false); + ui.retroshareid->setText(QString::fromUtf8(invite.c_str())); + /* set retroshare version */ ui.version->setText(Rshare::retroshareVersion(true)); @@ -87,6 +92,16 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ ) int friends = ids.size(); ui.friendsEdit->setText(QString::number(friends)); + + + QString string ; + string = rsFiles->getPartialsDirectory().c_str(); + QString datadir = string; + if(datadir.contains("Partials")) + { + datadir.replace("Partials",""); + } + ui.labelpath->setText(datadir); } load() ; } diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index 0e2af06f2..50c0c84fb 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -6,15 +6,15 @@ 0 0 - 1531 - 678 + 644 + 459 - 1 + 0 @@ -22,15 +22,180 @@ - - - QFrame::Box - - - QFrame::Sunken - + - + + + + Retroshare ID: + + + + + + + Statistics: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + PGP fingerprint: + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Location ID: + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + Export Profile: + + + + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Online since: + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Location: + + + + @@ -60,64 +225,7 @@ - - - - - 0 - 0 - - - - - 100 - 0 - - - - Name: - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Location: - - - - + @@ -136,153 +244,14 @@ - - - - - 0 - 0 - - - - - 100 - 0 - - + + - Location ID: + Export - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - PGP Id : - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - - - - - 75 - true - - - - TextLabel - - - - - - - PGP fingerprint: - - - - - - - - - - QFrame::Box - - - QFrame::Sunken - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Friend nodes: - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - + @@ -301,68 +270,18 @@ - - - - - 0 - 0 - - - - - 100 - 0 - - + + - Online since: + Show statistics - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - + + + 6 + @@ -394,16 +313,211 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Profile path: + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Friend nodes: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + 6 + + + + + + 16 + 16 + + + + + + + :/images/info16.png + + + + + + + + 75 + true + + + + Profile + + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Name: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + PGP Id : + + + + + + + + 75 + true + + + + TextLabel + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 75 + true + + + + TextLabel + + + - - - - show statistics window - - - @@ -412,7 +526,7 @@ 20 - 205 + 40 @@ -423,8 +537,8 @@ Certificate - - + + @@ -451,7 +565,7 @@ - + @@ -494,13 +608,6 @@ - - - - Create new node... - - - From d6b67bc41bbd110ea557e32048990939615b8280 Mon Sep 17 00:00:00 2001 From: defnax Date: Mon, 9 Dec 2019 21:13:51 +0100 Subject: [PATCH 4/5] updated authors & website links & on channel files view to move Download/Status button to the middle --- retroshare-gui/src/gui/AboutWidget.ui | 29 ++++------- retroshare-gui/src/gui/HelpDialog.ui | 15 +++--- .../gui/gxschannels/GxsChannelFilesWidget.cpp | 9 ++-- retroshare-gui/src/gui/help/authors.html | 51 ++++++++++++++----- 4 files changed, 61 insertions(+), 43 deletions(-) diff --git a/retroshare-gui/src/gui/AboutWidget.ui b/retroshare-gui/src/gui/AboutWidget.ui index 95fc79e05..99b638388 100644 --- a/retroshare-gui/src/gui/AboutWidget.ui +++ b/retroshare-gui/src/gui/AboutWidget.ui @@ -7,30 +7,13 @@ 0 0 594 - 594 + 352 Form - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - Qt::Horizontal - - - @@ -73,6 +56,16 @@ + + + + QFrame::StyledPanel + + + QFrame::Raised + + + diff --git a/retroshare-gui/src/gui/HelpDialog.ui b/retroshare-gui/src/gui/HelpDialog.ui index 9a09a9525..20fdd56cc 100644 --- a/retroshare-gui/src/gui/HelpDialog.ui +++ b/retroshare-gui/src/gui/HelpDialog.ui @@ -86,12 +86,11 @@ p, li { white-space: pre-wrap; } <p align="justify" 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-weight:600;">RetroShare provides file sharing, chat, messages and channels</span></p> <p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <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; font-weight:600;">Useful external links to more information:</span></p> -<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" font-size:12pt; text-decoration: underline; color:#0000ff;">Retroshare Webpage</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">Retroshare Wiki</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare's Forum</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">Retroshare Project Page</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare Team Blog</span></a></li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" color:#007af4;">RetroShare Dev Twitter</span></a></li></ul></body></html> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://retroshare.cc/"><span style=" font-size:12pt; text-decoration: underline; color:#007af4;">Retroshare Webpage</span></a></li> +<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://retroshare.readthedocs.io/"><span style=" color:#007af4;">Retroshare Wiki</span></a></li> +<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/RetroShare/RetroShare"><span style=" color:#007af4;">Retroshare Project Page</span></a></li> +<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://retroshareteam.wordpress.com/"><span style=" color:#007af4;">RetroShare Team Blog</span></a></li> +<li style=" font-family:'MS Shell Dlg 2'; font-size:12pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://twitter.com/retroshare"><span style=" color:#007af4;">RetroShare Dev Twitter</span></a></li></ul></body></html> true @@ -308,8 +307,8 @@ p, li { white-space: pre-wrap; } 0 0 - 550 - 36 + 566 + 18 diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesWidget.cpp index fdb472e6d..9931811f8 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesWidget.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesWidget.cpp @@ -34,9 +34,9 @@ #define COLUMN_FILENAME 0 #define COLUMN_SIZE 1 -#define COLUMN_TITLE 2 -#define COLUMN_PUBLISHED 3 -#define COLUMN_STATUS 4 +#define COLUMN_STATUS 2 +#define COLUMN_TITLE 3 +#define COLUMN_PUBLISHED 4 #define COLUMN_COUNT 5 #define COLUMN_DATA 0 @@ -107,9 +107,10 @@ void GxsChannelFilesWidget::addFiles(const RsGxsChannelPost &post, bool related) treeItem->setData(COLUMN_DATA, ROLE_MESSAGE_ID, qVariantFromValue(post.mMeta.mMsgId)); treeItem->setData(COLUMN_DATA, ROLE_FILE_HASH, qVariantFromValue(file.mHash)); treeItem->setData(COLUMN_DATA, ROLE_MSG, QString::fromUtf8(post.mMsg.c_str())); + treeItem->setTextAlignment(COLUMN_SIZE, Qt::AlignRight) ; ui->treeWidget->addTopLevelItem(treeItem); - + QWidget *statusWidget = new GxsChannelFilesStatusWidget(post.mMeta.mGroupId, post.mMeta.mMsgId, file); ui->treeWidget->setItemWidget(treeItem, COLUMN_STATUS, statusWidget); diff --git a/retroshare-gui/src/gui/help/authors.html b/retroshare-gui/src/gui/help/authors.html index 7d5f14d20..02dc3bff1 100644 --- a/retroshare-gui/src/gui/help/authors.html +++ b/retroshare-gui/src/gui/help/authors.html @@ -1,7 +1,7 @@