Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-15 00:28:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merged with upstream/master

Browse source
This commit is contained in:
csoler 2025-11-17 21:52:47 +01:00
commit 67e07b14fd
5 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
View file

@ -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.

34
retroshare-gui/src/gui/NewsFeed.cpp
View file

@ -513,13 +513,35 @@ void NewsFeed::handleSecurityEvent(std::shared_ptr<const RsEvent> event)
void NewsFeed::testFeeds(uint /*notifyFlags*/)
{
auto feedItem = new PostedItem(instance,
NEWSFEED_CHANNELNEWLIST,
RsGxsGroupId ("00000000000000000000000000000000"),
RsGxsMessageId("0000000000000000000000000000000000000000")
, false, true);
uint flags = Settings->getNewsFeedFlags();
instance->addFeedItem(feedItem);
//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);
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);;
auto feedItem2 = new BoardsPostItem(instance,
NEWSFEED_CHANNELNEWLIST,

2
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
View file

@ -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...")) ;

2
retroshare-gui/src/gui/settings/PeoplePage.ui
View file

@ -100,7 +100,7 @@
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>Delete banned identities after (0 means indefinitely):</string>
<string>Delete banned identities after (0 means never):</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

8
retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
View file

@ -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;