Gimmick and formatting

* flags for VATSIM servers
* improved country resolution
This commit is contained in:
Klaus Basan
2016-07-01 14:29:27 +02:00
parent 18112a0394
commit 663b161b0c
7 changed files with 70 additions and 25 deletions

View File

@@ -15,6 +15,7 @@
#include "blackgui/blackguiexport.h"
#include "blackmisc/network/server.h"
#include "blackmisc/network/serverlist.h"
#include "blackmisc/country.h"
#include <QComboBox>
#include <QObject>
@@ -36,7 +37,7 @@ namespace BlackGui
explicit CServerListSelector(QWidget *parent = nullptr);
//! Set the servers
void setServers(const BlackMisc::Network::CServerList &servers);
void setServers(const BlackMisc::Network::CServerList &servers, bool nameIsCountry = false);
//! Get the current server
BlackMisc::Network::CServer currentServer() const;
@@ -46,7 +47,13 @@ namespace BlackGui
private:
//! Build the item string descriptions
void setItemStrings(const BlackMisc::Network::CServerList &servers);
void setServerItems(const BlackMisc::Network::CServerList &servers, bool nameToCountry);
//! Do we know all countries?
static bool knowsAllCountries();
//! Turn server name into country (for VATSIM servers)
static BlackMisc::CCountry findCountry(const BlackMisc::Network::CServer &server);
BlackMisc::Network::CServerList m_servers; //!< corresponding servers
QStringList m_items; //!< items strings