mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-26 02:35:38 +08:00
Ref T506, use overlay text messages if those are available
This commit is contained in:
committed by
Mat Sutcliffe
parent
377e21ce6a
commit
3c314e9882
@@ -55,6 +55,7 @@ namespace BlackGui
|
|||||||
{
|
{
|
||||||
this->init(w, h);
|
this->init(w, h);
|
||||||
this->showKillButton(false);
|
this->showKillButton(false);
|
||||||
|
|
||||||
if (sGui) { connect(sGui, &CGuiApplication::styleSheetsChanged, this, &COverlayMessages::onStyleSheetsChanged, Qt::QueuedConnection); }
|
if (sGui) { connect(sGui, &CGuiApplication::styleSheetsChanged, this, &COverlayMessages::onStyleSheetsChanged, Qt::QueuedConnection); }
|
||||||
connect(ui->pb_Ok, &QPushButton::clicked, this, &COverlayMessages::onOkClicked);
|
connect(ui->pb_Ok, &QPushButton::clicked, this, &COverlayMessages::onOkClicked);
|
||||||
connect(ui->pb_Cancel, &QPushButton::clicked, this, &COverlayMessages::onCancelClicked);
|
connect(ui->pb_Cancel, &QPushButton::clicked, this, &COverlayMessages::onCancelClicked);
|
||||||
@@ -235,26 +236,33 @@ namespace BlackGui
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this->setModeToTextMessage();
|
// do we support inline text messages, we use this one
|
||||||
|
const bool activatedText = ui->comp_OverlayTextMessage->isActivated();
|
||||||
// message and display
|
if (activatedText)
|
||||||
ui->le_TmFrom->setText(textMessage.getSenderCallsign().asString());
|
{
|
||||||
ui->le_TmTo->setText(textMessage.getRecipientCallsign().asString());
|
this->setModeToOverlayTextMessage();
|
||||||
ui->le_TmReceived->setText(textMessage.getFormattedUtcTimestampHms());
|
timeOutMs = -1; // cancel timeout
|
||||||
ui->te_TmText->setText(textMessage.getMessage());
|
}
|
||||||
ui->wi_TmSupervisor->setVisible(textMessage.isSupervisorMessage());
|
else
|
||||||
ui->wi_TmSupervisor->setStyleSheet("background-color: red;");
|
{
|
||||||
|
// message and display
|
||||||
|
ui->le_TmFrom->setText(textMessage.getSenderCallsign().asString());
|
||||||
|
ui->le_TmTo->setText(textMessage.getRecipientCallsign().asString());
|
||||||
|
ui->le_TmReceived->setText(textMessage.getFormattedUtcTimestampHms());
|
||||||
|
ui->te_TmText->setText(textMessage.getMessage());
|
||||||
|
ui->wi_TmSupervisor->setVisible(textMessage.isSupervisorMessage());
|
||||||
|
ui->wi_TmSupervisor->setStyleSheet("background-color: red;");
|
||||||
|
|
||||||
|
this->setModeToTextMessage();
|
||||||
|
}
|
||||||
this->display(timeOutMs);
|
this->display(timeOutMs);
|
||||||
}
|
}
|
||||||
|
|
||||||
void COverlayMessages::showOverlayInlineTextMessage(Components::TextMessageTab tab)
|
void COverlayMessages::showOverlayInlineTextMessage(Components::TextMessageTab tab)
|
||||||
{
|
{
|
||||||
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_OverlayTextMessage);
|
|
||||||
ui->comp_OverlayTextMessage->setTab(tab);
|
ui->comp_OverlayTextMessage->setTab(tab);
|
||||||
ui->comp_OverlayTextMessage->updateAtcStationsButtons();
|
ui->comp_OverlayTextMessage->updateAtcStationsButtons();
|
||||||
this->setHeader("Text message");
|
this->setModeToOverlayTextMessage();
|
||||||
this->showKill(false);
|
|
||||||
this->display();
|
this->display();
|
||||||
ui->comp_OverlayTextMessage->focusTextEntry();
|
ui->comp_OverlayTextMessage->focusTextEntry();
|
||||||
}
|
}
|
||||||
@@ -596,6 +604,7 @@ namespace BlackGui
|
|||||||
void COverlayMessages::display(int timeOutMs)
|
void COverlayMessages::display(int timeOutMs)
|
||||||
{
|
{
|
||||||
this->show();
|
this->show();
|
||||||
|
this->raise();
|
||||||
this->setEnabled(true);
|
this->setEnabled(true);
|
||||||
if (timeOutMs > 250)
|
if (timeOutMs > 250)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user