flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 13:36:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes completer (model strings), show correct placeholder when simulator is changed

Browse Source
This commit is contained in:
Klaus Basan
2018-03-09 04:26:35 +01:00
parent 2a0b81de5b
commit ad71a67a44
4 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,12 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CMappingComponent::getLogCategories()
{
static const CLogCategoryList cats({ CLogCategory::mapping(), CLogCategory::guiComponent() });
return cats;
}
CMappingComponent::CMappingComponent(QWidget *parent) :
COverlayMessagesFrame(parent),
CIdentifiable(this),
@@ -137,18 +143,13 @@ namespace BlackGui
connect(ui->tvp_RenderedAircraft, &CAircraftModelView::objectChanged, this, &CMappingComponent::onChangedSimulatedAircraftInView);
// with external core models might be already available
this->onModelSetSimulatorChanged(ui->comp_SimulatorSelector->getValue());
this->onModelSetChanged();
}
CMappingComponent::~CMappingComponent()
{ }
const CLogCategoryList &CMappingComponent::getLogCategories()
{
static const CLogCategoryList cats({ CLogCategory::mapping(), CLogCategory::guiComponent() });
return cats;
}
int CMappingComponent::countCurrentMappings() const
{
Q_ASSERT(ui->tvp_RenderedAircraft);
@@ -177,6 +178,9 @@ namespace BlackGui
{
CLogMessage(this).info("Models loaded, you can update the model view");
}
// change completer
ui->completer_ModelStrings->setSimulator(ui->comp_SimulatorSelector->getValue());
}
void CMappingComponent::onRowCountChanged(int count, bool withFilter)
@@ -287,8 +291,11 @@ namespace BlackGui
void CMappingComponent::onModelSetSimulatorChanged(const CSimulatorInfo &simulator)
{
if (!sGui || !sGui->supportsContexts()) { return; }
if (sGui->isShuttingDown()) { return; }
if (sGui->getIContextSimulator()->isSimulatorAvailable()) { return; }
sGui->getIContextSimulator()->setModelSetLoaderSimulator(simulator);
// completer will be changed in onModelSetChanged
}
void CMappingComponent::onPluginChanged(const CSimulatorPluginInfo &pluginInfo)