flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-05 17:55:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #768, model string in login component is supposed to be empty without simulator

Browse Source
This commit is contained in:
Klaus Basan
2016-10-23 03:11:37 +02:00
parent 8c282a33bf
commit 847348cbe0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/components/logincomponent.cpp
View File

@@ -176,7 +176,7 @@ namespace BlackGui
} }
else else
{ {
this->setOwnModel(); this->setOwnModelAndIcaoValues();
if (this->m_visible) if (this->m_visible)
{ {
// already visible: // already visible:
@@ -434,7 +434,7 @@ namespace BlackGui
this->m_logoffCountdownTimer->start(); this->m_logoffCountdownTimer->start();
} }
void CLoginComponent::setOwnModel() void CLoginComponent::setOwnModelAndIcaoValues()
{ {
Q_ASSERT(sGui->getIContextOwnAircraft()); Q_ASSERT(sGui->getIContextOwnAircraft());
Q_ASSERT(sGui->getIContextSimulator()); Q_ASSERT(sGui->getIContextSimulator());
@@ -477,7 +477,6 @@ namespace BlackGui
void CLoginComponent::setGuiIcaoValues(const CAircraftModel &model, bool onlyIfEmpty) void CLoginComponent::setGuiIcaoValues(const CAircraftModel &model, bool onlyIfEmpty)
{ {
ui->le_SimulatorModel->setText(model.getModelStringAndDbKey());
if (!onlyIfEmpty || !ui->selector_AircraftIcao->isSet()) if (!onlyIfEmpty || !ui->selector_AircraftIcao->isSet())
{ {
ui->selector_AircraftIcao->setAircraftIcao(model.getAircraftIcaoCode()); ui->selector_AircraftIcao->setAircraftIcao(model.getAircraftIcaoCode());

4
src/blackgui/components/logincomponent.h
View File

@@ -172,8 +172,8 @@ namespace BlackGui
//! Logoff countdown //! Logoff countdown
void startLogoffTimerCountdown(); void startLogoffTimerCountdown();
//! Own model string //! Own model and ICAO data
void setOwnModel(); void setOwnModelAndIcaoValues();
//! Set ICAO values //! Set ICAO values
void setGuiIcaoValues(const BlackMisc::Simulation::CAircraftModel &model, bool onlyIfEmpty); void setGuiIcaoValues(const BlackMisc::Simulation::CAircraftModel &model, bool onlyIfEmpty);