diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/blackgui/components/dbloadoverviewcomponent.cpp
index a125baf30..02f8902cc 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.cpp
+++ b/src/blackgui/components/dbloadoverviewcomponent.cpp
@@ -54,6 +54,7 @@ namespace BlackGui
connect(ui->tb_DbReloadLiveries, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
connect(ui->tb_DbReloadModels, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
connect(ui->tb_DbReloadDistributors, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
+ connect(ui->tb_DbReloadCategories, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshDbPressed);
connect(ui->tb_SharedReloadAircraft, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
connect(ui->tb_SharedReloadAirlines, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
@@ -62,6 +63,7 @@ namespace BlackGui
connect(ui->tb_SharedReloadLiveries, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
connect(ui->tb_SharedReloadModels, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
connect(ui->tb_SharedReloadDistributors, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
+ connect(ui->tb_SharedReloadCategories, &QToolButton::pressed, this, &CDbLoadOverviewComponent::refreshSharedPressed);
connect(ui->pb_LoadAllFromDB, &QPushButton::pressed, this, &CDbLoadOverviewComponent::loadAllFromDb);
connect(ui->pb_LoadAllFromShared, &QPushButton::pressed, this, &CDbLoadOverviewComponent::loadAllFromShared);
@@ -98,6 +100,7 @@ namespace BlackGui
ui->tb_DbReloadLiveries->setVisible(visible);
ui->tb_DbReloadModels->setVisible(visible);
ui->tb_DbReloadDistributors->setVisible(visible);
+ ui->tb_DbReloadCategories->setVisible(visible);
}
void CDbLoadOverviewComponent::showVisibleSharedRefreshButtons(bool visible)
@@ -110,6 +113,7 @@ namespace BlackGui
ui->tb_SharedReloadLiveries->setVisible(visible);
ui->tb_SharedReloadModels->setVisible(visible);
ui->tb_SharedReloadDistributors->setVisible(visible);
+ ui->tb_SharedReloadCategories->setVisible(visible);
}
void CDbLoadOverviewComponent::resizeEvent(QResizeEvent *event)
@@ -163,6 +167,7 @@ namespace BlackGui
ui->le_ModelsCacheCount->setText(cacheCountForEntity(CEntityFlags::ModelEntity));
ui->le_CountriesCacheCount->setText(cacheCountForEntity(CEntityFlags::CountryEntity));
ui->le_DistributorsCacheCount->setText(cacheCountForEntity(CEntityFlags::DistributorEntity));
+ ui->le_CategoriesCacheCount->setText(cacheCountForEntity(CEntityFlags::AircraftCategoryEntity));
ui->le_AircraftIcaoDbCount->setText(dbCountForEntity(CEntityFlags::AircraftIcaoEntity));
ui->le_AirlinesIcaoDbCount->setText(dbCountForEntity(CEntityFlags::AirlineIcaoEntity));
@@ -171,6 +176,7 @@ namespace BlackGui
ui->le_ModelsDbCount->setText(dbCountForEntity(CEntityFlags::ModelEntity));
ui->le_CountriesDbCount->setText(dbCountForEntity(CEntityFlags::CountryEntity));
ui->le_DistributorsDbCount->setText(dbCountForEntity(CEntityFlags::DistributorEntity));
+ ui->le_CategoriesDbCount->setText(dbCountForEntity(CEntityFlags::AircraftCategoryEntity));
ui->le_AircraftIcaoSharedCount->setText(sharedCountForEntity(CEntityFlags::AircraftIcaoEntity));
ui->le_AirlinesIcaoSharedCount->setText(sharedCountForEntity(CEntityFlags::AirlineIcaoEntity));
@@ -179,6 +185,7 @@ namespace BlackGui
ui->le_ModelsSharedCount->setText(sharedCountForEntity(CEntityFlags::ModelEntity));
ui->le_CountriesSharedCount->setText(sharedCountForEntity(CEntityFlags::CountryEntity));
ui->le_DistributorsSharedCount->setText(sharedCountForEntity(CEntityFlags::DistributorEntity));
+ ui->le_CategoriesSharedCount->setText(sharedCountForEntity(CEntityFlags::AircraftCategoryEntity));
ui->le_AircraftIcaoCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
ui->le_AirlinesIcaoCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
@@ -187,6 +194,7 @@ namespace BlackGui
ui->le_ModelsCacheTs->setText(cacheTimestampForEntity(CEntityFlags::ModelEntity));
ui->le_CountriesCacheTs->setText(cacheTimestampForEntity(CEntityFlags::CountryEntity));
ui->le_DistributorsCacheTs->setText(cacheTimestampForEntity(CEntityFlags::DistributorEntity));
+ ui->le_CategoriesCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AircraftCategoryEntity));
ui->le_AircraftIcaoDbTs->setText(dbTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
ui->le_AirlinesIcaoDbTs->setText(dbTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
@@ -195,6 +203,7 @@ namespace BlackGui
ui->le_ModelsDbTs->setText(dbTimestampForEntity(CEntityFlags::ModelEntity));
ui->le_CountriesDbTs->setText(dbTimestampForEntity(CEntityFlags::CountryEntity));
ui->le_DistributorsDbTs->setText(dbTimestampForEntity(CEntityFlags::DistributorEntity));
+ ui->le_CategoriesDbTs->setText(dbTimestampForEntity(CEntityFlags::AircraftCategoryEntity));
ui->le_AircraftIcaoSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::AircraftIcaoEntity));
ui->le_AirlinesIcaoSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::AirlineIcaoEntity));
@@ -203,6 +212,7 @@ namespace BlackGui
ui->le_ModelsSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::ModelEntity));
ui->le_CountriesSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::CountryEntity));
ui->le_DistributorsSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::DistributorEntity));
+ ui->le_CategoriesSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::AircraftCategoryEntity));
// DB URL
const QString dbUrlHtml("
%3");
diff --git a/src/blackgui/components/dbloadoverviewcomponent.ui b/src/blackgui/components/dbloadoverviewcomponent.ui
index cd028bd5c..25c42fe6a 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.ui
+++ b/src/blackgui/components/dbloadoverviewcomponent.ui
@@ -7,7 +7,7 @@
0
0
644
- 253
+ 278
@@ -29,65 +29,17 @@
3
- -
-
-
- true
-
-
- count
-
-
-
- -
-
-
-
- 60
- 0
-
-
-
- Cache count
-
+
-
+
- C#:
+ Distributors:
- -
-
-
- true
-
-
- count
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- cache ts
-
-
-
- -
-
-
- true
-
-
- count
+
-
+
+
+ Shared URL will go here
@@ -103,28 +55,12 @@
true
- File ts
+ file ts
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- File ts
-
-
-
- -
-
+
-
+
true
@@ -133,92 +69,6 @@
- -
-
-
- Airlines:
-
-
-
- -
-
-
- DB URL:
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- File ts
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- cache ts
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- File ts
-
-
-
- -
-
-
- Distributors:
-
-
-
- -
-
-
- true
-
-
- count
-
-
-
- -
-
-
- Models:
-
-
-
-
@@ -235,54 +85,8 @@
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- DB ts
-
-
-
- -
-
-
- Checking DB URL
-
-
-
- -
-
-
- Shared URL will go here
-
-
-
- -
-
-
-
- 60
- 0
-
-
-
- shared count
-
-
- S#:
-
-
-
- -
-
+
-
+
true
@@ -291,81 +95,6 @@
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- cache ts
-
-
-
- -
-
-
- true
-
-
- count
-
-
-
- -
-
-
- true
-
-
- count
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- DB ts
-
-
-
- -
-
-
- Liveries:
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- DB ts
-
-
-
-
@@ -382,8 +111,115 @@
- -
-
+
-
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from shared files
+
+
+ ...
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+ Checking DB URL
+
+
+
+ -
+
+
+ Models:
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+ Liveries:
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ file ts
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
100
@@ -398,6 +234,49 @@
+ -
+
+
+
+ 60
+ 0
+
+
+
+ Cache count
+
+
+ C#:
+
+
+
+ -
+
+
+ DB URL:
+
+
+
+ -
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from shared files
+
+
+ ...
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
-
@@ -408,8 +287,59 @@
- -
-
+
-
+
+
+ Shared
+
+
+ Shr.:
+
+
+
+ -
+
+
+ Airports:
+
+
+
+ -
+
+
+ Cache ts:
+
+
+
+ -
+
+
+ Airlines:
+
+
+
+ -
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from database
+
+
+
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
true
@@ -418,65 +348,75 @@
- -
-
+
-
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ file ts
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+
+ 60
+ 0
+
+
+
+ DB count
+
- Countries:
+ DB#:
- -
-
-
+
-
+
+
- 100
- 0
+ 48
+ 16777215
-
- true
+
+ refresh from shared files
-
- cache ts
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- File ts
-
-
-
- -
-
- DB ts:
+ ...
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- cache ts
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
@@ -496,8 +436,8 @@
- -
-
+
-
+
100
@@ -512,36 +452,8 @@
- -
-
-
- Aircraft:
-
-
-
- -
-
-
- Airports:
-
-
-
- -
-
-
- Shared:
-
-
-
- -
-
-
- Shared ts:
-
-
-
- -
-
+
-
+
48
@@ -560,13 +472,26 @@
- -
-
+
-
+
+
+ Categories:
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
true
- count
+ file ts
@@ -610,268 +535,15 @@
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from shared files
-
+
-
+
- ...
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+ Aircraft:
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from shared files
-
-
- ...
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from shared files
-
-
- ...
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from shared files
-
-
- ...
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
- DB:
-
-
-
- -
-
-
- Shared
-
-
- Shr.:
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from database
-
-
-
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from database
-
-
-
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from shared files
-
-
- ...
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from database
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from database
-
-
-
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
-
- 100
- 0
-
-
-
- true
-
-
- File ts
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from database
-
-
-
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
-
- true
-
-
- count
-
-
-
- -
-
-
-
- 48
- 16777215
-
-
-
- refresh from database
-
-
-
-
-
-
- :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
-
-
-
- -
-
+
-
+
60
@@ -879,10 +551,10 @@
- DB count
+ shared count
- DB#:
+ S#:
@@ -898,22 +570,19 @@
true
- File ts
+ file ts
- -
-
-
- true
-
-
- count
+
-
+
+
+ DB:
- -
-
+
-
+
true
@@ -938,6 +607,36 @@
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from shared files
+
+
+ ...
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
-
@@ -948,14 +647,57 @@
- -
-
-
- Cache ts:
+
-
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ DB ts
- -
+
-
+
+
+ Shared ts:
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+ Countries:
+
+
+
+ -
@@ -1019,28 +761,58 @@
- -
-
+
-
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from shared files
+
+
+ ...
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
+
+ DB ts:
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
true
- count
+ file ts
- -
-
-
- true
-
-
- count
+
-
+
+
+ Shared:
- -
-
+
-
+
true
@@ -1059,8 +831,48 @@
- -
-
+
-
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from shared files
+
+
+ ...
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from database
+
+
+ ...
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
true
@@ -1069,8 +881,28 @@
- -
-
+
-
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from database
+
+
+
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
true
@@ -1079,6 +911,299 @@
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ cache ts
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from database
+
+
+
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from database
+
+
+
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ cache ts
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ cache ts
+
+
+
+ -
+
+
+ true
+
+
+ count
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ DB ts
+
+
+
+ -
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from database
+
+
+
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ cache ts
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ file ts
+
+
+
+ -
+
+
+
+ 48
+ 16777215
+
+
+
+ refresh from database
+
+
+
+ :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ DB ts
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ cache ts
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ cache ts
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ DB ts
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ true
+
+
+ file ts
+
+
+
@@ -1138,8 +1263,17 @@
le_DistributorsCacheTs
le_DistributorsDbTs
le_DistributorsSharedFileTs
+ tb_SharedReloadCategories
+ tb_DbReloadCategories
+ le_CategoriesCacheCount
+ le_CategoriesDbCount
+ le_CategoriesSharedCount
+ le_CategoriesCacheTs
+ le_CategoriesDbTs
+ le_CategoriesSharedFileTs
pb_LoadAllFromShared
pb_LoadAllFromDB
+ pb_LoadAllFromResources