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

refs #603, new CMD args, formerly passed by env.vars

Browse Source 
* removed from CProject
* removed. env. vars menu items
* prepared for vatlib cmd. args
* prepared for eol (end of lifetime) timestamp (time bomb)
This commit is contained in:
Klaus Basan
2016-02-29 02:17:20 +01:00
committed by Mathew Sutcliffe
parent d7e5b5206c
commit f4cbfc2fa9
22 changed files with 264 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackgui/components/dbdebugdatabasesetup.cpp
View File

@@ -7,6 +7,7 @@
* contained in the LICENSE file.
*/
#include "blackgui/guiapplication.h"
#include "blackmisc/project.h"
#include "dbdebugdatabasesetup.h"
#include "ui_dbdebugdatabasesetup.h"
@@ -23,7 +24,7 @@ namespace BlackGui
ui(new Ui::CDbDebugDatabaseSetup)
{
ui->setupUi(this);
bool enabled = CProject::isRunningInDeveloperEnvironment();
bool enabled = sGui->isRunningInDeveloperEnvironment();
this->setEnabled(enabled);
if (!enabled)
{

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

@@ -106,7 +106,7 @@ namespace BlackGui
CServerList otherServers(this->m_otherTrafficNetworkServers.get());
// add a testserver when no servers can be loaded
if (otherServers.isEmpty() && CProject::isRunningInBetaOrDeveloperEnvironment())
if (otherServers.isEmpty() && (sGui->isRunningInDeveloperEnvironment() || CProject::isBetaTest()))
{
otherServers.push_back(m_setup.get().fsdTestServersPlusHardcodedServers());
CLogMessage(this).info("Added servers for testing");

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

@@ -53,11 +53,11 @@ namespace BlackGui
// add swift test servers in case we have no servers:
// this is debug/bootstrap feature we can continue to test when something goes wrong
if (serverList.isEmpty() && CProject::isRunningInBetaOrDeveloperEnvironment())
if (serverList.isEmpty() && (CProject::isBetaTest() || sGui->isRunningInDeveloperEnvironment()))
{
serverList.push_back(m_setup.get().fsdTestServersPlusHardcodedServers());
this->ui->tvp_Servers->updateContainer(serverList);
}
this->ui->tvp_Servers->updateContainer(serverList);
}
void CSettingsNetworkServersComponent::ps_serverSelected(const QModelIndex &index)