refs #288, adjusted server and network views

* 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

View File

@@ -54,13 +54,7 @@ namespace BlackMisc
void CSettingsNetwork::initDefaultValues()
{
this->m_trafficNetworkServers.clear();
CServer currentServer(CServer("Testserver", "Client project testserver", "vatsim-germany.org", 6809, CUser("guest", "Guest Client project", "", "guest")));
this->setCurrentNetworkServer(currentServer);
this->addTrafficNetworkServer(this->getCurrentTrafficNetworkServer());
this->addTrafficNetworkServer(CServer("Europe C2", "VATSIM Server", "88.198.19.202", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw")));
this->addTrafficNetworkServer(CServer("Europe CC", "VATSIM Server", "5.9.155.43", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw")));
this->addTrafficNetworkServer(CServer("UK", "VATSIM Server", "109.169.48.148", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw")));
this->addTrafficNetworkServer(CServer("USA-W", "VATSIM Server", "64.151.108.52", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw")));
this->addTrafficNetworkServer(CServer("Testserver", "Client project testserver", "vatsim-germany.org", 6809, CUser("guest", "Guest Client project", "", "guest")));
}
/*

View File

@@ -32,7 +32,11 @@ namespace BlackMisc
//! Default constructor.
CSettingsNetwork();
//! Update
//! Destructor.
virtual ~CSettingsNetwork() {}
//! Current server
//! \deprecated shall not be used anymore
static const QString &CmdSetCurrentServer()
{
static const QString cmd("currenttrafficserver");
@@ -64,6 +68,7 @@ namespace BlackMisc
BlackMisc::Network::CServerList getTrafficNetworkServers() const { return m_trafficNetworkServers; }
//! Selected traffic network server
//! \deprecated Shall not be used anymore
BlackMisc::Network::CServer getCurrentTrafficNetworkServer() const { return m_trafficNetworkServerCurrent; }
//! URL of booking service