From 631b9b5f7a09fa45595b517e87c1bbfbc70dda8b Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 1 Feb 2022 20:01:38 +0100 Subject: [PATCH 1/5] Fix default font metrics for forums tree --- retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp | 4 ++++ retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp index fb962ca5c..19c408336 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp @@ -321,6 +321,10 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget float f = QFontMetricsF(font()).height()/14.0f ; + QFontMetricsF fontMetrics(ui->threadTreeWidget->font()); + int iconHeight = fontMetrics.height() * 1.4; + ui->threadTreeWidget->setIconSize(QSize(iconHeight, iconHeight)); + /* Set header resize modes and initial section sizes */ QHeaderView * ttheader = ui->threadTreeWidget->header () ; diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui index b27354e8b..c74ea5ebb 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui @@ -233,6 +233,11 @@ + + + 10 + + Qt::CustomContextMenu From fa9bc09cec18382f9c7f5dadc4ae227fbde77856 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 1 Feb 2022 20:38:14 +0100 Subject: [PATCH 2/5] changed default tree font color to black for light/builtin style --- retroshare-gui/src/gui/qss/stylesheet/default.qss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss index d1730bfef..607c371ff 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/default.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss @@ -311,7 +311,7 @@ BoardPostDisplayWidget_compact QToolButton#voteDownButton:disabled { ForumsDialog, GxsForumThreadWidget { - qproperty-textColorRead: darkgray; + qproperty-textColorRead: black; qproperty-textColorUnread: black; qproperty-textColorUnreadChildren: darkgray; qproperty-textColorNotSubscribed: black; From 63ee463086c54d85a3605edc048aaf32c57b5dbc Mon Sep 17 00:00:00 2001 From: David Gerber Date: Sat, 5 Feb 2022 18:12:04 +0100 Subject: [PATCH 3/5] Display the name of short invites properly Instead of [Unknown], since the name is actually in the short invite. --- retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp index 15456bbd5..ca56e06aa 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp @@ -599,7 +599,7 @@ void ConnectFriendWizard::initializePage(int id) if(mIsShortInvite) { if(ui->nameEdit->text().isEmpty()) - ui->nameEdit->setText(tr("[Unknown]")); + ui->nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str())); ui->addKeyToKeyring_CB->setChecked(false); ui->addKeyToKeyring_CB->setEnabled(false); ui->signersEdit->hide(); From 2aee2f008575bd7c36278bf9a2b58e9629709b2a Mon Sep 17 00:00:00 2001 From: Phenom Date: Sat, 5 Feb 2022 18:25:19 +0100 Subject: [PATCH 4/5] Fix to follow libretroshare master --- libretroshare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretroshare b/libretroshare index 55efaf9c7..c1feae8b9 160000 --- a/libretroshare +++ b/libretroshare @@ -1 +1 @@ -Subproject commit 55efaf9c730859ef3fc5c6f6049595c1225f9204 +Subproject commit c1feae8b9144adaae8cf4d6c8a441bf41a6d7a95 From ba7f072144c54db3acf84a91a46dae0fb6385bbb Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 7 Feb 2022 17:27:42 +0100 Subject: [PATCH 5/5] Fixed clean of Windows MinGW build --- build_scripts/Windows/build/clean.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/Windows/build/clean.bat b/build_scripts/Windows/build/clean.bat index e8d5aa7b8..4ab752d4d 100644 --- a/build_scripts/Windows/build/clean.bat +++ b/build_scripts/Windows/build/clean.bat @@ -8,7 +8,7 @@ if errorlevel 1 goto error_env call "%EnvPath%\env.bat" if errorlevel 1 goto error_env -call "%~dp0env.bat" %* +call "%~dp0env.bat" clean %* if errorlevel 2 exit /B 2 if errorlevel 1 goto error_env