diff --git a/src/gui/components/flightplancomponent.cpp b/src/gui/components/flightplancomponent.cpp
index 4791ec9fe..5da34b79d 100644
--- a/src/gui/components/flightplancomponent.cpp
+++ b/src/gui/components/flightplancomponent.cpp
@@ -87,7 +87,6 @@ namespace swift::gui::components
this->setOverlaySizeFactors(0.8, 0.9);
this->setReducedInfo(true);
this->setForceSmall(true);
- this->showKillButton(false);
setupNavComContextMenu();
setupSsrContextMenu();
diff --git a/src/gui/components/logincomponent.cpp b/src/gui/components/logincomponent.cpp
index 210b73132..33cc6df49 100644
--- a/src/gui/components/logincomponent.cpp
+++ b/src/gui/components/logincomponent.cpp
@@ -84,7 +84,6 @@ namespace swift::gui::components
this->setOverlaySizeFactors(0.8, 0.5);
this->setReducedInfo(true);
this->setForceSmall(true);
- this->showKillButton(false);
// Stored data
this->loadRememberedUserData();
diff --git a/src/gui/components/mappingcomponent.cpp b/src/gui/components/mappingcomponent.cpp
index 4f03f0b69..0e09cd491 100644
--- a/src/gui/components/mappingcomponent.cpp
+++ b/src/gui/components/mappingcomponent.cpp
@@ -112,7 +112,6 @@ namespace swift::gui::components
// overlay
this->setReducedInfo(true);
this->setForceSmall(true);
- this->showKillButton(false);
// Aircraft previews
connect(ui->cb_AircraftIconDisplayed, &QCheckBox::stateChanged, this,
diff --git a/src/gui/overlaymessages.cpp b/src/gui/overlaymessages.cpp
index 00d0e33a5..2991f64ee 100644
--- a/src/gui/overlaymessages.cpp
+++ b/src/gui/overlaymessages.cpp
@@ -49,7 +49,6 @@ namespace swift::gui
COverlayMessages::COverlayMessages(int w, int h, QWidget *parent) : QFrame(parent), ui(new Ui::COverlayMessages)
{
this->init(w, h);
- this->showKillButton(false);
if (sGui)
{
@@ -58,7 +57,6 @@ namespace swift::gui
}
connect(ui->pb_Ok, &QPushButton::clicked, this, &COverlayMessages::onOkClicked);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &COverlayMessages::onCancelClicked);
- connect(ui->tb_Kill, &QPushButton::clicked, this, &COverlayMessages::onKillClicked);
ui->tvp_StatusMessages->setResizeMode(CStatusMessageView::ResizingAlways);
ui->tvp_StatusMessages->setForceColumnsToMaxSize(
@@ -119,28 +117,8 @@ namespace swift::gui
this->close();
}
- void COverlayMessages::onKillClicked()
- {
- QMessageBox msgBox;
- msgBox.setText("Shutdown the application.");
- msgBox.setInformativeText(u"Do you want to terminate " % sGui->getApplicationNameAndVersion() % u"?");
- msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
- msgBox.setDefaultButton(QMessageBox::Save);
- if (QMessageBox::Ok == msgBox.exec() && sGui)
- {
- sGui->gracefulShutdown();
- sGui->exit();
- }
- }
-
bool COverlayMessages::useSmall() const { return (m_forceSmall || this->width() < 400 || this->height() < 300); }
- void COverlayMessages::showKill(bool show)
- {
- ui->tb_Kill->setVisible(m_hasKillButton && show);
- ui->tb_Kill->setEnabled(m_hasKillButton && show);
- }
-
bool COverlayMessages::displayTextMessage(const CTextMessage &textMessage) const
{
if (!sGui || sGui->isShuttingDown() || !sGui->getIContextOwnAircraft()) { return false; }
@@ -177,7 +155,7 @@ namespace swift::gui
ui->tvp_StatusMessages->rowsResizeModeBasedOnThreshold(newMsgs.size());
ui->tvp_StatusMessages->updateContainerMaybeAsync(newMsgs);
- this->setModeToMessages(false);
+ this->setModeToMessages();
this->display(timeout);
}
@@ -226,12 +204,12 @@ namespace swift::gui
if (this->useSmall())
{
- this->setModeToMessageSmall(message.isFailure());
+ this->setModeToMessageSmall();
ui->form_StatusMessageSmall->setValue(message);
}
else
{
- this->setModeToMessage(message.isFailure());
+ this->setModeToMessage();
ui->form_StatusMessage->setValue(message);
}
this->display(timeout);
@@ -413,44 +391,33 @@ namespace swift::gui
else { this->display(timeout); }
}
- void COverlayMessages::showKillButton(bool killButton)
- {
- m_hasKillButton = killButton;
- this->showKill(killButton);
- }
-
- void COverlayMessages::setModeToMessages(bool withKillButton)
+ void COverlayMessages::setModeToMessages()
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_StatusMessages);
- this->showKill(withKillButton);
this->setHeader("Messages");
}
- void COverlayMessages::setModeToMessage(bool withKillButton)
+ void COverlayMessages::setModeToMessage()
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_StatusMessage);
- this->showKill(withKillButton);
this->setHeader("Message");
}
- void COverlayMessages::setModeToMessageSmall(bool withKillButton)
+ void COverlayMessages::setModeToMessageSmall()
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_StatusMessageSmall);
- this->showKill(withKillButton);
this->setHeader("Message");
}
- void COverlayMessages::setModeToHTMLMessage(bool withKillButton)
+ void COverlayMessages::setModeToHTMLMessage()
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_HTMLMessage);
- this->showKill(withKillButton);
this->setHeader("Message");
}
- void COverlayMessages::setModeToProgressBar(bool withKillButton)
+ void COverlayMessages::setModeToProgressBar()
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_ProgressBar);
- this->showKill(withKillButton);
this->setHeader("Progress bar");
}
@@ -458,14 +425,12 @@ namespace swift::gui
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_TextMessage);
this->setHeader("Text message");
- this->showKill(false);
}
void COverlayMessages::setModeToOverlayTextMessage()
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_OverlayTextMessage);
this->setHeader("Text message");
- this->showKill(false);
}
void COverlayMessages::activateTextMessages(bool activate)
@@ -479,7 +444,6 @@ namespace swift::gui
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_Image);
this->setHeader("Image");
- this->showKillButton(false);
}
void COverlayMessages::setConfirmationMessage(const QString &message)
diff --git a/src/gui/overlaymessages.h b/src/gui/overlaymessages.h
index dd9804515..33a19c025 100644
--- a/src/gui/overlaymessages.h
+++ b/src/gui/overlaymessages.h
@@ -54,19 +54,19 @@ namespace swift::gui
virtual ~COverlayMessages() override;
//! Messages mode
- void setModeToMessages(bool withKillButton = false);
+ void setModeToMessages();
//! Single Message mode
- void setModeToMessage(bool withKillButton = false);
+ void setModeToMessage();
//! Single Message mode
- void setModeToMessageSmall(bool withKillButton = false);
+ void setModeToMessageSmall();
//! HTML message mode
- void setModeToHTMLMessage(bool withKillButton = false);
+ void setModeToHTMLMessage();
//! Progress bar
- void setModeToProgressBar(bool withKillButton = false);
+ void setModeToProgressBar();
//! Single text message mode
void setModeToTextMessage();
@@ -165,9 +165,6 @@ namespace swift::gui
void showProgressBar(int percentage, const QString &message,
std::chrono::milliseconds timeout = std::chrono::milliseconds(0));
- //! Allows to globally enable/disable kill button
- void showKillButton(bool killButton);
-
//! Close button clicked
void close();
@@ -215,9 +212,6 @@ namespace swift::gui
//! Cancel clicked (only when confirmation bar is active)
void onCancelClicked();
- //! Kill clicked (only when errors)
- void onKillClicked();
-
//! Init widget
void init(int w, int h);
@@ -227,10 +221,6 @@ namespace swift::gui
//! Small
bool useSmall() const;
- //! Show kill button?
- //! \sa COverlayMessages::showKillButton globally enable/disable kill button
- void showKill(bool show);
-
//! Display this message (use settings to decide)
bool displayTextMessage(const swift::misc::network::CTextMessage &textMessage) const;
};
diff --git a/src/gui/overlaymessages.ui b/src/gui/overlaymessages.ui
index b1fae4af9..2a35ed373 100644
--- a/src/gui/overlaymessages.ui
+++ b/src/gui/overlaymessages.ui
@@ -79,23 +79,6 @@
- -
-
-
- false
-
-
- kill application
-
-
- kill application
-
-
-
- :/misc/icons/misc/skull64.png:/misc/icons/misc/skull64.png
-
-
-
-
diff --git a/src/gui/overlaymessagesframe.h b/src/gui/overlaymessagesframe.h
index 980ef0785..0d01629b0 100644
--- a/src/gui/overlaymessagesframe.h
+++ b/src/gui/overlaymessagesframe.h
@@ -59,7 +59,6 @@ namespace swift::gui
m_overlayMessages = new COverlayMessages(inner.width(), inner.height(), this);
m_overlayMessages->hide();
- m_overlayMessages->showKillButton(m_showKillButton);
m_overlayMessages->setForceSmall(m_forceSmallMsgs);
m_overlayMessages->setReducedInfo(m_reducedInfo);
}
@@ -82,13 +81,6 @@ namespace swift::gui
if (middleFactor >= 0) { m_middleFactor = middleFactor; }
}
- //! \copydoc swift::gui::COverlayMessages::showKillButton
- void showKillButton(bool killButton)
- {
- m_showKillButton = killButton;
- if (m_overlayMessages) { m_overlayMessages->showKillButton(killButton); }
- }
-
//! \copydoc swift::gui::COverlayMessages::setForceSmall
void setForceSmall(bool force)
{
@@ -375,7 +367,6 @@ namespace swift::gui
return QSize(wInner, hInner);
}
- bool m_showKillButton = false; //!< show kill button
bool m_forceSmallMsgs = false; //!< force small messages
bool m_reducedInfo = false; //!< reduced info (no timestamp ..)
double m_widthFactor = 0.7; //!< inner frame x factor
diff --git a/src/misc/icons/misc/skull128.png b/src/misc/icons/misc/skull128.png
deleted file mode 100644
index 1d8d16cfc..000000000
Binary files a/src/misc/icons/misc/skull128.png and /dev/null differ
diff --git a/src/misc/icons/misc/skull256.png b/src/misc/icons/misc/skull256.png
deleted file mode 100644
index 0f95f9a68..000000000
Binary files a/src/misc/icons/misc/skull256.png and /dev/null differ
diff --git a/src/misc/icons/misc/skull512.png b/src/misc/icons/misc/skull512.png
deleted file mode 100644
index 70bef15f1..000000000
Binary files a/src/misc/icons/misc/skull512.png and /dev/null differ
diff --git a/src/misc/icons/misc/skull64.png b/src/misc/icons/misc/skull64.png
deleted file mode 100644
index f94bfc25d..000000000
Binary files a/src/misc/icons/misc/skull64.png and /dev/null differ
diff --git a/src/misc/misc.qrc b/src/misc/misc.qrc
index 7a055f104..fed2565d0 100644
--- a/src/misc/misc.qrc
+++ b/src/misc/misc.qrc
@@ -551,10 +551,6 @@
icons/textures/texture-outer.jpg
- icons/misc/skull64.png
- icons/misc/skull128.png
- icons/misc/skull256.png
- icons/misc/skull512.png
icons/misc/toolWizard64.png
icons/misc/toolWizard128.png
icons/misc/cn.png
diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp
index 466b82dcd..89b727b75 100644
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -182,9 +182,6 @@ void SwiftGuiStd::init()
connect(ui->comp_InfoBarStatus, &CInfoBarStatusComponent::transponderModeChanged, ui->dw_InfoBarStatus,
&CDockWidgetInfoBar::reloadStyleSheet, Qt::QueuedConnection);
- // Show kill button
- ui->fr_CentralFrameInside->showKillButton(true);
-
// do this as last statement, so it can be used as flag
// whether init has been completed
this->setVisible(true);