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

Ref T146, removed private slots in login component, using normal private functions

Browse Source
This commit is contained in:
Klaus Basan
2017-09-02 16:43:54 +02:00
committed by Mathew Sutcliffe
parent b49b7f8c71
commit 6f1ba6945c
2 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ namespace BlackGui
this->m_logoffCountdownTimer->setObjectName("CLoginComponent:m_logoffCountdownTimer"); this->m_logoffCountdownTimer->setObjectName("CLoginComponent:m_logoffCountdownTimer");
ui->pb_LogoffTimeout->setMaximum(LogoffIntervalSeconds); ui->pb_LogoffTimeout->setMaximum(LogoffIntervalSeconds);
ui->pb_LogoffTimeout->setValue(LogoffIntervalSeconds); ui->pb_LogoffTimeout->setValue(LogoffIntervalSeconds);
connect(this->m_logoffCountdownTimer, &QTimer::timeout, this, &CLoginComponent::ps_logoffCountdown); connect(this->m_logoffCountdownTimer, &QTimer::timeout, this, &CLoginComponent::logoffCountdown);
ui->selector_AircraftIcao->displayWithIcaoDescription(false); ui->selector_AircraftIcao->displayWithIcaoDescription(false);
ui->selector_AirlineIcao->displayWithIcaoDescription(false); ui->selector_AirlineIcao->displayWithIcaoDescription(false);
@@ -87,10 +87,10 @@ namespace BlackGui
ui->selector_AirlineIcao->displayMode(CDbAirlineIcaoSelectorComponent::DisplayVDesignatorAndId); ui->selector_AirlineIcao->displayMode(CDbAirlineIcaoSelectorComponent::DisplayVDesignatorAndId);
this->setOkButtonString(false); this->setOkButtonString(false);
connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CLoginComponent::ps_loginCancelled); connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CLoginComponent::loginCancelled);
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CLoginComponent::ps_toggleNetworkConnection); connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CLoginComponent::toggleNetworkConnection);
connect(ui->pb_OtherServersGotoSettings, &QPushButton::pressed, this, &CLoginComponent::requestNetworkSettings); connect(ui->pb_OtherServersGotoSettings, &QPushButton::pressed, this, &CLoginComponent::requestNetworkSettings);
connect(ui->tb_MappingWizard, &QToolButton::clicked, this, &CLoginComponent::ps_mappingWizard); connect(ui->tb_MappingWizard, &QToolButton::clicked, this, &CLoginComponent::mappingWizard);
ui->comp_FsdDetails->showEnableInfo(true); ui->comp_FsdDetails->showEnableInfo(true);
ui->comp_FsdDetails->setFsdSetupEnabled(false); ui->comp_FsdDetails->setFsdSetupEnabled(false);
@@ -115,41 +115,41 @@ namespace BlackGui
// VATSIM // VATSIM
ui->le_VatsimId->setValidator(new QIntValidator(100000, 9999999, this)); ui->le_VatsimId->setValidator(new QIntValidator(100000, 9999999, this));
connect(ui->le_VatsimId, &QLineEdit::editingFinished, this, &CLoginComponent::ps_validateVatsimValues); connect(ui->le_VatsimId, &QLineEdit::editingFinished, this, &CLoginComponent::validateVatsimValues);
ui->le_VatsimHomeAirport->setValidator(new CUpperCaseValidator(this)); ui->le_VatsimHomeAirport->setValidator(new CUpperCaseValidator(this));
connect(ui->le_VatsimHomeAirport, &QLineEdit::editingFinished, this, &CLoginComponent::ps_validateVatsimValues); connect(ui->le_VatsimHomeAirport, &QLineEdit::editingFinished, this, &CLoginComponent::validateVatsimValues);
connect(ui->le_VatsimPassword, &QLineEdit::editingFinished, this, &CLoginComponent::ps_validateVatsimValues); connect(ui->le_VatsimPassword, &QLineEdit::editingFinished, this, &CLoginComponent::validateVatsimValues);
connect(ui->le_VatsimRealName, &QLineEdit::editingFinished, this, &CLoginComponent::ps_validateVatsimValues); connect(ui->le_VatsimRealName, &QLineEdit::editingFinished, this, &CLoginComponent::validateVatsimValues);
// own aircraft // own aircraft
ui->le_Callsign->setMaxLength(LogoffIntervalSeconds); ui->le_Callsign->setMaxLength(LogoffIntervalSeconds);
ui->le_Callsign->setValidator(new CUpperCaseValidator(this)); ui->le_Callsign->setValidator(new CUpperCaseValidator(this));
connect(ui->le_Callsign, &QLineEdit::editingFinished, this, &CLoginComponent::ps_validateAircraftValues); connect(ui->le_Callsign, &QLineEdit::editingFinished, this, &CLoginComponent::validateAircraftValues);
ui->le_AircraftCombinedType->setMaxLength(3); ui->le_AircraftCombinedType->setMaxLength(3);
ui->le_AircraftCombinedType->setValidator(new CUpperCaseValidator(this)); ui->le_AircraftCombinedType->setValidator(new CUpperCaseValidator(this));
connect(ui->le_AircraftCombinedType, &QLineEdit::editingFinished, this, &CLoginComponent::ps_validateAircraftValues); connect(ui->le_AircraftCombinedType, &QLineEdit::editingFinished, this, &CLoginComponent::validateAircraftValues);
connect(ui->selector_AircraftIcao, &CDbAircraftIcaoSelectorComponent::changedAircraftIcao, this, &CLoginComponent::ps_changedAircraftIcao); connect(ui->selector_AircraftIcao, &CDbAircraftIcaoSelectorComponent::changedAircraftIcao, this, &CLoginComponent::changedAircraftIcao);
connect(ui->selector_AirlineIcao, &CDbAirlineIcaoSelectorComponent::changedAirlineIcao, this, &CLoginComponent::ps_changedAirlineIcao); connect(ui->selector_AirlineIcao, &CDbAirlineIcaoSelectorComponent::changedAirlineIcao, this, &CLoginComponent::changedAirlineIcao);
connect(ui->tb_SimulatorIcaoReverseLookup, &QToolButton::clicked, this, &CLoginComponent::ps_reverseLookupAircraftModel); connect(ui->tb_SimulatorIcaoReverseLookup, &QToolButton::clicked, this, &CLoginComponent::reverseLookupAircraftModel);
if (sGui && sGui->getIContextSimulator()) if (sGui && sGui->getIContextSimulator())
{ {
connect(sGui->getIContextSimulator(), &IContextSimulator::ownAircraftModelChanged, this, &CLoginComponent::ps_simulatorModelChanged); connect(sGui->getIContextSimulator(), &IContextSimulator::ownAircraftModelChanged, this, &CLoginComponent::simulatorModelChanged);
} }
// server GUI element // server GUI element
ui->frp_CurrentServer->setReadOnly(true); ui->frp_CurrentServer->setReadOnly(true);
ui->frp_CurrentServer->showPasswordField(false); ui->frp_CurrentServer->showPasswordField(false);
connect(sGui->getIContextNetwork(), &IContextNetwork::webServiceDataRead, this, &CLoginComponent::ps_onWebServiceDataRead); connect(sGui->getIContextNetwork(), &IContextNetwork::webServiceDataRead, this, &CLoginComponent::onWebServiceDataRead);
// inital setup, if data already available // inital setup, if data already available
this->ps_validateAircraftValues(); this->validateAircraftValues();
this->ps_validateVatsimValues(); this->validateVatsimValues();
this->ps_onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1); this->onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1);
CServerList otherServers(this->m_otherTrafficNetworkServers.getThreadLocal()); CServerList otherServers(this->m_otherTrafficNetworkServers.getThreadLocal());
// add a testserver when no servers can be loaded // add a testserver when no servers can be loaded
@@ -192,7 +192,7 @@ namespace BlackGui
{ {
// already visible: // already visible:
// re-trigger! treat as same as OK // re-trigger! treat as same as OK
this->ps_toggleNetworkConnection(); this->toggleNetworkConnection();
} }
else else
{ {
@@ -205,14 +205,14 @@ namespace BlackGui
} }
} }
void CLoginComponent::ps_loginCancelled() void CLoginComponent::loginCancelled()
{ {
this->m_logoffCountdownTimer->stop(); this->m_logoffCountdownTimer->stop();
ui->pb_LogoffTimeout->setValue(LogoffIntervalSeconds); ui->pb_LogoffTimeout->setValue(LogoffIntervalSeconds);
emit this->loginOrLogoffCancelled(); emit this->loginOrLogoffCancelled();
} }
void CLoginComponent::ps_toggleNetworkConnection() void CLoginComponent::toggleNetworkConnection()
{ {
if (ui->tw_Network->currentWidget() == ui->pg_FsdDetails) if (ui->tw_Network->currentWidget() == ui->pg_FsdDetails)
{ {
@@ -226,13 +226,13 @@ namespace BlackGui
CStatusMessage msg; CStatusMessage msg;
if (!isConnected) if (!isConnected)
{ {
if (!this->ps_validateAircraftValues()) if (!this->validateAircraftValues())
{ {
CLogMessage(this).validationWarning("Invalid aircraft data, login not possible"); CLogMessage(this).validationWarning("Invalid aircraft data, login not possible");
return; return;
} }
if (vatsimLogin && !this->ps_validateVatsimValues()) if (vatsimLogin && !this->validateVatsimValues())
{ {
CLogMessage(this).validationWarning("Invalid VATSIM data, login not possible"); CLogMessage(this).validationWarning("Invalid VATSIM data, login not possible");
return; return;
@@ -316,7 +316,7 @@ namespace BlackGui
} }
} }
void CLoginComponent::ps_onWebServiceDataRead(int entityInt, int stateInt, int number) void CLoginComponent::onWebServiceDataRead(int entityInt, int stateInt, int number)
{ {
const CEntityFlags::EntityFlag entity = static_cast<CEntityFlags::EntityFlag>(entityInt); const CEntityFlags::EntityFlag entity = static_cast<CEntityFlags::EntityFlag>(entityInt);
const CEntityFlags::ReadState state = static_cast<CEntityFlags::ReadState>(stateInt); const CEntityFlags::ReadState state = static_cast<CEntityFlags::ReadState>(stateInt);
@@ -493,11 +493,11 @@ namespace BlackGui
changed = true; changed = true;
} }
} }
const bool valid = this->ps_validateAircraftValues(); const bool valid = this->validateAircraftValues();
return valid ? changed : false; return valid ? changed : false;
} }
bool CLoginComponent::ps_validateAircraftValues() bool CLoginComponent::validateAircraftValues()
{ {
const CGuiAircraftValues values = getAircraftValuesFromGui(); const CGuiAircraftValues values = getAircraftValuesFromGui();
@@ -518,7 +518,7 @@ namespace BlackGui
return validCombinedType && validAirlineDesignator && validAircraftDesignator && validCallsign; return validCombinedType && validAirlineDesignator && validAircraftDesignator && validCallsign;
} }
bool CLoginComponent::ps_validateVatsimValues() bool CLoginComponent::validateVatsimValues()
{ {
CVatsimValues values = getVatsimValuesFromGui(); CVatsimValues values = getVatsimValuesFromGui();
@@ -537,28 +537,28 @@ namespace BlackGui
return validVatsimId && validHomeAirport && validVatsimPassword && validRealUserName; return validVatsimId && validHomeAirport && validVatsimPassword && validRealUserName;
} }
void CLoginComponent::ps_changedAircraftIcao(const CAircraftIcaoCode &icao) void CLoginComponent::changedAircraftIcao(const CAircraftIcaoCode &icao)
{ {
if (icao.isLoadedFromDb()) if (icao.isLoadedFromDb())
{ {
ui->le_AircraftCombinedType->setText(icao.getCombinedType()); ui->le_AircraftCombinedType->setText(icao.getCombinedType());
} }
this->ps_validateAircraftValues(); this->validateAircraftValues();
} }
void CLoginComponent::ps_changedAirlineIcao(const CAirlineIcaoCode &icao) void CLoginComponent::changedAirlineIcao(const CAirlineIcaoCode &icao)
{ {
Q_UNUSED(icao); Q_UNUSED(icao);
this->ps_validateAircraftValues(); this->validateAircraftValues();
} }
void CLoginComponent::ps_reloadSettings() void CLoginComponent::reloadSettings()
{ {
CServerList otherServers(this->m_otherTrafficNetworkServers.getThreadLocal()); CServerList otherServers(this->m_otherTrafficNetworkServers.getThreadLocal());
ui->comp_OtherServers->setServers(otherServers); ui->comp_OtherServers->setServers(otherServers);
} }
void CLoginComponent::ps_logoffCountdown() void CLoginComponent::logoffCountdown()
{ {
int v = ui->pb_LogoffTimeout->value(); int v = ui->pb_LogoffTimeout->value();
v -= 1; v -= 1;
@@ -567,18 +567,18 @@ namespace BlackGui
if (v <= 0) if (v <= 0)
{ {
this->m_logoffCountdownTimer->stop(); this->m_logoffCountdownTimer->stop();
this->ps_toggleNetworkConnection(); this->toggleNetworkConnection();
} }
} }
void CLoginComponent::ps_reverseLookupAircraftModel() void CLoginComponent::reverseLookupAircraftModel()
{ {
if (!sGui->getIContextSimulator()->isSimulatorAvailable()) { return; } if (!sGui->getIContextSimulator()->isSimulatorAvailable()) { return; }
const CAircraftModel model(sGui->getIContextOwnAircraft()->getOwnAircraft().getModel()); const CAircraftModel model(sGui->getIContextOwnAircraft()->getOwnAircraft().getModel());
this->ps_simulatorModelChanged(model); this->simulatorModelChanged(model);
} }
void CLoginComponent::ps_simulatorModelChanged(const CAircraftModel &model) void CLoginComponent::simulatorModelChanged(const CAircraftModel &model)
{ {
Q_ASSERT_X(sGui && sGui->getIContextNetwork(), Q_FUNC_INFO, "Missing context"); Q_ASSERT_X(sGui && sGui->getIContextNetwork(), Q_FUNC_INFO, "Missing context");
const bool isNetworkConnected = sGui && sGui->getIContextNetwork()->isConnected(); const bool isNetworkConnected = sGui && sGui->getIContextNetwork()->isConnected();
@@ -594,7 +594,7 @@ namespace BlackGui
// open dialog for model mapping // open dialog for model mapping
if (this->m_autoPopupWizard && !model.isLoadedFromDb()) if (this->m_autoPopupWizard && !model.isLoadedFromDb())
{ {
this->ps_mappingWizard(); this->mappingWizard();
} }
// check state of own aircraft // check state of own aircraft
@@ -604,7 +604,7 @@ namespace BlackGui
this->m_changedLoginDataDigestSignal.inputSignal(); this->m_changedLoginDataDigestSignal.inputSignal();
} }
void CLoginComponent::ps_mappingWizard() void CLoginComponent::mappingWizard()
{ {
if (!this->m_mappingWizard) if (!this->m_mappingWizard)
{ {

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

@@ -85,44 +85,43 @@ namespace BlackGui
//! Main info area changed //! Main info area changed
void mainInfoAreaChanged(const QWidget *currentWidget); void mainInfoAreaChanged(const QWidget *currentWidget);
private slots: private:
//! Login cancelled //! Login cancelled
void ps_loginCancelled(); void loginCancelled();
//! Login requested //! Login requested
void ps_toggleNetworkConnection(); void toggleNetworkConnection();
//! VATSIM data file was loaded //! VATSIM data file was loaded
void ps_onWebServiceDataRead(int entity, int stateInt, int number); void onWebServiceDataRead(int entity, int stateInt, int number);
//! Validate aircaft //! Validate aircaft
bool ps_validateAircraftValues(); bool validateAircraftValues();
//! Validate VATSIM credentials //! Validate VATSIM credentials
bool ps_validateVatsimValues(); bool validateVatsimValues();
//! Aircraft ICAO code has been changed //! Aircraft ICAO code has been changed
void ps_changedAircraftIcao(const BlackMisc::Aviation::CAircraftIcaoCode &icao); void changedAircraftIcao(const BlackMisc::Aviation::CAircraftIcaoCode &icao);
//! Airline ICAO code has been changed //! Airline ICAO code has been changed
void ps_changedAirlineIcao(const BlackMisc::Aviation::CAirlineIcaoCode &icao); void changedAirlineIcao(const BlackMisc::Aviation::CAirlineIcaoCode &icao);
//! Settings have been changed //! Settings have been changed
void ps_reloadSettings(); void reloadSettings();
//! Logoff countdown //! Logoff countdown
void ps_logoffCountdown(); void logoffCountdown();
//! Reverse lookup model //! Reverse lookup model
void ps_reverseLookupAircraftModel(); void reverseLookupAircraftModel();
//! Simulator model has been changed //! Simulator model has been changed
void ps_simulatorModelChanged(const BlackMisc::Simulation::CAircraftModel &model); void simulatorModelChanged(const BlackMisc::Simulation::CAircraftModel &model);
//! Launch mapping wizard //! Launch mapping wizard
void ps_mappingWizard(); void mappingWizard();
private:
//! GUI aircraft values, formatted //! GUI aircraft values, formatted
struct CGuiAircraftValues struct CGuiAircraftValues
{ {
@@ -209,7 +208,7 @@ namespace BlackGui
bool m_visible = false; //!< is this component selected? bool m_visible = false; //!< is this component selected?
const int LogoffIntervalSeconds = 20; //!< time before logoff const int LogoffIntervalSeconds = 20; //!< time before logoff
QTimer *m_logoffCountdownTimer { nullptr }; //!< timer used logoff countdown QTimer *m_logoffCountdownTimer { nullptr }; //!< timer used logoff countdown
BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TTrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings }; BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TTrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::reloadSettings };
BlackMisc::CSetting<BlackGui::Settings::TOwnAircraftModel> m_currentAircraftModel { this }; //!< current settings of aircraft BlackMisc::CSetting<BlackGui::Settings::TOwnAircraftModel> m_currentAircraftModel { this }; //!< current settings of aircraft
BlackMisc::CData<BlackCore::Data::TVatsimCurrentServer> m_currentVatsimServer { this }; //!< cache for current VATSIM server BlackMisc::CData<BlackCore::Data::TVatsimCurrentServer> m_currentVatsimServer { this }; //!< cache for current VATSIM server
}; };