From 330919329d1016ae03de26d74778ef394f9e0575 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 6 Jul 2014 17:17:40 +0200
Subject: [PATCH] refs #291, timers for aircraft component independent of
 network connection Remarks: sim can be connected, while network is not

---
 samples/blackgui/mainwindow.cpp      |  4 ---
 samples/blackgui/mainwindow_init.cpp | 21 +++------------
 src/blackgui/aircraftcomponent.cpp   |  5 ++++
 src/blackgui/aircraftcomponent.ui    | 38 ++++++++++++++++++++++++++--
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/samples/blackgui/mainwindow.cpp b/samples/blackgui/mainwindow.cpp
index e539bda2f..dd9af668c 100644
--- a/samples/blackgui/mainwindow.cpp
+++ b/samples/blackgui/mainwindow.cpp
@@ -311,10 +311,6 @@ void MainWindow::connectionStatusChanged(uint /** from **/, uint to, const QStri
 {
     this->updateGuiStatusInformation();
     INetwork::ConnectionStatus newStatus = static_cast<INetwork::ConnectionStatus>(to);
-    if (newStatus == INetwork::Connected)
-        this->startUpdateTimers();
-    else if (newStatus == INetwork::Disconnecting || newStatus == INetwork::Disconnected || newStatus == INetwork::DisconnectedError)
-        this->stopUpdateTimers();
 
     // sounds
     switch (newStatus)
diff --git a/samples/blackgui/mainwindow_init.cpp b/samples/blackgui/mainwindow_init.cpp
index b7cfc5ede..2936bf645 100644
--- a/samples/blackgui/mainwindow_init.cpp
+++ b/samples/blackgui/mainwindow_init.cpp
@@ -145,6 +145,9 @@ void MainWindow::init(const CRuntimeConfig &runtimeConfig)
     // hotkeys
     this->registerHotkeys();
 
+    // update timers
+    this->startUpdateTimers();
+
     // do this as last statement, so it can be used as flag
     // whether init has been completed
     this->m_init = true;
@@ -234,24 +237,6 @@ void MainWindow::initialDataReads()
 
     this->ui->comp_Settings->reloadSettings(); // init read
     this->reloadOwnAircraft(); // init read, independent of traffic network
-
-    // also reads bookings if not connected
-    if (this->getIContextNetwork()->isConnected())
-    {
-        // connection is already established
-        this->ui->comp_AtcStations->update();
-        this->ui->comp_Aircrafts->update();
-
-        this->updateGuiStatusInformation();
-        this->ui->comp_Users->update();
-        this->ui->comp_Aircrafts->update();
-    }
-    else
-    {
-        // Initial booking read
-        QTimer::singleShot(30 * 1000, this->ui->comp_AtcStations, SLOT(update()));
-    }
-
     this->displayStatusMessage(CStatusMessage(CStatusMessage::TypeGui, CStatusMessage::SeverityInfo, "initial data read"));
 }
 
diff --git a/src/blackgui/aircraftcomponent.cpp b/src/blackgui/aircraftcomponent.cpp
index 070b69f52..bacd8723f 100644
--- a/src/blackgui/aircraftcomponent.cpp
+++ b/src/blackgui/aircraftcomponent.cpp
@@ -20,10 +20,15 @@ namespace BlackGui
     {
         Q_ASSERT(this->ui->tvp_AircraftsInRange);
         Q_ASSERT(this->getIContextNetwork());
+        Q_ASSERT(this->getIContextSimulator());
 
         if (this->getIContextNetwork()->isConnected())
         {
             this->ui->tvp_AircraftsInRange->update(this->getIContextNetwork()->getAircraftsInRange());
         }
+        if (this->getIContextSimulator()->isConnected())
+        {
+            this->ui->tvp_AirportsInRange->update(this->getIContextSimulator()->getAirportsInRange());
+        }
     }
 }
diff --git a/src/blackgui/aircraftcomponent.ui b/src/blackgui/aircraftcomponent.ui
index ab5715874..51fed7cbf 100644
--- a/src/blackgui/aircraftcomponent.ui
+++ b/src/blackgui/aircraftcomponent.ui
@@ -11,14 +11,14 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>TabWidget</string>
+   <string>Airports in range</string>
   </property>
   <property name="currentIndex">
    <number>0</number>
   </property>
   <widget class="QWidget" name="tb_AircraftsInRange">
    <attribute name="title">
-    <string>In range</string>
+    <string>Aircrafts in range</string>
    </attribute>
    <layout class="QVBoxLayout" name="vl_AircraftsInRange">
     <property name="spacing">
@@ -45,6 +45,35 @@
     </item>
    </layout>
   </widget>
+  <widget class="QWidget" name="tb_AirportsInRange">
+   <attribute name="title">
+    <string>Airports in range</string>
+   </attribute>
+   <layout class="QVBoxLayout" name="vl_AirportsInRange">
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="BlackGui::CAirportView" name="tvp_AirportsInRange">
+      <attribute name="verticalHeaderVisible">
+       <bool>false</bool>
+      </attribute>
+     </widget>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>
@@ -52,6 +81,11 @@
    <extends>QTableView</extends>
    <header>blackgui/aircraftview.h</header>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::CAirportView</class>
+   <extends>QTableView</extends>
+   <header>blackgui/airportview.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>