Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added more info when loading forums

Browse Source
This commit is contained in:
csoler 2020-03-26 17:10:29 +01:00
parent 5dcbb978c3
commit 8cf78b072b
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
8 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
View File

@ -116,7 +116,7 @@ void GxsChannelPostItem::setup()
mCloseOnRead = false;
/* clear ui */
ui->titleLabel->setText(tr("Loading"));
ui->titleLabel->setText(tr("Loading..."));
ui->datetimelabel->clear();
ui->filelabel->clear();
ui->newCommentLabel->hide();

2
retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
View File

@ -59,7 +59,7 @@ void GxsForumGroupItem::setup()
setAttribute(Qt::WA_DeleteOnClose, true);
/* clear ui */
ui->nameLabel->setText(tr("Loading"));
ui->nameLabel->setText(tr("Loading..."));
ui->titleLabel->clear();
ui->descLabel->clear();

2
retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
View File

@ -97,7 +97,7 @@ void GxsForumMsgItem::setup()
mCloseOnRead = false;
/* clear ui */
ui->titleLabel->setText(tr("Loading"));
ui->titleLabel->setText(tr("Loading..."));
ui->subjectLabel->clear();
ui->timestamplabel->clear();
ui->parentNameLabel->clear();

2
retroshare-gui/src/gui/feeds/PostedGroupItem.cpp
View File

@ -60,7 +60,7 @@ void PostedGroupItem::setup()
setAttribute(Qt::WA_DeleteOnClose, true);
/* clear ui */
ui->nameLabel->setText(tr("Loading"));
ui->nameLabel->setText(tr("Loading..."));
ui->titleLabel->clear();
ui->descLabel->clear();

2
retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
View File

@ -935,7 +935,7 @@ QPixmap GxsIdDetails::drawIdentIcon( QString hash, quint16 width, bool rotate)
QString GxsIdDetails::getLoadingText(const RsGxsId &id)
{
return QString("%1... %2").arg(QApplication::translate("GxsIdDetails", "Loading"), QString::fromStdString(id.toStdString().substr(0, 5)));
return QString("%1... %2").arg(QApplication::translate("GxsIdDetails", "Loading..."), QString::fromStdString(id.toStdString().substr(0, 5)));
}
QString GxsIdDetails::getFailedText(const RsGxsId &id)

2
retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp
View File

@ -50,7 +50,7 @@ GxsMessageFramePostWidget::~GxsMessageFramePostWidget()
void GxsMessageFramePostWidget::groupIdChanged()
{
mGroupName = groupId().isNull () ? "" : tr("Loading");
mGroupName = groupId().isNull () ? "" : tr("Loading...");
groupNameChanged(mGroupName);
emit groupChanged(this);

39
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -869,8 +869,27 @@ static QString getDurationString(uint32_t days)
}
}
void GxsForumThreadWidget::updateForumDescription()
void GxsForumThreadWidget::setForumDescriptionLoading()
{
ui->postText->setText(tr("<b>Loading...<b>"));
}
void GxsForumThreadWidget::clearForumDescription()
{
ui->postText->clear();
}
void GxsForumThreadWidget::updateForumDescription(bool success)
{
if(!success)
{
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);
mStateHelper->setWidgetEnabled(ui->newthreadButton, false);
return;
}
std::cerr << "Updating forum description" << std::endl;
if (!mThreadId.isNull())
return;
@ -1697,6 +1716,8 @@ void GxsForumThreadWidget::updateGroupData()
// ui->threadTreeWidget->selectionModel()->reset();
// mThreadProxyModel->clear();
setForumDescriptionLoading();
RsThread::async([this]()
{
// 1 - get message data from p3GxsForums
@ -1705,18 +1726,14 @@ void GxsForumThreadWidget::updateGroupData()
std::vector<RsGxsForumGroup> groups;
forumIds.push_back(groupId());
bool success = false;
if(!rsGxsForums->getForumsInfo(forumIds,groups))
{
std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum group info for forum " << groupId() << std::endl;
return;
}
if(groups.size() != 1)
{
else if(groups.size() != 1)
std::cerr << __PRETTY_FUNCTION__ << " obtained more than one group info for forum " << groupId() << std::endl;
return;
}
else
success = true;
// 2 - sort the messages into a proper hierarchy
@ -1724,7 +1741,7 @@ void GxsForumThreadWidget::updateGroupData()
// 3 - update the model in the UI thread.
RsQThreadUtils::postToObject( [group,this]()
RsQThreadUtils::postToObject( [group,success,this]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
@ -1736,7 +1753,7 @@ void GxsForumThreadWidget::updateGroupData()
ui->threadTreeWidget->setColumnHidden(RsGxsForumModel::COLUMN_THREAD_DISTRIBUTION, !IS_GROUP_PGP_KNOWN_AUTHED(mForumGroup.mMeta.mSignFlags) && !(IS_GROUP_PGP_AUTHED(mForumGroup.mMeta.mSignFlags)));
ui->subscribeToolButton->setHidden(IS_GROUP_SUBSCRIBED(mForumGroup.mMeta.mSubscribeFlags)) ;
updateForumDescription();
updateForumDescription(success);
}, this );

5
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
View File

@ -170,11 +170,14 @@ private:
static void loadAuthorIdCallback(GxsIdDetailsType type, const RsIdentityDetails &details, QObject *object, const QVariant &/*data*/);
void updateMessageData(const RsGxsMessageId& msgId);
void updateForumDescription();
void updateForumDescription(bool success);
void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
private:
void setForumDescriptionLoading();
void clearForumDescription();
RsGxsGroupId mLastForumID;
RsGxsMessageId mThreadId;
RsGxsMessageId mOrigThreadId;