mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-23 23:45:35 +08:00
Remove ISimulator::getSimulatorInfo()
To provide maximum flexibility, the simulator info is specified by each plugin in the JSON metadata file. * Renamed SCimulatorInfo to CSimulatorPluginInfo * Removed pre-defined simulator infos (UnspecifiedSim, FSX, etc) * CContextSimulator keeps track of which plugin is loaded and its info * QSignalMapper keeps track of which listener emitted the simulatorStared() signal * CSimulatorPluginInfo contains name, simulator name and description * TODO: GUI part * TODO: CTestFsCommon
This commit is contained in:
committed by
Roland Winklmeier
parent
3897fb2d1a
commit
63e48ae332
@@ -78,14 +78,14 @@ namespace BlackGui
|
||||
connect(this->ui->pb_ClearRestrictedRendering, &QCheckBox::pressed, this, &CSettingsSimulatorComponent::ps_clearRestricedRendering);
|
||||
}
|
||||
|
||||
void CSettingsSimulatorComponent::setCurrentPlugin(const CSimulatorInfo &plugin)
|
||||
void CSettingsSimulatorComponent::setCurrentPlugin(const CSimulatorPluginInfo &plugin)
|
||||
{
|
||||
if (plugin.isUnspecified()) {
|
||||
ui->cb_Plugins->setCurrentIndex(0);
|
||||
return;
|
||||
}
|
||||
|
||||
const QString searchFor = plugin.getShortName();
|
||||
const QString searchFor = plugin.name();
|
||||
for (int i = 0; i < this->ui->cb_Plugins->count(); ++i)
|
||||
{
|
||||
const QString t = ui->cb_Plugins->itemText(i);
|
||||
@@ -118,8 +118,8 @@ namespace BlackGui
|
||||
Q_ASSERT(this->getIContextSettings());
|
||||
if (!this->getIContextSimulator() || !this->getIContextSettings()) return;
|
||||
|
||||
CSimulatorInfoList simDrivers = this->getIContextSimulator()->getAvailableSimulatorPlugins();
|
||||
simDrivers.insert(simDrivers.begin(), CSimulatorInfo::UnspecifiedSim());
|
||||
CSimulatorPluginInfoList simDrivers = this->getIContextSimulator()->getAvailableSimulatorPlugins();
|
||||
simDrivers.insert(simDrivers.begin(), CSimulatorPluginInfo());
|
||||
if (simDrivers.isEmpty())
|
||||
{
|
||||
CLogMessage(this).error("No drivers available");
|
||||
@@ -132,7 +132,7 @@ namespace BlackGui
|
||||
}
|
||||
|
||||
// update
|
||||
CSimulatorInfo currentDriver = simDrivers[index];
|
||||
CSimulatorPluginInfo currentDriver = simDrivers[index];
|
||||
const QString path = CSettingUtilities::appendPaths(IContextSettings::PathSimulatorSettings(), CSettingsSimulator::ValueSelectedDriver());
|
||||
this->getIContextSettings()->value(path, CSettingUtilities::CmdUpdate(), currentDriver.toCVariant());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user