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

Overlay messages

Browse Source 
* setReducedInfo, no timestamp/category
* color as parameter for shadow
This commit is contained in:
Klaus Basan
2018-01-16 05:35:26 +01:00
parent fff9585c5d
commit 977130ce52
7 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/components/statusmessageform.cpp
View File

@@ -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

3
src/blackgui/components/statusmessageform.h
View File

@@ -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::CStatusMessageForm> ui;

11
src/blackgui/components/statusmessageformsmall.cpp
View File

@@ -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

4
src/blackgui/components/statusmessageformsmall.h
View File

@@ -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::CStatusMessageFormSmall> ui;
};

9
src/blackgui/overlaymessages.cpp
View File

@@ -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);

7
src/blackgui/overlaymessages.h
View File

@@ -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

12
src/blackgui/overlaymessagesframe.h
View File

@@ -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