flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 11:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bootstrap: Remove wasLoadedFromWeb flag

Browse Source
This commit is contained in:
Lars Toenning
2023-03-02 20:53:30 +01:00
parent acf8df95a6
commit 6dc2492d29
7 changed files with 1 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/blackgui/components/setuploadingdialog.cpp
View File

@@ -53,7 +53,6 @@ namespace BlackGui::Components
this->displaySetupCacheInfo();
this->displayCmdBoostrapUrl();
this->displayBootstrapUrls();
this->displayGlobalSetup();
this->displayOtherVersionsInfo();
@@ -77,35 +76,6 @@ namespace BlackGui::Components
return sApp && sApp->hasSetupReader();
}
void CSetupLoadingDialog::displayBootstrapUrls()
{
if (!sApp || sApp->isShuttingDown()) { return; }
const CGlobalSetup setup = sApp->getGlobalSetup();
if (setup.wasLoadedFromWeb())
{
QPointer<CSetupLoadingDialog> myself(this);
QTimer::singleShot(250, this, [ = ]
{
if (!myself) { return; }
const CUrlList bootstrapUrls = setup.getSwiftBootstrapFileUrls();
for (const CUrl &url : bootstrapUrls)
{
const bool cc = CNetworkUtils::canConnect(url);
if (!myself) { return; } // because of CEventLoop::processEventsUntil
const CStatusMessage msg = cc ?
CStatusMessage(this).info(u"Can connect to '%1'") << url.getFullUrl() :
CStatusMessage(this).warning(u"Cannot connect to '%1'") << url.getFullUrl();
ui->comp_Messages->appendStatusMessageToList(msg);
}
});
}
else
{
const CStatusMessage msg = CStatusMessage(this).warning(u"No loaded bootstrap setup available, skipping URL test");
ui->comp_Messages->appendStatusMessageToList(msg);
}
}
void CSetupLoadingDialog::displayCmdBoostrapUrl()
{
if (!sApp->hasSetupReader()) { return; }

3
src/blackgui/components/setuploadingdialog.h
View File

@@ -46,9 +46,6 @@ namespace BlackGui::Components
//! Setup reader?
bool hasSetupReader() const;
//! Set info fields
void displayBootstrapUrls();
//! Display bootstrap URL
void displayCmdBoostrapUrl();