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

fixed SwiftGuiStd::setContextAvailability

Browse Source 
(check against isEmptyObject, not isUsingImplementingObject)
This commit is contained in:
Klaus Basan
2017-03-07 22:50:35 +01:00
committed by Mathew Sutcliffe
parent 83383f438c
commit eabb576b67
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/swiftguistandard/swiftguistd.cpp
View File

@@ -163,7 +163,7 @@ QAction *SwiftGuiStd::getWindowMinimizeAction(QObject *parent)
QAction *SwiftGuiStd::getWindowNormalAction(QObject *parent) QAction *SwiftGuiStd::getWindowNormalAction(QObject *parent)
{ {
QIcon i(CIcons::changeIconBackgroundColor(this->style()->standardIcon(QStyle::SP_TitleBarNormalButton), Qt::white, QSize(16, 16))); const QIcon i(CIcons::changeIconBackgroundColor(this->style()->standardIcon(QStyle::SP_TitleBarNormalButton), Qt::white, QSize(16, 16)));
QAction *a = new QAction(i, "Window normal", parent); QAction *a = new QAction(i, "Window normal", parent);
connect(a, &QAction::triggered, this, &SwiftGuiStd::ps_showNormal); connect(a, &QAction::triggered, this, &SwiftGuiStd::ps_showNormal);
return a; return a;
@@ -171,7 +171,7 @@ QAction *SwiftGuiStd::getWindowNormalAction(QObject *parent)
QAction *SwiftGuiStd::getToggleWindowVisibilityAction(QObject *parent) QAction *SwiftGuiStd::getToggleWindowVisibilityAction(QObject *parent)
{ {
QIcon i(CIcons::changeIconBackgroundColor(this->style()->standardIcon(QStyle::SP_TitleBarShadeButton), Qt::white, QSize(16, 16))); const QIcon i(CIcons::changeIconBackgroundColor(this->style()->standardIcon(QStyle::SP_TitleBarShadeButton), Qt::white, QSize(16, 16)));
QAction *a = new QAction(i, "Toogle main window visibility", parent); QAction *a = new QAction(i, "Toogle main window visibility", parent);
connect(a, &QAction::triggered, this, &SwiftGuiStd::ps_toggleWindowVisibility); connect(a, &QAction::triggered, this, &SwiftGuiStd::ps_toggleWindowVisibility);
return a; return a;
@@ -179,7 +179,7 @@ QAction *SwiftGuiStd::getToggleWindowVisibilityAction(QObject *parent)
QAction *SwiftGuiStd::getToggleStayOnTopAction(QObject *parent) QAction *SwiftGuiStd::getToggleStayOnTopAction(QObject *parent)
{ {
QIcon i(CIcons::changeIconBackgroundColor(this->style()->standardIcon(QStyle::SP_TitleBarUnshadeButton), Qt::white, QSize(16, 16))); const QIcon i(CIcons::changeIconBackgroundColor(this->style()->standardIcon(QStyle::SP_TitleBarUnshadeButton), Qt::white, QSize(16, 16)));
QAction *a = new QAction(i, "Toogle main window on top", parent); QAction *a = new QAction(i, "Toogle main window on top", parent);
connect(a, &QAction::triggered, this, &SwiftGuiStd::ps_toogleWindowStayOnTop); connect(a, &QAction::triggered, this, &SwiftGuiStd::ps_toogleWindowStayOnTop);
return a; return a;
@@ -290,9 +290,9 @@ void SwiftGuiStd::setContextAvailability()
{ {
const bool corePreviouslyAvailable = this->m_coreAvailable; const bool corePreviouslyAvailable = this->m_coreAvailable;
if (sGui && if (sGui &&
!sGui->isShuttingDown() &&
sGui->getIContextApplication() && sGui->getIContextApplication() &&
sGui->getIContextApplication()->isUsingImplementingObject()) !sGui->isShuttingDown() &&
!sGui->getIContextApplication()->isEmptyObject())
{ {
// ping to check if core is still alive // ping to check if core is still alive
this->m_coreAvailable = this->isMyIdentifier(sGui->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier())); this->m_coreAvailable = this->isMyIdentifier(sGui->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier()));
@@ -302,8 +302,8 @@ void SwiftGuiStd::setContextAvailability()
this->m_coreAvailable = false; this->m_coreAvailable = false;
} }
this->m_contextNetworkAvailable = this->m_coreAvailable && sGui->getIContextNetwork() && sGui->getIContextNetwork()->isUsingImplementingObject(); this->m_contextNetworkAvailable = this->m_coreAvailable && sGui->getIContextNetwork() && !sGui->getIContextNetwork()->isEmptyObject();
this->m_contextAudioAvailable = this->m_coreAvailable && sGui->getIContextAudio() && sGui->getIContextAudio()->isUsingImplementingObject(); this->m_contextAudioAvailable = this->m_coreAvailable && sGui->getIContextAudio() && !sGui->getIContextAudio()->isEmptyObject();
// react to a change in core's availability // react to a change in core's availability
if (this->m_coreAvailable != corePreviouslyAvailable) if (this->m_coreAvailable != corePreviouslyAvailable)

2
src/swiftguistandard/swiftguistd.h
View File

@@ -182,7 +182,7 @@ private slots:
bool ps_reloadOwnAircraft(); bool ps_reloadOwnAircraft();
//! Display status message //! Display status message
void ps_displayStatusMessageInGui(const BlackMisc::CStatusMessage &); void ps_displayStatusMessageInGui(const BlackMisc::CStatusMessage &statusMessage);
//! Connection status changed //! Connection status changed
//! \param from old status, as int so it is compliant with DBus //! \param from old status, as int so it is compliant with DBus