#1944 added missing exit button connections to menus

Author: Robosturm

objects/dialogs/ingame/coinfodialog.cpp

@@ -77,6 +77,21 @@ COInfoDialog::COInfoDialog(spCO pCO, spPlayer pPlayer,
     m_pPanel->addItem(m_COInfo);
     showCO();
     connect(this, &COInfoDialog::quit, this, &COInfoDialog::remove, Qt::QueuedConnection);
+    connect(Mainapp::getInstance(), &Mainapp::sigKeyDown, this, &COInfoDialog::keyInput, Qt::QueuedConnection);
+}
+
+void COInfoDialog::keyInput(oxygine::KeyEvent event)
+{
+    if (!event.getContinousPress())
+    {
+        // for debugging
+        Qt::Key cur = event.getKey();
+        if (cur == Settings::getInstance()->getKey_cancel() ||
+            cur == Settings::getInstance()->getKey_cancel2())
+        {
+            emit quit();
+        }
+    }
 }
 
 void COInfoDialog::remove()

objects/dialogs/ingame/coinfodialog.h

@@ -36,6 +36,7 @@ public slots:
     void slotBack();
 private slots:
     void remove();
+    void keyInput(oxygine::KeyEvent event);
 private:
     oxygine::spButton m_NextButton;
     oxygine::spButton m_QuitButton;

objects/dialogs/ingame/dialogattacklog.cpp

@@ -268,6 +268,21 @@ DialogAttackLog::DialogAttackLog(GameMap* pMap, Player* pPlayer)
 
     connect(this, &DialogAttackLog::sigShowAttack, this, &DialogAttackLog::showAttack, Qt::QueuedConnection);
     connect(this, &DialogAttackLog::sigFinished, this, &DialogAttackLog::remove, Qt::QueuedConnection);
+    connect(Mainapp::getInstance(), &Mainapp::sigKeyDown, this, &DialogAttackLog::keyInput, Qt::QueuedConnection);
+}
+
+void DialogAttackLog::keyInput(oxygine::KeyEvent event)
+{
+    if (!event.getContinousPress())
+    {
+        // for debugging
+        Qt::Key cur = event.getKey();
+        if (cur == Settings::getInstance()->getKey_cancel() ||
+            cur == Settings::getInstance()->getKey_cancel2())
+        {
+            emit sigFinished();
+        }
+    }
 }
 
 void DialogAttackLog::remove()

objects/dialogs/ingame/dialogattacklog.h

@@ -28,6 +28,7 @@ public slots:
     void showAttack(qint32 posAtkX, qint32 posAtkY, qint32 playerAtk, qint32 posDefX, qint32 posDefY, qint32 playerDef);
 private slots:
     void remove();
+    void keyInput(oxygine::KeyEvent event);
 private:
     QVector<spAttackReport> m_Log;
     Player* m_pPlayer{nullptr};

objects/dialogs/ingame/dialogunitinfo.cpp

@@ -170,6 +170,21 @@ DialogUnitInfo::DialogUnitInfo(Player* pPlayer)
 
     connect(this, &DialogUnitInfo::sigMoveToUnit, this, &DialogUnitInfo::moveToUnit, Qt::QueuedConnection);
     connect(this, &DialogUnitInfo::sigFinished, this, &DialogUnitInfo::remove, Qt::QueuedConnection);
+    connect(Mainapp::getInstance(), &Mainapp::sigKeyDown, this, &DialogUnitInfo::keyInput, Qt::QueuedConnection);
+}
+
+void DialogUnitInfo::keyInput(oxygine::KeyEvent event)
+{
+    if (!event.getContinousPress())
+    {
+        // for debugging
+        Qt::Key cur = event.getKey();
+        if (cur == Settings::getInstance()->getKey_cancel() ||
+            cur == Settings::getInstance()->getKey_cancel2())
+        {
+            emit sigFinished();
+        }
+    }
 }
 
 void DialogUnitInfo::remove()

objects/dialogs/ingame/dialogunitinfo.h

@@ -24,6 +24,7 @@ public slots:
     void moveToUnit(qint32 posX, qint32 posY);
 private slots:
     void remove();
+    void keyInput(oxygine::KeyEvent event);
 private:
     Player* m_pPlayer{nullptr};
 };

objects/dialogs/ingame/dialogvictoryconditions.cpp

@@ -141,6 +141,21 @@ DialogVictoryConditions::DialogVictoryConditions(GameMap* pMap)
     pPanel->setContentHeigth(y + 40);
     connect(this, &DialogVictoryConditions::sigShowPopup, this, &DialogVictoryConditions::showPopup, Qt::QueuedConnection);
     connect(this, &DialogVictoryConditions::sigFinished, this, &DialogVictoryConditions::remove, Qt::QueuedConnection);
+    connect(Mainapp::getInstance(), &Mainapp::sigKeyDown, this, &DialogVictoryConditions::keyInput, Qt::QueuedConnection);
+}
+
+void DialogVictoryConditions::keyInput(oxygine::KeyEvent event)
+{
+    if (!event.getContinousPress())
+    {
+        // for debugging
+        Qt::Key cur = event.getKey();
+        if (cur == Settings::getInstance()->getKey_cancel() ||
+            cur == Settings::getInstance()->getKey_cancel2())
+        {
+            emit sigFinished();
+        }
+    }
 }
 
 void DialogVictoryConditions::remove()
@@ -161,3 +176,4 @@ void DialogVictoryConditions::showPopup(QString rule)
         }
     }
 }
+

objects/dialogs/ingame/dialogvictoryconditions.h

@@ -22,6 +22,7 @@ class DialogVictoryConditions final : public QObject, public oxygine::Actor
     void sigShowPopup(QString rule);
 protected slots:
     void showPopup(QString rule);
+    void keyInput(oxygine::KeyEvent event);
     void remove();
 private:
     oxygine::spButton m_OkButton;