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

refs #288, adjusted server and network views

Browse Source 
* aircraft settings are gone, move to login screen
* no selected server needed anymore
* marked outdated methods as deprecated
This commit is contained in:
Klaus Basan
2014-11-15 01:30:50 +01:00
committed by Roland Winklmeier
parent d1d02d6c3c
commit 44d0cd002b
9 changed files with 59 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/blackgui/components/settingscomponent.cpp
View File

@@ -52,31 +52,11 @@ namespace BlackGui
return ui->comp_AudioSetup->playNotificationSounds();
}
/*
* Update own ICAO data from GUI
*/
void CSettingsComponent::setOwnAircraftIcaoDataFromGui(CAircraftIcao &icao) const
{
icao.setAirlineDesignator(this->ui->le_SettingsIcaoAirlineDesignator->text());
icao.setAircraftDesignator(this->ui->le_SettingsIcaoAircraftDesignator->text());
icao.setAircraftCombinedType(this->ui->le_SettingsIcaoCombinedType->text());
}
void CSettingsComponent::setGuiOpacity(double value)
{
this->ui->hs_SettingsGuiOpacity->setValue(value);
}
bool CSettingsComponent::loginAsObserver() const
{
return this->ui->rb_SettingsLoginStealthMode->isChecked();
}
bool CSettingsComponent::loginStealth() const
{
return this->ui->rb_SettingsLoginStealthMode->isChecked();
}
int CSettingsComponent::getAtcUpdateIntervalSeconds() const
{
return this->ui->hs_SettingsGuiAtcRefreshTime->value();
@@ -92,11 +72,6 @@ namespace BlackGui
return this->ui->hs_SettingsGuiUserRefreshTime->value();
}
QString CSettingsComponent::getOwnCallsignFromGui() const
{
return this->ui->le_SettingsAircraftCallsign->text();
}
/*
* Reload settings
*/
@@ -106,7 +81,6 @@ namespace BlackGui
CSettingsNetwork nws = this->getIContextSettings()->getNetworkSettings();
// update servers
this->ui->tvp_SettingsTnServers->setSelectedServer(nws.getCurrentTrafficNetworkServer());
this->ui->tvp_SettingsTnServers->updateContainer(nws.getTrafficNetworkServers());
// update hot keys
@@ -130,14 +104,12 @@ namespace BlackGui
this->connect(this->getIContextSettings(), &IContextSettings::changedSettings, this, &CSettingsComponent::ps_changedSettings);
// Opacity, intervals
bool connected = false;
this->connect(this->ui->hs_SettingsGuiOpacity, &QSlider::valueChanged, this, &CSettingsComponent::changedWindowsOpacity);
this->connect(this->ui->hs_SettingsGuiAircraftRefreshTime, &QSlider::valueChanged, this, &CSettingsComponent::changedAircraftsUpdateInterval);
this->connect(this->ui->hs_SettingsGuiAtcRefreshTime, &QSlider::valueChanged, this, &CSettingsComponent::changedAtcStationsUpdateInterval);
this->connect(this->ui->hs_SettingsGuiUserRefreshTime, &QSlider::valueChanged, this, &CSettingsComponent::changedUsersUpdateInterval);
// Settings server
this->connect(this->ui->pb_SettingsTnCurrentServer, &QPushButton::released, this, &CSettingsComponent::ps_alterTrafficServer);
this->connect(this->ui->pb_SettingsTnRemoveServer, &QPushButton::released, this, &CSettingsComponent::ps_alterTrafficServer);
this->connect(this->ui->pb_SettingsTnSaveServer, &QPushButton::released, this, &CSettingsComponent::ps_alterTrafficServer);
this->connect(this->ui->tvp_SettingsTnServers, &QTableView::clicked, this, &CSettingsComponent::ps_networkServerSelected);
@@ -154,7 +126,7 @@ namespace BlackGui
this->ui->cb_SettingsGuiFontSize->setCurrentText(QString::number(font.pointSize()));
this->m_fontColor = QColor(CStyleSheetUtility::instance().fontColor());
this->ui->le_SettingsGuiFontColor->setText(this->m_fontColor.name());
connected = this->connect(this->ui->cb_SettingsGuiFont, SIGNAL(currentFontChanged(QFont)), this, SLOT(ps_fontChanged()));
bool connected = this->connect(this->ui->cb_SettingsGuiFont, SIGNAL(currentFontChanged(QFont)), this, SLOT(ps_fontChanged()));
Q_ASSERT(connected);
connected = this->connect(this->ui->cb_SettingsGuiFontSize, SIGNAL(currentIndexChanged(QString)), this, SLOT(ps_fontChanged()));
Q_ASSERT(connected);
@@ -169,7 +141,7 @@ namespace BlackGui
void CSettingsComponent::ps_networkServerSelected(QModelIndex index)
{
const CServer clickedServer = this->ui->tvp_SettingsTnServers->at<CServer>(index);
this->ps_updateGuiSelectedServerTextboxes(clickedServer);
this->ui->frp_ServerForm->setServer(clickedServer);
}
/*
@@ -177,20 +149,17 @@ namespace BlackGui
*/
void CSettingsComponent::ps_alterTrafficServer()
{
CServer server = this->ps_selectedServerFromTextboxes();
if (!server.isValidForLogin())
CServer server = this->ui->frp_ServerForm->getServer();
CStatusMessageList msgs = server.validate();
if (!msgs.isEmpty())
{
CLogMessage().validationWarning("Wrong settings for server");
CLogMessage(this).validations(msgs);
return;
}
const QString path = CSettingUtilities::appendPaths(IContextSettings::PathNetworkSettings(), CSettingsNetwork::ValueTrafficServers());
QObject *sender = QObject::sender();
if (sender == this->ui->pb_SettingsTnCurrentServer)
{
this->getIContextSettings()->value(path, CSettingsNetwork::CmdSetCurrentServer(), server.toQVariant());
}
else if (sender == this->ui->pb_SettingsTnRemoveServer)
if (sender == this->ui->pb_SettingsTnRemoveServer)
{
this->getIContextSettings()->value(path, CSettingUtilities::CmdRemove(), server.toQVariant());
}
@@ -210,42 +179,6 @@ namespace BlackGui
Q_UNUSED(type);
}
/*
* Textboxes from server
*/
void CSettingsComponent::ps_updateGuiSelectedServerTextboxes(const CServer &server)
{
this->ui->le_SettingsTnCsName->setText(server.getName());
this->ui->le_SettingsTnCsDescription->setText(server.getDescription());
this->ui->le_SettingsTnCsAddress->setText(server.getAddress());
this->ui->le_SettingsTnCsPort->setText(QString::number(server.getPort()));
this->ui->le_SettingsTnCsRealName->setText(server.getUser().getRealName());
this->ui->le_SettingsTnCsNetworkId->setText(server.getUser().getId());
this->ui->le_SettingsTnCsPassword->setText(server.getUser().getPassword());
}
/*
* Server settings from textboxes
*/
CServer CSettingsComponent::ps_selectedServerFromTextboxes() const
{
CServer server;
bool portOk = false;
server.setName(this->ui->le_SettingsTnCsName->text());
server.setDescription(this->ui->le_SettingsTnCsDescription->text());
server.setAddress(this->ui->le_SettingsTnCsAddress->text());
server.setPort(this->ui->le_SettingsTnCsPort->text().toInt(&portOk));
if (!portOk) server.setPort(-1);
CUser user;
user.setRealName(this->ui->le_SettingsTnCsRealName->text());
user.setId(this->ui->le_SettingsTnCsNetworkId->text());
user.setPassword(this->ui->le_SettingsTnCsPassword->text());
server.setUser(user);
return server;
}
/*
* Save the hotkeys
*/