From 170da452eee9af87fb165b3ae1fa5a816c049da3 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 20 Apr 2020 12:46:56 +0200 Subject: [PATCH] [Weather] Message that "real weather is loading" --- src/blackgui/components/weathercomponent.cpp | 6 ++++-- src/blackgui/components/weathercomponent.h | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/blackgui/components/weathercomponent.cpp b/src/blackgui/components/weathercomponent.cpp index 73b9f43cf..8e58d8f13 100644 --- a/src/blackgui/components/weathercomponent.cpp +++ b/src/blackgui/components/weathercomponent.cpp @@ -42,7 +42,7 @@ namespace BlackGui namespace Components { CWeatherComponent::CWeatherComponent(QWidget *parent) : - QWidget(parent), + COverlayMessagesFrameEnableForDockWidgetInfoArea(parent), CIdentifiable(this), ui(new Ui::CWeatherComponent) { @@ -215,8 +215,9 @@ namespace BlackGui if (m_lastOwnAircraftPosition.isNull() || calculateGreatCircleDistance(position, m_lastOwnAircraftPosition).value(CLengthUnit::km()) > 20) { - requestWeatherGrid(position); + this->requestWeatherGrid(position); m_lastOwnAircraftPosition = position; + showOverlayHTMLMessage("Weather loading,
this may take a while", 7500); } } else @@ -234,6 +235,7 @@ namespace BlackGui if (!CWeatherScenario::isRealWeatherScenario(scenario)) { return; } // we have received weather grid data and assume those are real weather updates + closeOverlay(); } ui->lbl_Status->setText({}); setWeatherGrid(weatherGrid); diff --git a/src/blackgui/components/weathercomponent.h b/src/blackgui/components/weathercomponent.h index bce13bcd2..73e39c9bf 100644 --- a/src/blackgui/components/weathercomponent.h +++ b/src/blackgui/components/weathercomponent.h @@ -40,8 +40,7 @@ namespace BlackGui { //! Weather component class BLACKGUI_EXPORT CWeatherComponent : - public QWidget, - public CEnableForDockWidgetInfoArea, + public COverlayMessagesFrameEnableForDockWidgetInfoArea, public BlackMisc::CIdentifiable { Q_OBJECT