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

Ref T210, adjusting classes to use new functions

Browse Source
This commit is contained in:
Klaus Basan
2017-12-19 03:14:42 +01:00
parent 4a2a059865
commit 0f8bbbbfc2
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -185,7 +185,7 @@ namespace BlackCore
m_network->presetServer(server);
// Fall back to observer mode, if no simulator is available or not simulating
if (CBuildConfig::isStableBranch() && !this->getIContextSimulator()->isSimulatorSimulating())
if (!CBuildConfig::isLocalDeveloperDebugBuild() && !this->getIContextSimulator()->isSimulatorSimulating())
{
CLogMessage(this).info("No simulator connected or connected simulator not simulating. Falling back to observer mode");
mode = INetwork::LoginAsObserver;

2
src/blackcore/setupreader.cpp
View File

@@ -42,7 +42,7 @@ namespace BlackCore
{
{ "url", "bootstrapurl" },
QCoreApplication::translate("application", "Bootstrap URL, e.g. https://datastore.swift-project.org/shared"),
"bootstrapurl", (sApp->isUnitTest()) ? unitTestBootstrapUrl() : ""
"bootstrapurl", (sApp->getApplicationInfo().isUnitTest()) ? unitTestBootstrapUrl() : ""
}, m_cmdBootstrapMode
{
{ "bmode", "bootstrapmode" },

2
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -718,7 +718,7 @@ namespace BlackCore
};
// only in not officially shipped versions
return (CBuildConfig::isStableBranch() && !CBuildConfig::isDevBranch()) ? e : opts;
return (CBuildConfig::isLocalDeveloperDebugBuild()) ? opts : e;
}
bool CNetworkVatlib::getCmdLineClientIdAndKey(int &id, QString &key)

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

@@ -157,7 +157,7 @@ namespace BlackGui
CServerList otherServers(m_otherTrafficNetworkServers.getThreadLocal());
// add a testserver when no servers can be loaded
if (otherServers.isEmpty() && (sGui->isRunningInDeveloperEnvironment() || CBuildConfig::isDevBranch()))
if (otherServers.isEmpty() && sGui->isRunningInDeveloperEnvironment())
{
otherServers.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers());
CLogMessage(this).info("Added servers for testing");

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

@@ -265,7 +265,7 @@ namespace BlackGui
bool changed = false;
if (aircraftFromBackend.getModelString() != modelString)
{
CAircraftModelList models = sGui->getIContextSimulator()->getModelSetModelsStartingWith(modelString);
const CAircraftModelList models = sGui->getIContextSimulator()->getModelSetModelsStartingWith(modelString);
if (models.isEmpty())
{
CLogMessage(this).validationError("No model for title: %1") << modelString;

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

@@ -47,7 +47,7 @@ namespace BlackGui
this->tabBar()->setExpanding(false);
this->tabBar()->setUsesScrollButtons(true);
this->setCurrentIndex(0); // 1st tab
ui->comp_DataLoadOverview->showVisibleDbRefreshButtons(CBuildConfig::isDebugBuild() || CBuildConfig::isDevBranch());
ui->comp_DataLoadOverview->showVisibleDbRefreshButtons(CBuildConfig::isDebugBuild() || sGui->isRunningInDeveloperEnvironment());
ui->comp_DataLoadOverview->showVisibleLoadAllButtons(false, false);
connect(ui->comp_SettingsGuiGeneral, &CSettingsGuiComponent::changedWindowsOpacity, this, &CSettingsComponent::changedWindowsOpacity);

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

@@ -60,7 +60,7 @@ 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() && (CBuildConfig::isDevBranch() || sGui->isRunningInDeveloperEnvironment()))
if (serverList.isEmpty() && (sGui->isRunningInDeveloperEnvironment()))
{
serverList.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers());
}

2
src/blackgui/loginmodebuttons.cpp
View File

@@ -74,7 +74,7 @@ namespace BlackGui
void CLoginModeButtons::configureLoginModes()
{
if (CBuildConfig::isStableBranch() && !sGui->getIContextSimulator()->isSimulatorSimulating())
if (!sGui->isRunningInDeveloperEnvironment() && !sGui->getIContextSimulator()->isSimulatorSimulating())
{
// Disable pilot login modes
ui->rb_LoginNormal->setEnabled(false);

2
src/blackmisc/simulation/fscommon/fscommonutil.cpp
View File

@@ -72,7 +72,7 @@ namespace BlackMisc
"C:/Program Files (x86)/Microsoft Games/Microsoft Flight Simulator X",
"C:/FSX"
});
if (!CBuildConfig::isStableBranch())
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
// developer directories
someDefaultDirs.push_back("P:/FSX (MSI)");