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

refs #661, fixed server settings

Browse Source 
(settings were not displayed added in GUI as displayed in presentation)
This commit is contained in:
Klaus Basan
2016-05-24 23:48:23 +02:00
parent 988251b079
commit cc166020b9
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,15 +58,15 @@ namespace BlackGui
void CSettingsNetworkServersComponent::ps_reloadSettings() void CSettingsNetworkServersComponent::ps_reloadSettings()
{ {
CServerList serverList(m_trafficNetworkServers.get()); CServerList serverList(m_trafficNetworkServers.getCopy());
// add swift test servers in case we have no servers: // add swift test servers in case we have no servers:
// this is debug/bootstrap feature we can continue to test when something goes wrong // this is debug/bootstrap feature we can continue to test when something goes wrong
if (serverList.isEmpty() && (CBuildConfig::isBetaTest() || sGui->isRunningInDeveloperEnvironment())) if (serverList.isEmpty() && (CBuildConfig::isBetaTest() || sGui->isRunningInDeveloperEnvironment()))
{ {
serverList.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers()); serverList.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers());
this->ui->tvp_Servers->updateContainer(serverList);
} }
this->ui->tvp_Servers->updateContainer(serverList);
} }
void CSettingsNetworkServersComponent::ps_serverSelected(const QModelIndex &index) void CSettingsNetworkServersComponent::ps_serverSelected(const QModelIndex &index)
@@ -85,6 +85,7 @@ namespace BlackGui
QObject *sender = QObject::sender(); QObject *sender = QObject::sender();
CStatusMessage msg; CStatusMessage msg;
bool changed = false; bool changed = false;
bool save = false;
if (sender == this->ui->pb_RemoveServer) if (sender == this->ui->pb_RemoveServer)
{ {
// lenient name removal // lenient name removal
@@ -103,6 +104,7 @@ namespace BlackGui
} }
else if (sender == this->ui->pb_SaveServer) else if (sender == this->ui->pb_SaveServer)
{ {
save = true;
if (msgs.isEmpty() && server.hasAddressAndPort()) if (msgs.isEmpty() && server.hasAddressAndPort())
{ {
// update in any case to list before saving if we have a valid form // update in any case to list before saving if we have a valid form
@@ -113,15 +115,10 @@ namespace BlackGui
if (changed) if (changed)
{ {
msg = m_trafficNetworkServers.set(serverList); msg = save ? m_trafficNetworkServers.setAndSave(serverList) : m_trafficNetworkServers.set(serverList);
this->ps_reloadSettings(); // call manually as local object this->ps_reloadSettings(); // call manually as local object
} }
if (msgs.isEmpty() && sender == this->ui->pb_SaveServer)
{
msg = sGui->getIContextApplication()->saveSettings(m_trafficNetworkServers.getKey());
}
if (!msg.isEmpty()) if (!msg.isEmpty())
{ {
msg.addCategories(this); msg.addCategories(this);