Increase timeout a bit (WLAN experience)

src/blackgui/components/dbloadoverviewcomponent.cpp

@@ -11,6 +11,7 @@
 #include "ui_dbloadoverviewcomponent.h"
 
 #include "blackcore/webdataservices.h"
+#include "blackcore/db/infodatareader.h"
 #include "blackgui/guiapplication.h"
 #include "blackmisc/network/networkutils.h"
 
@@ -62,6 +63,7 @@ namespace BlackGui
             if (sGui->hasWebDataServices())
             {
                 connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbLoadOverviewComponent::ps_dataLoaded);
+                QTimer::singleShot(10 * 1000, this, &CDbLoadOverviewComponent::ps_loadInfoObjects);
             }
         }
 
@@ -130,22 +132,6 @@ namespace BlackGui
             if (!sGui) { return; }
             if (!sGui->hasWebDataServices()) { return; }
 
-            ui->le_AircraftIcaoCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
-            ui->le_AirlinesIcaoCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
-            ui->le_AirportsCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AirportEntity));
-            ui->le_LiveriesCacheTs->setText(cacheTimestampForEntity(CEntityFlags::LiveryEntity));
-            ui->le_ModelsCacheTs->setText(cacheTimestampForEntity(CEntityFlags::ModelEntity));
-            ui->le_CountriesCacheTs->setText(cacheTimestampForEntity(CEntityFlags::CountryEntity));
-            ui->le_DistributorsCacheTs->setText(cacheTimestampForEntity(CEntityFlags::DistributorEntity));
-
-            ui->le_AircraftIcaoDbTs->setText(dbTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
-            ui->le_AirlinesIcaoDbTs->setText(dbTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
-            ui->le_AirportsDbTs->setText(dbTimestampForEntity(CEntityFlags::AirportEntity));
-            ui->le_LiveriesDbTs->setText(dbTimestampForEntity(CEntityFlags::LiveryEntity));
-            ui->le_ModelsDbTs->setText(dbTimestampForEntity(CEntityFlags::ModelEntity));
-            ui->le_CountriesDbTs->setText(dbTimestampForEntity(CEntityFlags::CountryEntity));
-            ui->le_DistributorsDbTs->setText(dbTimestampForEntity(CEntityFlags::DistributorEntity));
-
             ui->le_AircraftIcaoCacheCount->setText(cacheCountForEntity(CEntityFlags::AircraftIcaoEntity));
             ui->le_AirlinesIcaoCacheCount->setText(cacheCountForEntity(CEntityFlags::AirlineIcaoEntity));
             ui->le_AirportsCacheCount->setText(cacheCountForEntity(CEntityFlags::AirportEntity));
@@ -162,8 +148,32 @@ namespace BlackGui
             ui->le_CountriesDbCount->setText(dbCountForEntity(CEntityFlags::CountryEntity));
             ui->le_DistributorsDbCount->setText(dbCountForEntity(CEntityFlags::DistributorEntity));
 
-            ui->le_AircraftSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
-            ui->le_AirlinesSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
+            ui->le_AircraftIcaoSharedCount->setText(sharedCountForEntity(CEntityFlags::AircraftIcaoEntity));
+            ui->le_AirlinesIcaoSharedCount->setText(sharedCountForEntity(CEntityFlags::AirlineIcaoEntity));
+            ui->le_AirportsSharedCount->setText(sharedCountForEntity(CEntityFlags::AirportEntity));
+            ui->le_LiveriesSharedCount->setText(sharedCountForEntity(CEntityFlags::LiveryEntity));
+            ui->le_ModelsSharedCount->setText(sharedCountForEntity(CEntityFlags::ModelEntity));
+            ui->le_CountriesSharedCount->setText(sharedCountForEntity(CEntityFlags::CountryEntity));
+            ui->le_DistributorsSharedCount->setText(sharedCountForEntity(CEntityFlags::DistributorEntity));
+
+            ui->le_AircraftIcaoCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
+            ui->le_AirlinesIcaoCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
+            ui->le_AirportsCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AirportEntity));
+            ui->le_LiveriesCacheTs->setText(cacheTimestampForEntity(CEntityFlags::LiveryEntity));
+            ui->le_ModelsCacheTs->setText(cacheTimestampForEntity(CEntityFlags::ModelEntity));
+            ui->le_CountriesCacheTs->setText(cacheTimestampForEntity(CEntityFlags::CountryEntity));
+            ui->le_DistributorsCacheTs->setText(cacheTimestampForEntity(CEntityFlags::DistributorEntity));
+
+            ui->le_AircraftIcaoDbTs->setText(dbTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
+            ui->le_AirlinesIcaoDbTs->setText(dbTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
+            ui->le_AirportsDbTs->setText(dbTimestampForEntity(CEntityFlags::AirportEntity));
+            ui->le_LiveriesDbTs->setText(dbTimestampForEntity(CEntityFlags::LiveryEntity));
+            ui->le_ModelsDbTs->setText(dbTimestampForEntity(CEntityFlags::ModelEntity));
+            ui->le_CountriesDbTs->setText(dbTimestampForEntity(CEntityFlags::CountryEntity));
+            ui->le_DistributorsDbTs->setText(dbTimestampForEntity(CEntityFlags::DistributorEntity));
+
+            ui->le_AircraftIcaoSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
+            ui->le_AirlinesIcaoSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
             ui->le_AirportsSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::AirportEntity));
             ui->le_LiveriesSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::LiveryEntity));
             ui->le_ModelsSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::ModelEntity));
@@ -231,13 +241,19 @@ namespace BlackGui
 
         QString CDbLoadOverviewComponent::sharedFileTimestampForEntity(CEntityFlags::Entity entity)
         {
-            const QDateTime ts = sGui->getWebDataServices()->getSharedFileTimestamp(entity);
+            const QDateTime ts = sGui->getWebDataServices()->getSharedInfoObjectTimestamp(entity);
             return formattedTimestamp(ts);
         }
 
+        QString CDbLoadOverviewComponent::sharedCountForEntity(CEntityFlags::Entity entity)
+        {
+            const int c = sGui->getWebDataServices()->getSharedInfoObjectCount(entity);
+            return c < 0 ? "-" : QString::number(c);
+        }
+
         QString CDbLoadOverviewComponent::dbCountForEntity(CEntityFlags::Entity entity)
         {
-            const int c = sGui->getWebDataServices()->getDbInfoCount(entity);
+            const int c = sGui->getWebDataServices()->getDbInfoObjectCount(entity);
             return c < 0 ? "-" : QString::number(c);
         }
 
@@ -266,8 +282,8 @@ namespace BlackGui
             this->showLoading();
 
             // shared files ts
-            sGui->getWebDataServices()->triggerLoadingOfSharedFilesHeaders(entities);
-            sGui->getWebDataServices()->triggerReadOfInfoObjects();
+            sGui->getWebDataServices()->triggerReadOfSharedInfoObjects();
+            sGui->getWebDataServices()->triggerReadOfDbInfoObjects();
         }
 
         void CDbLoadOverviewComponent::ps_refreshSharedPressed()
@@ -289,18 +305,48 @@ namespace BlackGui
             this->showLoading();
 
             // shared files ts
-            sGui->getWebDataServices()->triggerReadOfInfoObjects();
+            sGui->getWebDataServices()->triggerReadOfDbInfoObjects();
         }
 
         void CDbLoadOverviewComponent::ps_dataLoaded(CEntityFlags::Entity entities, CEntityFlags::ReadState state, int number)
         {
             Q_UNUSED(number);
-            if (!entities.testFlag(CEntityFlags::InfoObjectEntity) && !CEntityFlags::anySwiftDbEntity(entities)) { return; }
+            if (!entities.testFlag(CEntityFlags::SharedInfoObjectEntity) && !entities.testFlag(CEntityFlags::DbInfoObjectEntity) && !CEntityFlags::anySwiftDbEntity(entities)) { return; }
             if (state == CEntityFlags::ReadFinished || state == CEntityFlags::ReadFinishedRestricted)
             {
                 this->m_loadInProgress = false;
                 emit this->ps_triggerDigestGuiUpdate();
             }
         }
+
+        void CDbLoadOverviewComponent::ps_loadInfoObjects()
+        {
+            if (this->m_loadInProgress) { return; }
+            if (!sGui || !sGui->hasWebDataServices()) { return; }
+            bool direct = false;
+
+            if (sGui->getWebDataServices()->getDbInfoDataReader() && sGui->getWebDataServices()->getDbInfoDataReader()->getInfoObjectCount() > 0)
+            {
+                direct = true;
+            }
+            else
+            {
+                sGui->getWebDataServices()->triggerReadOfDbInfoObjects();
+            }
+
+            if (sGui->getWebDataServices()->getSharedInfoDataReader() && sGui->getWebDataServices()->getSharedInfoDataReader()->getInfoObjectCount() > 0)
+            {
+                direct = true;
+            }
+            else
+            {
+                sGui->getWebDataServices()->triggerReadOfSharedInfoObjects();
+            }
+
+            if (direct)
+            {
+                this->m_dsTriggerGuiUpdate.inputSignal();
+            }
+        }
     } // ns
 } // ns

src/blackgui/components/dbloadoverviewcomponent.h

@@ -83,20 +83,23 @@ namespace BlackGui
             //! Timestamp
             static QString formattedTimestamp(const QDateTime &dateTime);
 
-            //! Formatted ts for entity
+            //! Formatted ts for entity (cache)
             static QString cacheTimestampForEntity(BlackMisc::Network::CEntityFlags::Entity entity);
 
-            //! Formatted ts for entity
-            static QString dbTimestampForEntity(BlackMisc::Network::CEntityFlags::Entity entity);
-
-            //! Formatted count for entity
+            //! Formatted count for entity (cache)
             static QString cacheCountForEntity(BlackMisc::Network::CEntityFlags::Entity entity);
 
-            //! Formatted ts for entity
+            //! Formatted ts for entity (DB)
+            static QString dbTimestampForEntity(BlackMisc::Network::CEntityFlags::Entity entity);
+
+            //! Formatted count for entity (DB)
+            static QString dbCountForEntity(BlackMisc::Network::CEntityFlags::Entity entity);
+
+            //! Formatted ts for entity (shared)
             static QString sharedFileTimestampForEntity(BlackMisc::Network::CEntityFlags::Entity entity);
 
-            //! Formatted count for entity
-            static QString dbCountForEntity(BlackMisc::Network::CEntityFlags::Entity entity);
+            //! Formatted count for entity (shared)
+            static QString sharedCountForEntity(BlackMisc::Network::CEntityFlags::Entity entity);
 
             //! Admit caches
             static void admitCaches();
@@ -113,6 +116,9 @@ namespace BlackGui
 
             //! Data have been loaded
             void ps_dataLoaded(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number);
+
+            //! Load info objects if not already loaded
+            void ps_loadInfoObjects();
         };
     } // ns
 } // ns

src/blackgui/components/dbloadoverviewcomponent.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>626</width>
-    <height>283</height>
+    <width>712</width>
+    <height>273</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,8 +27,18 @@
     <number>2</number>
    </property>
    <property name="spacing">
-    <number>4</number>
+    <number>3</number>
    </property>
+   <item row="8" column="7">
+    <widget class="QLineEdit" name="le_DistributorsSharedCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="5">
     <widget class="QLabel" name="lbl_CacheCount">
      <property name="minimumSize">
@@ -55,7 +65,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="7">
+   <item row="4" column="8">
     <widget class="QLineEdit" name="le_LiveriesCacheTs">
      <property name="minimumSize">
       <size>
@@ -71,16 +81,6 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="5">
-    <widget class="QLineEdit" name="le_LiveriesCacheCount">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>count</string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="6">
     <widget class="QLineEdit" name="le_AircraftIcaoDbCount">
      <property name="readOnly">
@@ -91,7 +91,23 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="9">
+   <item row="3" column="10">
+    <widget class="QLineEdit" name="le_AirportsSharedFileTs">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>File ts</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="10">
     <widget class="QLineEdit" name="le_DistributorsSharedFileTs">
      <property name="minimumSize">
       <size>
@@ -107,19 +123,13 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="9">
-    <widget class="QLineEdit" name="le_AirportsSharedFileTs">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
+   <item row="4" column="5">
+    <widget class="QLineEdit" name="le_LiveriesCacheCount">
      <property name="readOnly">
       <bool>true</bool>
      </property>
      <property name="placeholderText">
-      <string>File ts</string>
+      <string>count</string>
      </property>
     </widget>
    </item>
@@ -137,7 +147,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="9">
+   <item row="4" column="10">
     <widget class="QLineEdit" name="le_LiveriesSharedFileTs">
      <property name="minimumSize">
       <size>
@@ -153,7 +163,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="7">
+   <item row="3" column="8">
     <widget class="QLineEdit" name="le_AirportsCacheTs">
      <property name="minimumSize">
       <size>
@@ -169,7 +179,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="9">
+   <item row="5" column="10">
     <widget class="QLineEdit" name="le_ModelsSharedFileTs">
      <property name="minimumSize">
       <size>
@@ -202,7 +212,14 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="7">
+   <item row="5" column="0">
+    <widget class="QLabel" name="lbl_Models">
+     <property name="text">
+      <string>Models:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="8">
     <widget class="QLineEdit" name="le_AircraftIcaoCacheTs">
      <property name="minimumSize">
       <size>
@@ -218,14 +235,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="lbl_Models">
-     <property name="text">
-      <string>Models:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="8">
+   <item row="3" column="9">
     <widget class="QLineEdit" name="le_AirportsDbTs">
      <property name="minimumSize">
       <size>
@@ -241,6 +251,62 @@
      </property>
     </widget>
    </item>
+   <item row="10" column="2" colspan="9">
+    <widget class="QLabel" name="lbl_DatabaseUrl">
+     <property name="text">
+      <string>Checking DB URL</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="2" colspan="9" alignment="Qt::AlignTop">
+    <widget class="QLabel" name="lbl_SharedUrls">
+     <property name="text">
+      <string>Checking shared servers' URLs</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="7">
+    <widget class="QLabel" name="lbl_SharedCount">
+     <property name="minimumSize">
+      <size>
+       <width>60</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>shared count</string>
+     </property>
+     <property name="text">
+      <string>S#:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="5">
+    <widget class="QLineEdit" name="le_AircraftIcaoCacheCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="8">
+    <widget class="QLineEdit" name="le_DistributorsCacheTs">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>cache ts</string>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="6">
     <widget class="QLineEdit" name="le_AirportsDbCount">
      <property name="readOnly">
@@ -261,33 +327,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="7">
-    <widget class="QLineEdit" name="le_DistributorsCacheTs">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>cache ts</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="5">
-    <widget class="QLineEdit" name="le_AircraftIcaoCacheCount">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>count</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="8">
+   <item row="1" column="9">
     <widget class="QLineEdit" name="le_AircraftIcaoDbTs">
      <property name="minimumSize">
       <size>
@@ -303,22 +343,6 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="8">
-    <widget class="QLineEdit" name="le_DistributorsDbTs">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>DB ts</string>
-     </property>
-    </widget>
-   </item>
    <item row="4" column="0">
     <widget class="QLabel" name="lbl_Liveries">
      <property name="text">
@@ -326,7 +350,23 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="7">
+   <item row="8" column="9">
+    <widget class="QLineEdit" name="le_DistributorsDbTs">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>DB ts</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="8">
     <widget class="QLineEdit" name="le_ModelsCacheTs">
      <property name="minimumSize">
       <size>
@@ -342,7 +382,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="8">
+   <item row="2" column="9">
     <widget class="QLineEdit" name="le_AirlinesIcaoDbTs">
      <property name="minimumSize">
       <size>
@@ -358,6 +398,26 @@
      </property>
     </widget>
    </item>
+   <item row="5" column="5">
+    <widget class="QLineEdit" name="le_ModelsCacheCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="6">
+    <widget class="QLineEdit" name="le_LiveriesDbCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
    <item row="7" column="0">
     <widget class="QLabel" name="lbl_Countries">
      <property name="text">
@@ -365,7 +425,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="7">
+   <item row="7" column="8">
     <widget class="QLineEdit" name="le_CountriesCacheTs">
      <property name="minimumSize">
       <size>
@@ -381,7 +441,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="9">
+   <item row="7" column="10">
     <widget class="QLineEdit" name="le_CountriesSharedFileTs">
      <property name="minimumSize">
       <size>
@@ -397,73 +457,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="6">
-    <widget class="QLineEdit" name="le_LiveriesDbCount">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>count</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="5">
-    <widget class="QLineEdit" name="le_ModelsCacheCount">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>count</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="lbl_AircraftIcao">
-     <property name="text">
-      <string>Aircraft:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="8">
+   <item row="0" column="9">
     <widget class="QLabel" name="lbl_DbTs">
      <property name="text">
       <string>DB ts:</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="8">
-    <widget class="QLineEdit" name="le_ModelsDbTs">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>DB ts</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="8">
-    <widget class="QLineEdit" name="le_CountriesDbTs">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>DB ts</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="7">
+   <item row="2" column="8">
     <widget class="QLineEdit" name="le_AirlinesIcaoCacheTs">
      <property name="minimumSize">
       <size>
@@ -479,7 +480,60 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="9">
+   <item row="5" column="9">
+    <widget class="QLineEdit" name="le_ModelsDbTs">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>DB ts</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="9">
+    <widget class="QLineEdit" name="le_CountriesDbTs">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>DB ts</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="lbl_AircraftIcao">
+     <property name="text">
+      <string>Aircraft:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="lbl_Airports">
+     <property name="text">
+      <string>Airports:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0" alignment="Qt::AlignTop">
+    <widget class="QLabel" name="lbl_SharedUrl">
+     <property name="text">
+      <string>Shared:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="10">
     <widget class="QLabel" name="lbl_SharedFilesTs">
      <property name="text">
       <string>Shared ts:</string>
@@ -506,20 +560,6 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="lbl_Airports">
-     <property name="text">
-      <string>Airports:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="0" alignment="Qt::AlignTop">
-    <widget class="QLabel" name="lbl_SharedUrl">
-     <property name="text">
-      <string>Shared:</string>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="5">
     <widget class="QLineEdit" name="le_AirportsCacheCount">
      <property name="readOnly">
@@ -530,8 +570,8 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="3" alignment="Qt::AlignHCenter">
-    <widget class="QToolButton" name="tb_SharedReloadModels">
+   <item row="8" column="3" alignment="Qt::AlignHCenter">
+    <widget class="QToolButton" name="tb_SharedReloadDistributors">
      <property name="maximumSize">
       <size>
        <width>48</width>
@@ -570,6 +610,26 @@
      </property>
     </widget>
    </item>
+   <item row="5" column="3" alignment="Qt::AlignHCenter">
+    <widget class="QToolButton" name="tb_SharedReloadModels">
+     <property name="maximumSize">
+      <size>
+       <width>48</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>refresh from shared files</string>
+     </property>
+     <property name="text">
+      <string>...</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../blackmisc/blackmisc.qrc">
+       <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="3" alignment="Qt::AlignHCenter">
     <widget class="QToolButton" name="tb_SharedReloadAirports">
      <property name="maximumSize">
@@ -590,36 +650,6 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="3" alignment="Qt::AlignHCenter">
-    <widget class="QToolButton" name="tb_SharedReloadDistributors">
-     <property name="maximumSize">
-      <size>
-       <width>48</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="toolTip">
-      <string>refresh from shared files</string>
-     </property>
-     <property name="text">
-      <string>...</string>
-     </property>
-     <property name="icon">
-      <iconset resource="../../blackmisc/blackmisc.qrc">
-       <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
-    <widget class="QLabel" name="lbl_SharedRefresh">
-     <property name="toolTip">
-      <string>Shared</string>
-     </property>
-     <property name="text">
-      <string>Shr.:</string>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="3" alignment="Qt::AlignHCenter">
     <widget class="QToolButton" name="tb_SharedReloadAirlines">
      <property name="maximumSize">
@@ -667,40 +697,13 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="3" alignment="Qt::AlignHCenter">
-    <widget class="QToolButton" name="tb_SharedReloadCountries">
-     <property name="maximumSize">
-      <size>
-       <width>48</width>
-       <height>16777215</height>
-      </size>
-     </property>
+   <item row="0" column="3">
+    <widget class="QLabel" name="lbl_SharedRefresh">
      <property name="toolTip">
-      <string>refresh from shared files</string>
+      <string>Shared</string>
      </property>
      <property name="text">
-      <string>...</string>
-     </property>
-     <property name="icon">
-      <iconset resource="../../blackmisc/blackmisc.qrc">
-       <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="4">
-    <widget class="QToolButton" name="tb_DbReloadAircraft">
-     <property name="maximumSize">
-      <size>
-       <width>48</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="toolTip">
-      <string>refresh from database</string>
-     </property>
-     <property name="icon">
-      <iconset resource="../../blackmisc/blackmisc.qrc">
-       <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
+      <string>Shr.:</string>
      </property>
     </widget>
    </item>
@@ -744,18 +747,8 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="6">
-    <widget class="QLineEdit" name="le_AirlinesIcaoDbCount">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string>count</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="4">
-    <widget class="QToolButton" name="tb_DbReloadModels">
+   <item row="7" column="3" alignment="Qt::AlignHCenter">
+    <widget class="QToolButton" name="tb_SharedReloadCountries">
      <property name="maximumSize">
       <size>
        <width>48</width>
@@ -763,10 +756,10 @@
       </size>
      </property>
      <property name="toolTip">
-      <string>refresh from database</string>
+      <string>refresh from shared files</string>
      </property>
      <property name="text">
-      <string/>
+      <string>...</string>
      </property>
      <property name="icon">
       <iconset resource="../../blackmisc/blackmisc.qrc">
@@ -774,8 +767,8 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="4">
-    <widget class="QToolButton" name="tb_DbReloadLiveries">
+   <item row="1" column="4">
+    <widget class="QToolButton" name="tb_DbReloadAircraft">
      <property name="maximumSize">
       <size>
        <width>48</width>
@@ -785,9 +778,6 @@
      <property name="toolTip">
       <string>refresh from database</string>
      </property>
-     <property name="text">
-      <string/>
-     </property>
      <property name="icon">
       <iconset resource="../../blackmisc/blackmisc.qrc">
        <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
@@ -814,8 +804,8 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="9">
-    <widget class="QLineEdit" name="le_AirlinesSharedFileTs">
+   <item row="2" column="10">
+    <widget class="QLineEdit" name="le_AirlinesIcaoSharedFileTs">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -830,19 +820,53 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="9">
-    <widget class="QLineEdit" name="le_AircraftSharedFileTs">
-     <property name="minimumSize">
+   <item row="5" column="4">
+    <widget class="QToolButton" name="tb_DbReloadModels">
+     <property name="maximumSize">
       <size>
-       <width>100</width>
-       <height>0</height>
+       <width>48</width>
+       <height>16777215</height>
       </size>
      </property>
+     <property name="toolTip">
+      <string>refresh from database</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../../blackmisc/blackmisc.qrc">
+       <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="6">
+    <widget class="QLineEdit" name="le_AirlinesIcaoDbCount">
      <property name="readOnly">
       <bool>true</bool>
      </property>
      <property name="placeholderText">
-      <string>File ts</string>
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="4">
+    <widget class="QToolButton" name="tb_DbReloadLiveries">
+     <property name="maximumSize">
+      <size>
+       <width>48</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>refresh from database</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../../blackmisc/blackmisc.qrc">
+       <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
      </property>
     </widget>
    </item>
@@ -862,13 +886,19 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="6">
-    <widget class="QLineEdit" name="le_CountriesDbCount">
+   <item row="1" column="10">
+    <widget class="QLineEdit" name="le_AircraftIcaoSharedFileTs">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="readOnly">
       <bool>true</bool>
      </property>
      <property name="placeholderText">
-      <string>count</string>
+      <string>File ts</string>
      </property>
     </widget>
    </item>
@@ -882,7 +912,17 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="8">
+   <item row="7" column="6">
+    <widget class="QLineEdit" name="le_CountriesDbCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="9">
     <widget class="QLineEdit" name="le_LiveriesDbTs">
      <property name="minimumSize">
       <size>
@@ -908,14 +948,14 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="7">
+   <item row="0" column="8">
     <widget class="QLabel" name="lbl_CacheTs">
      <property name="text">
       <string>Cache ts:</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="3" colspan="7">
+   <item row="9" column="3" colspan="8">
     <widget class="QWidget" name="wi_LoadAllButtons" native="true">
      <layout class="QHBoxLayout" name="hl_LoadAllButtons">
       <property name="leftMargin">
@@ -968,17 +1008,63 @@
      </layout>
     </widget>
    </item>
-   <item row="11" column="2" colspan="8" alignment="Qt::AlignTop">
-    <widget class="QLabel" name="lbl_SharedUrls">
-     <property name="text">
-      <string>Checking shared servers' URLs</string>
+   <item row="7" column="7">
+    <widget class="QLineEdit" name="le_CountriesSharedCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="2" colspan="8">
-    <widget class="QLabel" name="lbl_DatabaseUrl">
-     <property name="text">
-      <string>Checking DB URL</string>
+   <item row="5" column="7">
+    <widget class="QLineEdit" name="le_ModelsSharedCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="7">
+    <widget class="QLineEdit" name="le_LiveriesSharedCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="7">
+    <widget class="QLineEdit" name="le_AirportsSharedCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="7">
+    <widget class="QLineEdit" name="le_AirlinesIcaoSharedCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="7">
+    <widget class="QLineEdit" name="le_AircraftIcaoSharedCount">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="placeholderText">
+      <string>count</string>
      </property>
     </widget>
    </item>

src/blackmisc/network/networkutils.cpp

@@ -47,7 +47,7 @@ namespace BlackMisc
     {
         int CNetworkUtils::getTimeoutMs()
         {
-            return 2000;
+            return 3000;
         }
 
         bool CNetworkUtils::canPing(const QString &hostAddress)
@@ -341,4 +341,4 @@ namespace BlackMisc
             return phpError.remove(regEx);
         }
     } // namespace
-} // namespacee
+} // namespace