diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 5e9035f3d..31d8b9648 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -555,13 +555,22 @@ namespace BlackGui const CAircraftModelList models(m_modelLoader->getCachedModels(simulator)); const int modelsLoaded = models.size(); ui->tvp_OwnAircraftModels->updateContainerMaybeAsync(models); + CStatusMessage m; if (modelsLoaded < 1) { // loading ok, but no data - CLogMessage(this).warning("Loading completed for simulator '%1', but no models") << simulator; + m = CLogMessage(this).warning("Loading completed for simulator '%1', but no models") << simulator; + } + else + { + m = CLogMessage(this).info("Loading completed for simulator '%1' with %2 models") << simulator << modelsLoaded; } - emit this->successfullyLoadedModels(simulator); + // overlay + if (!m.isEmpty() && info == IAircraftModelLoader::ParsedData) { this->showOverlayMessage(m, 5000); } + + // signal + emit this->successfullyLoadedModels(simulator, modelsLoaded); } else { diff --git a/src/blackgui/components/dbownmodelscomponent.h b/src/blackgui/components/dbownmodelscomponent.h index ea4c0f844..c885ddbc5 100644 --- a/src/blackgui/components/dbownmodelscomponent.h +++ b/src/blackgui/components/dbownmodelscomponent.h @@ -123,7 +123,7 @@ namespace BlackGui signals: //! Models have been successfully loaded - void successfullyLoadedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator); + void successfullyLoadedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, int count); private: QScopedPointer ui; diff --git a/src/blackgui/components/dbownmodelsdialog.h b/src/blackgui/components/dbownmodelsdialog.h index f36776555..f40a2d313 100644 --- a/src/blackgui/components/dbownmodelsdialog.h +++ b/src/blackgui/components/dbownmodelsdialog.h @@ -51,7 +51,7 @@ namespace BlackGui signals: //! \copydoc CDbOwnModelsComponent::successfullyLoadedModels - void successfullyLoadedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator); + void successfullyLoadedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, int count); private: QScopedPointer ui; diff --git a/src/blackgui/components/firstmodelsetcomponent.cpp b/src/blackgui/components/firstmodelsetcomponent.cpp index 4670d49c4..16bfd5d52 100644 --- a/src/blackgui/components/firstmodelsetcomponent.cpp +++ b/src/blackgui/components/firstmodelsetcomponent.cpp @@ -104,8 +104,9 @@ namespace BlackGui this->onSimulatorChanged(simulator); } - void CFirstModelSetComponent::onModelsLoaded(const CSimulatorInfo &simulator) + void CFirstModelSetComponent::onModelsLoaded(const CSimulatorInfo &simulator, int count) { + Q_UNUSED(count); const CSimulatorInfo currentSimulator = ui->comp_SimulatorSelector->getValue(); if (simulator != currentSimulator) { return; } // ignore changes not for my selected simulator this->onSimulatorChanged(simulator); diff --git a/src/blackgui/components/firstmodelsetcomponent.h b/src/blackgui/components/firstmodelsetcomponent.h index 007d81efd..2bdab6005 100644 --- a/src/blackgui/components/firstmodelsetcomponent.h +++ b/src/blackgui/components/firstmodelsetcomponent.h @@ -60,7 +60,7 @@ namespace BlackGui void onSettingsChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); //! Models have been loaded - void onModelsLoaded(const BlackMisc::Simulation::CSimulatorInfo &simulator); + void onModelsLoaded(const BlackMisc::Simulation::CSimulatorInfo &simulator, int count); //! Asynchronously call onSettingsChanged void triggerSettingsChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);