flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 19:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #120 Remove separate PTT COM1/COM2 hotkeys

Browse Source
This commit is contained in:
Lars Toenning
2021-09-14 00:04:21 +02:00
parent 8763180a41
commit cedaa48f5a
6 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/context/contextaudio.cpp
View File

@@ -584,16 +584,6 @@ namespace BlackCore
m_voiceClient->setPttForCom(enable, com); m_voiceClient->setPttForCom(enable, com);
} }
void CContextAudioBase::setVoiceTransmissionCom1(bool enabled)
{
this->setVoiceTransmission(enabled, COM1);
}
void CContextAudioBase::setVoiceTransmissionCom2(bool enabled)
{
this->setVoiceTransmission(enabled, COM2);
}
void CContextAudioBase::setVoiceTransmissionComActive(bool enabled) void CContextAudioBase::setVoiceTransmissionComActive(bool enabled)
{ {
this->setVoiceTransmission(enabled, COMActive); this->setVoiceTransmission(enabled, COMActive);

4
src/blackcore/context/contextaudio.h
View File

@@ -321,8 +321,6 @@ namespace BlackCore
//! Enable/disable voice transmission, nornally used with hotkey //! Enable/disable voice transmission, nornally used with hotkey
//! @{ //! @{
void setVoiceTransmission(bool enable, BlackMisc::Audio::PTTCOM com); void setVoiceTransmission(bool enable, BlackMisc::Audio::PTTCOM com);
void setVoiceTransmissionCom1(bool enabled);
void setVoiceTransmissionCom2(bool enabled);
void setVoiceTransmissionComActive(bool enabled); void setVoiceTransmissionComActive(bool enabled);
//! @} //! @}
@@ -355,8 +353,6 @@ namespace BlackCore
void onAfvConnectionFailure(const BlackMisc::CStatusMessage &msg); void onAfvConnectionFailure(const BlackMisc::CStatusMessage &msg);
CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CContextAudioBase::setVoiceTransmissionComActive }; CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CContextAudioBase::setVoiceTransmissionComActive };
CActionBind m_actionPttCom1 { BlackMisc::Input::pttCom1HotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CContextAudioBase::setVoiceTransmissionCom1 };
CActionBind m_actionPttCom2 { BlackMisc::Input::pttCom2HotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CContextAudioBase::setVoiceTransmissionCom2 };
CActionBind m_actionAudioVolumeIncrease { BlackMisc::Input::audioVolumeIncreaseHotkeyAction(), BlackMisc::Input::audioVolumeIncreaseHotkeyIcon(), this, &CContextAudioBase::audioIncreaseVolume }; CActionBind m_actionAudioVolumeIncrease { BlackMisc::Input::audioVolumeIncreaseHotkeyAction(), BlackMisc::Input::audioVolumeIncreaseHotkeyIcon(), this, &CContextAudioBase::audioIncreaseVolume };
CActionBind m_actionAudioVolumeDecrease { BlackMisc::Input::audioVolumeDecreaseHotkeyAction(), BlackMisc::Input::audioVolumeDecreaseHotkeyIcon(), this, &CContextAudioBase::audioDecreaseVolume }; CActionBind m_actionAudioVolumeDecrease { BlackMisc::Input::audioVolumeDecreaseHotkeyAction(), BlackMisc::Input::audioVolumeDecreaseHotkeyIcon(), this, &CContextAudioBase::audioDecreaseVolume };
CActionBind m_actionAudioVolumeIncreaseCom1 { BlackMisc::Input::audioVolumeIncreaseCom1HotkeyAction(), BlackMisc::Input::audioVolumeIncreaseHotkeyIcon(), this, &CContextAudioBase::audioIncreaseVolumeCom1 }; CActionBind m_actionAudioVolumeIncreaseCom1 { BlackMisc::Input::audioVolumeIncreaseCom1HotkeyAction(), BlackMisc::Input::audioVolumeIncreaseHotkeyIcon(), this, &CContextAudioBase::audioIncreaseVolumeCom1 };

2
src/blackgui/components/infobarstatuscomponent.h
View File

@@ -63,8 +63,6 @@ namespace BlackGui
private: private:
QScopedPointer<Ui::CInfoBarStatusComponent> ui; QScopedPointer<Ui::CInfoBarStatusComponent> ui;
BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged }; BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged };
BlackCore::CActionBind m_actionPtt1 { BlackMisc::Input::pttCom1HotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged };
BlackCore::CActionBind m_actionPtt2 { BlackMisc::Input::pttCom2HotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged };
BlackMisc::CDigestSignal m_dsResize { this, &CInfoBarStatusComponent::adjustTextSize, 1000, 50 }; BlackMisc::CDigestSignal m_dsResize { this, &CInfoBarStatusComponent::adjustTextSize, 1000, 50 };

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

@@ -23,18 +23,6 @@ namespace BlackMisc
return CIcons::StandardIconRadio16; return CIcons::StandardIconRadio16;
} }
const QString &pttCom1HotkeyAction()
{
static const QString s("/Voice/Activate push-to-talk COM1");
return s;
}
const QString &pttCom2HotkeyAction()
{
static const QString s("/Voice/Activate push-to-talk COM2");
return s;
}
CIcons::IconIndex audioVolumeDecreaseHotkeyIcon() CIcons::IconIndex audioVolumeDecreaseHotkeyIcon()
{ {
return CIcons::StandardIconVolumeLow16; return CIcons::StandardIconVolumeLow16;

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

@@ -23,12 +23,6 @@ namespace BlackMisc
//! PTT key //! PTT key
BLACKMISC_EXPORT const QString &pttHotkeyAction(); BLACKMISC_EXPORT const QString &pttHotkeyAction();
//! PTT key COM1 only
BLACKMISC_EXPORT const QString &pttCom1HotkeyAction();
//! PTT key COM2 only
BLACKMISC_EXPORT const QString &pttCom2HotkeyAction();
//! PTT key //! PTT key
BLACKMISC_EXPORT BlackMisc::CIcons::IconIndex pttHotkeyIcon(); BLACKMISC_EXPORT BlackMisc::CIcons::IconIndex pttHotkeyIcon();

2
src/swiftguistandard/swiftguistd.h
View File

@@ -125,8 +125,6 @@ private:
QScopedPointer<BlackGui::Components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog QScopedPointer<BlackGui::Components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog
BlackMisc::CData<BlackMisc::Simulation::Data::TLastAutoPublish> m_lastAutoPublish { this }; BlackMisc::CData<BlackMisc::Simulation::Data::TLastAutoPublish> m_lastAutoPublish { this };
BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged }; BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged };
BlackCore::CActionBind m_actionPtt1 { BlackMisc::Input::pttCom1HotkeyAction(), BlackMisc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged };
BlackCore::CActionBind m_actionPtt2 { BlackMisc::Input::pttCom2HotkeyAction(), BlackMisc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged };
BlackCore::CActionBindings m_menuHotkeyHandlers; BlackCore::CActionBindings m_menuHotkeyHandlers;
BlackGui::CManagedStatusBar m_statusBar; BlackGui::CManagedStatusBar m_statusBar;
BlackMisc::CLogHistoryReplica m_logHistoryForStatus { this }; BlackMisc::CLogHistoryReplica m_logHistoryForStatus { this };