flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-02 07:05:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T376, integrated voice form into server form

Browse Source
This commit is contained in:
Klaus Basan
2018-09-28 05:07:34 +02:00
parent e51bbd1f5d
commit 6390f5dc5e
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackgui/editors/serverform.cpp
View File

@@ -15,6 +15,8 @@
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
using namespace BlackMisc;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
namespace BlackGui namespace BlackGui
@@ -49,9 +51,10 @@ namespace BlackGui
ui->le_Address->setText(server.getAddress()); ui->le_Address->setText(server.getAddress());
ui->le_Port->setText(QString::number(server.getPort())); ui->le_Port->setText(QString::number(server.getPort()));
ui->form_ServerFsd->setValue(server.getFsdSetup()); ui->form_ServerFsd->setValue(server.getFsdSetup());
ui->form_Voice->setValue(server.getVoiceSetup());
} }
BlackMisc::Network::CServer CServerForm::getServer() const CServer CServerForm::getServer() const
{ {
const CUser user( const CUser user(
ui->le_NetworkId->text().trimmed(), ui->le_NetworkId->text().trimmed(),
@@ -59,13 +62,15 @@ namespace BlackGui
QStringLiteral(""), QStringLiteral(""),
ui->le_Password->text().trimmed() ui->le_Password->text().trimmed()
); );
const CFsdSetup setup(ui->form_ServerFsd->getValue()); const CFsdSetup fsdSetup(ui->form_ServerFsd->getValue());
const CVoiceSetup voiceSetup(ui->form_Voice->getValue());
const CServer server( const CServer server(
ui->le_Name->text().trimmed().simplified(), ui->le_Name->text().trimmed().simplified(),
ui->le_Description->text().trimmed().simplified(), ui->le_Description->text().trimmed().simplified(),
ui->le_Address->text().trimmed(), ui->le_Address->text().trimmed(),
ui->le_Port->text().trimmed().toInt(), ui->le_Port->text().trimmed().toInt(),
user, setup, user,
fsdSetup, voiceSetup,
ui->cbp_Ecosystem->getSelectedEcosystem(), ui->cbp_Ecosystem->getSelectedEcosystem(),
this->getServerType(), this->getServerType(),
true true
@@ -133,10 +138,10 @@ namespace BlackGui
ui->cb_ServerType->setCurrentText(dummy.getServerTypeAsString()); ui->cb_ServerType->setCurrentText(dummy.getServerTypeAsString());
} }
BlackMisc::CStatusMessageList CServerForm::validate(bool nested) const CStatusMessageList CServerForm::validate(bool nested) const
{ {
Q_UNUSED(nested); Q_UNUSED(nested);
const CServer server = getServer(); const CServer server = this->getServer();
return server.validate(); return server.validate();
} }
} // ns } // ns

23
src/blackgui/editors/serverform.ui
View File

@@ -286,6 +286,23 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tb_ServerVoicce">
<attribute name="title">
<string>Voice</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item alignment="Qt::AlignTop">
<widget class="BlackGui::Editors::CVoiceSetupForm" name="form_Voice">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>
@@ -302,6 +319,12 @@
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>blackgui/ecosystemcombobox.h</header> <header>blackgui/ecosystemcombobox.h</header>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::Editors::CVoiceSetupForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/voicesetupform.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>le_RealName</tabstop> <tabstop>le_RealName</tabstop>