From 977130ce5288d25ae8f18d62346a54f554a3ba2d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 16 Jan 2018 05:35:26 +0100 Subject: [PATCH] Overlay messages * setReducedInfo, no timestamp/category * color as parameter for shadow --- src/blackgui/components/statusmessageform.cpp | 16 ++++++++-------- src/blackgui/components/statusmessageform.h | 3 +-- .../components/statusmessageformsmall.cpp | 11 +++++++++++ src/blackgui/components/statusmessageformsmall.h | 4 +++- src/blackgui/overlaymessages.cpp | 9 +++++++-- src/blackgui/overlaymessages.h | 7 +++++-- src/blackgui/overlaymessagesframe.h | 12 ++++++++++++ 7 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/blackgui/components/statusmessageform.cpp b/src/blackgui/components/statusmessageform.cpp index d76699f37..ae6718655 100644 --- a/src/blackgui/components/statusmessageform.cpp +++ b/src/blackgui/components/statusmessageform.cpp @@ -69,15 +69,15 @@ namespace BlackGui this->setVisible(!isVisible()); } - void CStatusMessageForm::setReducedInfo(bool minimized) + void CStatusMessageForm::setReducedInfo(bool reduced) { - ui->le_Timestamp->setVisible(!minimized); - ui->lbl_Timestamp->setVisible(!minimized); - ui->le_Categories->setVisible(!minimized); - ui->lbl_Categories->setVisible(!minimized); - ui->le_Severity->setVisible(!minimized); - ui->lbl_SeverityIcon->setVisible(!minimized); - ui->lbl_Severity->setVisible(!minimized); + ui->le_Timestamp->setVisible(!reduced); + ui->lbl_Timestamp->setVisible(!reduced); + ui->le_Categories->setVisible(!reduced); + ui->lbl_Categories->setVisible(!reduced); + ui->le_Severity->setVisible(!reduced); + ui->lbl_SeverityIcon->setVisible(!reduced); + ui->lbl_Severity->setVisible(!reduced); } } // ns } // ns diff --git a/src/blackgui/components/statusmessageform.h b/src/blackgui/components/statusmessageform.h index 17530ac25..aa3136882 100644 --- a/src/blackgui/components/statusmessageform.h +++ b/src/blackgui/components/statusmessageform.h @@ -41,7 +41,6 @@ namespace BlackGui //! Destructor virtual ~CStatusMessageForm(); - public slots: //! Set message void setVariant(const BlackMisc::CVariant &messageVariant); @@ -55,7 +54,7 @@ namespace BlackGui void toggleVisibility(); //! Minimize by hiding status ... - void setReducedInfo(bool minimized); + void setReducedInfo(bool reduced); private: QScopedPointer ui; diff --git a/src/blackgui/components/statusmessageformsmall.cpp b/src/blackgui/components/statusmessageformsmall.cpp index 9c8f86aaa..c42d82996 100644 --- a/src/blackgui/components/statusmessageformsmall.cpp +++ b/src/blackgui/components/statusmessageformsmall.cpp @@ -49,5 +49,16 @@ namespace BlackGui { this->setVisible(!isVisible()); } + + void CStatusMessageFormSmall::setReducedInfo(bool minimized) + { + ui->le_Timestamp->setVisible(!minimized); + ui->lbl_Timestamp->setVisible(!minimized); + ui->le_Categories->setVisible(!minimized); + ui->lbl_Categories->setVisible(!minimized); + ui->le_Severity->setVisible(!minimized); + ui->lbl_SeverityIcon->setVisible(!minimized); + ui->lbl_Severity->setVisible(!minimized); + } } // ns } // ns diff --git a/src/blackgui/components/statusmessageformsmall.h b/src/blackgui/components/statusmessageformsmall.h index 70aa68357..b33123f9e 100644 --- a/src/blackgui/components/statusmessageformsmall.h +++ b/src/blackgui/components/statusmessageformsmall.h @@ -41,7 +41,6 @@ namespace BlackGui //! Destructor virtual ~CStatusMessageFormSmall(); - public slots: //! Set message void setVariant(const BlackMisc::CVariant &messageVariant); @@ -51,6 +50,9 @@ namespace BlackGui //! Toggle visibility void toggleVisibility(); + //! Minimize by hiding status ... + void setReducedInfo(bool minimized); + private: QScopedPointer ui; }; diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp index 01c6a3d0a..ddc8cb25d 100644 --- a/src/blackgui/overlaymessages.cpp +++ b/src/blackgui/overlaymessages.cpp @@ -405,10 +405,15 @@ namespace BlackGui return m_awaitingConfirmation; } - void COverlayMessages::addShadow() + void COverlayMessages::setReducedInfo(bool reduced) + { + ui->form_StatusMessage->setReducedInfo(reduced); + ui->form_StatusMessageSmall->setReducedInfo(reduced); + } + + void COverlayMessages::addShadow(QColor color) { QGraphicsDropShadowEffect *shadow = new QGraphicsDropShadowEffect(this); - QColor color(Qt::blue); color.setAlpha(96); shadow->setColor(color); this->setGraphicsEffect(shadow); diff --git a/src/blackgui/overlaymessages.h b/src/blackgui/overlaymessages.h index b1784896b..f278e8346 100644 --- a/src/blackgui/overlaymessages.h +++ b/src/blackgui/overlaymessages.h @@ -68,7 +68,7 @@ namespace BlackGui //! Display image void setModeToImage(); - //! Force small + //! Force small (smaller layout) void setForceSmall(bool force) { m_forceSmall = force; } //! Set header text @@ -119,8 +119,11 @@ namespace BlackGui //! Is awaiting a conformation bool hasPendingConfirmation() const; + //! Display reduced information + void setReducedInfo(bool reduced); + //! Add a shadow - void addShadow(); + void addShadow(QColor color = Qt::gray); signals: //! Confirmation completed diff --git a/src/blackgui/overlaymessagesframe.h b/src/blackgui/overlaymessagesframe.h index 5cde6fd90..a32a84c6c 100644 --- a/src/blackgui/overlaymessagesframe.h +++ b/src/blackgui/overlaymessagesframe.h @@ -81,6 +81,16 @@ namespace BlackGui } } + //! \copydoc BlackGui::COverlayMessages::setReducedInfo + void setReducedInfo(bool reduced) + { + m_reducedInfo = reduced; + if (m_overlayMessages) + { + m_overlayMessages->setReducedInfo(reduced); + } + } + //! \copydoc BlackGui::COverlayMessages::showOverlayMessagesWithConfirmation void showOverlayMessagesWithConfirmation( const BlackMisc::CStatusMessageList &messages, @@ -175,6 +185,7 @@ namespace BlackGui // m_overlayMessages->addShadow(); m_overlayMessages->showKillButton(m_showKillButton); m_overlayMessages->setForceSmall(m_forceSmallMsgs); + m_overlayMessages->setReducedInfo(m_reducedInfo); } Q_ASSERT(m_overlayMessages); @@ -228,6 +239,7 @@ namespace BlackGui bool m_showKillButton = false; //!< show kill button bool m_forceSmallMsgs = false; //!< force small messages + bool m_reducedInfo = false; //!< reduced info (no timestamp ..) double m_widthFactor = 0.7; //!< inner frame x factor double m_heightFactor = 0.6; //!< inner frame x factor double m_middleFactor = 2; //!< 2 means middle, 1 means on top