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

Ref T761, avoid to override aircraft callsign from the (standard) login component

Browse Source 
* set input field to callsign if network is connected
* this sets the callsign of the adv. login component in case it was used
This commit is contained in:
Klaus Basan
2019-11-21 18:46:05 +01:00
committed by Mat Sutcliffe
parent f07ca09424
commit 36d77b7785
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,7 +365,7 @@ namespace BlackGui
void CLoginComponent::onWebServiceDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number) void CLoginComponent::onWebServiceDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number)
{ {
if (!CEntityFlags::isFinishedReadState(state)) { return; } if (!CEntityFlags::isFinishedReadState(state)) { return; }
Q_UNUSED(number); Q_UNUSED(number)
if (entity == CEntityFlags::VatsimDataFile) if (entity == CEntityFlags::VatsimDataFile)
{ {
@@ -441,7 +441,7 @@ namespace BlackGui
void CLoginComponent::onNetworkStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to) void CLoginComponent::onNetworkStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{ {
Q_UNUSED(from); Q_UNUSED(from)
if (to != CConnectionStatus::Connected) { return; } if (to != CConnectionStatus::Connected) { return; }
this->setUiLoginState(true); this->setUiLoginState(true);
@@ -450,7 +450,7 @@ namespace BlackGui
void CLoginComponent::onServerTabWidgetChanged(int index) void CLoginComponent::onServerTabWidgetChanged(int index)
{ {
Q_UNUSED(index); Q_UNUSED(index)
if (!m_updatePilotOnServerChanges) { return; } if (!m_updatePilotOnServerChanges) { return; }
const bool vatsim = this->isVatsimNetworkTabSelected(); const bool vatsim = this->isVatsimNetworkTabSelected();
const CServer server = vatsim ? this->getCurrentVatsimServer() : this->getCurrentOtherServer(); const CServer server = vatsim ? this->getCurrentVatsimServer() : this->getCurrentOtherServer();
@@ -634,10 +634,12 @@ namespace BlackGui
(ownAircraft.hasAirlineDesignator() ? (u' ' % ownAircraft.getAirlineIcaoCodeDesignator()) : QString()) % (ownAircraft.hasAirlineDesignator() ? (u' ' % ownAircraft.getAirlineIcaoCodeDesignator()) : QString()) %
(ownAircraft.hasModelString() ? (u' ' % ownAircraft.getModelString()) : QString()) (ownAircraft.hasModelString() ? (u' ' % ownAircraft.getModelString()) : QString())
); );
const QString cs = ownAircraft.getCallsignAsString();
ui->le_LoginSince->setText(QDateTime::currentDateTimeUtc().toString()); ui->le_LoginSince->setText(QDateTime::currentDateTimeUtc().toString());
ui->le_LoginAsAircaft->setText(ac); ui->le_LoginAsAircaft->setText(ac);
ui->le_LoginCallsign->setText(ownAircraft.getCallsignAsString());
ui->le_LoginAsAircaft->home(false); ui->le_LoginAsAircaft->home(false);
ui->le_LoginCallsign->setText(cs);
if (!cs.isEmpty()) { ui->le_Callsign->setText(cs); }
} }
bool CLoginComponent::validateAircraftValues() bool CLoginComponent::validateAircraftValues()
@@ -836,7 +838,7 @@ namespace BlackGui
bool changedCallsign = false; bool changedCallsign = false;
if (!cs.isEmpty() && ownAircraft.getCallsignAsString() != cs) if (!cs.isEmpty() && ownAircraft.getCallsignAsString() != cs)
{ {
const CCallsign callsign(cs); const CCallsign callsign(cs, CCallsign::Aircraft);
sGui->getIContextOwnAircraft()->updateOwnCallsign(callsign); sGui->getIContextOwnAircraft()->updateOwnCallsign(callsign);
ownAircraft.setCallsign(callsign); // also update ownAircraft.setCallsign(callsign); // also update
changedCallsign = true; changedCallsign = true;
@@ -892,14 +894,14 @@ namespace BlackGui
const IContextNetwork *nwc = sGui->getIContextNetwork(); const IContextNetwork *nwc = sGui->getIContextNetwork();
const bool connected = nwc->isConnected(); const bool connected = nwc->isConnected();
if (!connected) { return; } if (!connected) { return; }
const CSimulatedAircraft ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
this->setGuiLoginAsValues(ownAircraft);
this->setUiLoginState(connected); this->setUiLoginState(connected);
this->setOwnModelAndIcaoValues(); this->setOwnModelAndIcaoValues();
const CServer server = nwc->getConnectedServer(); const CServer server = nwc->getConnectedServer();
ui->le_LoginHomeBase->setText(server.getUser().getHomeBase().asString()); ui->le_LoginHomeBase->setText(server.getUser().getHomeBase().asString());
ui->frp_CurrentServer->setServer(server); ui->frp_CurrentServer->setServer(server);
ui->frp_LoginMode->setLoginMode(nwc->getLoginMode()); ui->frp_LoginMode->setLoginMode(nwc->getLoginMode());
const CSimulatedAircraft ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
this->setGuiLoginAsValues(ownAircraft);
} }
} // namespace } // namespace
} // namespace } // namespace