From f73b25c81a48d55fa261d5e6a674221deeecc855 Mon Sep 17 00:00:00 2001 From: David Bears Date: Wed, 22 Oct 2025 15:41:17 -0400 Subject: [PATCH 1/7] fix the permission matrix global switch --- .../src/gui/settings/RSPermissionMatrixWidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp index bfa05d4f5..9286f4020 100644 --- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp +++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp @@ -620,8 +620,8 @@ bool RSPermissionMatrixWidget::computeServiceAndPeer(int x,int y,uint32_t& servi const float icoFracY = fICON_SIZE_Y/fROW_SIZE; if( - i < 0 || i >= service_ids.size() || - j < 0 || j >= peer_ids.size() || + fi < 0.f || i >= service_ids.size() || + fj < 0.f || j >= peer_ids.size() || std::fmod(fi + icoFracX/2 + .5f, 1.f) >= icoFracX || std::fmod(fj + icoFracY/2 + .5f, 1.f) >= icoFracY ) return false; @@ -647,8 +647,8 @@ bool RSPermissionMatrixWidget::computeServiceGlobalSwitch(int x,int y,uint32_t& const float icoFracX = fICON_SIZE_X/fCOL_SIZE; if( - i < 0 || i >= service_ids.size() || - y < -S*fROW_SIZE || y > 0 || + fi < 0.f || i >= service_ids.size() || + y >= 0.f || y < -S*fROW_SIZE || std::fmod(fi + icoFracX/2 + .5f, 1.f) >= icoFracX ) return false; From 82215711c2e732f24b810e7a3913a848d44b4054 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 7 Nov 2025 10:15:10 +0100 Subject: [PATCH 2/7] fixed arrow problem in sync time menu --- retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp index 67f9d55df..da745b122 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp @@ -484,7 +484,7 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point) actnn = ctxMenu2->addAction(tr("1 year" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 365)) ; if(current_sync_time == 365) { actnn->setEnabled(false);actnn->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/start.png"));} actnn = ctxMenu2->addAction(tr("3 years" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant(1095)) ; if(current_sync_time ==1095) { actnn->setEnabled(false);actnn->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/start.png"));} actnn = ctxMenu2->addAction(tr("5 years" ),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant(1825)) ; if(current_sync_time ==1825) { actnn->setEnabled(false);actnn->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/start.png"));} - actnn = ctxMenu2->addAction(tr("Indefinitly"),this,SLOT(setSyncPostsDelay())); actnn->setData(QVariant( 0)) ; if(current_store_time == 0) { actnn->setEnabled(false);actnn->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/start.png"));} + actnn = ctxMenu2->addAction(tr("Indefinitly"),this,SLOT(setSyncPostsDelay())) ; actnn->setData(QVariant( 0)) ; if(current_sync_time == 0) { actnn->setEnabled(false);actnn->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/start.png"));} ctxMenu2->setEnabled(isSubscribed); ctxMenu2 = contextMnu.addMenu(tr("Store posts for at most...")) ; From ae5f91700e3d68d4c68c473f6e7faf59ac18193f Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 7 Nov 2025 23:39:04 +0100 Subject: [PATCH 3/7] updated libretroshare submodule to latest commit --- libretroshare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretroshare b/libretroshare index da6b849a4..a82f87cc9 160000 --- a/libretroshare +++ b/libretroshare @@ -1 +1 @@ -Subproject commit da6b849a41f3cf6e60f6f76e1f3c4463876a8741 +Subproject commit a82f87cc935694e903bc5b99768d4390d421fb14 From 72ae5b74acef338944faa2aacae9dc0867a9e85e Mon Sep 17 00:00:00 2001 From: defnax <9952056+defnax@users.noreply.github.com> Date: Mon, 10 Nov 2025 18:43:22 +0100 Subject: [PATCH 4/7] added more feed tests --- retroshare-gui/src/gui/NewsFeed.cpp | 32 +++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index de2767286..d0c59168f 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -512,13 +512,33 @@ void NewsFeed::handleSecurityEvent(std::shared_ptr event) void NewsFeed::testFeeds(uint /*notifyFlags*/) { - auto feedItem = new GxsChannelPostItem(instance, - NEWSFEED_CHANNELNEWLIST, - RsGxsGroupId ("00000000000000000000000000000000"), - RsGxsMessageId("0000000000000000000000000000000000000000") - , false, true); + uint flags = Settings->getNewsFeedFlags(); - instance->addFeedItem(feedItem); + if (flags & RS_FEED_TYPE_PEER) + instance->addFeedItemIfUnique(new PeerItem(instance, NEWSFEED_PEERLIST, RsPeerId(""), PEER_TYPE_CONNECT, false), true); + + if (flags & RS_FEED_TYPE_MSG) + instance->addFeedItemIfUnique(new MsgItem(instance, NEWSFEED_MESSAGELIST, std::string(""), false), true); + + if (flags & RS_FEED_TYPE_CHANNEL){ + instance->addFeedItem(new GxsChannelGroupItem(instance, NEWSFEED_CHANNELNEWLIST, RsGxsGroupId(""), false, true)); + instance->addFeedItem(new GxsChannelPostItem(instance, NEWSFEED_CHANNELNEWLIST, RsGxsGroupId(""), RsGxsMessageId(""), false, true)); + instance->addFeedItem(new ChannelsCommentsItem(instance, NEWSFEED_CHANNELNEWLIST, RsGxsGroupId(""), RsGxsMessageId(""), RsGxsMessageId(""), false, true)); + } + + if(flags & RS_FEED_TYPE_FORUM){ + instance->addFeedItem(new GxsForumGroupItem(instance, NEWSFEED_NEW_FORUM, RsGxsGroupId(""), false, true)); + instance->addFeedItem(new GxsForumMsgItem(instance, NEWSFEED_NEW_FORUM, RsGxsGroupId(""), RsGxsMessageId(""), false, true )); + } + + if(flags & RS_FEED_TYPE_POSTED){ + instance->addFeedItem( new PostedGroupItem(instance, NEWSFEED_POSTEDNEWLIST, RsGxsGroupId(""), false, true)); + instance->addFeedItem( new PostedItem(instance, NEWSFEED_POSTEDMSGLIST, RsGxsGroupId(""), RsGxsMessageId(""), false, true)); + instance->addFeedItem( new BoardsCommentsItem(instance, NEWSFEED_POSTEDMSGLIST, RsGxsGroupId(""), RsGxsMessageId(""), false, true)); + } + + if (flags & RS_FEED_TYPE_CIRCLE) + instance->addFeedItemIfUnique(new GxsCircleItem(instance, NEWSFEED_CIRCLELIST, RsGxsCircleId(""), RsGxsId(""), RS_FEED_ITEM_CIRCLE_MEMB_JOIN),true);; #ifdef TO_REMOVE if (!instance) { From 24540db6aa8ef79d9bab9c466c3010dfeebd4a5b Mon Sep 17 00:00:00 2001 From: Passw Date: Wed, 12 Nov 2025 09:12:05 +0800 Subject: [PATCH 5/7] fix typo WindowsMSys2_InstallGuide.md complet complete --- build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md index a0d1b67b6..eba8edf19 100644 --- a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md +++ b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md @@ -8,7 +8,7 @@ Requirements: about 12 GB of free space The resulting binary is a 32-bit build of Retroshare which will also work fine on a 64-bit system. -**If you want to make complet solution without debugging it, prefer to use \build_scripts\Windows-msys2\build.bat** +**If you want to make complete solution without debugging it, prefer to use \build_scripts\Windows-msys2\build.bat** This batch will install and build all for you. From 3385abfdc6900f6ecd1631d4d2ac6808e2e89952 Mon Sep 17 00:00:00 2001 From: defnax <9952056+defnax@users.noreply.github.com> Date: Sat, 15 Nov 2025 15:21:04 +0100 Subject: [PATCH 6/7] Added comment for test feeds --- retroshare-gui/src/gui/NewsFeed.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index d0c59168f..c3be5a8a5 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -514,6 +514,8 @@ void NewsFeed::testFeeds(uint /*notifyFlags*/) { uint flags = Settings->getNewsFeedFlags(); + //For test your feed add valid ID's for RsGxsGroupId & RsGxsMessageId, else test feed will be not displayed + if (flags & RS_FEED_TYPE_PEER) instance->addFeedItemIfUnique(new PeerItem(instance, NEWSFEED_PEERLIST, RsPeerId(""), PEER_TYPE_CONNECT, false), true); From 0629113d16718265fdb796838d447bf74e23ed1f Mon Sep 17 00:00:00 2001 From: defnax <9952056+defnax@users.noreply.github.com> Date: Sat, 15 Nov 2025 16:58:34 +0100 Subject: [PATCH 7/7] Fix wording --- retroshare-gui/src/gui/settings/PeoplePage.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/settings/PeoplePage.ui b/retroshare-gui/src/gui/settings/PeoplePage.ui index a654f8a28..3fd4575f6 100644 --- a/retroshare-gui/src/gui/settings/PeoplePage.ui +++ b/retroshare-gui/src/gui/settings/PeoplePage.ui @@ -100,7 +100,7 @@ Qt::RightToLeft - Delete banned identities after (0 means indefinitely): + Delete banned identities after (0 means never): Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter