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

Ref T515, mapping component improvements

Browse Source 
* allow to re-display validation dialog
* highlight disabled models
This commit is contained in:
Klaus Basan
2019-01-23 17:10:00 +01:00
committed by Mat Sutcliffe
parent 6644927943
commit 583a5bfb28
7 changed files with 147 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/swiftguistandard/swiftguistd.cpp
View File

@@ -310,7 +310,7 @@ void SwiftGuiStd::setContextAvailability()
this->displayDBusReconnectDialog();
}
m_contextNetworkAvailable = m_coreAvailable && sGui->getIContextNetwork() && !sGui->getIContextNetwork()->isEmptyObject();
m_contextAudioAvailable = m_coreAvailable && sGui->getIContextAudio() && !sGui->getIContextAudio()->isEmptyObject();
m_contextAudioAvailable = m_coreAvailable && sGui->getIContextAudio() && !sGui->getIContextAudio()->isEmptyObject();
// react to a change in core's availability
if (m_coreAvailable != corePreviouslyAvailable)
@@ -437,15 +437,23 @@ void SwiftGuiStd::verifyPrerequisites()
}
void SwiftGuiStd::onValidatedModelSet(const CSimulatorInfo &simulator, const CAircraftModelList &valid, const CAircraftModelList &invalid, bool stopped, const CStatusMessageList &msgs)
{
this->displayValidationDialog();
m_validationDialog->validatedModelSet(simulator, valid, invalid, stopped, msgs);
// modal version
// const int r = m_validationDialog->exec();
// Q_UNUSED(r);
}
void SwiftGuiStd::displayValidationDialog()
{
if (!sGui || sGui->isShuttingDown()) { return; }
if (!m_validationDialog)
{
m_validationDialog.reset(new CAircraftModelSetValidationDialog(this));
}
m_validationDialog->validatedModelSet(simulator, valid, invalid, stopped, msgs);
const int r = m_validationDialog->exec();
Q_UNUSED(r);
m_validationDialog->show();
}
void SwiftGuiStd::checkDbDataLoaded()