flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved XPDR definitions into "actionhotkeydefs.h"

Browse Source
This commit is contained in:
Klaus Basan
2019-06-11 02:46:06 +02:00
committed by Mat Sutcliffe
parent 017e9402fd
commit d072224a8b
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/context/contextownaircraftimpl.h
View File

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

23
src/blackmisc/input/actionhotkeydefs.cpp
View File

@@ -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

12
src/blackmisc/input/actionhotkeydefs.h
View File

@@ -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