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

[AFV] Displayed sync. (integrated with COM unit) flag in cockpit

Browse Source
This commit is contained in:
Klaus Basan
2020-03-25 00:33:34 +01:00
committed by Mat Sutcliffe
parent 1b2f470cd6
commit 7d4e897b88
7 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackgui/components/audiodevicevolumesetupcomponent.cpp
View File

@@ -154,6 +154,7 @@ namespace BlackGui
{
if (!myself || !sGui || sGui->isShuttingDown()) { return; }
myself->setTransmitReceiveInUiFromVoiceClient();
}, ct);
Q_ASSERT(c);
m_afvConnections.append(c);
@@ -216,12 +217,14 @@ namespace BlackGui
ui->le_Info->setToolTip(info);
}
void CAudioDeviceVolumeSetupComponent::setTransmitReceiveInUi(bool tx1, bool rec1, bool tx2, bool rec2)
void CAudioDeviceVolumeSetupComponent::setTransmitReceiveInUi(bool tx1, bool rec1, bool tx2, bool rec2, bool integrated)
{
ui->cb_1Tx->setChecked(tx1);
ui->cb_2Tx->setChecked(tx2);
ui->cb_1Rec->setChecked(rec1);
ui->cb_2Rec->setChecked(rec2);
ui->cb_IntegratedWithCom->setChecked(integrated);
}
void CAudioDeviceVolumeSetupComponent::setTransmitReceiveInUiFromVoiceClient()
@@ -245,7 +248,8 @@ namespace BlackGui
const bool com1Rx = com1Enabled;
const bool com2Rx = com2Enabled;
this->setTransmitReceiveInUi(com1Tx, com1Rx, com2Tx, com2Rx);
const bool integrated = sGui->getCContextAudioBase()->isComUnitIntegrated();
this->setTransmitReceiveInUi(com1Tx, com1Rx, com2Tx, com2Rx, integrated);
}
CAfvClient *CAudioDeviceVolumeSetupComponent::afvClient()

3
src/blackgui/components/audiodevicevolumesetupcomponent.h
View File

@@ -118,10 +118,11 @@ namespace BlackGui
BlackMisc::Audio::CAudioDeviceInfo getSelectedOutputDevice() const;
//! Transmit and receive state @{
void setTransmitReceiveInUi(bool tx1, bool rec1, bool tx2, bool rec2);
void setTransmitReceiveInUi(bool tx1, bool rec1, bool tx2, bool rec2, bool integrated);
void setTransmitReceiveInUiFromVoiceClient();
//! @}
//! Direct access to client
static BlackCore::Afv::Clients::CAfvClient *afvClient();
bool m_init = false;

25
src/blackgui/components/audiodevicevolumesetupcomponent.ui
View File

@@ -6,14 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>243</width>
<height>267</height>
<width>340</width>
<height>272</height>
</rect>
</property>
<property name="windowTitle">
<string>Audio setup</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gl_AudioDeviceVolumeSetupComponent">
<item row="9" column="0">
<widget class="QToolButton" name="tb_ResetInVolume">
<property name="text">
@@ -93,7 +93,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset>
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/diagona/icons/diagona/icons/arrow-circle-135.png</normaloff>:/diagona/icons/diagona/icons/arrow-circle-135.png</iconset>
</property>
</widget>
@@ -190,6 +190,16 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_IntegratedWithCom">
<property name="toolTip">
<string>integrated with sim. cockpit</string>
</property>
<property name="text">
<string>sync.</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -221,7 +231,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset>
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/diagona/icons/diagona/icons/arrow-circle-135.png</normaloff>:/diagona/icons/diagona/icons/arrow-circle-135.png</iconset>
</property>
</widget>
@@ -313,6 +323,7 @@
<tabstop>cb_1Rec</tabstop>
<tabstop>cb_2Tx</tabstop>
<tabstop>cb_2Rec</tabstop>
<tabstop>cb_IntegratedWithCom</tabstop>
<tabstop>cb_SetupAudioInputDevice</tabstop>
<tabstop>tb_RefreshInDevice</tabstop>
<tabstop>cb_SetupAudioOutputDevice</tabstop>
@@ -324,6 +335,8 @@
<tabstop>hs_VolumeOut</tabstop>
<tabstop>tb_ResetOutVolume</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../../blackmisc/blackmisc.qrc"/>
</resources>
<connections/>
</ui>