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

Ref T167, in swift GUI

Browse Source 
* removed isContextNetworkAvailableCheck / isContextAudioAvailableCheck
* replaced those by displayDBusReconnectDialog
* using a counter to ignore some errors before showing re-connect dialog
This commit is contained in:
Klaus Basan
2017-09-28 21:10:40 +02:00
committed by Mathew Sutcliffe
parent ed51d3c5dd
commit 8b1ef20146
3 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/swiftguistandard/swiftguistd.cpp
View File

@@ -36,6 +36,7 @@
#include <QWidget>
#include <Qt>
#include <QtGlobal>
#include <QMessageBox>
class QCloseEvent;
class QEvent;
@@ -214,20 +215,6 @@ void SwiftGuiStd::ps_loginRequested()
}
}
bool SwiftGuiStd::isContextNetworkAvailableCheck()
{
if (m_contextNetworkAvailable) return true;
CLogMessage(this).error("Network context not available, no updates this time");
return false;
}
bool SwiftGuiStd::isContextAudioAvailableCheck()
{
if (m_contextAudioAvailable) return true;
CLogMessage(this).error("Audio context not available");
return false;
}
void SwiftGuiStd::ps_displayStatusMessageInGui(const CStatusMessage &statusMessage)
{
if (!m_init) { return; }
@@ -288,10 +275,8 @@ void SwiftGuiStd::ps_handleTimerBasedUpdates()
void SwiftGuiStd::setContextAvailability()
{
const bool corePreviouslyAvailable = m_coreAvailable;
if (sGui &&
sGui->getIContextApplication() &&
!sGui->isShuttingDown() &&
!sGui->getIContextApplication()->isEmptyObject())
const bool isShuttingDown = !sGui || sGui->isShuttingDown();
if (!isShuttingDown && sGui->getIContextApplication() && !sGui->getIContextApplication()->isEmptyObject())
{
// ping to check if core is still alive
m_coreAvailable = this->isMyIdentifier(sGui->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier()));
@@ -300,7 +285,19 @@ void SwiftGuiStd::setContextAvailability()
{
m_coreAvailable = false;
}
if (isShuttingDown) { return; }
if (m_coreAvailable && m_coreFailures > 0)
{
m_coreFailures--;
}
else if (!m_coreAvailable && m_coreFailures < MaxCoreFailures)
{
m_coreFailures++;
}
else if (!m_coreAvailable && !m_displayingDBusReconnect)
{
this->displayDBusReconnectDialog();
}
m_contextNetworkAvailable = m_coreAvailable && sGui->getIContextNetwork() && !sGui->getIContextNetwork()->isEmptyObject();
m_contextAudioAvailable = m_coreAvailable && sGui->getIContextAudio() && !sGui->getIContextAudio()->isEmptyObject();
@@ -443,3 +440,26 @@ void SwiftGuiStd::displayLog()
{
ui->comp_MainInfoArea->displayLog();
}
void SwiftGuiStd::displayDBusReconnectDialog()
{
if (!sGui || sGui->isShuttingDown()) { return; }
if (!sGui->getCoreFacade()) { return; }
if (m_displayingDBusReconnect) { return; }
m_displayingDBusReconnect = true;
QMessageBox msgBox(this);
msgBox.setIcon(QMessageBox::Critical);
msgBox.setText("swift core not reachable.");
msgBox.setInformativeText("Do you want to try to reconnect? 'Abort' will close the GUI.");
msgBox.setStandardButtons(QMessageBox::Retry | QMessageBox::Abort);
msgBox.setDefaultButton(QMessageBox::Retry);
const int ret = msgBox.exec();
m_displayingDBusReconnect = false;
m_coreFailures = 0;
if (ret == QMessageBox::Abort)
{
this->close();
return;
}
sGui->getCoreFacade()->tryToReconnectWithDBus();
}