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

Ref T335, show removed consolidated models as overlay message

Browse Source
This commit is contained in:
Klaus Basan
2018-09-12 16:25:42 +02:00
parent 640e6ab055
commit c43b51056b
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/menus/aircraftmodelmenus.cpp
View File

@@ -304,8 +304,9 @@ namespace BlackGui
bool filtered = false;
const CAircraftModelList models(this->getAllOrAllFilteredAircraftModels(&filtered));
if (models.isEmpty()) { return; }
QStringList removedModelStrings;
const int i = this->modelView()->showLoadIndicator();
const CAircraftModelList consolidated = CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(models, this->getSimulatorModels(), true);
const CAircraftModelList consolidated = CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(models, this->getSimulatorModels(), removedModelStrings, true);
const CSimulatorInfo sim(this->getSimulator());
if (!filtered)
@@ -324,6 +325,11 @@ namespace BlackGui
}
}
this->modelView()->hideLoadIndicator(i);
if (!removedModelStrings.isEmpty() && this->getMappingComponent())
{
const CStatusMessage m = CStatusMessage(this).info("Removed %1 model(s)") << removedModelStrings.size();
this->getMappingComponent()->showOverlayMessage(m, 5000);
}
}
void CConsolidateWithSimulatorModels::consolidateSelectedData()
@@ -337,12 +343,18 @@ namespace BlackGui
return;
}
QStringList removedModelStrings;
const int i = this->modelView()->showLoadIndicator();
const CAircraftModelList consolidated = CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(models, this->getSimulatorModels(), true);
const CAircraftModelList consolidated = CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(models, this->getSimulatorModels(), removedModelStrings, true);
const CSimulatorInfo sim(this->getSimulator());
this->modelsTargetUpdatable()->updateModelsForSimulator(consolidated, sim);
this->modelView()->hideLoadIndicator(i);
if (!removedModelStrings.isEmpty() && this->getMappingComponent())
{
const CStatusMessage m = CStatusMessage(this).info("Removed %1 model(s)") << removedModelStrings.size();
this->getMappingComponent()->showOverlayMessage(m, 5000);
}
}
CAircraftModelList CConsolidateWithSimulatorModels::getSimulatorModels() const