diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index a2b33b105..cb0051f78 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -38,7 +38,7 @@ namespace BlackGui namespace Components { CDbOwnModelsComponent::CDbOwnModelsComponent(QWidget *parent) : - QFrame(parent), + COverlayMessagesFrame(parent), ui(new Ui::CDbOwnModelsComponent) { ui->setupUi(this); @@ -457,10 +457,10 @@ namespace BlackGui m_modelLoader->startLoading(mode, static_cast(&CDatabaseUtils::consolidateModelsWithDbData), modelDirectories); } - void CDbOwnModelsComponent::onOwnModelsLoadingFinished(const CStatusMessage &status, const CSimulatorInfo &simulator, IAircraftModelLoader::LoadFinishedInfo info) + void CDbOwnModelsComponent::onOwnModelsLoadingFinished(const CStatusMessageList &statusMessages, const CSimulatorInfo &simulator, IAircraftModelLoader::LoadFinishedInfo info) { Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Expect single simulator"); - if (status.isSuccess() && m_modelLoader) + if (statusMessages.isSuccess() && m_modelLoader) { const CAircraftModelList models(m_modelLoader->getAircraftModels()); const int modelsLoaded = models.size(); @@ -474,7 +474,11 @@ namespace BlackGui else { ui->tvp_OwnAircraftModels->clear(); - CLogMessage(this).error("Loading of models failed, simulator '%1', details: %2") << simulator.toQString() << status.getMessage(); + CLogMessage(this).error("Loading of models failed, simulator '%1'") << simulator.toQString(); + } + + if (statusMessages.hasWarningOrErrorMessages()) { + this->showOverlayMessages(statusMessages); } // cache loads may occur in background, do not adjust UI settings diff --git a/src/blackgui/components/dbownmodelscomponent.h b/src/blackgui/components/dbownmodelscomponent.h index bde97ec07..638f841c5 100644 --- a/src/blackgui/components/dbownmodelscomponent.h +++ b/src/blackgui/components/dbownmodelscomponent.h @@ -13,6 +13,7 @@ #define BLACKGUI_COMPONENTS_DBOWNMODELSCOMPONENT_H #include "blackgui/menus/menudelegate.h" +#include "blackgui/overlaymessagesframe.h" #include "blackmisc/datacache.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodellist.h" @@ -44,7 +45,7 @@ namespace BlackGui * Handling of own models on disk (the models installed for the simulator) */ class CDbOwnModelsComponent : - public QFrame, + public COverlayMessagesFrame, public BlackMisc::Simulation::IModelsSetable, public BlackMisc::Simulation::IModelsUpdatable, public BlackMisc::Simulation::IModelsPerSimulatorSetable, @@ -131,7 +132,7 @@ namespace BlackGui void loadInstalledModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode mode, const QStringList &modelDirectories = {}); //! Model loading finished - void onOwnModelsLoadingFinished(const BlackMisc::CStatusMessage &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadFinishedInfo info); + void onOwnModelsLoadingFinished(const BlackMisc::CStatusMessageList &statusMessages, const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadFinishedInfo info); //! Request simulator models void requestSimulatorModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode mode, const QStringList &modelDirectories = {});