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

refs #832, overlay messages may be overridden with pending confirmation dialogs

Browse Source 
found during #832
This commit is contained in:
Klaus Basan
2016-12-13 18:37:48 +01:00
parent e0b38fb296
commit 4e5413ff3f
4 changed files with 92 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackgui/overlaymessages.h
View File

@@ -50,7 +50,7 @@ namespace BlackGui
explicit COverlayMessages(const QString &headerText, int w, int h, QWidget *parent);
//! Destructor
~COverlayMessages();
virtual ~COverlayMessages();
//! Messages mode
void setModeToMessages();
@@ -75,15 +75,11 @@ namespace BlackGui
//! Show multiple messages with confirmation bar
void showOverlayMessagesWithConfirmation(const BlackMisc::CStatusMessageList &messages,
const QString &confirmationMessage,
std::function<void()> okLambda,
int defaultButton = QMessageBox::Cancel,
int timeOutMs = -1);
const QString &confirmationMessage,
std::function<void()> okLambda,
int defaultButton = QMessageBox::Cancel,
int timeOutMs = -1);
//! Set the default confirmation button
void setDefaultConfirmationButton(int button = QMessageBox::Cancel);
public slots:
//! Show multiple messages
void showOverlayMessages(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1);
@@ -105,6 +101,16 @@ namespace BlackGui
//! Close button clicked
void close();
//! Set the default confirmation button
void setDefaultConfirmationButton(int button = QMessageBox::Cancel);
//! Is awaiting a conformation
bool hasPendingConfirmation() const;
signals:
//! Confirmation completed
void confirmationCompleted();
protected:
//! Show message
void display(int timeOutMs = -1);
@@ -126,8 +132,10 @@ namespace BlackGui
QScopedPointer<Ui::COverlayMessages> ui;
QString m_header;
int m_lastConfirmation = QMessageBox::Cancel;
bool m_awaitingConfirmation = false;
std::function<void()> m_okLambda;
QTimer m_autoCloseTimer { this };
QList<std::function<void()>> m_pendingMessageCalls;
//! Init widget
void init(int w, int h);