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

Ref T286, renaming / adding utility functions in simulator info

Browse Source
This commit is contained in:
Klaus Basan
2018-07-03 19:22:53 +02:00
parent 2798d36435
commit ac406d43f6
13 changed files with 74 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackgui/components/configsimulatorcomponent.cpp
View File

@@ -54,10 +54,10 @@ namespace BlackGui
sims = m_modelSets.simulatorsWithInitializedCache();
}
const bool p3d = (sims.p3d() || !CFsCommonUtil::p3dDir().isEmpty()) && CBuildConfig::isCompiledWithP3DSupport();
const bool fsx = (sims.fsx() || !CFsCommonUtil::fsxDir().isEmpty()) && CBuildConfig::isCompiledWithFsxSupport();
const bool fs9 = (sims.fs9() || !CFsCommonUtil::fs9Dir().isEmpty()) && CBuildConfig::isCompiledWithFs9Support();
const bool xp = sims.xplane() && CBuildConfig::isCompiledWithXPlaneSupport();
const bool p3d = (sims.isP3D() || !CFsCommonUtil::p3dDir().isEmpty()) && CBuildConfig::isCompiledWithP3DSupport();
const bool fsx = (sims.isFSX() || !CFsCommonUtil::fsxDir().isEmpty()) && CBuildConfig::isCompiledWithFsxSupport();
const bool fs9 = (sims.isFS9() || !CFsCommonUtil::fs9Dir().isEmpty()) && CBuildConfig::isCompiledWithFs9Support();
const bool xp = sims.isXPlane() && CBuildConfig::isCompiledWithXPlaneSupport();
ui->cb_P3D->setChecked(p3d);
ui->cb_FSX->setChecked(fsx);

16
src/blackgui/components/dbownmodelscomponent.cpp
View File

@@ -256,7 +256,7 @@ namespace BlackGui
if (m_loadActions.isEmpty()) { m_loadActions = QList<QAction *>({nullptr, nullptr, nullptr, nullptr}); }
menuActions.addMenuSimulator();
if (sims.fsx())
if (sims.isFSX())
{
if (!m_loadActions[0])
{
@@ -269,7 +269,7 @@ namespace BlackGui
}
menuActions.addAction(m_loadActions[0], CMenuAction::pathSimulator());
}
if (sims.p3d())
if (sims.isP3D())
{
if (!m_loadActions[1])
{
@@ -282,7 +282,7 @@ namespace BlackGui
}
menuActions.addAction(m_loadActions[1], CMenuAction::pathSimulator());
}
if (sims.fs9())
if (sims.isFS9())
{
if (!m_loadActions[2])
{
@@ -295,7 +295,7 @@ namespace BlackGui
}
menuActions.addAction(m_loadActions[2], CMenuAction::pathSimulator());
}
if (sims.xplane())
if (sims.isXPlane())
{
if (!m_loadActions[3])
{
@@ -315,7 +315,7 @@ namespace BlackGui
{
if (m_reloadActions.isEmpty()) { m_reloadActions = QList<QAction *>({nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr}); }
menuActions.addMenu(CIcons::refresh16(), "Force model reload", CMenuAction::pathSimulatorModelsReload());
if (sims.fsx())
if (sims.isFSX())
{
if (!m_reloadActions[0])
{
@@ -341,7 +341,7 @@ namespace BlackGui
menuActions.addAction(m_reloadActions[0], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(m_reloadActions[1], CMenuAction::pathSimulatorModelsReload());
}
if (sims.p3d())
if (sims.isP3D())
{
if (!m_reloadActions[2])
{
@@ -367,7 +367,7 @@ namespace BlackGui
menuActions.addAction(m_reloadActions[2], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(m_reloadActions[3], CMenuAction::pathSimulatorModelsReload());
}
if (sims.fs9())
if (sims.isFS9())
{
if (!m_reloadActions[4])
{
@@ -393,7 +393,7 @@ namespace BlackGui
menuActions.addAction(m_reloadActions[4], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(m_reloadActions[5], CMenuAction::pathSimulatorModelsReload());
}
if (sims.xplane())
if (sims.isXPlane())
{
if (!m_reloadActions[6])
{

8
src/blackgui/components/dbownmodelsetcomponent.cpp
View File

@@ -417,7 +417,7 @@ namespace BlackGui
Q_ASSERT_X(ownModelSetComp, Q_FUNC_INFO, "Cannot access parent");
if (m_setActions.isEmpty())
{
if (sims.fsx())
if (sims.isFSX())
{
QAction *a = new QAction(CIcons::appModels16(), "FSX models", this);
connect(a, &QAction::triggered, ownModelSetComp, [ownModelSetComp](bool checked)
@@ -435,7 +435,7 @@ namespace BlackGui
});
m_setNewActions.append(a);
}
if (sims.p3d())
if (sims.isP3D())
{
QAction *a = new QAction(CIcons::appModels16(), "P3D models", this);
connect(a, &QAction::triggered, ownModelSetComp, [ownModelSetComp](bool checked)
@@ -453,7 +453,7 @@ namespace BlackGui
});
m_setNewActions.append(a);
}
if (sims.fs9())
if (sims.isFS9())
{
QAction *a = new QAction(CIcons::appModels16(), "FS9 models", this);
connect(a, &QAction::triggered, ownModelSetComp, [ownModelSetComp](bool checked)
@@ -471,7 +471,7 @@ namespace BlackGui
});
m_setNewActions.append(a);
}
if (sims.xplane())
if (sims.isXPlane())
{
QAction *a = new QAction(CIcons::appModels16(), "XPlane models", this);
connect(a, &QAction::triggered, ownModelSetComp, [ownModelSetComp](bool checked)

16
src/blackgui/components/simulatorselector.cpp
View File

@@ -87,16 +87,16 @@ namespace BlackGui
if (simulator == current) { return; } // avoid unnecessary signals
// checkboxes
ui->cb_FSX->setChecked(simulator.fsx());
ui->cb_FS9->setChecked(simulator.fs9());
ui->cb_XPlane->setChecked(simulator.xplane());
ui->cb_P3D->setChecked(simulator.p3d());
ui->cb_FSX->setChecked(simulator.isFSX());
ui->cb_FS9->setChecked(simulator.isFS9());
ui->cb_XPlane->setChecked(simulator.isXPlane());
ui->cb_P3D->setChecked(simulator.isP3D());
// radio buttons
if (simulator.fsx()) { ui->rb_FSX->setChecked(simulator.fsx()); return; }
if (simulator.fs9()) { ui->rb_FS9->setChecked(simulator.fs9()); return; }
if (simulator.xplane()) { ui->rb_XPlane->setChecked(simulator.xplane()); return; }
if (simulator.p3d()) { ui->rb_P3D->setChecked(simulator.p3d()); return; }
if (simulator.isFSX()) { ui->rb_FSX->setChecked(simulator.isFSX()); return; }
if (simulator.isFS9()) { ui->rb_FS9->setChecked(simulator.isFS9()); return; }
if (simulator.isXPlane()) { ui->rb_XPlane->setChecked(simulator.isXPlane()); return; }
if (simulator.isP3D()) { ui->rb_P3D->setChecked(simulator.isP3D()); return; }
}
void CSimulatorSelector::setToLastSelection()