From 94b53cef6c27b2e2128809c0e0c5b02b76ca51aa Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 17 Feb 2019 17:10:23 +0100 Subject: [PATCH] Improved loading/parsing messages --- src/blackgui/components/dbaircraftcategorycomponent.cpp | 4 ++-- src/blackgui/components/dbaircrafticaocomponent.cpp | 4 ++-- src/blackgui/components/dbairlineicaocomponent.cpp | 4 ++-- src/blackgui/components/dbliverycomponent.cpp | 4 ++-- src/blackgui/components/dbmodelcomponent.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/blackgui/components/dbaircraftcategorycomponent.cpp b/src/blackgui/components/dbaircraftcategorycomponent.cpp index 48ea8538f..e3797d94a 100644 --- a/src/blackgui/components/dbaircraftcategorycomponent.cpp +++ b/src/blackgui/components/dbaircraftcategorycomponent.cpp @@ -52,14 +52,14 @@ namespace BlackGui if (CEntityFlags::isFinishedReadState(readState)) { - this->showOverlayHTMLMessage(QStringLiteral("Updating"), 2000); + this->showOverlayHTMLMessage(QStringLiteral("Updating %1").arg(CEntityFlags::entitiesToString(entity)), 2000); const CAircraftCategoryList categories = sGui->getWebDataServices()->getAircraftCategories(); ui->tvp_AircraftCategoryView->updateContainerMaybeAsync(categories); ui->tvp_AircraftCategoryTree->updateContainer(categories); } else { - this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::stateToString(readState), 10000); + this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::entitiesToString(entity) % u" " % CEntityFlags::stateToString(readState), 10000); } } diff --git a/src/blackgui/components/dbaircrafticaocomponent.cpp b/src/blackgui/components/dbaircrafticaocomponent.cpp index 11f57fa50..d210747c0 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.cpp +++ b/src/blackgui/components/dbaircrafticaocomponent.cpp @@ -68,12 +68,12 @@ namespace BlackGui if (CEntityFlags::isFinishedReadState(readState)) { - this->showOverlayHTMLMessage(QStringLiteral("Updating"), 2000); + this->showOverlayHTMLMessage(QStringLiteral("Updating %1").arg(CEntityFlags::entitiesToString(entity)), 2000); ui->tvp_AircraftIcao->updateContainerMaybeAsync(sGui->getWebDataServices()->getAircraftIcaoCodes()); } else { - this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::stateToString(readState), 10000); + this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::entitiesToString(entity) % u" " % CEntityFlags::stateToString(readState), 10000); } } diff --git a/src/blackgui/components/dbairlineicaocomponent.cpp b/src/blackgui/components/dbairlineicaocomponent.cpp index 53cf588ac..a051d09bf 100644 --- a/src/blackgui/components/dbairlineicaocomponent.cpp +++ b/src/blackgui/components/dbairlineicaocomponent.cpp @@ -64,12 +64,12 @@ namespace BlackGui if (CEntityFlags::isFinishedReadState(readState)) { - this->showOverlayHTMLMessage(QStringLiteral("Updating"), 2000); + this->showOverlayHTMLMessage(QStringLiteral("Updating %1").arg(CEntityFlags::entitiesToString(entity)), 2000); ui->tvp_AirlineIcao->updateContainerMaybeAsync(sGui->getWebDataServices()->getAirlineIcaoCodes()); } else { - this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::stateToString(readState), 10000); + this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::entitiesToString(entity) % u" " % CEntityFlags::stateToString(readState), 10000); } } diff --git a/src/blackgui/components/dbliverycomponent.cpp b/src/blackgui/components/dbliverycomponent.cpp index 57239d30b..aa5def476 100644 --- a/src/blackgui/components/dbliverycomponent.cpp +++ b/src/blackgui/components/dbliverycomponent.cpp @@ -71,12 +71,12 @@ namespace BlackGui if (CEntityFlags::isFinishedReadState(readState)) { - this->showOverlayHTMLMessage(QStringLiteral("Updating"), 2000); + this->showOverlayHTMLMessage(QStringLiteral("Updating %1").arg(CEntityFlags::entitiesToString(entity)), 2000); ui->tvp_Liveries->updateContainerMaybeAsync(sGui->getWebDataServices()->getLiveries()); } else { - this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::stateToString(readState), 10000); + this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::entitiesToString(entity) % u" " % CEntityFlags::stateToString(readState), 10000); } } diff --git a/src/blackgui/components/dbmodelcomponent.cpp b/src/blackgui/components/dbmodelcomponent.cpp index 38f89b540..b4efa6421 100644 --- a/src/blackgui/components/dbmodelcomponent.cpp +++ b/src/blackgui/components/dbmodelcomponent.cpp @@ -93,12 +93,12 @@ namespace BlackGui if (CEntityFlags::isFinishedReadState(readState)) { - this->showOverlayHTMLMessage(QStringLiteral("Updating"), 2000); + this->showOverlayHTMLMessage(QStringLiteral("Updating %1").arg(CEntityFlags::entitiesToString(entity)), 2000); ui->tvp_AircraftModel->updateContainerMaybeAsync(sGui->getWebDataServices()->getModels()); } else { - this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::stateToString(readState), 25000); + this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::entitiesToString(entity) % u" " % CEntityFlags::stateToString(readState), 10000); } }