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

as discussed in slack: added default swift testserver (FSD servers) if no settings can be loaded

Browse Source
This commit is contained in:
Klaus Basan
2015-07-11 01:36:06 +02:00
committed by Mathew Sutcliffe
parent d8e0ff83e6
commit 6a1f5e8347
5 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
#include "blackcore/context_simulator.h"
#include "blackcore/network.h"
#include "blackcore/simulator.h"
#include "blackcore/global_network_settings.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "../uppercasevalidator.h"
@@ -142,6 +143,12 @@ namespace BlackGui
ps_validateVatsimValues();
ps_onVatsimDataFileLoaded();
CServerList otherServers = this->m_trafficNetworkServers.get();
// add a testserver when no servers can be loaded
if (otherServers.isEmpty() && CProject::isDebugBuild())
{
otherServers.push_back(CGlobalNetworkSettings::instance().swiftFSDTestServer());
}
this->ui->cbp_OtherServers->setServers(otherServers);
}

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

@@ -11,7 +11,9 @@
#include "ui_settingsnetworkserverscomponent.h"
#include "blackcore/context_network.h"
#include "blackcore/context_settings.h"
#include "blackcore/global_network_settings.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/project.h"
#include "blackmisc/settingsblackmiscclasses.h"
using namespace BlackCore;
@@ -44,8 +46,15 @@ namespace BlackGui
void CSettingsNetworkServersComponent::reloadSettings()
{
// update servers
this->ui->tvp_SettingsTnServers->updateContainer(m_trafficNetworkServers.get());
CServerList serverList(m_trafficNetworkServers.get());
// add swift test server in case we have no servers
// this is debug/bootstrap feature we can continue to test when something goes wrong
if (serverList.isEmpty() && CProject::isDebugBuild())
{
serverList.push_back(CGlobalNetworkSettings::instance().swiftFSDTestServer());
}
this->ui->tvp_SettingsTnServers->updateContainer(serverList);
}
void CSettingsNetworkServersComponent::ps_networkServerSelected(QModelIndex index)
@@ -66,7 +75,7 @@ namespace BlackGui
return;
}
CServerList serverList = m_trafficNetworkServers.get();
CServerList serverList(m_trafficNetworkServers.get());
QObject *sender = QObject::sender();
if (sender == this->ui->pb_SettingsTnServersRemoveServer)
{

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

@@ -51,7 +51,6 @@ namespace BlackGui
private:
QScopedPointer<Ui::CSettingsNetworkServersComponent> ui;
BlackCore::CSetting<BlackCore::Settings::Network::TrafficServers> m_trafficNetworkServers { this };
};
} // ns