From b1353cefd4e73afa023326cca87962c1d7f3a37e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 13 Mar 2016 18:13:36 +0000 Subject: [PATCH] refs #485, renamed overlay messages functions --- src/blackgui/components/dblogincomponent.cpp | 2 +- src/blackgui/components/dbstashcomponent.cpp | 6 ++-- src/blackgui/overlaymessages.cpp | 18 ++++++------ src/blackgui/overlaymessages.h | 10 +++---- src/blackgui/overlaymessagesframe.cpp | 20 +++++++------- src/blackgui/overlaymessagesframe.h | 29 ++++++++++---------- src/swiftguistandard/swiftguistd.cpp | 2 +- src/swiftlauncher/swiftlauncher.cpp | 2 +- 8 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/blackgui/components/dblogincomponent.cpp b/src/blackgui/components/dblogincomponent.cpp index c669e78aa..8523668e4 100644 --- a/src/blackgui/components/dblogincomponent.cpp +++ b/src/blackgui/components/dblogincomponent.cpp @@ -43,7 +43,7 @@ namespace BlackGui COverlayMessagesFrame *mf = qobject_cast(parentWidget()); Q_ASSERT_X(mf, Q_FUNC_INFO, "No overlay widget"); if (!mf) { return; } - mf->showMessages(msgs); + mf->showOverlayMessages(msgs); } void CDbLoginComponent::ps_onLoginClicked() diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index 090cb5be4..acbfff121 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/src/blackgui/components/dbstashcomponent.cpp @@ -466,7 +466,7 @@ namespace BlackGui if (!msgs.hasErrorMessages() && onlyErrors) { return false; } BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component"); if (!this->getMappingComponent()) { return false; } - this->getMappingComponent()->showMessages(msgs, timeoutMs); + this->getMappingComponent()->showOverlayMessages(msgs, timeoutMs); return true; } @@ -476,7 +476,7 @@ namespace BlackGui if (!msgs.hasErrorMessages() && onlyErrors) { return false; } BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component"); if (!this->getMappingComponent()) { return false; } - this->getMappingComponent()->showMessagesWithConfirmation(msgs, confirmation, okLambda, defaultButton, timeoutMs); + this->getMappingComponent()->showOverlayMessagesWithConfirmation(msgs, confirmation, okLambda, defaultButton, timeoutMs); return true; } @@ -485,7 +485,7 @@ namespace BlackGui if (msg.isEmpty()) { return false; } BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component"); if (!this->getMappingComponent()) { return false; } - this->getMappingComponent()->showMessage(msg, timeoutMs); + this->getMappingComponent()->showOverlayMessage(msg, timeoutMs); return true; } } // ns diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp index a44f51f0f..3586bc841 100644 --- a/src/blackgui/overlaymessages.cpp +++ b/src/blackgui/overlaymessages.cpp @@ -93,7 +93,7 @@ namespace BlackGui COverlayMessages::~COverlayMessages() {} - void COverlayMessages::showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs) + void COverlayMessages::showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs) { if (messages.isEmpty()) { return; } this->setModeToMessages(); @@ -101,7 +101,7 @@ namespace BlackGui 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 (this->useSmall()) @@ -117,7 +117,7 @@ namespace BlackGui this->display(timeOutMs); } - void COverlayMessages::showTextMessage(const CTextMessage &textMessage, int timeOutMs) + void COverlayMessages::showOverlayTextMessage(const CTextMessage &textMessage, int timeOutMs) { if (textMessage.isEmpty()) { return; } this->setModeToTextMessage(); @@ -131,19 +131,19 @@ namespace BlackGui this->display(timeOutMs); } - void COverlayMessages::showVariant(const BlackMisc::CVariant &variant, int timeOutMs) + void COverlayMessages::showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs) { if (variant.canConvert()) { - showMessages(variant.value(), timeOutMs); + showOverlayMessages(variant.value(), timeOutMs); } else if (variant.canConvert()) { - showMessage(variant.value(), timeOutMs); + showOverlayMessage(variant.value(), timeOutMs); } else if (variant.canConvert()) { - showTextMessage(variant.value(), timeOutMs); + showOverlayTextMessage(variant.value(), timeOutMs); } 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 okLambda, int defaultButton, int timeOutMs) + void COverlayMessages::showOverlayMessagesWithConfirmation(const CStatusMessageList &messages, const QString &confirmationMessage, std::function okLambda, int defaultButton, int timeOutMs) { this->setConfirmationMessage(confirmationMessage); - this->showMessages(messages, timeOutMs); + this->showOverlayMessages(messages, timeOutMs); this->m_okLambda = okLambda; this->setDefaultConfirmationButton(defaultButton); } diff --git a/src/blackgui/overlaymessages.h b/src/blackgui/overlaymessages.h index ccb7af89b..23fa78282 100644 --- a/src/blackgui/overlaymessages.h +++ b/src/blackgui/overlaymessages.h @@ -62,7 +62,7 @@ namespace BlackGui void setConfirmationMessage(const QString &message); //! Show multiple messages with confirmation bar - void showMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, + void showOverlayMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, const QString &confirmationMessage, std::function okLambda, int defaultButton = QMessageBox::Cancel, @@ -73,16 +73,16 @@ namespace BlackGui public slots: //! Show multiple messages - void showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1); + void showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1); //! 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 - 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 - void showVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1); + void showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1); //! Close button clicked void close(); diff --git a/src/blackgui/overlaymessagesframe.cpp b/src/blackgui/overlaymessagesframe.cpp index 6d9e4b7fb..26c00765f 100644 --- a/src/blackgui/overlaymessagesframe.cpp +++ b/src/blackgui/overlaymessagesframe.cpp @@ -31,42 +31,42 @@ namespace BlackGui if (!m_overlayMessages) { return; } } - void COverlayMessagesFrame::showMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, const QString &confirmationMessage, std::function okLambda, int defaultButton, int timeOutMs) + void COverlayMessagesFrame::showOverlayMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, const QString &confirmationMessage, std::function okLambda, int defaultButton, int timeOutMs) { if (messages.isEmpty()) { return; } this->initInnerFrame(); - this->m_overlayMessages->showMessagesWithConfirmation(messages, confirmationMessage, okLambda, defaultButton, timeOutMs); + this->m_overlayMessages->showOverlayMessagesWithConfirmation(messages, confirmationMessage, okLambda, defaultButton, timeOutMs); this->repaint(); } - void COverlayMessagesFrame::showMessage(const BlackMisc::CStatusMessage &message, int timeOutMs) + void COverlayMessagesFrame::showOverlayMessage(const BlackMisc::CStatusMessage &message, int timeOutMs) { if (message.isEmpty()) { return; } this->initInnerFrame(); - this->m_overlayMessages->showMessage(message, timeOutMs); + this->m_overlayMessages->showOverlayMessage(message, timeOutMs); this->repaint(); } - void COverlayMessagesFrame::showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs) + void COverlayMessagesFrame::showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs) { if (messages.isEmpty()) { return; } this->initInnerFrame(); - this->m_overlayMessages->showMessages(messages, timeOutMs); + this->m_overlayMessages->showOverlayMessages(messages, timeOutMs); 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; } this->initInnerFrame(); - this->m_overlayMessages->showTextMessage(textMessage, timeOutMs); + this->m_overlayMessages->showOverlayTextMessage(textMessage, timeOutMs); this->repaint(); } - void COverlayMessagesFrame::showVariant(const BlackMisc::CVariant &variant, int timeOutMs) + void COverlayMessagesFrame::showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs) { this->initInnerFrame(); - this->m_overlayMessages->showVariant(variant, timeOutMs); + this->m_overlayMessages->showOverlayVariant(variant, timeOutMs); this->repaint(); } diff --git a/src/blackgui/overlaymessagesframe.h b/src/blackgui/overlaymessagesframe.h index 37f66aa59..8c240323f 100644 --- a/src/blackgui/overlaymessagesframe.h +++ b/src/blackgui/overlaymessagesframe.h @@ -38,25 +38,26 @@ namespace BlackGui //! Hide the inner frame void hideStatusMessagesFrame(); - //! \copydoc COverlayMessages::showMessagesWithConfirmation - void showMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages, - const QString &confirmationMessage, - std::function okLambda, - int defaultButton = QMessageBox::Cancel, - int timeOutMs = -1); + //! \copydoc COverlayMessages::showOverlayMessagesWithConfirmation + void showOverlayMessagesWithConfirmation( + const BlackMisc::CStatusMessageList &messages, + const QString &confirmationMessage, + std::function okLambda, + int defaultButton = QMessageBox::Cancel, + int timeOutMs = -1); public slots: - //! \copydoc COverlayMessages::showMessages - void showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1); + //! \copydoc COverlayMessages::showOverlayMessages + void showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1); - //! \copydoc COverlayMessages::showMessage - void showMessage(const BlackMisc::CStatusMessage &message, int timeOutMs = -1); + //! \copydoc COverlayMessages::showOverlayMessage + void showOverlayMessage(const BlackMisc::CStatusMessage &message, int timeOutMs = -1); - //! \copydoc COverlayMessages::showTextMessage - void showTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs = -1); + //! \copydoc COverlayMessages::showOverlayTextMessage + void showOverlayTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs = -1); - //! \copydoc COverlayMessages::showVariant - void showVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1); + //! \copydoc COverlayMessages::showOverlayVariant + void showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1); protected: //! \copydoc QFrame::paintEvent diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 522c83174..2a4ccf79c 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -210,7 +210,7 @@ void SwiftGuiStd::ps_displayStatusMessageInGui(const CStatusMessage &statusMessa // display overlay for errors, but not for validation if (statusMessage.getSeverity() == CStatusMessage::SeverityError && ! statusMessage.getCategories().contains(CLogCategory::validation())) { - this->ui->fr_CentralFrameInside->showMessage(statusMessage); + this->ui->fr_CentralFrameInside->showOverlayMessage(statusMessage); } } diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index cd9f3fcd6..173bb4883 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -367,7 +367,7 @@ void CSwiftLauncher::ps_dbusServerModeSelected(bool selected) 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)