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

refs #883, improved position and layout of overlay message frame

Browse Source
This commit is contained in:
Klaus Basan
2017-02-19 02:50:46 +01:00
committed by Mathew Sutcliffe
parent 4ef64e4e22
commit 873823eaa1
9 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackgui/overlaymessages.cpp
View File

@@ -54,7 +54,7 @@ namespace BlackGui
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &COverlayMessages::ps_onStyleSheetsChanged);
connect(ui->pb_Ok, &QPushButton::clicked, this, &COverlayMessages::ps_okClicked);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &COverlayMessages::ps_cancelClicked);
connect(ui->pb_Kill, &QPushButton::clicked, this, &COverlayMessages::ps_killClicked);
connect(ui->tb_Kill, &QPushButton::clicked, this, &COverlayMessages::ps_killClicked);
ui->tvp_StatusMessages->setResizeMode(CStatusMessageView::ResizingAuto);
ui->fr_Confirmation->setVisible(false);
@@ -134,8 +134,8 @@ namespace BlackGui
void COverlayMessages::showKill(bool show)
{
ui->pb_Kill->setVisible(show);
ui->pb_Kill->setEnabled(show);
ui->tb_Kill->setVisible(show);
ui->tb_Kill->setEnabled(show);
}
bool COverlayMessages::displayTextMessage(const CTextMessage &textMessage) const
@@ -264,23 +264,23 @@ namespace BlackGui
{
if (variant.canConvert<CStatusMessageList>())
{
showOverlayMessages(variant.value<CStatusMessageList>(), timeOutMs);
this->showOverlayMessages(variant.value<CStatusMessageList>(), timeOutMs);
}
else if (variant.canConvert<CStatusMessage>())
{
showOverlayMessage(variant.value<CStatusMessage>(), timeOutMs);
this->showOverlayMessage(variant.value<CStatusMessage>(), timeOutMs);
}
else if (variant.canConvert<CTextMessage>())
{
showOverlayTextMessage(variant.value<CTextMessage>(), timeOutMs);
this->showOverlayTextMessage(variant.value<CTextMessage>(), timeOutMs);
}
else if (variant.canConvert<QPixmap>())
{
showOverlayImage(variant.value<QPixmap>(), timeOutMs);
this->showOverlayImage(variant.value<QPixmap>(), timeOutMs);
}
else if (variant.canConvert<CPixmap>())
{
showOverlayImage(variant.value<CPixmap>(), timeOutMs);
this->showOverlayImage(variant.value<CPixmap>(), timeOutMs);
}
else
{
@@ -361,16 +361,16 @@ namespace BlackGui
ui->pb_Cancel->setAutoDefault(false);
ui->pb_Ok->setDefault(true);
ui->pb_Ok->setAutoDefault(true);
this->m_lastConfirmation = QMessageBox::Ok;
ui->pb_Ok->setFocus();
this->m_lastConfirmation = QMessageBox::Ok;
break;
case QMessageBox::Cancel:
ui->pb_Ok->setDefault(false);
ui->pb_Ok->setAutoDefault(false);
ui->pb_Cancel->setDefault(true);
ui->pb_Cancel->setAutoDefault(true);
this->m_lastConfirmation = QMessageBox::Cancel;
ui->pb_Cancel->setFocus();
this->m_lastConfirmation = QMessageBox::Cancel;
break;
default:
break;