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

Merge pull request #2077 from csoler/v0.6-BugFixing_2

Browse source 
[WIP] V0.6 bug fixing 2
This commit is contained in:
csoler 2020-10-15 20:33:52 +02:00 • committed by GitHub
commit 6a7d298fff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
View file

@ -824,7 +824,7 @@ void PostedListWidgetWithModel::insertBoardDetails(const RsPostedGroup& group)
ui->logoLabel->setPixmap(chanImage); ui->logoLabel->setPixmap(chanImage);
ui->logoLabel->setFixedSize(QSize(ui->logoLabel->height()*chanImage.width()/(float)chanImage.height(),ui->logoLabel->height())); // make the logo have the same aspect ratio than the original image ui->logoLabel->setFixedSize(QSize(ui->logoLabel->height()*chanImage.width()/(float)chanImage.height(),ui->logoLabel->height())); // make the logo have the same aspect ratio than the original image
//ui->submitPostButton->setEnabled(bool(group.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH)); ui->submitPostButton->setEnabled(IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags));
ui->subscribeToolButton->setSubscribed(IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags)); ui->subscribeToolButton->setSubscribed(IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags));
ui->subscribeToolButton->setEnabled(true); ui->subscribeToolButton->setEnabled(true);

9
retroshare-gui/src/gui/common/GroupTreeWidget.cpp
View file

@ -525,7 +525,14 @@ void GroupTreeWidget::fillGroupItems(QTreeWidgetItem *categoryItem, const QList<
if(!IS_GROUP_SUBSCRIBED(itemInfo.subscribeFlags)) if(!IS_GROUP_SUBSCRIBED(itemInfo.subscribeFlags))
tooltip += "\n" + tr("Subscribe to download and read messages") ; tooltip += "\n" + tr("Subscribe to download and read messages") ;
tooltip += "\n" + tr("Description") + ": " + itemInfo.description; QString desc = itemInfo.description.left(30);
desc.replace("\n"," ");
desc.replace("\t"," ");
if(itemInfo.description.length() > 30)
desc += "...";
tooltip += "\n" + tr("Description") + ": " + desc;
tooltip += "\n" + tr("Id") + ": " + itemInfo.id; tooltip += "\n" + tr("Id") + ": " + itemInfo.id;

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

@ -1008,7 +1008,7 @@ void GxsForumThreadWidget::updateForumDescription(bool success)
blank(); blank();
QString forum_description = QString("<b>ERROR:</b> Forum could not be loaded. Database might be in heavy use. Please try later."); QString forum_description = QString("<b>ERROR:</b> Forum could not be loaded. Database might be in heavy use. Please try later.");
ui->postText->setText(forum_description); ui->postText->setText(forum_description);
mStateHelper->setWidgetEnabled(ui->newthreadButton, false); ui->newthreadButton->setEnabled(false);
return; return;
} }
@ -1094,7 +1094,7 @@ void GxsForumThreadWidget::updateForumDescription(bool success)
forum_description += QString("<b>%1: \t</b>%2<br/>").arg(tr("Anti-spam")).arg(anti_spam_features1); forum_description += QString("<b>%1: \t</b>%2<br/>").arg(tr("Anti-spam")).arg(anti_spam_features1);
ui->subscribeToolButton->setSubscribed(IS_GROUP_SUBSCRIBED(mForumGroup.mMeta.mSubscribeFlags)); ui->subscribeToolButton->setSubscribed(IS_GROUP_SUBSCRIBED(mForumGroup.mMeta.mSubscribeFlags));
mStateHelper->setWidgetEnabled(ui->newthreadButton, (IS_GROUP_SUBSCRIBED(mForumGroup.mMeta.mSubscribeFlags))); ui->newthreadButton->setEnabled(IS_GROUP_SUBSCRIBED(mForumGroup.mMeta.mSubscribeFlags));
if(!group.mAdminList.ids.empty()) if(!group.mAdminList.ids.empty())
{ {