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

Ref T376, CVoiceSetup used in login component to override

Browse Source
This commit is contained in:
Klaus Basan
2018-09-28 05:10:57 +02:00
parent b5a270dc09
commit d37a6cd20d
2 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/blackgui/components/logincomponent.cpp
View File

@@ -53,6 +53,7 @@
using namespace BlackConfig; using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
using namespace BlackCore; using namespace BlackCore;
@@ -95,8 +96,11 @@ namespace BlackGui
connect(ui->tb_MappingWizard, &QToolButton::clicked, this, &CLoginComponent::mappingWizard); connect(ui->tb_MappingWizard, &QToolButton::clicked, this, &CLoginComponent::mappingWizard);
connect(&m_networkSetup, &CNetworkSetup::setupChanged, this, &CLoginComponent::reloadSetup, Qt::QueuedConnection); connect(&m_networkSetup, &CNetworkSetup::setupChanged, this, &CLoginComponent::reloadSetup, Qt::QueuedConnection);
ui->comp_FsdDetails->showEnableInfo(true); ui->form_FsdDetails->showEnableInfo(true);
ui->comp_FsdDetails->setFsdSetupEnabled(false); ui->form_FsdDetails->setFsdSetupEnabled(false);
ui->form_Voice->showEnableInfo(true);
ui->form_Voice->setVoiceSetupEnabled(false);
ui->lblp_AircraftCombinedType->setToolTips("ok", "wrong"); ui->lblp_AircraftCombinedType->setToolTips("ok", "wrong");
ui->lblp_AirlineIcao->setToolTips("ok", "wrong"); ui->lblp_AirlineIcao->setToolTips("ok", "wrong");
@@ -260,12 +264,18 @@ namespace BlackGui
currentServer.setUser(user); currentServer.setUser(user);
// FSD setup, then override // FSD setup, then override
if (ui->comp_FsdDetails->isFsdSetupEnabled()) if (ui->form_FsdDetails->isFsdSetupEnabled())
{ {
const CFsdSetup fsd = ui->comp_FsdDetails->getValue(); const CFsdSetup fsd = ui->form_FsdDetails->getValue();
currentServer.setFsdSetup(fsd); currentServer.setFsdSetup(fsd);
} }
if (ui->form_Voice->isVoiceSetupEnabled())
{
const CVoiceSetup voice = ui->form_Voice->getValue();
currentServer.setVoiceSetup(voice);
}
ui->frp_CurrentServer->setServer(currentServer); ui->frp_CurrentServer->setServer(currentServer);
sGui->getIContextOwnAircraft()->updateOwnAircraftPilot(currentServer.getUser()); sGui->getIContextOwnAircraft()->updateOwnAircraftPilot(currentServer.getUser());
@@ -273,6 +283,11 @@ namespace BlackGui
ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft(); ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
// Login // Login
if (sGui->getIContextAudio())
{
sGui->getIContextAudio()->setVoiceSetup(currentServer.getVoiceSetup());
}
msg = sGui->getIContextNetwork()->connectToNetwork(currentServer, mode); msg = sGui->getIContextNetwork()->connectToNetwork(currentServer, mode);
if (msg.isSuccess()) if (msg.isSuccess())
{ {

66
src/blackgui/components/logincomponent.ui
View File

@@ -89,7 +89,7 @@
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="pg_NetworkVatsim"> <widget class="QWidget" name="pg_NetworkVatsim">
<property name="toolTip"> <property name="toolTip">
@@ -241,17 +241,29 @@
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Editors::CFsdSetupForm" name="comp_FsdDetails"> <widget class="BlackGui::Editors::CFsdSetupForm" name="form_FsdDetails"/>
<property name="frameShape"> </item>
<enum>QFrame::NoFrame</enum> </layout>
</property> </widget>
<property name="frameShadow"> <widget class="QWidget" name="pg_Voice">
<enum>QFrame::Plain</enum> <attribute name="title">
</property> <string>Voice</string>
<property name="lineWidth"> </attribute>
<number>0</number> <layout class="QVBoxLayout" name="vl_Voice">
</property> <property name="leftMargin">
</widget> <number>3</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="BlackGui::Editors::CVoiceSetupForm" name="form_Voice"/>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -704,6 +716,24 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::Editors::CServerForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/serverform.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Editors::CFsdSetupForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/fsdsetupform.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Editors::CVoiceSetupForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/voicesetupform.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CModelMatcherLogEnable</class> <class>BlackGui::Components::CModelMatcherLogEnable</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -715,12 +745,6 @@
<extends>QLabel</extends> <extends>QLabel</extends>
<header>blackgui/ticklabel.h</header> <header>blackgui/ticklabel.h</header>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::Editors::CFsdSetupForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/fsdsetupform.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class> <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -738,12 +762,6 @@
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>blackgui/components/serverlistselector.h</header> <header>blackgui/components/serverlistselector.h</header>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::Editors::CServerForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/serverform.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::CLoginModeButtons</class> <class>BlackGui::CLoginModeButtons</class>
<extends>QFrame</extends> <extends>QFrame</extends>