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

improvement of autoloading of GxsGroupFrameDialog

Browse source
This commit is contained in:
csoler 2020-03-26 16:47:37 +01:00
parent 6616e8a6b3
commit 5dcbb978c3
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/retroshare/rsgxsifacehelper.h
View file

@ -393,7 +393,7 @@ protected:
*/ */
RsTokenService::GxsRequestStatus waitToken( RsTokenService::GxsRequestStatus waitToken(
uint32_t token, uint32_t token,
std::chrono::milliseconds maxWait = std::chrono::milliseconds(10000), std::chrono::milliseconds maxWait = std::chrono::milliseconds(20000),
std::chrono::milliseconds checkEvery = std::chrono::milliseconds(100), std::chrono::milliseconds checkEvery = std::chrono::milliseconds(100),
bool auto_delete_if_unsuccessful=true) bool auto_delete_if_unsuccessful=true)
{ {

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

@ -169,13 +169,15 @@ void GxsGroupFrameDialog::initUi()
connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
settingsChanged(); settingsChanged();
} }
mInitialized = true;
} }
void GxsGroupFrameDialog::showEvent(QShowEvent *event) void GxsGroupFrameDialog::showEvent(QShowEvent *event)
{ {
if (!mInitialized) { if (!mInitialized || ui->groupTreeWidget->treeWidget()->topLevelItemCount() == 0)
{
/* Problem: virtual methods cannot be used in constructor */ /* Problem: virtual methods cannot be used in constructor */
mInitialized = true;
initUi(); initUi();
} }

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

@ -392,11 +392,10 @@ void GxsForumThreadWidget::blank()
//mThreadModel->clear(); //mThreadModel->clear();
#ifdef SUSPENDED_CODE
mStateHelper->setWidgetEnabled(ui->newthreadButton, false); mStateHelper->setWidgetEnabled(ui->newthreadButton, false);
mStateHelper->setWidgetEnabled(ui->previousButton, false); mStateHelper->setWidgetEnabled(ui->previousButton, false);
mStateHelper->setWidgetEnabled(ui->nextButton, false); mStateHelper->setWidgetEnabled(ui->nextButton, false);
#endif
ui->versions_CB->hide(); ui->versions_CB->hide();
} }