flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-28 03:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

renamed the GUI components for consistency

Browse Source
This commit is contained in:
Klaus Basan
2015-10-02 14:58:03 +02:00
committed by Mathew Sutcliffe
parent 42304f640b
commit eaa8339f2b
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackgui/components/datainfoareacomponent.cpp
View File

@@ -52,28 +52,28 @@ namespace BlackGui
CDbAircraftIcaoComponent *CDataInfoAreaComponent::getAircraftComponent() const CDbAircraftIcaoComponent *CDataInfoAreaComponent::getAircraftComponent() const
{ {
return this->ui->comp_AircraftIcao; return this->ui->comp_DbAircraftIcao;
} }
CDbAirlineIcaoComponent *CDataInfoAreaComponent::getAirlineComponent() const CDbAirlineIcaoComponent *CDataInfoAreaComponent::getAirlineComponent() const
{ {
return this->ui->comp_AirlineIcao; return this->ui->comp_DbAirlineIcao;
} }
CDbCountryComponent *CDataInfoAreaComponent::getCountryComponent() const CDbCountryComponent *CDataInfoAreaComponent::getCountryComponent() const
{ {
return this->ui->comp_Countries; return this->ui->comp_DbCountries;
} }
void CDataInfoAreaComponent::setProvider(BlackMisc::Network::IWebDataServicesProvider *provider) void CDataInfoAreaComponent::setProvider(BlackMisc::Network::IWebDataServicesProvider *provider)
{ {
Q_ASSERT_X(provider, Q_FUNC_INFO, "Missing provider"); Q_ASSERT_X(provider, Q_FUNC_INFO, "Missing provider");
this->ui->comp_AircraftIcao->setProvider(provider); this->ui->comp_DbAircraftIcao->setProvider(provider);
this->ui->comp_AirlineIcao->setProvider(provider); this->ui->comp_DbAirlineIcao->setProvider(provider);
this->ui->comp_DbDistributors->setProvider(provider); this->ui->comp_DbDistributors->setProvider(provider);
this->ui->comp_DbLiveries->setProvider(provider); this->ui->comp_DbLiveries->setProvider(provider);
this->ui->comp_DbModels->setProvider(provider); this->ui->comp_DbModels->setProvider(provider);
this->ui->comp_Countries->setProvider(provider); this->ui->comp_DbCountries->setProvider(provider);
CWebDataServicesAware::setProvider(provider); CWebDataServicesAware::setProvider(provider);
} }
@@ -95,10 +95,18 @@ namespace BlackGui
bool CDataInfoAreaComponent::readDbDataFromResourceDir() bool CDataInfoAreaComponent::readDbDataFromResourceDir()
{ {
bool s = hasProvider() && bool s = hasProvider() &&
this->readDbDataFromDisk(CProject::getSwiftStaticDbFilesDir()); this->readDbDataFromDisk(CProject::getSwiftStaticDbFilesDir(), true);
// info
if (s) if (s)
{ {
CLogMessage(this).info("Read DB data"); CLogMessage(this).info("Read DB data");
this->ui->comp_DbAircraftIcao->showLoadIndicator();
this->ui->comp_DbAirlineIcao->showLoadIndicator();
this->ui->comp_DbCountries->showLoadIndicator();
this->ui->comp_DbDistributors->showLoadIndicator();
this->ui->comp_DbLiveries->showLoadIndicator();
this->ui->comp_DbModels->showLoadIndicator();
} }
else else
{ {

6
src/blackgui/components/datainfoareacomponent.ui
View File

@@ -286,7 +286,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CDbAircraftIcaoComponent" name="comp_AircraftIcao"> <widget class="BlackGui::Components::CDbAircraftIcaoComponent" name="comp_DbAircraftIcao">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@@ -353,7 +353,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CDbAirlineIcaoComponent" name="comp_AirlineIcao"> <widget class="BlackGui::Components::CDbAirlineIcaoComponent" name="comp_DbAirlineIcao">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@@ -420,7 +420,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CDbCountryComponent" name="comp_Countries"> <widget class="BlackGui::Components::CDbCountryComponent" name="comp_DbCountries">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>