mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-07 02:35:33 +08:00
Ref T775, special handling for "broadcast" messages
* identify broadcast messages * do NOT play sound * use "own" tab for text messages (group together)
This commit is contained in:
committed by
Mat Sutcliffe
parent
4de544a991
commit
00ed15f111
@@ -62,6 +62,10 @@ namespace BlackMisc
|
||||
|
||||
bool CTextMessage::isSupervisorMessage() const
|
||||
{
|
||||
// ignore broadcast messages
|
||||
if (this->isBroadcastMessage()) { return false; }
|
||||
|
||||
// normal SUP message
|
||||
return m_senderCallsign.isSupervisorCallsign();
|
||||
}
|
||||
|
||||
@@ -79,6 +83,11 @@ namespace BlackMisc
|
||||
return m_relayedMessage || this->getMessage().startsWith(CTextMessage::swiftRelayMessage());
|
||||
}
|
||||
|
||||
void CTextMessage::markAsBroadcastMessage()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void CTextMessage::makeRelayedMessage(const CCallsign &partnerCallsign)
|
||||
{
|
||||
if (this->getMessage().startsWith(CTextMessage::swiftRelayMessage())) { return; }
|
||||
@@ -193,6 +202,12 @@ namespace BlackMisc
|
||||
return (cs.asString().startsWith("SERVER", Qt::CaseInsensitive));
|
||||
}
|
||||
|
||||
bool CTextMessage::isBroadcastMessage() const
|
||||
{
|
||||
const CCallsign cs = this->getRecipientCallsign();
|
||||
return cs.isBroadcastCallsign();
|
||||
}
|
||||
|
||||
QString CTextMessage::asString(bool withSender, bool withRecipient, const QString &separator) const
|
||||
{
|
||||
QString s(this->getFormattedUtcTimestampHms());
|
||||
|
||||
@@ -114,6 +114,9 @@ namespace BlackMisc
|
||||
//! Initial message of server?
|
||||
bool isServerMessage() const;
|
||||
|
||||
//! Is this a broadcast message
|
||||
bool isBroadcastMessage() const;
|
||||
|
||||
//! Whole message as formatted string. Used to display message in a console window.
|
||||
//! \param withSender include sender information in string?
|
||||
//! \param withRecipient include recipient information in string?
|
||||
@@ -156,6 +159,9 @@ namespace BlackMisc
|
||||
//! Mark as relayed message
|
||||
void markAsRelayedMessage() { m_relayedMessage = true; }
|
||||
|
||||
//! Mark as broadcast message
|
||||
void markAsBroadcastMessage();
|
||||
|
||||
//! Mark as relayed and keep original sender
|
||||
void makeRelayedMessage(const Aviation::CCallsign &partnerCallsign);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user