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

[UI] Login, use remembered ICAO codes if there is no DB model

Browse Source 
Remark: We need to see how this works, in some cases in
the past (previous version) his has caused odd behaviour
This commit is contained in:
Klaus Basan
2020-04-22 19:53:06 +02:00
committed by Mat Sutcliffe
parent 348a5573c4
commit 5987e58043
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,7 +331,9 @@ namespace BlackGui
CCrashHandler::instance()->crashAndLogInfoFlightNetwork(currentServer.getEcosystem().toQString(true)); CCrashHandler::instance()->crashAndLogInfoFlightNetwork(currentServer.getEcosystem().toQString(true));
CCrashHandler::instance()->crashAndLogAppendInfo(currentServer.getServerSessionId(false)); CCrashHandler::instance()->crashAndLogAppendInfo(currentServer.getServerSessionId(false));
m_networkSetup.setLastServer(currentServer); m_networkSetup.setLastServer(currentServer);
m_lastAircraftModel.set(ownAircraft.getModel());
const CAircraftModel ownModel = ownAircraft.getModel();
m_lastAircraftModel.set(ownModel);
ui->le_LoginCallsign->setText(ownAircraft.getCallsignAsString()); ui->le_LoginCallsign->setText(ownAircraft.getCallsignAsString());
ui->le_LoginHomeBase->setText(currentServer.getUser().getHomeBase().asString()); ui->le_LoginHomeBase->setText(currentServer.getUser().getHomeBase().asString());
if (vatsimLogin) { m_networkSetup.setLastVatsimServer(currentServer); } if (vatsimLogin) { m_networkSetup.setLastVatsimServer(currentServer); }
@@ -550,6 +552,8 @@ namespace BlackGui
CAircraftModel model = ownModel; CAircraftModel model = ownModel;
const bool simulating = sGui->getIContextSimulator() && const bool simulating = sGui->getIContextSimulator() &&
(sGui->getIContextSimulator()->getSimulatorStatus() & ISimulator::Simulating); (sGui->getIContextSimulator()->getSimulatorStatus() & ISimulator::Simulating);
// fill simulator related values
if (simulating) if (simulating)
{ {
if (!model.hasModelString()) if (!model.hasModelString())
@@ -568,16 +572,14 @@ namespace BlackGui
} }
else else
{ {
if (!model.hasModelString())
{
model = this->getPrefillModel();
}
ui->le_SimulatorModel->clear(); ui->le_SimulatorModel->clear();
this->highlightModelField(); this->highlightModelField();
} }
ui->le_SimulatorModel->setToolTip(model.asHtmlSummary()); ui->le_SimulatorModel->setToolTip(model.asHtmlSummary());
// reset the model // reset the model
bool changedOwnAircraftIcaoValues = false;
if (model.isLoadedFromDb() || (model.getAircraftIcaoCode().isLoadedFromDb() && model.getLivery().isLoadedFromDb())) if (model.isLoadedFromDb() || (model.getAircraftIcaoCode().isLoadedFromDb() && model.getLivery().isLoadedFromDb()))
{ {
// full model from DB, take all values // full model from DB, take all values
@@ -585,20 +587,19 @@ namespace BlackGui
} }
else else
{ {
if (sGui->getIContextSimulator()->isSimulatorAvailable()) // we have a model, which is not from DB
model = this->getPrefillModel(); // manually entered values
if (model.getLivery().hasValidDbKey() && model.getLivery().isColorLivery())
{ {
// sim. attached, but no model data from DB // special case for color liveries/NO airline
/** for NOW, keep the values as they were
ui->le_AircraftCombinedType->clear();
ui->selector_AircraftIcao->clear();
ui->selector_AirlineIcao->clear(); ui->selector_AirlineIcao->clear();
**/
} }
this->setGuiIcaoValues(model, true);
changedOwnAircraftIcaoValues = this->updateOwnAircaftIcaoValuesFromGuiValues();
} }
const bool changedOwnAircraftCallsignPilot = this->updateOwnAircraftCallsignAndPilotFromGuiValues(); const bool changedOwnAircraftCallsignPilot = this->updateOwnAircraftCallsignAndPilotFromGuiValues();
const bool changedOwnAircraftIcaoValues = this->updateOwnAircaftIcaoValuesFromGuiValues();
if (changedOwnAircraftIcaoValues || changedOwnAircraftCallsignPilot) if (changedOwnAircraftIcaoValues || changedOwnAircraftCallsignPilot)
{ {
m_changedLoginDataDigestSignal.inputSignal(); m_changedLoginDataDigestSignal.inputSignal();

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

@@ -239,7 +239,7 @@ namespace BlackGui
//! Tab index changed //! Tab index changed
void onDetailsTabChanged(int index); void onDetailsTabChanged(int index);
static constexpr int OverlayMessageMs = 5000; static constexpr int OverlayMessageMs = 5000;
static constexpr int LogoffIntervalSeconds = 20; //!< time before logoff static constexpr int LogoffIntervalSeconds = 20; //!< time before logoff
QScopedPointer<Ui::CLoginComponent> ui; QScopedPointer<Ui::CLoginComponent> ui;