flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T292, adjusted UI components to reflect model loader changes

Browse Source
This commit is contained in:
Klaus Basan
2018-07-22 18:19:26 +02:00
parent 5faace2bb2
commit 24a1f7d96d
7 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackgui/components/aircraftmodelstringcompleter.cpp
View File

@@ -44,22 +44,21 @@ namespace BlackGui
connect(ui->rb_OwnModels, &QRadioButton::clicked, this, &CAircraftModelStringCompleter::initGui);
connect(&m_modelCaches, &CModelCaches::cacheChanged, this, &CAircraftModelStringCompleter::setSimulator, Qt::QueuedConnection);
CSimulatorInfo sim = CSimulatorInfo(CSimulatorInfo::P3D); // default
CSimulatorInfo simulator = CSimulatorInfo(CSimulatorInfo::P3D); // default
if (sGui->getIContextSimulator())
{
connect(sGui->getIContextSimulator(), &IContextSimulator::simulatorStatusChanged, this, &CAircraftModelStringCompleter::onSimulatorConnected);
sim = sGui->getIContextSimulator()->getSimulatorPluginInfo().getSimulator();
if (sim.isSingleSimulator())
CSimulatorInfo pluginSimulator = sGui->getIContextSimulator()->getSimulatorPluginInfo().getSimulator();
if (pluginSimulator.isSingleSimulator())
{
m_modelCaches.setCurrentSimulator(sim);
simulator = pluginSimulator;
}
else
{
this->setSourceVisible(OwnModels, false);
sim = m_modelCaches.getCurrentSimulator();
this->setSourceVisible(OwnModels, false); // hide own models
}
}
this->setSimulator(sim);
this->setSimulator(simulator);
}
CAircraftModelStringCompleter::~CAircraftModelStringCompleter()
@@ -106,9 +105,9 @@ namespace BlackGui
bool CAircraftModelStringCompleter::setSimulator(const CSimulatorInfo &simulator)
{
if (simulator.isSingleSimulator()) { return false; }
if (this->getSimulator() == simulator) { return false; }
m_currentSimulator = simulator;
m_modelCaches.setCurrentSimulator(simulator); // all models
QPointer<CAircraftModelStringCompleter> myself(this);
QTimer::singleShot(100, this, [ = ]
{
@@ -150,7 +149,7 @@ namespace BlackGui
else if (ui->rb_OwnModels->isChecked())
{
if (!simChanged && m_currentDataSource == OwnModels) { return; }
modelStrings = m_modelCaches.getCurrentCachedModels().toCompleterStrings();
modelStrings = m_modelCaches.getCachedModels(this->getSimulator()).toCompleterStrings();
dataSource = OwnModels;
}