From d072224a8b49eb59185be5e92c31a385dc3ac7e4 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 11 Jun 2019 02:46:06 +0200
Subject: [PATCH] Moved XPDR definitions into "actionhotkeydefs.h"

---
 .../context/contextownaircraftimpl.h          |  9 ++++----
 src/blackmisc/input/actionhotkeydefs.cpp      | 23 +++++++++++++++++++
 src/blackmisc/input/actionhotkeydefs.h        | 12 ++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/blackcore/context/contextownaircraftimpl.h b/src/blackcore/context/contextownaircraftimpl.h
index 9d361c224..cdab4d2a7 100644
--- a/src/blackcore/context/contextownaircraftimpl.h
+++ b/src/blackcore/context/contextownaircraftimpl.h
@@ -16,11 +16,11 @@
 #include "blackcore/corefacadeconfig.h"
 #include "blackcore/vatsim/vatsimsettings.h"
 #include "blackcore/actionbind.h"
-#include "blackmisc/network/settings/serversettings.h"
-#include "blackmisc/network/user.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/ownaircraftprovider.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/network/settings/serversettings.h"
+#include "blackmisc/network/user.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/aviation/airlineicaocode.h"
@@ -30,6 +30,7 @@
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/length.h"
+#include "blackmisc/input/actionhotkeydefs.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/settingscache.h"
 #include "blackmisc/identifiable.h"
@@ -213,8 +214,8 @@ namespace BlackCore
             QString m_voiceRoom2UrlOverride;             //!< overridden voice room url
             mutable QReadWriteLock m_lockAircraft;       //!< lock aircraft
 
-            CActionBind m_actionToggleXpdr { "/Own aircraft/Toggle XPDR state", BlackMisc::CIcons::radio16(), this, &CContextOwnAircraft::actionToggleTransponder };
-            CActionBind m_actionIdent { "/Own aircraft/XPDR ident", BlackMisc::CIcons::radio16(), this, &CContextOwnAircraft::actionIdent };
+            CActionBind m_actionToggleXpdr { BlackMisc::Input::toggleXPDRStateHotkeyAction(), BlackMisc::Input::toggleXPDRStateHotkeyIcon(), this, &CContextOwnAircraft::actionToggleTransponder };
+            CActionBind m_actionIdent      { BlackMisc::Input::toggleXPDRIdentHotkeyAction(), BlackMisc::Input::toggleXPDRIdentHotkeyIcon(), this, &CContextOwnAircraft::actionIdent };
 
             static constexpr qint64 MinHistoryDeltaMs = 1000;
             static constexpr int MaxHistoryElements   = 20;
diff --git a/src/blackmisc/input/actionhotkeydefs.cpp b/src/blackmisc/input/actionhotkeydefs.cpp
index dc2694e2f..f5b8acfbb 100644
--- a/src/blackmisc/input/actionhotkeydefs.cpp
+++ b/src/blackmisc/input/actionhotkeydefs.cpp
@@ -56,5 +56,28 @@ namespace BlackMisc
             static const QString s("/Audio/Volume increase");
             return s;
         }
+
+        const QPixmap &toggleXPDRStateHotkeyIcon()
+        {
+            return CIcons::radio16();
+        }
+
+        const QPixmap &toggleXPDRIdentHotkeyIcon()
+        {
+            return CIcons::radio16();
+        }
+
+        const QString &toggleXPDRStateHotkeyAction()
+        {
+            static const QString s("/Own aircraft/Toggle XPDR state");
+            return s;
+        }
+
+        const QString &toggleXPDRIdentHotkeyAction()
+        {
+            static const QString s("/Own aircraft/XPDR ident");
+            return s;
+        }
+
     } // ns
 } // ns
diff --git a/src/blackmisc/input/actionhotkeydefs.h b/src/blackmisc/input/actionhotkeydefs.h
index 747646234..089c5fa6b 100644
--- a/src/blackmisc/input/actionhotkeydefs.h
+++ b/src/blackmisc/input/actionhotkeydefs.h
@@ -44,6 +44,18 @@ namespace BlackMisc
         //! Audio icon volume -
         BLACKMISC_EXPORT const QPixmap &audioVolumeDecreaseHotkeyIcon();
 
+        //! XPDR state
+        BLACKMISC_EXPORT const QString &toggleXPDRStateHotkeyAction();
+
+        //! XPDR state
+        BLACKMISC_EXPORT const QPixmap &toggleXPDRStateHotkeyIcon();
+
+        //! XPDR state
+        BLACKMISC_EXPORT const QString &toggleXPDRIdentHotkeyAction();
+
+        //! XPDR ident
+        BLACKMISC_EXPORT const QPixmap &toggleXPDRIdentHotkeyIcon();
+
     } // ns
 } // ns