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

Ref T40, allow to pass timeout

Browse Source
This commit is contained in:
Klaus Basan
2017-04-24 04:56:13 +02:00
committed by Mathew Sutcliffe
parent 523f650a34
commit b39f9a33a2
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/guiapplication.cpp
View File

@@ -301,12 +301,12 @@ namespace BlackGui
return m->displayInStatusBar(message); return m->displayInStatusBar(message);
} }
bool CGuiApplication::displayInOverlayWindow(const CStatusMessage &message) bool CGuiApplication::displayInOverlayWindow(const CStatusMessage &message, int timeOutMs)
{ {
IMainWindowAccess *m = mainWindowAccess(); IMainWindowAccess *m = mainWindowAccess();
BLACK_VERIFY_X(m, Q_FUNC_INFO, "No access interface"); BLACK_VERIFY_X(m, Q_FUNC_INFO, "No access interface");
if (!m) { return false; } if (!m) { return false; }
return m->displayInOverlayWindow(message); return m->displayInOverlayWindow(message, timeOutMs);
} }
bool CGuiApplication::displayTextInConsole(const QString &text) bool CGuiApplication::displayTextInConsole(const QString &text)

2
src/blackgui/guiapplication.h
View File

@@ -111,7 +111,7 @@ namespace BlackGui
//! \name direct access to main application window //! \name direct access to main application window
//! @{ //! @{
virtual bool displayInStatusBar(const BlackMisc::CStatusMessage &message) override; virtual bool displayInStatusBar(const BlackMisc::CStatusMessage &message) override;
virtual bool displayInOverlayWindow(const BlackMisc::CStatusMessage &message) override; virtual bool displayInOverlayWindow(const BlackMisc::CStatusMessage &message, int timeOutMs = -1) override;
virtual bool displayTextInConsole(const QString &text) override; virtual bool displayTextInConsole(const QString &text) override;
//! @} //! @}

4
src/blackgui/mainwindowaccess.cpp
View File

@@ -36,11 +36,11 @@ namespace BlackGui
return true; return true;
} }
bool IMainWindowAccess::displayInOverlayWindow(const BlackMisc::CStatusMessage &message) bool IMainWindowAccess::displayInOverlayWindow(const BlackMisc::CStatusMessage &message, int timeOutMs)
{ {
if (message.isEmpty()) { return false; } if (message.isEmpty()) { return false; }
if (!this->m_mwaOverlayFrame) { return false; } if (!this->m_mwaOverlayFrame) { return false; }
this->m_mwaOverlayFrame->showOverlayMessage(message); this->m_mwaOverlayFrame->showOverlayMessage(message, timeOutMs);
return true; return true;
} }

2
src/blackgui/mainwindowaccess.h
View File

@@ -38,7 +38,7 @@ namespace BlackGui
virtual bool displayInStatusBar(const BlackMisc::CStatusMessage &message); virtual bool displayInStatusBar(const BlackMisc::CStatusMessage &message);
//! Display in overlay window //! Display in overlay window
virtual bool displayInOverlayWindow(const BlackMisc::CStatusMessage &message); virtual bool displayInOverlayWindow(const BlackMisc::CStatusMessage &message, int timeOutMs = -1);
protected: protected:
Components::CLogComponent *m_mwaLogComponent = nullptr; //!< the log component if any Components::CLogComponent *m_mwaLogComponent = nullptr; //!< the log component if any