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

refs #485, renamed overlay messages functions

Browse Source
This commit is contained in:
Klaus Basan
2016-03-13 18:13:36 +00:00
committed by Mathew Sutcliffe
parent c411f07551
commit b1353cefd4
8 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ namespace BlackGui
COverlayMessagesFrame *mf = qobject_cast<COverlayMessagesFrame *>(parentWidget()); COverlayMessagesFrame *mf = qobject_cast<COverlayMessagesFrame *>(parentWidget());
Q_ASSERT_X(mf, Q_FUNC_INFO, "No overlay widget"); Q_ASSERT_X(mf, Q_FUNC_INFO, "No overlay widget");
if (!mf) { return; } if (!mf) { return; }
mf->showMessages(msgs); mf->showOverlayMessages(msgs);
} }
void CDbLoginComponent::ps_onLoginClicked() void CDbLoginComponent::ps_onLoginClicked()

6
src/blackgui/components/dbstashcomponent.cpp
View File

@@ -466,7 +466,7 @@ namespace BlackGui
if (!msgs.hasErrorMessages() && onlyErrors) { return false; } if (!msgs.hasErrorMessages() && onlyErrors) { return false; }
BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component"); BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component");
if (!this->getMappingComponent()) { return false; } if (!this->getMappingComponent()) { return false; }
this->getMappingComponent()->showMessages(msgs, timeoutMs); this->getMappingComponent()->showOverlayMessages(msgs, timeoutMs);
return true; return true;
} }
@@ -476,7 +476,7 @@ namespace BlackGui
if (!msgs.hasErrorMessages() && onlyErrors) { return false; } if (!msgs.hasErrorMessages() && onlyErrors) { return false; }
BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component"); BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component");
if (!this->getMappingComponent()) { return false; } if (!this->getMappingComponent()) { return false; }
this->getMappingComponent()->showMessagesWithConfirmation(msgs, confirmation, okLambda, defaultButton, timeoutMs); this->getMappingComponent()->showOverlayMessagesWithConfirmation(msgs, confirmation, okLambda, defaultButton, timeoutMs);
return true; return true;
} }
@@ -485,7 +485,7 @@ namespace BlackGui
if (msg.isEmpty()) { return false; } if (msg.isEmpty()) { return false; }
BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component"); BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component");
if (!this->getMappingComponent()) { return false; } if (!this->getMappingComponent()) { return false; }
this->getMappingComponent()->showMessage(msg, timeoutMs); this->getMappingComponent()->showOverlayMessage(msg, timeoutMs);
return true; return true;
} }
} // ns } // ns

18
src/blackgui/overlaymessages.cpp
View File

@@ -93,7 +93,7 @@ namespace BlackGui
COverlayMessages::~COverlayMessages() COverlayMessages::~COverlayMessages()
{} {}
void COverlayMessages::showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs) void COverlayMessages::showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs)
{ {
if (messages.isEmpty()) { return; } if (messages.isEmpty()) { return; }
this->setModeToMessages(); this->setModeToMessages();
@@ -101,7 +101,7 @@ namespace BlackGui
this->display(timeOutMs); this->display(timeOutMs);
} }
void COverlayMessages::showMessage(const BlackMisc::CStatusMessage &message, int timeOutMs) void COverlayMessages::showOverlayMessage(const BlackMisc::CStatusMessage &message, int timeOutMs)
{ {
if (message.isEmpty()) { return; } if (message.isEmpty()) { return; }
if (this->useSmall()) if (this->useSmall())
@@ -117,7 +117,7 @@ namespace BlackGui
this->display(timeOutMs); this->display(timeOutMs);
} }
void COverlayMessages::showTextMessage(const CTextMessage &textMessage, int timeOutMs) void COverlayMessages::showOverlayTextMessage(const CTextMessage &textMessage, int timeOutMs)
{ {
if (textMessage.isEmpty()) { return; } if (textMessage.isEmpty()) { return; }
this->setModeToTextMessage(); this->setModeToTextMessage();
@@ -131,19 +131,19 @@ namespace BlackGui
this->display(timeOutMs); this->display(timeOutMs);
} }
void COverlayMessages::showVariant(const BlackMisc::CVariant &variant, int timeOutMs) void COverlayMessages::showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs)
{ {
if (variant.canConvert<CStatusMessageList>()) if (variant.canConvert<CStatusMessageList>())
{ {
showMessages(variant.value<CStatusMessageList>(), timeOutMs); showOverlayMessages(variant.value<CStatusMessageList>(), timeOutMs);
} }
else if (variant.canConvert<CStatusMessage>()) else if (variant.canConvert<CStatusMessage>())
{ {
showMessage(variant.value<CStatusMessage>(), timeOutMs); showOverlayMessage(variant.value<CStatusMessage>(), timeOutMs);
} }
else if (variant.canConvert<CTextMessage>()) else if (variant.canConvert<CTextMessage>())
{ {
showTextMessage(variant.value<CTextMessage>(), timeOutMs); showOverlayTextMessage(variant.value<CTextMessage>(), timeOutMs);
} }
Q_ASSERT_X(false, Q_FUNC_INFO, "Unsupported type"); Q_ASSERT_X(false, Q_FUNC_INFO, "Unsupported type");
} }
@@ -185,10 +185,10 @@ namespace BlackGui
} }
} }
void COverlayMessages::showMessagesWithConfirmation(const CStatusMessageList &messages, const QString &confirmationMessage, std::function<void ()> okLambda, int defaultButton, int timeOutMs) void COverlayMessages::showOverlayMessagesWithConfirmation(const CStatusMessageList &messages, const QString &confirmationMessage, std::function<void ()> okLambda, int defaultButton, int timeOutMs)
{ {
this->setConfirmationMessage(confirmationMessage); this->setConfirmationMessage(confirmationMessage);
this->showMessages(messages, timeOutMs); this->showOverlayMessages(messages, timeOutMs);
this->m_okLambda = okLambda; this->m_okLambda = okLambda;
this->setDefaultConfirmationButton(defaultButton); this->setDefaultConfirmationButton(defaultButton);
} }

10
src/blackgui/overlaymessages.h
View File

@@ -62,7 +62,7 @@ namespace BlackGui
void setConfirmationMessage(const QString &message); void setConfirmationMessage(const QString &message);
//! Show multiple messages with confirmation bar //! Show multiple messages with confirmation bar
void showMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, void showOverlayMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages,
const QString &confirmationMessage, const QString &confirmationMessage,
std::function<void()> okLambda, std::function<void()> okLambda,
int defaultButton = QMessageBox::Cancel, int defaultButton = QMessageBox::Cancel,
@@ -73,16 +73,16 @@ namespace BlackGui
public slots: public slots:
//! Show multiple messages //! Show multiple messages
void showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1); void showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1);
//! Show single message //! Show single message
void showMessage(const BlackMisc::CStatusMessage &message, int timeOutMs = -1); void showOverlayMessage(const BlackMisc::CStatusMessage &message, int timeOutMs = -1);
//! Info message, based on text message //! Info message, based on text message
void showTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs = -1); void showOverlayTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs = -1);
//! Display one of the supported types //! Display one of the supported types
void showVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1); void showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1);
//! Close button clicked //! Close button clicked
void close(); void close();

20
src/blackgui/overlaymessagesframe.cpp
View File

@@ -31,42 +31,42 @@ namespace BlackGui
if (!m_overlayMessages) { return; } if (!m_overlayMessages) { return; }
} }
void COverlayMessagesFrame::showMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, const QString &confirmationMessage, std::function<void ()> okLambda, int defaultButton, int timeOutMs) void COverlayMessagesFrame::showOverlayMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, const QString &confirmationMessage, std::function<void ()> okLambda, int defaultButton, int timeOutMs)
{ {
if (messages.isEmpty()) { return; } if (messages.isEmpty()) { return; }
this->initInnerFrame(); this->initInnerFrame();
this->m_overlayMessages->showMessagesWithConfirmation(messages, confirmationMessage, okLambda, defaultButton, timeOutMs); this->m_overlayMessages->showOverlayMessagesWithConfirmation(messages, confirmationMessage, okLambda, defaultButton, timeOutMs);
this->repaint(); this->repaint();
} }
void COverlayMessagesFrame::showMessage(const BlackMisc::CStatusMessage &message, int timeOutMs) void COverlayMessagesFrame::showOverlayMessage(const BlackMisc::CStatusMessage &message, int timeOutMs)
{ {
if (message.isEmpty()) { return; } if (message.isEmpty()) { return; }
this->initInnerFrame(); this->initInnerFrame();
this->m_overlayMessages->showMessage(message, timeOutMs); this->m_overlayMessages->showOverlayMessage(message, timeOutMs);
this->repaint(); this->repaint();
} }
void COverlayMessagesFrame::showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs) void COverlayMessagesFrame::showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs)
{ {
if (messages.isEmpty()) { return; } if (messages.isEmpty()) { return; }
this->initInnerFrame(); this->initInnerFrame();
this->m_overlayMessages->showMessages(messages, timeOutMs); this->m_overlayMessages->showOverlayMessages(messages, timeOutMs);
this->repaint(); this->repaint();
} }
void COverlayMessagesFrame::showTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs) void COverlayMessagesFrame::showOverlayTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs)
{ {
if (textMessage.isEmpty()) { return; } if (textMessage.isEmpty()) { return; }
this->initInnerFrame(); this->initInnerFrame();
this->m_overlayMessages->showTextMessage(textMessage, timeOutMs); this->m_overlayMessages->showOverlayTextMessage(textMessage, timeOutMs);
this->repaint(); this->repaint();
} }
void COverlayMessagesFrame::showVariant(const BlackMisc::CVariant &variant, int timeOutMs) void COverlayMessagesFrame::showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs)
{ {
this->initInnerFrame(); this->initInnerFrame();
this->m_overlayMessages->showVariant(variant, timeOutMs); this->m_overlayMessages->showOverlayVariant(variant, timeOutMs);
this->repaint(); this->repaint();
} }

29
src/blackgui/overlaymessagesframe.h
View File

@@ -38,25 +38,26 @@ namespace BlackGui
//! Hide the inner frame //! Hide the inner frame
void hideStatusMessagesFrame(); void hideStatusMessagesFrame();
//! \copydoc COverlayMessages::showMessagesWithConfirmation //! \copydoc COverlayMessages::showOverlayMessagesWithConfirmation
void showMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, void showOverlayMessagesWithConfirmation(
const QString &confirmationMessage, const BlackMisc::CStatusMessageList &messages,
std::function<void()> okLambda, const QString &confirmationMessage,
int defaultButton = QMessageBox::Cancel, std::function<void()> okLambda,
int timeOutMs = -1); int defaultButton = QMessageBox::Cancel,
int timeOutMs = -1);
public slots: public slots:
//! \copydoc COverlayMessages::showMessages //! \copydoc COverlayMessages::showOverlayMessages
void showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1); void showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1);
//! \copydoc COverlayMessages::showMessage //! \copydoc COverlayMessages::showOverlayMessage
void showMessage(const BlackMisc::CStatusMessage &message, int timeOutMs = -1); void showOverlayMessage(const BlackMisc::CStatusMessage &message, int timeOutMs = -1);
//! \copydoc COverlayMessages::showTextMessage //! \copydoc COverlayMessages::showOverlayTextMessage
void showTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs = -1); void showOverlayTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs = -1);
//! \copydoc COverlayMessages::showVariant //! \copydoc COverlayMessages::showOverlayVariant
void showVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1); void showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1);
protected: protected:
//! \copydoc QFrame::paintEvent //! \copydoc QFrame::paintEvent

2
src/swiftguistandard/swiftguistd.cpp
View File

@@ -210,7 +210,7 @@ void SwiftGuiStd::ps_displayStatusMessageInGui(const CStatusMessage &statusMessa
// display overlay for errors, but not for validation // display overlay for errors, but not for validation
if (statusMessage.getSeverity() == CStatusMessage::SeverityError && ! statusMessage.getCategories().contains(CLogCategory::validation())) if (statusMessage.getSeverity() == CStatusMessage::SeverityError && ! statusMessage.getCategories().contains(CLogCategory::validation()))
{ {
this->ui->fr_CentralFrameInside->showMessage(statusMessage); this->ui->fr_CentralFrameInside->showOverlayMessage(statusMessage);
} }
} }

2
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -367,7 +367,7 @@ void CSwiftLauncher::ps_dbusServerModeSelected(bool selected)
void CSwiftLauncher::ps_showStatusMessage(const CStatusMessage &msg) void CSwiftLauncher::ps_showStatusMessage(const CStatusMessage &msg)
{ {
this->ui->fr_SwiftLauncherMain->showMessage(msg, 5000); this->ui->fr_SwiftLauncherMain->showOverlayMessage(msg, 5000);
} }
void CSwiftLauncher::ps_appendLogMessage(const CStatusMessage &message) void CSwiftLauncher::ps_appendLogMessage(const CStatusMessage &message)