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

Ref T703, overlay message utility functions

Browse Source
This commit is contained in:
Klaus Basan
2019-08-16 19:44:16 +02:00
committed by Mat Sutcliffe
parent 55d0eb97d0
commit bfcf553e3f
4 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ namespace BlackGui
} }
else else
{ {
this->showOverlayHTMLMessageOrMessages(msgs); this->showOverlayMessagesOrHTMLMessage(msgs);
} }
} }

28
src/blackgui/overlaymessages.cpp
View File

@@ -185,6 +185,34 @@ namespace BlackGui
this->display(timeOutMs); this->display(timeOutMs);
} }
void COverlayMessages::showOverlayMessagesOrSingleMessage(const CStatusMessageList &messages, bool appendOldMessages, int timeOutMs)
{
if (messages.isEmpty()) { return; }
if (!sGui || sGui->isShuttingDown()) { return; }
if (messages.size() > 1)
{
this->showOverlayMessages(messages, appendOldMessages, timeOutMs);
}
else
{
this->showOverlayMessage(messages.front(), timeOutMs);
}
}
void COverlayMessages::showOverlayMessagesOrHTMLMessage(const CStatusMessageList &messages, bool appendOldMessages, int timeOutMs)
{
if (messages.isEmpty()) { return; }
if (!sGui || sGui->isShuttingDown()) { return; }
if (messages.size() > 1)
{
this->showOverlayMessages(messages, appendOldMessages, timeOutMs);
}
else
{
this->showHTMLMessage(messages.front(), timeOutMs);
}
}
void COverlayMessages::sortOverlayMessages(const CPropertyIndex &propertyIndex, Qt::SortOrder order) void COverlayMessages::sortOverlayMessages(const CPropertyIndex &propertyIndex, Qt::SortOrder order)
{ {
ui->tvp_StatusMessages->sortByPropertyIndex(propertyIndex, order); ui->tvp_StatusMessages->sortByPropertyIndex(propertyIndex, order);

6
src/blackgui/overlaymessages.h
View File

@@ -104,6 +104,12 @@ namespace BlackGui
//! Show multiple messages //! Show multiple messages
void showOverlayMessages(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1); void showOverlayMessages(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1);
//! Show multiple messages or a single message
void showOverlayMessagesOrSingleMessage(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1);
//! Show multiple messages or a single message (HTML)
void showOverlayMessagesOrHTMLMessage(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1);
//! Sort of overlay messages //! Sort of overlay messages
void sortOverlayMessages(const BlackMisc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder); void sortOverlayMessages(const BlackMisc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder);

25
src/blackgui/overlaymessagesframe.h
View File

@@ -156,18 +156,23 @@ namespace BlackGui
WIDGET::repaint(); WIDGET::repaint();
} }
//! \copydoc BlackGui::COverlayMessages::showOverlayMessages //! \copydoc BlackGui::COverlayMessages::showOverlayMessagesOrSingleMessage
void showOverlayHTMLMessageOrMessages(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1) void showOverlayMessagesOrSingleMessage(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1)
{ {
if (messages.isEmpty()) { return; } if (messages.isEmpty()) { return; }
if (messages.size() == 1) this->initInnerFrame();
{ m_overlayMessages->showOverlayMessagesOrSingleMessage(messages, appendOldMessages, timeOutMs);
this->showOverlayHTMLMessage(messages.front(), timeOutMs); WIDGET::repaint();
} }
else
{
this->showOverlayMessages(messages, appendOldMessages, timeOutMs); //! \copydoc BlackGui::COverlayMessages::showOverlayMessagesOrHTMLMessage
} void showOverlayMessagesOrHTMLMessage(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1)
{
if (messages.isEmpty()) { return; }
this->initInnerFrame();
m_overlayMessages->showOverlayMessagesOrHTMLMessage(messages, appendOldMessages, timeOutMs);
WIDGET::repaint();
} }
//! \copydoc BlackGui::COverlayMessages::sortOverlayMessages //! \copydoc BlackGui::COverlayMessages::sortOverlayMessages