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

refs #471, removed old info window and migrated to overlay widget

Browse Source 
* added small message display (more suitable for swift GUI)
* fixed nullptr bug with ESC key
* adjusted swift GUI
This commit is contained in:
Klaus Basan
2015-11-02 19:31:32 +01:00
committed by Mathew Sutcliffe
parent 012543ef02
commit 8e57914e67
15 changed files with 365 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/blackgui/overlaymessagesframe.cpp
View File

@@ -28,22 +28,37 @@ namespace BlackGui
void COverlayMessagesFrame::hideStatusMessagesFrame()
{
if (!m_statusMessages) { return; }
if (!m_overlayMessages) { return; }
}
void COverlayMessagesFrame::showMessages(const BlackMisc::CStatusMessageList &messages)
{
if (messages.isEmpty()) { return; }
this->initInnerFrame();
this->m_statusMessages->showMessages(messages);
this->repaint();
}
void COverlayMessagesFrame::showMessage(const BlackMisc::CStatusMessage &message)
void COverlayMessagesFrame::showMessage(const BlackMisc::CStatusMessage &message, int timeOutMs)
{
if (message.isEmpty()) { return; }
this->initInnerFrame();
this->m_statusMessages->showMessage(message);
this->m_overlayMessages->showMessage(message, timeOutMs);
this->repaint();
}
void COverlayMessagesFrame::showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs)
{
if (messages.isEmpty()) { return; }
this->initInnerFrame();
this->m_overlayMessages->showMessages(messages, timeOutMs);
this->repaint();
}
void COverlayMessagesFrame::showTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs)
{
if (textMessage.isEmpty()) { return; }
this->initInnerFrame();
this->m_overlayMessages->showTextMessage(textMessage, timeOutMs);
this->repaint();
}
void COverlayMessagesFrame::showVariant(const BlackMisc::CVariant &variant, int timeOutMs)
{
this->initInnerFrame();
this->m_overlayMessages->showVariant(variant, timeOutMs);
this->repaint();
}
@@ -56,10 +71,9 @@ namespace BlackGui
void COverlayMessagesFrame::keyPressEvent(QKeyEvent *event)
{
if (!m_statusMessages) { QFrame::keyPressEvent(event); }
if (event->key() == Qt::Key_Escape)
if (m_overlayMessages && event->key() == Qt::Key_Escape)
{
m_statusMessages->close();
m_overlayMessages->close();
event->setAccepted(true);
}
else
@@ -80,9 +94,9 @@ namespace BlackGui
void COverlayMessagesFrame::initInnerFrame()
{
QSize inner(innerFrameSize());
if (!this->m_statusMessages)
if (!this->m_overlayMessages)
{
this->m_statusMessages = new COverlayMessages(inner.width(), inner.height(), this);
this->m_overlayMessages = new COverlayMessages(inner.width(), inner.height(), this);
}
QPoint middle = this->geometry().center();
@@ -90,6 +104,6 @@ namespace BlackGui
int h = inner.height();
int x = middle.x() - w / 2;
int y = middle.y() - h / 2;
this->m_statusMessages->setGeometry(x, y, w, h);
this->m_overlayMessages->setGeometry(x, y, w, h);
}
} // ns