diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp
index ca439a23b..ce4cd6c80 100644
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -33,6 +33,12 @@ namespace BlackGui
ui->setupUi(this);
this->m_timerComponent = new CTimerBasedComponent(SLOT(update()), this);
+ // some icons
+ this->ui->pb_AtcStationsAtisReload->setIcon(CIcons::atis());
+ this->ui->pb_AtcStationsAtisReload->setText("");
+ this->ui->pb_AtcStationsLoadMetar->setIcon(CIcons::metar());
+ this->ui->pb_AtcStationsLoadMetar->setText("");
+
// set station mode
this->ui->tvp_AtcStationsOnline->setStationMode(CAtcStationListModel::StationsOnline);
this->ui->tvp_AtcStationsBooked->setStationMode(CAtcStationListModel::StationsBooked);
diff --git a/src/blackgui/components/atcstationcomponent.ui b/src/blackgui/components/atcstationcomponent.ui
index 0907a512a..c9f5b3037 100644
--- a/src/blackgui/components/atcstationcomponent.ui
+++ b/src/blackgui/components/atcstationcomponent.ui
@@ -7,7 +7,7 @@
0
0
400
- 501
+ 462
@@ -39,7 +39,7 @@
-
-
+
0
0
@@ -68,48 +68,117 @@
-
-
+
0
0
-
-
- 0
- 0
-
-
16777215
- 110
+ 75
-
- Info (ATIS, METAR, ...)
+
+ QFrame::NoFrame
-
-
- 0
+
+ QFrame::Raised
+
+
+
+ QLayout::SetDefaultConstraint
- 0
+ 2
- 12
+ 0
- 0
+ 2
2
-
-
+
+ 2
+
+
+ 4
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 40
+ 16777215
+
+
+
+ METAR: Airport ICAO code
+
+
+ EDDF
+
+
+ 5
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Load METAR
+
+
+ METAR
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Reload ATIS
+
+
+ ATIS
+
+
+ false
+
+
+
+ -
-
+
0
0
@@ -123,100 +192,10 @@
16777215
- 100
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 25
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
- QLayout::SetDefaultConstraint
-
-
- 5
-
-
- 0
-
-
- 2
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
- Load METAR
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Reload ATIS
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 60
16777215
-
-
-
-
- EDDF
-
-
- 5
-
-
+
true
diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp
index 31b7529e6..2169bb8df 100644
--- a/src/blackgui/dockwidget.cpp
+++ b/src/blackgui/dockwidget.cpp
@@ -100,13 +100,13 @@ namespace BlackGui
void CDockWidget::hideEvent(QHideEvent *event)
{
- qDebug() << "hide" << this->objectName() << "v:" << isVisible() << "h:" << isHidden();
+ // qDebug() << "hide" << this->objectName() << "v:" << isVisible() << "h:" << isHidden();
QDockWidget::hideEvent(event);
}
void CDockWidget::showEvent(QShowEvent *event)
{
- qDebug() << "show" << this->objectName() << "v:" << isVisible() << "h:" << isHidden();
+ // qDebug() << "show" << this->objectName() << "v:" << isVisible() << "h:" << isHidden();
QDockWidget::showEvent(event);
}
diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp
index 657f34fcc..f380c14f7 100644
--- a/src/blackmisc/iconlist.cpp
+++ b/src/blackmisc/iconlist.cpp
@@ -35,7 +35,9 @@ namespace BlackMisc
static const CIconList icons(
{
// keep indexes alphabetically sorted and in sync with CIcons
+ CIcon(CIcons::AviationAtis, "ATIS"),
CIcon(CIcons::AviationAttitudeIndicator, "attitude indicator"),
+ CIcon(CIcons::AviationMetar, "METAR"),
CIcon(CIcons::GeoPosition, "geo position"),
CIcon(CIcons::NetworkCapabilityTextOnly, "text only"),
CIcon(CIcons::NetworkCapabilityUnknown, "unknown"),
diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp
index 3e144aee6..271fe5d18 100644
--- a/src/blackmisc/icons.cpp
+++ b/src/blackmisc/icons.cpp
@@ -30,7 +30,9 @@ namespace BlackMisc
{
switch (index)
{
+ case AviationAtis: return atis();
case AviationAttitudeIndicator: return attitudeIndicator16();
+ case AviationMetar: return metar();
case GeoPosition: return geoPosition16();
case NetworkCapabilityTextOnly: return capabilityTextOnly();
case NetworkCapabilityUnknown: return capabilityUnknown();
diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h
index bdc147630..cac694aa5 100644
--- a/src/blackmisc/icons.h
+++ b/src/blackmisc/icons.h
@@ -29,6 +29,8 @@ namespace BlackMisc
{
// keep indexes alphabetically sorted and in sync with CIconList
AviationAttitudeIndicator,
+ AviationAtis,
+ AviationMetar,
GeoPosition,
NetworkCapabilityTextOnly,
NetworkCapabilityUnknown,
@@ -683,6 +685,18 @@ namespace BlackMisc
return pm;
}
+ //! METAR
+ static const QPixmap &metar()
+ {
+ return weatherCloudy16();
+ }
+
+ //! ATIS
+ static const QPixmap &atis()
+ {
+ return text16();
+ }
+
//! Geo position
static const QPixmap &geoPosition16()
{