refactor: Remove kill button

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();

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();

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,

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)
+    void COverlayMessages::setModeToMessages()
-    {
-        m_hasKillButton = killButton;
-        this->showKill(killButton);
-    }
-
-    void COverlayMessages::setModeToMessages(bool withKillButton)
     {
         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)

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;
     };

src/gui/overlaymessages.ui

@@ -79,23 +79,6 @@
            </property>
           </spacer>
          </item>
-         <item>
-          <widget class="QToolButton" name="tb_Kill">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string>kill application</string>
-           </property>
-           <property name="text">
-            <string>kill application</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../misc/misc.qrc">
-             <normaloff>:/misc/icons/misc/skull64.png</normaloff>:/misc/icons/misc/skull64.png</iconset>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QToolButton" name="tb_Close">
            <property name="text">

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

src/misc/misc.qrc

@@ -551,10 +551,6 @@
         <file>icons/textures/texture-outer.jpg</file>
     </qresource>
     <qresource prefix="/misc">
-        <file>icons/misc/skull64.png</file>
-        <file>icons/misc/skull128.png</file>
-        <file>icons/misc/skull256.png</file>
-        <file>icons/misc/skull512.png</file>
         <file>icons/misc/toolWizard64.png</file>
         <file>icons/misc/toolWizard128.png</file>
         <file>icons/misc/cn.png</file>

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);