Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-19 11:28:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

gxsforums: fixed wrong branch for displaying text from banned persons

Browse source 
add default to false for mdisplaybannedtext
This commit is contained in:
chelovechishko 2020-08-16 18:48:57 +09:00
parent 6b174ede8e
commit aad8bf0134
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -336,6 +336,8 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
// load settings // load settings
processSettings(true); processSettings(true);
mDisplayBannedText = false;
blankPost(); blankPost();
ui->subscribeToolButton->setToolTip(tr( "<p>Subscribing to the forum will gather \ ui->subscribeToolButton->setToolTip(tr( "<p>Subscribing to the forum will gather \
@ -1276,8 +1278,8 @@ void GxsForumThreadWidget::insertMessageData(const RsGxsForumMsg &msg)
banned_text_info += "<ul><li><b><font color=\"#e00000\">" + tr( "Messages from this author are not forwarded.") + "</font></b></li></ul>"; banned_text_info += "<ul><li><b><font color=\"#e00000\">" + tr( "Messages from this author are not forwarded.") + "</font></b></li></ul>";
banned_text_info += "<p><b><font color=\"#e00000\">" + tr( "You can force the visibility and forwarding of messages by setting a different opinion for that Id in People's tab.") + "</font></b></p><hr>"; banned_text_info += "<p><b><font color=\"#e00000\">" + tr( "You can force the visibility and forwarding of messages by setting a different opinion for that Id in People's tab.") + "</font></b></p><hr>";
} }
}
} else {
uint32_t flags = RSHTML_FORMATTEXT_EMBED_LINKS; uint32_t flags = RSHTML_FORMATTEXT_EMBED_LINKS;
if(Settings->getForumLoadEmoticons()) if(Settings->getForumLoadEmoticons())
flags |= RSHTML_FORMATTEXT_EMBED_SMILEYS ; flags |= RSHTML_FORMATTEXT_EMBED_SMILEYS ;
@ -1294,7 +1296,6 @@ void GxsForumThreadWidget::insertMessageData(const RsGxsForumMsg &msg)
, backgroundColor, desiredContrast, desiredMinimumFontSize , backgroundColor, desiredContrast, desiredMinimumFontSize
); );
ui->postText->setHtml(extraTxt); ui->postText->setHtml(extraTxt);
}
QStringList urls; QStringList urls;
RsHtml::findAnchors(ui->postText->toHtml(), urls); RsHtml::findAnchors(ui->postText->toHtml(), urls);