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

refs #297 Added new network settings.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-06-30 20:58:22 +01:00
parent d971b073b7
commit bacf771a15
12 changed files with 98 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,7 @@ namespace BlackGui
ps_validateAircraftValues();
ps_validateVatsimValues();
ps_onVatsimDataFileLoaded();
CServerList otherServers = this->getIContextSettings()->getNetworkSettings().getTrafficNetworkServers();
CServerList otherServers = this->m_trafficNetworkServers.get();
this->ui->cbp_OtherServers->setServers(otherServers);
}
@@ -447,7 +447,7 @@ namespace BlackGui
void CLoginComponent::ps_onSettingsChanged(uint settingsType)
{
if (settingsType != static_cast<uint>(IContextSettings::SettingsNetwork)) { return; }
CServerList otherServers = this->getIContextSettings()->getNetworkSettings().getTrafficNetworkServers();
CServerList otherServers = this->m_trafficNetworkServers.get();
this->ui->cbp_OtherServers->setServers(otherServers);
}

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

@@ -14,6 +14,7 @@
#include "blackgui/blackguiexport.h"
#include "enableforruntime.h"
#include "blackcore/settings/network.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/network/server.h"
#include <QFrame>
@@ -150,6 +151,8 @@ namespace BlackGui
QScopedPointer<Ui::CLoginComponent> ui;
const int LogoffIntervalSeconds = 10;
QTimer *m_logoffCountdownTimer = nullptr;
BlackCore::CSetting<BlackCore::Settings::Network::TrafficServers> m_trafficNetworkServers { this };
};
} // namespace

12
src/blackgui/components/settingsnetworkserverscomponent.cpp
View File

@@ -50,11 +50,8 @@ namespace BlackGui
void CSettingsNetworkServersComponent::reloadSettings()
{
// local copy
CSettingsNetwork nws = this->getIContextSettings()->getNetworkSettings();
// update servers
this->ui->tvp_SettingsTnServers->updateContainer(nws.getTrafficNetworkServers());
this->ui->tvp_SettingsTnServers->updateContainer(m_trafficNetworkServers.get());
}
void CSettingsNetworkServersComponent::ps_networkServerSelected(QModelIndex index)
@@ -75,16 +72,17 @@ namespace BlackGui
return;
}
const QString path = CSettingUtilities::appendPaths(IContextSettings::PathNetworkSettings(), CSettingsNetwork::ValueTrafficServers());
CServerList serverList = m_trafficNetworkServers.get();
QObject *sender = QObject::sender();
if (sender == this->ui->pb_SettingsTnServersRemoveServer)
{
this->getIContextSettings()->value(path, CSettingUtilities::CmdRemove(), CVariant::from(server));
serverList.removeIf(&CServer::getName, server.getName());
}
else if (sender == this->ui->pb_SettingsTnServersSaveServer)
{
this->getIContextSettings()->value(path, CSettingUtilities::CmdUpdate(), CVariant::from(server));
serverList.replaceOrAdd(&CServer::getName, server.getName(), server);
}
m_trafficNetworkServers.set(serverList);
}
void CSettingsNetworkServersComponent::ps_changedSettings(uint typeValue)

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

@@ -14,6 +14,7 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/components/enableforruntime.h"
#include "blackcore/settings/network.h"
#include <QFrame>
#include <QScopedPointer>
@@ -57,6 +58,8 @@ namespace BlackGui
private:
QScopedPointer<Ui::CSettingsNetworkServersComponent> ui;
BlackCore::CSetting<BlackCore::Settings::Network::TrafficServers> m_trafficNetworkServers { this };
};
} // ns
} // ns