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

Ref T150, use new checks in load/status UI components

Browse Source
This commit is contained in:
Klaus Basan
2017-09-14 02:46:36 +02:00
committed by Mathew Sutcliffe
parent a4de52852d
commit 5d2531080b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/components/dbloadoverviewcomponent.cpp
View File

@@ -189,7 +189,7 @@ namespace BlackGui
static const QString imgFailed(":/diagona/icons/diagona/icons/cross-script.png"); static const QString imgFailed(":/diagona/icons/diagona/icons/cross-script.png");
const QString dbUrlHtml("<img src=\"%1\">&nbsp;&nbsp;<a href=\"%2\">%3</a>"); const QString dbUrlHtml("<img src=\"%1\">&nbsp;&nbsp;<a href=\"%2\">%3</a>");
const QString url = sGui->getGlobalSetup().getDbHomePageUrl().getFullUrl(); const QString url = sGui->getGlobalSetup().getDbHomePageUrl().getFullUrl();
bool canConnect = sGui->getWebDataServices() && sGui->getWebDataServices()->canConnectSwiftDb(); bool canConnect = sGui->isSwiftDbAccessible();
ui->lbl_DatabaseUrl->setText(dbUrlHtml.arg(canConnect ? imgOk : imgFailed, url, url)); ui->lbl_DatabaseUrl->setText(dbUrlHtml.arg(canConnect ? imgOk : imgFailed, url, url));
ui->lbl_DatabaseUrl->setToolTip(url); ui->lbl_DatabaseUrl->setToolTip(url);
@@ -213,7 +213,7 @@ namespace BlackGui
} }
ui->lbl_SharedUrls->setText(tableHtml.arg(allRowsHtml.trimmed())); ui->lbl_SharedUrls->setText(tableHtml.arg(allRowsHtml.trimmed()));
ui->lbl_SharedUrls->setMinimumHeight(10 + (18 * sharedUrls.size())); ui->lbl_SharedUrls->setMinimumHeight(10 + (18 * sharedUrls.size()));
const QString currentlyUsedSharedUrl = sGui->getWebDataServices()->getDbReaderCurrentSharedDbDataUrl().toQString(); const QString currentlyUsedSharedUrl = sGui->getWorkingSharedUrl().toQString();
ui->lbl_SharedUrls->setToolTip( ui->lbl_SharedUrls->setToolTip(
currentlyUsedSharedUrl.isEmpty() ? "No shared URL" : "currently used: " + currentlyUsedSharedUrl currentlyUsedSharedUrl.isEmpty() ? "No shared URL" : "currently used: " + currentlyUsedSharedUrl
); );
@@ -343,7 +343,7 @@ namespace BlackGui
{ {
direct = true; direct = true;
} }
else if (sGui->getWebDataServices()->canConnectSwiftDb()) else if (sGui->isSwiftDbAccessible())
{ {
// do not trigger if cannot be connected // do not trigger if cannot be connected
sGui->getWebDataServices()->triggerReadOfDbInfoObjects(); sGui->getWebDataServices()->triggerReadOfDbInfoObjects();

2
src/blackgui/components/infobarstatuscomponent.cpp
View File

@@ -52,7 +52,7 @@ namespace BlackGui
{ {
connect(sGui->getIContextSimulator(), &IContextSimulator::simulatorStatusChanged, this, &CInfoBarStatusComponent::onSimulatorStatusChanged); connect(sGui->getIContextSimulator(), &IContextSimulator::simulatorStatusChanged, this, &CInfoBarStatusComponent::onSimulatorStatusChanged);
connect(sGui->getIContextSimulator(), &IContextSimulator::modelSetChanged, this, &CInfoBarStatusComponent::onMapperReady); connect(sGui->getIContextSimulator(), &IContextSimulator::modelSetChanged, this, &CInfoBarStatusComponent::onMapperReady);
connect(sGui, &CGuiApplication::internetAccessibleChanged, this, &CInfoBarStatusComponent::onInternetAccessibleChanged); connect(sGui, &CGuiApplication::changedInternetAccessibility, this, &CInfoBarStatusComponent::onInternetAccessibleChanged);
// initial values // initial values
this->onMapperReady(); this->onMapperReady();