From 475e0d1e712467e3f588e49b2e04d893ca99bafa Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 14 Feb 2021 19:38:36 +0100 Subject: [PATCH 1/5] Fixed some missed icons * Fixed background color when Friend is selected --- .../src/gui/advsearch/AdvancedSearchDialog.ui | 37 ++++++++++++++++--- .../gui/advsearch/advancedsearchdialog.cpp | 3 ++ .../src/gui/help/browser/helpbrowser.ui | 4 +- .../src/gui/qss/stylesheet/Standard.qss | 11 ++++-- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui b/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui index 1c3549f50..5926e8d94 100644 --- a/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui +++ b/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui @@ -18,7 +18,16 @@ :/images/logo/logo_16.png:/images/logo/logo_16.png - + + 0 + + + 0 + + + 0 + + 0 @@ -63,7 +72,16 @@ 0 - + + 2 + + + 2 + + + 2 + + 2 @@ -93,7 +111,7 @@ 20 - 40 + 9 @@ -106,7 +124,16 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 @@ -115,7 +142,7 @@ Add a further search criterion. - + :/images/add_24x24.png:/images/add_24x24.png diff --git a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp index ab1476579..eb9b9ce83 100644 --- a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp +++ b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp @@ -21,6 +21,7 @@ *******************************************************************************/ #include "advancedsearchdialog.h" +#include "gui/common/FilesDefs.h" AdvancedSearchDialog::AdvancedSearchDialog(QWidget * parent) : QDialog (parent) { @@ -50,6 +51,8 @@ AdvancedSearchDialog::AdvancedSearchDialog(QWidget * parent) : QDialog (parent) this, SLOT(reset())); connect(this->executeButton, SIGNAL(clicked()), this, SLOT(prepareSearch())); + + addExprButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/add.png")); } diff --git a/retroshare-gui/src/gui/help/browser/helpbrowser.ui b/retroshare-gui/src/gui/help/browser/helpbrowser.ui index 824ffcb80..b3c288b97 100644 --- a/retroshare-gui/src/gui/help/browser/helpbrowser.ui +++ b/retroshare-gui/src/gui/help/browser/helpbrowser.ui @@ -14,8 +14,8 @@ RetroShare Help - - :/images/help.png:/images/help.png + + :/images/logo/logo_24.png:/images/logo/logo_24.png true diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 7d5730b39..3f37155dc 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -1191,16 +1191,21 @@ ChannelsCommentsItem QFrame#mainFrame, BoardsCommentsItem QFrame#mainFrame { } ChannelsCommentsItem QLabel#newCommentLabel, BoardsCommentsItem QLabel#newCommentLabel { - font: 14px; + font-size: 14px; font: bold; } ChannelsCommentsItem QLabel#subjectLabel, ChannelsCommentsItem QLabel#titleLabel , QLabel#nameLabel { - font: 14px; + font-size: 14px; font: bold; } BoardsCommentsItem QLabel#subjectLabel, QLabel#titleLabel , QLabel#nameLabel { - font: 14px; + font-size: 14px; font: bold; } + +NewFriendList QTreeView#peerTreeWidget::item:selected { + background-color: #cde8ff; +} + From 0de6a960ba2363f979ae554a9ae4bf545c456ea1 Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 14 Feb 2021 20:23:09 +0100 Subject: [PATCH 2/5] Fixed for right Toaster to has no Frame --- retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp | 2 +- retroshare-gui/src/gui/toaster/GroupChatToaster.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp index cf467d08f..ae61c7b3b 100644 --- a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp +++ b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp @@ -38,7 +38,7 @@ ChatLobbyToaster::ChatLobbyToaster(const ChatLobbyId &lobby_id, const RsGxsId &s //ui.textLabel->setText(RsHtml().formatText(NULL, message, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS | RSHTML_FORMATTEXT_CLEANSTYLE)); // Disabled, because emoticon replacement kills performance ui.textLabel->setText(RsHtml().formatText(NULL, message, RSHTML_FORMATTEXT_CLEANSTYLE)); - ui.avatarWidget->setFrameType(AvatarWidget::NORMAL_FRAME); + ui.avatarWidget->setFrameType(AvatarWidget::NO_FRAME); ui.avatarWidget->setDefaultAvatar(":images/chat_64.png"); /* Get sender info */ diff --git a/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp b/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp index 64d49f605..9bafc20da 100644 --- a/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp +++ b/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp @@ -37,7 +37,7 @@ GroupChatToaster::GroupChatToaster(const RsPeerId &peerId, const QString &messag /* set informations */ ui.textLabel->setText(RsHtml().formatText(NULL, message, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS | RSHTML_FORMATTEXT_CLEANSTYLE)); ui.toasterLabel->setText(QString::fromUtf8(rsPeers->getPeerName(peerId).c_str())); - ui.avatarWidget->setFrameType(AvatarWidget::NO_FRAME); + ui.avatarWidget->setFrameType(AvatarWidget::NORMAL_FRAME); ui.avatarWidget->setDefaultAvatar(":/images/user/personal64.png"); ui.avatarWidget->setId(ChatId(peerId)); } From 8bf3c9b78b87dea120920afdf1319319228539cd Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 14 Feb 2021 20:53:49 +0100 Subject: [PATCH 3/5] Fixed message feeds stylesheet issue --- retroshare-gui/src/gui/feeds/MsgItem.ui | 2 +- retroshare-gui/src/gui/qss/stylesheet/Standard.qss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui index ea629873f..9075554a9 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.ui +++ b/retroshare-gui/src/gui/feeds/MsgItem.ui @@ -24,7 +24,7 @@ 1 - + 0 diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 3f37155dc..d235efa86 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -869,7 +869,7 @@ GxsForumThreadWidget QToolButton#subscribeToolButton:hover { GxsForumMsgItem QFrame#mainFrame, PeerItem QFrame#mainFrame, GxsForumGroupItem QFrame#mainFrame, GxsChannelGroupItem QFrame#mainFrame, MsgItem QFrame#mainFrame, ChatMsgItem QFrame#mainFrame -SecurityIpItem QFrame#mainFrame { +SecurityIpItem QFrame#mainFrame ,MsgItem QFrame#msgFrame,{ background-color: white; } From 41f66247aa5b7d1b323cc97453c1e20958e556be Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 14 Feb 2021 21:17:07 +0100 Subject: [PATCH 4/5] Removed the left & right spacers from the home page --- retroshare-gui/src/gui/HomePage.ui | 171 ++++++++---------- .../src/gui/qss/stylesheet/Standard.qss | 2 +- 2 files changed, 72 insertions(+), 101 deletions(-) diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui index 5d1a85882..60743b3c1 100644 --- a/retroshare-gui/src/gui/HomePage.ui +++ b/retroshare-gui/src/gui/HomePage.ui @@ -14,72 +14,7 @@ Form - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 50 - 408 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - - - :/images/logo/logo_web_nobackground.png - - - Qt::AlignCenter - - - - - - - - 12 - - - - Open Source cross-platform, -private and secure decentralized communication platform. - - - - Qt::AlignCenter - - - - + @@ -243,7 +178,75 @@ private and secure decentralized communication platform. - + + + + + 0 + 0 + + + + + + + :/images/logo/logo_web_nobackground.png + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 40 + + + + + + + + + 12 + + + + Open Source cross-platform, +private and secure decentralized communication platform. + + + + Qt::AlignCenter + + + + @@ -324,39 +327,7 @@ private and secure decentralized communication platform. - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 50 - 408 - - - - - + diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index d235efa86..97376aeab 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -869,7 +869,7 @@ GxsForumThreadWidget QToolButton#subscribeToolButton:hover { GxsForumMsgItem QFrame#mainFrame, PeerItem QFrame#mainFrame, GxsForumGroupItem QFrame#mainFrame, GxsChannelGroupItem QFrame#mainFrame, MsgItem QFrame#mainFrame, ChatMsgItem QFrame#mainFrame -SecurityIpItem QFrame#mainFrame ,MsgItem QFrame#msgFrame,{ +SecurityIpItem QFrame#mainFrame, MsgItem QFrame#msgFrame{ background-color: white; } From ceccb8cb475294aa8b39b66a59157bd28b12c1f2 Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 14 Feb 2021 21:59:02 +0100 Subject: [PATCH 5/5] Removed embeded emojis --- retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp index 6fc855895..7dc90eb82 100644 --- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp +++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp @@ -350,7 +350,7 @@ void BoardPostDisplayWidget_compact::setup() ui->pictureLabel->setPicture( FilesDefs::getPixmapFromQtResourcePath(":/images/thumb-default.png") ); } - ui->notes->setText(RsHtml().formatText(NULL, QString::fromUtf8(mPost.mNotes.c_str()), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); + ui->notes->setText(RsHtml().formatText(NULL, QString::fromUtf8(mPost.mNotes.c_str()), RSHTML_FORMATTEXT_EMBED_LINKS)); QObject::connect(ui->expandButton, SIGNAL(toggled(bool)), this, SLOT(doExpand(bool)));