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

21
src/blackgui/overlaymessagesframe.h
View File

@@ -12,6 +12,7 @@
#ifndef BLACKGUI_OVERLAYMESSAGES_FRAME_H
#define BLACKGUI_OVERLAYMESSAGES_FRAME_H
#include "blackgui/blackguiexport.h"
#include "blackgui/overlaymessages.h"
#include <QFrame>
@@ -20,7 +21,7 @@ namespace BlackGui
/*!
* Display status messages (nested in another widget)
*/
class COverlayMessagesFrame : public QFrame
class BLACKGUI_EXPORT COverlayMessagesFrame : public QFrame
{
Q_OBJECT
@@ -37,11 +38,18 @@ namespace BlackGui
//! Hide the inner frame
void hideStatusMessagesFrame();
//! Show multiple messages
void showMessages(const BlackMisc::CStatusMessageList &messages);
public slots:
//! \copydoc COverlayMessages::showMessages
void showMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1);
//! Show single message
void showMessage(const BlackMisc::CStatusMessage &message);
//! \copydoc COverlayMessages::showMessage
void showMessage(const BlackMisc::CStatusMessage &message, int timeOutMs = -1);
//! \copydoc COverlayMessages::showTextMessage
void showTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs = -1);
//! \copydoc COverlayMessages::showVariant
void showVariant(const BlackMisc::CVariant &variant, int timeOutMs = -1);
protected:
//! \copydoc QFrame::paintEvent
@@ -50,7 +58,7 @@ namespace BlackGui
//! \copydoc QFrame::keyPressEvent
virtual void keyPressEvent(QKeyEvent *event) override;
COverlayMessages *m_statusMessages = nullptr; //!< embedded QFrame with Status messages
COverlayMessages *m_overlayMessages = nullptr; //!< embedded QFrame with Status messages
private:
//! Calculate inner frame size
@@ -59,7 +67,6 @@ namespace BlackGui
//! Init the inner frame (if not yet initialized)
void initInnerFrame();
};
} // ns
#endif // guard