Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-26 07:55:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2201 from csoler/v0.6-BugFixing_5

Browse source 
v0.6.6-RC2 bug fixing
This commit is contained in:
csoler 2021-01-03 23:09:48 +01:00 • committed by GitHub
commit 6cbd8fe3d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
View file

@ -1276,7 +1276,10 @@ void RsGxsForumModel::recursSetMsgReadStatus(ForumModelIndex i,bool read_status,
else else
rsGxsForums->setMessageReadStatus(token,std::make_pair( mForumGroup.mMeta.mGroupId, mPosts[i].mMsgId ), read_status); rsGxsForums->setMessageReadStatus(token,std::make_pair( mForumGroup.mMeta.mGroupId, mPosts[i].mMsgId ), read_status);
QModelIndex itemIndex = createIndex(i - 1, 0, &mPosts[i]); void *ref ;
convertTabEntryToRefPointer(i,ref); // we dont use i+1 here because i is not a row, but an index in the mPosts tab
QModelIndex itemIndex = createIndex(i - 1, 0, ref);
emit dataChanged(itemIndex, itemIndex); emit dataChanged(itemIndex, itemIndex);
} }

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

@ -91,13 +91,13 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
if(RsAccounts::isHiddenNode()) if(RsAccounts::isHiddenNode())
{ {
ui.tabWidget->removeTab(TAB_RELAYS) ; // remove relays. Not useful in Tor mode.
ui.tabWidget->removeTab(TAB_IP_FILTERS) ; // remove IP filters. Not useful in Tor mode.
if(RsAccounts::isTorAuto()) if(RsAccounts::isTorAuto())
{ {
// Here we use absolute numbers instead of consts defined above, because the consts correspond to the tab number *after* this tab removal. // Here we use absolute numbers instead of consts defined above, because the consts correspond to the tab number *after* this tab removal.
ui.tabWidget->removeTab(TAB_RELAYS) ; // remove relays. Not useful in Tor mode.
ui.tabWidget->removeTab(TAB_IP_FILTERS) ; // remove IP filters. Not useful in Tor mode.
ui.hiddenpage_proxyAddress_i2p->hide() ; ui.hiddenpage_proxyAddress_i2p->hide() ;
ui.hiddenpage_proxyLabel_i2p->hide() ; ui.hiddenpage_proxyLabel_i2p->hide() ;
ui.hiddenpage_proxyPort_i2p->hide() ; ui.hiddenpage_proxyPort_i2p->hide() ;
@ -110,6 +110,8 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
ui.hiddenpage_outHeader->setText(tr("Tor has been automatically configured by Retroshare. You shouldn't need to change anything here.")) ; ui.hiddenpage_outHeader->setText(tr("Tor has been automatically configured by Retroshare. You shouldn't need to change anything here.")) ;
ui.hiddenpage_inHeader->setText(tr("Tor has been automatically configured by Retroshare. You shouldn't need to change anything here.")) ; ui.hiddenpage_inHeader->setText(tr("Tor has been automatically configured by Retroshare. You shouldn't need to change anything here.")) ;
ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_I2P_BOB); // warning: the order of operation here is very important.
} }
} }
else else

BIN
retroshare-gui/src/release/Data/LOC06_43542d01e908b37636990038a8633cab/file_sharing/dirlist_7fe5ae5f67034e189936e5af4c778b47.bin
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 76 KiB