refs #841, use settings to decide which text message is displayed

This commit is contained in:
Klaus Basan
2016-12-23 01:06:08 +01:00
committed by Mathew Sutcliffe
parent 062f0671ea
commit a7469d2959
2 changed files with 22 additions and 0 deletions

View File

@@ -13,6 +13,7 @@
#define BLACKGUI_OVERLAYMESSAGES_H
#include "blackgui/blackguiexport.h"
#include "blackgui/settings/textmessagesettings.h"
#include "blackmisc/pixmap.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/statusmessagelist.h"
@@ -130,6 +131,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::COverlayMessages> ui;
BlackMisc::CSettingReadOnly<BlackGui::Settings::TextMessageSettings> m_messageSettings { this };
QString m_header;
int m_lastConfirmation = QMessageBox::Cancel;
bool m_awaitingConfirmation = false;
@@ -145,6 +147,9 @@ namespace BlackGui
//! Small
bool useSmall() const;
//! Display this message (use settings to decide)
bool displayTextMessage(const BlackMisc::Network::CTextMessage &textMessage) const;
};
} // ns