diff --git a/src/blackgui/components/loginadvcomponent.cpp b/src/blackgui/components/loginadvcomponent.cpp new file mode 100644 index 000000000..2964393fe --- /dev/null +++ b/src/blackgui/components/loginadvcomponent.cpp @@ -0,0 +1,892 @@ +/* Copyright (C) 2019 + * swift project Community / Contributors + * + * This file is part of swift Project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated, + * or distributed except according to the terms contained in the LICENSE file. + */ + +#include "ui_loginadvcomponent.h" +#include "loginadvcomponent.h" +#include "serverlistselector.h" +#include "dbquickmappingwizard.h" +#include "blackgui/editors/serverform.h" +#include "blackgui/editors/pilotform.h" +#include "blackgui/guiapplication.h" +#include "blackgui/loginmodebuttons.h" +#include "blackgui/ticklabel.h" +#include "blackgui/uppercasevalidator.h" +#include "blackcore/context/contextaudio.h" +#include "blackcore/context/contextnetwork.h" +#include "blackcore/context/contextownaircraft.h" +#include "blackcore/context/contextsimulator.h" +#include "blackcore/webdataservices.h" +#include "blackcore/data/globalsetup.h" +#include "blackcore/network.h" +#include "blackcore/simulator.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/icons.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/network/entityflags.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/simulation/simulatorinternals.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/crashhandler.h" +#include "blackconfig/buildconfig.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace BlackConfig; +using namespace BlackMisc; +using namespace BlackMisc::Aviation; +using namespace BlackMisc::Audio; +using namespace BlackMisc::Network; +using namespace BlackMisc::Simulation; +using namespace BlackCore; +using namespace BlackCore::Data; +using namespace BlackCore::Context; +using namespace BlackGui; + +namespace BlackGui +{ + namespace Components + { + const CLogCategoryList &CLoginAdvComponent::getLogCategories() + { + static const BlackMisc::CLogCategoryList cats { CLogCategory::guiComponent() }; + return cats; + } + + CLoginAdvComponent::CLoginAdvComponent(QWidget *parent) : + COverlayMessagesFrame(parent), + ui(new Ui::CLoginAdvComponent) + { + ui->setupUi(this); + ui->tw_Details->setCurrentWidget(ui->tb_LoginMode); + m_logoffCountdownTimer.setObjectName("CLoginAdvComponent:m_logoffCountdownTimer"); + + ui->tw_Network->setCurrentIndex(0); + ui->selector_AircraftIcao->displayWithIcaoDescription(false); + ui->selector_AirlineIcao->displayWithIcaoDescription(false); + ui->selector_AircraftIcao->displayMode(CDbAircraftIcaoSelectorComponent::DisplayIcaoAndId); + ui->selector_AirlineIcao->displayMode(CDbAirlineIcaoSelectorComponent::DisplayVDesignatorAndId); + + this->setLogoffCountdown(); + connect(&m_logoffCountdownTimer, &QTimer::timeout, this, &CLoginAdvComponent::logoffCountdown); + connect(ui->comp_OtherServers, &CServerListSelector::serverChanged, this, &CLoginAdvComponent::onSelectedServerChanged); + connect(ui->comp_VatsimServers, &CServerListSelector::serverChanged, this, &CLoginAdvComponent::onSelectedServerChanged); + connect(ui->pb_RefreshOtherServers, &QToolButton::clicked, this, &CLoginAdvComponent::reloadOtherServersSetup); + connect(ui->tw_Network, &QTabWidget::currentChanged, this, &CLoginAdvComponent::onServerTabWidgetChanged); + connect(ui->pb_Cancel, &QPushButton::clicked, this, &CLoginAdvComponent::loginCancelled, Qt::QueuedConnection); + connect(ui->pb_Ok, &QPushButton::clicked, this, &CLoginAdvComponent::toggleNetworkConnection, Qt::QueuedConnection); + connect(ui->pb_OtherServersGotoSettings, &QPushButton::pressed, this, &CLoginAdvComponent::requestNetworkSettings); + connect(ui->pb_MappingWizard, &QToolButton::clicked, this, &CLoginAdvComponent::mappingWizard, Qt::QueuedConnection); + connect(&m_networkSetup, &CNetworkSetup::setupChanged, this, &CLoginAdvComponent::reloadOtherServersSetup, Qt::QueuedConnection); + + ui->form_FsdDetails->showEnableInfo(true); + ui->form_FsdDetails->setFsdSetupEnabled(false); + + ui->form_Voice->showEnableInfo(true); + ui->form_Voice->setVoiceSetupEnabled(false); + + ui->lblp_AircraftCombinedType->setToolTips("ok", "wrong"); + ui->lblp_AirlineIcao->setToolTips("ok", "wrong"); + ui->lblp_AircraftIcao->setToolTips("ok", "wrong"); + ui->lblp_Callsign->setToolTips("ok", "wrong"); + + // overlay + this->setOverlaySizeFactors(0.8, 0.5); + this->setReducedInfo(true); + this->setForceSmall(true); + this->showKillButton(false); + + // Stored data + this->loadRememberedUserData(); + + // Remark: The validators affect the signals such as returnPressed, editingFinished + // So I use no ranges in the CUpperCaseValidators, as this disables the signals for invalid values + + // own aircraft + constexpr int MaxLength = 10; + constexpr int MinLength = 0; + CUpperCaseValidator *ucv = new CUpperCaseValidator(MinLength, MaxLength, ui->le_Callsign); + // ucv->setAllowedCharacters09AZ(); + ui->le_Callsign->setMaxLength(MaxLength); + ui->le_Callsign->setValidator(ucv); + connect(ui->le_Callsign, &QLineEdit::editingFinished, this, &CLoginAdvComponent::validateAircraftValues); + + ui->le_AircraftCombinedType->setMaxLength(3); + ui->le_AircraftCombinedType->setValidator(new CUpperCaseValidator(this)); + connect(ui->le_AircraftCombinedType, &QLineEdit::editingFinished, this, &CLoginAdvComponent::validateAircraftValues); + connect(ui->selector_AircraftIcao, &CDbAircraftIcaoSelectorComponent::changedAircraftIcao, this, &CLoginAdvComponent::changedAircraftIcao, Qt::QueuedConnection); + connect(ui->selector_AirlineIcao, &CDbAirlineIcaoSelectorComponent::changedAirlineIcao, this, &CLoginAdvComponent::changedAirlineIcao, Qt::QueuedConnection); + connect(ui->pb_SimulatorLookup, &QToolButton::clicked, this, &CLoginAdvComponent::lookupOwnAircraftModel); + connect(ui->tw_Details, &QTabWidget::currentChanged, this, &CLoginAdvComponent::onDetailsTabChanged); + + if (sGui && sGui->getIContextSimulator()) + { + connect(sGui->getIContextSimulator(), &IContextSimulator::ownAircraftModelChanged, this, &CLoginAdvComponent::onSimulatorModelChanged, Qt::QueuedConnection); + connect(sGui->getIContextSimulator(), &IContextSimulator::vitalityLost, this, &CLoginAdvComponent::autoLogoffDetection, Qt::QueuedConnection); + connect(sGui->getIContextSimulator(), &IContextSimulator::simulatorStatusChanged, this, &CLoginAdvComponent::onSimulatorStatusChanged, Qt::QueuedConnection); + } + + // server and UI elements when in disconnect state + ui->frp_CurrentServer->setReadOnly(true); + ui->frp_CurrentServer->showPasswordField(false); + ui->tb_Timeout->setIcon(m_iconPause); + connect(ui->tb_Timeout, &QToolButton::clicked, this, &CLoginAdvComponent::toggleTimeout); + + // web service data + if (sGui && sGui->getWebDataServices()) + { + connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CLoginAdvComponent::onWebServiceDataRead, Qt::QueuedConnection); + } + + // inital setup, if data already available + this->validateAircraftValues(); + ui->form_Pilot->validate(); + ui->cb_AutoLogoff->setChecked(m_networkSetup.useAutoLogoff()); + this->onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1); + this->reloadOtherServersSetup(); + + connect(ui->pb_OverrideCredentialsVatsim, &QPushButton::clicked, this, &CLoginAdvComponent::overrideCredentialsToPilot); + connect(ui->pb_OverrideCredentialsOtherServers, &QPushButton::clicked, this, &CLoginAdvComponent::overrideCredentialsToPilot); + + this->setUiLoginState(false); + + const int tab = m_networkSetup.wasLastUsedWithOtherServer() ? LoginOthers : LoginVATSIM; + ui->tw_Network->setCurrentIndex(tab); + + QPointer myself(this); + QTimer::singleShot(5000, this, [ = ] + { + if (!myself) { return; } + this->updateGui(); + }); + } + + CLoginAdvComponent::~CLoginAdvComponent() + { } + + void CLoginAdvComponent::mainInfoAreaChanged(const QWidget *currentWidget) + { + if (!sGui || sGui->isShuttingDown()) { return; } + m_logoffCountdownTimer.stop(); // in any case stop the timer + if (currentWidget != this && currentWidget != this->parentWidget()) + { + // const bool wasVisible = m_visible; + m_visible = false; + m_logoffCountdownTimer.stop(); + + /** T639 + if (!wasVisible) + { + // set own values, and send signals + this->setOwnModelAndIcaoValues(); + } + **/ + } + else + { + if (m_visible) + { + // already visible: + // re-trigger! treat as same as OK + this->toggleNetworkConnection(); + } + else + { + m_visible = true; + this->setOwnModelAndIcaoValues(); + const bool isConnected = sGui->getIContextNetwork()->isConnected(); + this->setUiLoginState(isConnected); + if (isConnected) { this->startLogoffTimerCountdown(); } + } + } + + // we decided to make it difficult for users to disable it + if (!CBuildConfig::isLocalDeveloperDebugBuild()) + { + ui->cb_AutoLogoff->setChecked(true); + } + } + + void CLoginAdvComponent::setLogoffCountdown(int timeoutSeconds) + { + if (timeoutSeconds < 0) { timeoutSeconds = LogoffIntervalSeconds; } + + ui->pb_LogoffTimeout->setMaximum(timeoutSeconds); + ui->pb_LogoffTimeout->setValue(timeoutSeconds); + m_logoffIntervalSeconds = timeoutSeconds; + } + + void CLoginAdvComponent::loginCancelled() + { + m_logoffCountdownTimer.stop(); + this->setLogoffCountdown(); // reset time + this->closeOverlay(); + emit this->loginOrLogoffCancelled(); + } + + void CLoginAdvComponent::toggleNetworkConnection() + { + if (!sGui || sGui->isShuttingDown()) { return; } + if (!sGui->getIContextNetwork() || !sGui->getIContextAudio()) { return; } + + const bool isConnected = sGui && sGui->getIContextNetwork()->isConnected(); + const bool vatsimLogin = this->isVatsimNetworkTabSelected(); + m_networkSetup.setAutoLogoff(ui->cb_AutoLogoff->isChecked()); + + ui->form_Pilot->setVatsimValidation(vatsimLogin); + this->setUiLoginState(isConnected); + + // reset time + this->setLogoffCountdown(); + + CServer currentServer; // used for login + CSimulatedAircraft ownAircraft; // used own aircraft + CStatusMessage msg; + if (!isConnected) + { + if (!this->validateAircraftValues()) + { + this->showOverlayHTMLMessage(CStatusMessage(this).validationWarning(u"Invalid aircraft data, login not possible"), OverlayMessageMs); + return; + } + + const CStatusMessageList pilotMsgs = ui->form_Pilot->validate(); + if (pilotMsgs.isFailure()) + { + this->showOverlayHTMLMessage(CStatusMessage(this).validationWarning(u"Invalid pilot data, login not possible"), OverlayMessageMs); + return; + } + + // sync values with GUI values + this->updateOwnAircraftCallsignAndPilotFromGuiValues(); + this->updateOwnAircaftIcaoValuesFromGuiValues(); + + // Login mode + const INetwork::LoginMode mode = ui->frp_LoginMode->getLoginMode(); + switch (mode) + { + case INetwork::LoginStealth: CLogMessage(this).info(u"login in stealth mode"); break; + case INetwork::LoginAsObserver: CLogMessage(this).info(u"login in observer mode"); break; + default: break; // INetwork::LoginNormal + } + + // Server + currentServer = this->getCurrentServer(); + const CUser user = this->getUserFromPilotGuiValues(); + currentServer.setUser(user); + + // FSD setup, then override + if (ui->form_FsdDetails->isFsdSetupEnabled()) + { + const CFsdSetup fsd = ui->form_FsdDetails->getValue(); + currentServer.setFsdSetup(fsd); + } + + if (ui->form_Voice->isVoiceSetupEnabled()) + { + const CVoiceSetup voice = ui->form_Voice->getValue(); + currentServer.setVoiceSetup(voice); + } + + ui->frp_CurrentServer->setServer(currentServer); + sGui->getIContextOwnAircraft()->updateOwnAircraftPilot(currentServer.getUser()); + + // set own aircraft from all values + ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft(); + + // Login + if (sGui->getIContextAudio()) + { + sGui->getIContextAudio()->setVoiceSetup(currentServer.getVoiceSetup()); + } + + msg = sGui->getIContextNetwork()->connectToNetwork(currentServer, mode); + if (msg.isSuccess()) + { + Q_ASSERT_X(currentServer.isValidForLogin(), Q_FUNC_INFO, "invalid server"); + sGui->setExtraWindowTitle(QStringLiteral("[%1]").arg(ownAircraft.getCallsignAsString())); + CCrashHandler::instance()->crashAndLogInfoUserName(currentServer.getUser().getRealNameAndId()); + CCrashHandler::instance()->crashAndLogInfoFlightNetwork(currentServer.getEcosystem().toQString(true)); + CCrashHandler::instance()->crashAndLogAppendInfo(currentServer.getServerSessionId(false)); + m_networkSetup.setLastServer(currentServer); + m_lastAircraftModel.set(ownAircraft.getModel()); + ui->le_LoginCallsign->setText(ownAircraft.getCallsignAsString()); + ui->le_LoginHomeBase->setText(currentServer.getUser().getHomeBase().asString()); + if (vatsimLogin) { m_networkSetup.setLastVatsimServer(currentServer); } + } + else + { + sGui->setExtraWindowTitle(""); + } + } + else + { + // disconnect from network + sGui->getIContextAudio()->leaveAllVoiceRooms(); + sGui->setExtraWindowTitle(""); + msg = sGui->getIContextNetwork()->disconnectFromNetwork(); + } + + // log message and trigger events + msg.addCategories(this); + CLogMessage::preformatted(msg); + if (msg.isSuccess()) + { + this->setGuiLoginAsValues(ownAircraft); + emit this->loginOrLogoffSuccessful(); + } + else + { + emit this->loginOrLogoffCancelled(); + } + } + + void CLoginAdvComponent::onWebServiceDataRead(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number) + { + if (!CEntityFlags::isFinishedReadState(state)) { return; } + Q_UNUSED(number); + + if (entity == CEntityFlags::VatsimDataFile) + { + CServerList vatsimFsdServers = sGui->getIContextNetwork()->getVatsimFsdServers(); + if (vatsimFsdServers.isEmpty()) { return; } + vatsimFsdServers.sortBy(&CServer::getName); + const CServer currentServer = m_networkSetup.getLastVatsimServer(); + ui->comp_VatsimServers->setServers(vatsimFsdServers, true); + ui->comp_VatsimServers->preSelect(currentServer.getName()); + } + } + + void CLoginAdvComponent::loadRememberedUserData() + { + const CServer lastServer = m_networkSetup.getLastServer(); + if (!lastServer.isNull()) + { + ui->tw_Network->setCurrentWidget( + lastServer.getServerType() == CServer::FSDServerVatsim ? + ui->tb_NetworkVatsim : ui->tb_OtherServers); + } + + const CUser lastUser = lastServer.getUser(); + ui->form_Pilot->setUser(lastUser); + if (lastUser.hasCallsign()) + { + ui->le_Callsign->setText(lastUser.getCallsign().asString()); + } + else if (CBuildConfig::isLocalDeveloperDebugBuild()) + { + ui->le_Callsign->setText("SWIFT"); + } + } + + void CLoginAdvComponent::overrideCredentialsToPilot() + { + CServer server; + const QObject *s = QObject::sender(); + if (s == ui->pb_OverrideCredentialsOtherServers) + { + server = this->getCurrentOtherServer(); + } + else if (s == ui->pb_OverrideCredentialsVatsim) + { + // the VATSIM server selected has no valid user credentials + server = m_networkSetup.getLastVatsimServer(); + } + else { return; } + ui->form_Pilot->setUser(server.getUser(), true); + } + + void CLoginAdvComponent::onSelectedServerChanged(const CServer &server) + { + if (!m_updatePilotOnServerChanges) { return; } + const bool vatsim = this->isVatsimNetworkTabSelected(); + const CUser user = vatsim ? this->getCurrentVatsimServer().getUser() : server.getUser(); + ui->form_Pilot->setUser(user, true); + } + + void CLoginAdvComponent::onSimulatorStatusChanged(int status) + { + ISimulator::SimulatorStatus s = static_cast(status); + if (!this->hasValidContexts()) { return; } + if (sGui->getIContextNetwork()->isConnected()) + { + if (!s.testFlag(ISimulator::Connected)) + { + // sim NOT connected but network connected + this->autoLogoffDetection(); + } + } + } + + void CLoginAdvComponent::onServerTabWidgetChanged(int index) + { + Q_UNUSED(index); + if (!m_updatePilotOnServerChanges) { return; } + const bool vatsim = this->isVatsimNetworkTabSelected(); + const CServer server = vatsim ? this->getCurrentVatsimServer() : this->getCurrentOtherServer(); + ui->form_Pilot->setUser(server.getUser(), true); + } + + bool CLoginAdvComponent::hasValidContexts() const + { + if (!sGui || !sGui->supportsContexts()) { return false; } + if (sGui->isShuttingDown()) { return false; } + if (!sGui->getIContextSimulator()) { return false; } + if (!sGui->getIContextNetwork()) { return false; } + if (!sGui->getIContextOwnAircraft()) { return false; } + return true; + } + + void CLoginAdvComponent::setServerButtonsVisible(bool visible) + { + ui->wi_OtherServersButtons->setVisible(visible); + ui->wi_VatsimButtons->setVisible(visible); + } + + void CLoginAdvComponent::onDetailsTabChanged(int index) + { + Q_UNUSED(index); + const bool showNetwork = (ui->tw_Details->currentWidget() != ui->tb_FsdDetails); + + const CServer server = this->getCurrentServer(); + + // only override if not yet enabled + if (!ui->form_FsdDetails->isFsdSetupEnabled()) { ui->form_FsdDetails->setValue(server.getFsdSetup()); } + if (!ui->form_Voice->isVoiceSetupEnabled()) { ui->form_Voice->setValue(server.getVoiceSetup()); } + + ui->tw_Network->setVisible(showNetwork); + ui->tw_Details->setMinimumHeight(showNetwork ? 0 : 125); + } + + CLoginAdvComponent::CGuiAircraftValues CLoginAdvComponent::getAircraftValuesFromGui() const + { + CGuiAircraftValues values; + values.ownCallsign = CCallsign(ui->le_Callsign->text().trimmed().toUpper()); + values.ownAircraftIcao = ui->selector_AircraftIcao->getAircraftIcao(); + values.ownAirlineIcao = ui->selector_AirlineIcao->getAirlineIcao(); + values.ownAircraftCombinedType = ui->le_AircraftCombinedType->text().trimmed().toUpper(); + values.ownAircraftSimulatorModel = ui->le_SimulatorModel->text().trimmed().toUpper(); + return values; + } + + CUser CLoginAdvComponent::getUserFromPilotGuiValues() const + { + CUser user = ui->form_Pilot->getUser(); + user.setCallsign(this->getCallsignFromGui()); + return user; + } + + CCallsign CLoginAdvComponent::getCallsignFromGui() const + { + const CCallsign cs(ui->le_Callsign->text().trimmed().toUpper()); + return cs; + } + + CServer CLoginAdvComponent::getCurrentVatsimServer() const + { + CServer server = ui->comp_VatsimServers->currentServer(); + if (!server.getUser().hasValidVatsimId()) + { + // normally VATSIM server have no valid user associated + const CUser user = m_networkSetup.getLastVatsimServer().getUser(); + server.setUser(user); + } + return server; + } + + CServer CLoginAdvComponent::getCurrentOtherServer() const + { + return ui->comp_OtherServers->currentServer(); + } + + CServer CLoginAdvComponent::getCurrentServer() const + { + return this->isVatsimNetworkTabSelected() ? this->getCurrentVatsimServer() : this->getCurrentOtherServer(); + } + + void CLoginAdvComponent::startLogoffTimerCountdown() + { + ui->pb_LogoffTimeout->setValue(m_logoffIntervalSeconds); + m_logoffCountdownTimer.setInterval(1000); + m_logoffCountdownTimer.start(); + } + + void CLoginAdvComponent::setOwnModelAndIcaoValues(const CAircraftModel &ownModel) + { + if (!this->hasValidContexts()) { return; } + CAircraftModel model = ownModel; + const bool simulating = sGui->getIContextSimulator() && + (sGui->getIContextSimulator()->getSimulatorStatus() & ISimulator::Simulating); + if (simulating) + { + if (!model.hasModelString()) + { + model = sGui->getIContextOwnAircraft()->getOwnAircraft().getModel(); + } + const QString modelAndKey(model.getModelStringAndDbKey()); + ui->le_SimulatorModel->setText(modelAndKey); + ui->le_SimulatorModel->home(false); + this->highlightModelField(model); + + const CSimulatorInfo sim = sGui->getIContextSimulator()->getSimulatorPluginInfo().getSimulator(); + const CSimulatorInternals simulatorInternals = sGui->getIContextSimulator()->getSimulatorInternals(); + const QString simStr = sim.toQString() + QStringLiteral(" ") + simulatorInternals.getSimulatorVersion(); + CCrashHandler::instance()->crashAndLogInfoSimulator(simStr); + } + else + { + if (!model.hasModelString()) + { + model = this->getPrefillModel(); + } + ui->le_SimulatorModel->clear(); + this->highlightModelField(); + } + ui->le_SimulatorModel->setToolTip(model.asHtmlSummary()); + + // reset the model + if (model.isLoadedFromDb() || (model.getAircraftIcaoCode().isLoadedFromDb() && model.getLivery().isLoadedFromDb())) + { + // full model from DB, take all values + this->setGuiIcaoValues(model, false); + } + else + { + if (sGui->getIContextSimulator()->isSimulatorAvailable()) + { + // sim. attached, but no model data from DB + ui->le_AircraftCombinedType->clear(); + ui->selector_AircraftIcao->clear(); + ui->selector_AirlineIcao->clear(); + } + } + + const bool changedOwnAircraftCallsignPilot = this->updateOwnAircraftCallsignAndPilotFromGuiValues(); + const bool changedOwnAircraftIcaoValues = this->updateOwnAircaftIcaoValuesFromGuiValues(); + if (changedOwnAircraftIcaoValues || changedOwnAircraftCallsignPilot) + { + m_changedLoginDataDigestSignal.inputSignal(); + } + } + + bool CLoginAdvComponent::setGuiIcaoValues(const CAircraftModel &model, bool onlyIfEmpty) + { + bool changed = false; + if (!onlyIfEmpty || !ui->selector_AircraftIcao->isSet()) + { + changed = ui->selector_AircraftIcao->setAircraftIcao(model.getAircraftIcaoCode()); + } + if (!onlyIfEmpty || !ui->selector_AirlineIcao->isSet()) + { + const bool c = ui->selector_AirlineIcao->setAirlineIcao(model.getAirlineIcaoCode()); + changed |= c; + } + if (!onlyIfEmpty || ui->le_AircraftCombinedType->text().trimmed().isEmpty()) + { + const QString combined(model.getAircraftIcaoCode().getCombinedType()); + if (ui->le_AircraftCombinedType->text() != combined) + { + ui->le_AircraftCombinedType->setText(combined); + changed = true; + } + } + const bool valid = this->validateAircraftValues(); + return valid ? changed : false; + } + + void CLoginAdvComponent::setGuiLoginAsValues(const CSimulatedAircraft &ownAircraft) + { + const QString ac( + ownAircraft.getAircraftIcaoCodeDesignator() % + (ownAircraft.hasAirlineDesignator() ? (u' ' % ownAircraft.getAirlineIcaoCodeDesignator()) : QString()) % + (ownAircraft.hasModelString() ? (u' ' % ownAircraft.getModelString()) : QString()) + ); + ui->le_LoginSince->setText(QDateTime::currentDateTimeUtc().toString()); + ui->le_LoginAsAircaft->setText(ac); + ui->le_LoginCallsign->setText(ownAircraft.getCallsignAsString()); + ui->le_LoginAsAircaft->home(false); + } + + bool CLoginAdvComponent::validateAircraftValues() + { + CGuiAircraftValues values = this->getAircraftValuesFromGui(); + + // fill in combined type if empty + if (ui->le_AircraftCombinedType->text().isEmpty() && values.ownAircraftIcao.isLoadedFromDb()) + { + ui->le_AircraftCombinedType->setText(values.ownAircraftIcao.getCombinedType()); + values.ownAircraftCombinedType = values.ownAircraftIcao.getCombinedType(); + } + + const bool validCombinedType = CAircraftIcaoCode::isValidCombinedType(values.ownAircraftCombinedType); + ui->lblp_AircraftCombinedType->setTicked(validCombinedType); + + // airline is optional, e.g. C172 has no airline + const bool validAirlineDesignator = values.ownAirlineIcao.hasValidDesignator() || values.ownAirlineIcao.getDesignator().isEmpty(); + ui->lblp_AirlineIcao->setTicked(validAirlineDesignator); + + const bool validAircraftDesignator = values.ownAircraftIcao.hasValidDesignator(); + ui->lblp_AircraftIcao->setTicked(validAircraftDesignator); + + const bool validCallsign = CCallsign::isValidAircraftCallsign(values.ownCallsign); + ui->lblp_Callsign->setTicked(validCallsign); + + // model intentionally ignored + return validCombinedType && validAirlineDesignator && validAircraftDesignator && validCallsign; + } + + void CLoginAdvComponent::changedAircraftIcao(const CAircraftIcaoCode &icao) + { + if (icao.isLoadedFromDb()) + { + ui->le_AircraftCombinedType->setText(icao.getCombinedType()); + } + this->validateAircraftValues(); + } + + void CLoginAdvComponent::changedAirlineIcao(const CAirlineIcaoCode &icao) + { + Q_UNUSED(icao); + this->validateAircraftValues(); + } + + void CLoginAdvComponent::reloadOtherServersSetup() + { + const CServerList otherServers(m_networkSetup.getOtherServersPlusPredefinedServers()); + ui->comp_OtherServers->setServers(otherServers); + } + + void CLoginAdvComponent::logoffCountdown() + { + int v = ui->pb_LogoffTimeout->value(); + v -= 1; + if (v < 0) { v = 0; } + ui->pb_LogoffTimeout->setValue(v); + if (v <= 0) + { + m_logoffCountdownTimer.stop(); + this->toggleNetworkConnection(); + } + } + + void CLoginAdvComponent::autoLogoffDetection() + { + if (!ui->cb_AutoLogoff->isChecked()) { return; } + if (!this->hasValidContexts()) { return; } + if (!sGui->getIContextNetwork()->isConnected()) { return; } // nothing to logoff + + const CStatusMessage m = CStatusMessage(this, CStatusMessage::SeverityInfo, u"Auto logoff in progress (could be simulator shutdown, crash, closing simulator)"); + const int delaySecs = 30; + this->showOverlayHTMLMessage(m, qRound(1000 * delaySecs * 0.8)); + this->setLogoffCountdown(delaySecs); + + emit this->requestLoginPage(); + } + + void CLoginAdvComponent::lookupOwnAircraftModel() + { + if (!this->hasValidContexts()) { return; } + if (!sGui->getIContextSimulator()->isSimulatorAvailable()) { return; } + const CAircraftModel model(sGui->getIContextOwnAircraft()->getOwnAircraft().getModel()); + this->onSimulatorModelChanged(model); + } + + void CLoginAdvComponent::onSimulatorModelChanged(const CAircraftModel &model) + { + if (!sGui || !sGui->getIContextNetwork() || sApp->isShuttingDown()) { return; } + const bool isNetworkConnected = sGui && sGui->getIContextNetwork()->isConnected(); + if (isNetworkConnected) { return; } + + // update with latest DB data + CAircraftModel reverseModel(model); + if (sGui->hasWebDataServices()) + { + reverseModel = sGui->getWebDataServices()->getModelForModelString(model.getModelString()); + if (!reverseModel.isLoadedFromDb()) { reverseModel = model; } // reset if not found + } + + const QString modelStr(reverseModel.hasModelString() ? reverseModel.getModelString() : ""); + if (!reverseModel.hasModelString()) + { + CLogMessage(this).validationInfo(u"Invalid lookup for '%1' successful: %2") << modelStr << reverseModel.toQString(); + CLogMessage(this).validationInfo(u"Hint: Are you using the emulated driver? Set a model if so!"); + return; + } + this->setOwnModelAndIcaoValues(reverseModel); + + // open dialog for model mapping + if (m_autoPopupWizard && !reverseModel.isLoadedFromDb()) + { + this->mappingWizard(); + } + + // check state of own aircraft + this->updateOwnAircraftCallsignAndPilotFromGuiValues(); + + // let others know data changed + m_changedLoginDataDigestSignal.inputSignal(); + } + + void CLoginAdvComponent::mappingWizard() + { + if (!sGui || !sGui->getIContextOwnAircraft() || sGui->isShuttingDown()) { return; } + if (!sGui->hasMinimumMappingVersion()) { return; } + + if (!m_mappingWizard) + { + m_mappingWizard.reset(new CDbQuickMappingWizard(this)); + } + + if (sGui->getIContextSimulator()->isSimulatorAvailable()) + { + // preset on model + const CAircraftModel model(sGui->getIContextOwnAircraft()->getOwnAircraft().getModel()); + m_mappingWizard->presetModel(model); + } + else + { + // preset on GUI values only + const CAircraftIcaoCode icao(ui->selector_AircraftIcao->getAircraftIcao()); + m_mappingWizard->presetAircraftIcao(icao); + } + m_mappingWizard->show(); + } + + void CLoginAdvComponent::toggleTimeout() + { + if (m_logoffCountdownTimer.isActive()) + { + m_logoffCountdownTimer.stop(); + ui->tb_Timeout->setIcon(m_iconPlay); + } + else + { + m_logoffCountdownTimer.start(); + ui->tb_Timeout->setIcon(m_iconPause); + } + } + + void CLoginAdvComponent::setUiLoginState(bool connected) + { + ui->fr_LoginDisconnected->setVisible(!connected); + ui->fr_LogoffConfirmationConnected->setVisible(connected); + + const QString s = connected ? QStringLiteral("disconnect") : QStringLiteral("connect"); + ui->pb_Ok->setText(s); + } + + void CLoginAdvComponent::highlightModelField(const CAircraftModel &model) + { + if (!model.hasModelString()) { ui->le_SimulatorModel->setProperty("validation", "error"); } + else if (!model.isLoadedFromDb()) { ui->le_SimulatorModel->setProperty("validation", "warning"); } + else { ui->le_SimulatorModel->setProperty("validation", "ok"); } + ui->le_SimulatorModel->setStyleSheet(""); // force update + } + + bool CLoginAdvComponent::isVatsimNetworkTabSelected() const + { + return (ui->tw_Network->currentWidget() == ui->tb_NetworkVatsim); + } + + CAircraftModel CLoginAdvComponent::getPrefillModel() const + { + const CAircraftModel model = m_lastAircraftModel.get(); + if (model.hasAircraftDesignator()) { return model; } + return IContextOwnAircraft::getDefaultOwnAircraftModel(); + } + + bool CLoginAdvComponent::updateOwnAircraftCallsignAndPilotFromGuiValues() + { + if (!this->hasValidContexts()) { return false; } + CSimulatedAircraft ownAircraft(sGui->getIContextOwnAircraft()->getOwnAircraft()); + const QString cs(ui->le_Callsign->text().trimmed().toUpper()); + bool changedCallsign = false; + if (!cs.isEmpty() && ownAircraft.getCallsignAsString() != cs) + { + const CCallsign callsign(cs); + sGui->getIContextOwnAircraft()->updateOwnCallsign(callsign); + ownAircraft.setCallsign(callsign); // also update + changedCallsign = true; + } + CUser pilot = ownAircraft.getPilot(); + const CUser uiUser = ui->form_Pilot->getUser(); + pilot.setRealName(uiUser.getRealName()); + pilot.setHomeBase(uiUser.getHomeBase()); + pilot.setId(uiUser.getId()); + pilot.setCallsign(CCallsign(cs)); + bool changedPilot = false; + if (ownAircraft.getPilot() != pilot) + { + // it can be that the callsign was changed and this results in unchanged here + changedPilot = sGui->getIContextOwnAircraft()->updateOwnAircraftPilot(pilot); + } + return changedCallsign || changedPilot; + } + + bool CLoginAdvComponent::updateOwnAircaftIcaoValuesFromGuiValues() + { + if (!this->hasValidContexts()) { return false; } + const CSimulatedAircraft ownAircraft(sGui->getIContextOwnAircraft()->getOwnAircraft()); + const CGuiAircraftValues aircraftValues = this->getAircraftValuesFromGui(); + + CAircraftIcaoCode aircraftCode(ownAircraft.getAircraftIcaoCode()); + CAirlineIcaoCode airlineCode(ownAircraft.getAirlineIcaoCode()); + + bool changedIcaoCodes = false; + if (aircraftValues.ownAircraftIcao.hasValidDesignator() && aircraftValues.ownAircraftIcao != aircraftCode) + { + aircraftCode = aircraftValues.ownAircraftIcao; + changedIcaoCodes = true; + } + if (aircraftValues.ownAirlineIcao.hasValidDesignator() && aircraftValues.ownAirlineIcao != airlineCode) + { + airlineCode = aircraftValues.ownAirlineIcao; + changedIcaoCodes = true; + } + + if (changedIcaoCodes) + { + sGui->getIContextOwnAircraft()->updateOwnIcaoCodes(aircraftCode, airlineCode); + } + + return changedIcaoCodes; + } + + void CLoginAdvComponent::updateGui() + { + if (!this->hasValidContexts()) { return; } + if (!sGui->getIContextNetwork()) { return; } + IContextNetwork *nwc = sGui->getIContextNetwork(); + const bool connected = nwc->isConnected(); + if (!connected) { return; } + this->setUiLoginState(connected); + this->setOwnModelAndIcaoValues(); + const CServer server = nwc->getConnectedServer(); + ui->le_LoginHomeBase->setText(server.getUser().getHomeBase().asString()); + ui->frp_CurrentServer->setServer(server); + ui->frp_LoginMode->setLoginMode(nwc->getLoginMode()); + const CSimulatedAircraft ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft(); + this->setGuiLoginAsValues(ownAircraft); + } + } // namespace +} // namespace diff --git a/src/blackgui/components/loginadvcomponent.h b/src/blackgui/components/loginadvcomponent.h new file mode 100644 index 000000000..9aba92bf3 --- /dev/null +++ b/src/blackgui/components/loginadvcomponent.h @@ -0,0 +1,259 @@ +/* Copyright (C) 2019 + * swift project Community / Contributors + * + * This file is part of swift Project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated, + * or distributed except according to the terms contained in the LICENSE file. + */ + +//! \file + +#ifndef BLACKGUI_LOGINADVCOMPONENT_H +#define BLACKGUI_LOGINADVCOMPONENT_H + +#include "blackcore/vatsim/vatsimsettings.h" +#include "blackcore/data/networksetup.h" +#include "blackgui/settings/guisettings.h" +#include "blackgui/overlaymessagesframe.h" +#include "blackgui/blackguiexport.h" +#include "blackmisc/simulation/data/lastmodel.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/network/data/lastserver.h" +#include "blackmisc/network/entityflags.h" +#include "blackmisc/network/server.h" +#include "blackmisc/network/user.h" +#include "blackmisc/digestsignal.h" +#include "blackmisc/settingscache.h" +#include "blackmisc/datacache.h" + +#include +#include +#include +#include +#include +#include + +namespace Ui { class CLoginAdvComponent; } +namespace BlackMisc +{ + namespace Simulation + { + class CAircraftModel; + class CSimulatedAircraft; + } +} +namespace BlackGui +{ + namespace Components + { + class CDbQuickMappingWizard; + + /*! + * Login component to flight network + */ + class BLACKGUI_EXPORT CLoginAdvComponent : public COverlayMessagesFrame + { + Q_OBJECT + + public: + //! The tabs + enum Tab + { + LoginVATSIM, + LoginOthers, + LoginFSD + }; + + //! Log categories + static const BlackMisc::CLogCategoryList &getLogCategories(); + + //! Constructor + explicit CLoginAdvComponent(QWidget *parent = nullptr); + + //! Destructor + virtual ~CLoginAdvComponent() override; + + //! Automatically popup + void setAutoPopupWizad(bool autoPopup); + + //! Main info area changed + void mainInfoAreaChanged(const QWidget *currentWidget); + + //! Set a logoff time + void setLogoffCountdown(int timeoutSeconds = -1); + + //! Login requested + void toggleNetworkConnection(); + + signals: + //! Login + void loginOrLogoffSuccessful(); + + //! Cancelled + void loginOrLogoffCancelled(); + + //! Request network settings + void requestNetworkSettings(); + + //! Request to be shown + void requestLoginPage(); + + //! Relevant login data changed (digest version) + void loginDataChangedDigest(); + + private: + //! GUI aircraft values, formatted + struct CGuiAircraftValues + { + BlackMisc::Aviation::CCallsign ownCallsign; + BlackMisc::Aviation::CAircraftIcaoCode ownAircraftIcao; + BlackMisc::Aviation::CAirlineIcaoCode ownAirlineIcao; + QString ownAircraftCombinedType; + QString ownAircraftSimulatorModel; + }; + + // -------------- values from GUI ----------------- + + //! Values from GUI + CGuiAircraftValues getAircraftValuesFromGui() const; + + //! User from VATSIM data + BlackMisc::Network::CUser getUserFromPilotGuiValues() const; + + //! Callsign from GUI + BlackMisc::Aviation::CCallsign getCallsignFromGui() const; + + //! Update own callsign (own aircraft from what is set in the GUI) + //! \return changed? + bool updateOwnAircraftCallsignAndPilotFromGuiValues(); + + //! Update own ICAO values (own aircraft from what is set in the GUI) + //! \return changed? + bool updateOwnAircaftIcaoValuesFromGuiValues(); + + // -------------- values to GUI ----------------- + + //! Update GUI values + void updateGui(); + + //! Set ICAO values + //! \return changed values? + bool setGuiIcaoValues(const BlackMisc::Simulation::CAircraftModel &model, bool onlyIfEmpty); + + //! Set the "login as" values + void setGuiLoginAsValues(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft); + + // -------------- others ----------------- + + //! Selected server (VATSIM) + BlackMisc::Network::CServer getCurrentVatsimServer() const; + + //! Selected server (others) + BlackMisc::Network::CServer getCurrentOtherServer() const; + + //! Current server based on selected tab + BlackMisc::Network::CServer getCurrentServer() const; + + //! Get a prefill model + BlackMisc::Simulation::CAircraftModel getPrefillModel() const; + + //! Login cancelled + void loginCancelled(); + + //! VATSIM data file was loaded + void onWebServiceDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number); + + //! Validate aircaft + bool validateAircraftValues(); + + //! Aircraft ICAO code has been changed + void changedAircraftIcao(const BlackMisc::Aviation::CAircraftIcaoCode &icao); + + //! Airline ICAO code has been changed + void changedAirlineIcao(const BlackMisc::Aviation::CAirlineIcaoCode &icao); + + //! Settings have been changed + void reloadOtherServersSetup(); + + //! Logoff countdown + void logoffCountdown(); + + //! Auto-logoff detection + void autoLogoffDetection(); + + //! Lookup own model + void lookupOwnAircraftModel(); + + //! Simulator model has been changed + void onSimulatorModelChanged(const BlackMisc::Simulation::CAircraftModel &model); + + //! Launch mapping wizard + void mappingWizard(); + + //! Pause/Continue timeout + void toggleTimeout(); + + //! Show / hide elements for UI depending on login state + void setUiLoginState(bool connected); + + //! Own model and ICAO data for GUI and own aircraft + void setOwnModelAndIcaoValues(const BlackMisc::Simulation::CAircraftModel &ownModel = {}); + + //! Set OK button string + void setOkButtonString(bool connected); + + //! Logoff countdown + void startLogoffTimerCountdown(); + + //! Highlight model field according to model data + void highlightModelField(const BlackMisc::Simulation::CAircraftModel &model = {}); + + //! Is the VATSIM network tab selected? + bool isVatsimNetworkTabSelected() const; + + //! Load from settings + void loadRememberedUserData(); + + //! Copy credentials to pilot + void overrideCredentialsToPilot(); + + //! Server changed + void onSelectedServerChanged(const BlackMisc::Network::CServer &server); + + //! Simulator status changed + void onSimulatorStatusChanged(int status); + + //! Tab widget (server) changed + void onServerTabWidgetChanged(int index); + + //! Has contexts? + bool hasValidContexts() const; + + //! Set the server buttons visible + void setServerButtonsVisible(bool visible); + + //! Tab index changed + void onDetailsTabChanged(int index); + + static constexpr int OverlayMessageMs = 5000; + static constexpr int LogoffIntervalSeconds = 20; //!< time before logoff + + QScopedPointer ui; + QScopedPointer m_mappingWizard; //!< mapping wizard + BlackMisc::CDigestSignal m_changedLoginDataDigestSignal { this, &CLoginAdvComponent::loginDataChangedDigest, 1500, 10 }; + bool m_autoPopupWizard = false; //!< automatically popup wizard if mapping is needed + bool m_visible = false; //!< is this component selected? + bool m_updatePilotOnServerChanges = true; + const QIcon m_iconPlay {":/famfamfam/icons/famfamfam/icons/silk/control_play_blue.png"}; + const QIcon m_iconPause {":/famfamfam/icons/famfamfam/icons/silk/control_pause_blue.png"}; + int m_logoffIntervalSeconds = LogoffIntervalSeconds; + QTimer m_logoffCountdownTimer; //!< timer for logoff countdown + + BlackMisc::CData m_lastAircraftModel { this }; //!< recently used aircraft model + BlackCore::Data::CNetworkSetup m_networkSetup; //!< servers last used + }; + } // namespace +} // namespace + +#endif // guard diff --git a/src/blackgui/components/loginadvcomponent.ui b/src/blackgui/components/loginadvcomponent.ui new file mode 100644 index 000000000..77fa0a585 --- /dev/null +++ b/src/blackgui/components/loginadvcomponent.ui @@ -0,0 +1,971 @@ + + + CLoginAdvComponent + + + + 0 + 0 + 329 + 745 + + + + Login component + + + + 2 + + + 1 + + + 1 + + + 1 + + + 1 + + + + + + 5 + + + 5 + + + 5 + + + 5 + + + + + Network + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + QTabWidget::North + + + 0 + + + + Login at VATSIM + + + VATSIM + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + copy credentials to pilot section + + + override pilot + + + + + + + + + + + + + + Other servers + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + reload + + + + :/diagona/icons/diagona/icons/arrow-circle-225.png:/diagona/icons/diagona/icons/arrow-circle-225.png + + + + + + + goto settings + + + + + + + copy credentials to pilot section + + + override pilot + + + + + + + + + + + + + + 0 + + + + Mode + + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + + + + FSD details + + + + 3 + + + 3 + + + 3 + + + 3 + + + + + true + + + + + 0 + 0 + 293 + 55 + + + + + 2 + + + 2 + + + 2 + + + 2 + + + + + + + + + + + + + Voice + + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + + + + Matching log + + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + + + + + + + + + + Pilot's info + + + + 2 + + + 2 + + + 2 + + + 2 + + + + + + 0 + 60 + + + + Qt::NoFocus + + + + + + + + + + Qt::StrongFocus + + + Own aircraft + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 6 + + + 10 + + + 6 + + + 3 + + + + + + 75 + 0 + + + + Qt::StrongFocus + + + + + + + + 75 + 0 + + + + Qt::StrongFocus + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + unique model identifier + + + + + + + + 35 + 16777215 + + + + refresh + + + + :/diagona/icons/diagona/icons/arrow-circle-225.png:/diagona/icons/diagona/icons/arrow-circle-225.png + + + + + + + + 35 + 16777215 + + + + quick mapping wizard + + + + :/own/icons/own/swift3D/sw3DGreen-24.png:/own/icons/own/swift3D/sw3DGreen-24.png + + + + + + + + + + + + + + + + + Launch + + + Model + + + + + + + Callsign + + + + + + + ICAO code e.g. B737, A320, F18 + + + Aircraft + + + + + + + + + + + + + + ICAO code e.g. DLH, LHA, ... + + + Airline + + + + + + + e.g. L2J + + + + + + + + + 3 + + + e.g. "L2J" + + + + + + + + + + + + + + e.g. DEMBZ + + + Qt::ImhUppercaseOnly + + + 10 + + + e.g. DEMBZ + + + + + + + Aircraft type e.g. L2J, L1P, .... + + + Type + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 5 + + + 5 + + + 5 + + + 5 + + + + + Matching log. + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + + + Current server and aircraft + + + + 2 + + + 2 + + + 5 + + + 2 + + + 2 + + + + + + 0 + 100 + + + + Qt::StrongFocus + + + + + + + + + + Login since: + + + + + + + Aircraft: + + + + + + + true + + + + + + + Callsign/home + + + CS/home: + + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 1 + + + 1 + + + 1 + + + 1 + + + + + 10 + + + 10 + + + %v + + + + + + + ... + + + + + + + + + + + + + + 10 + + + 3 + + + 3 + + + 3 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + cancel + + + Esc + + + + + + + ok + + + + + + + automatically logoff when simulator changes or appears crashed + + + auto logoff + + + + + + + + + + + BlackGui::Editors::CFsdSetupForm + QFrame +
blackgui/editors/fsdsetupform.h
+ 1 + + + BlackGui::Editors::CVoiceSetupForm + QFrame +
blackgui/editors/voicesetupform.h
+ 1 + + + BlackGui::CTickLabel + QLabel +
blackgui/ticklabel.h
+ + + BlackGui::Editors::CServerForm + QFrame +
blackgui/editors/serverform.h
+ 1 + + + BlackGui::Components::CModelMatcherLogEnable + QFrame +
blackgui/components/modelmatcherlogenable.h
+ 1 + + + BlackGui::Components::CDbAircraftIcaoSelectorComponent + QFrame +
blackgui/components/dbaircrafticaoselectorcomponent.h
+ 1 + + + BlackGui::Components::CDbAirlineIcaoSelectorComponent + QFrame +
blackgui/components/dbairlineicaoselectorcomponent.h
+ 1 + + + BlackGui::Components::CServerListSelector + QComboBox +
blackgui/components/serverlistselector.h
+ + + BlackGui::CLoginModeButtons + QFrame +
blackgui/loginmodebuttons.h
+ 1 + + + BlackGui::Editors::CPilotForm + QFrame +
blackgui/editors/pilotform.h
+ 1 + + + + tw_Network + comp_VatsimServers + pb_OverrideCredentialsVatsim + tw_Details + form_Pilot + le_SimulatorModel + pb_SimulatorLookup + pb_MappingWizard + le_Callsign + selector_AircraftIcao + le_AircraftCombinedType + selector_AirlineIcao + frp_CurrentServer + le_LoginCallsign + le_LoginHomeBase + le_LoginAsAircaft + le_LoginSince + tb_Timeout + cb_AutoLogoff + pb_Ok + pb_Cancel + comp_OtherServers + pb_RefreshOtherServers + pb_OtherServersGotoSettings + pb_OverrideCredentialsOtherServers + sa_FsdDetails + + + + + + diff --git a/src/blackgui/components/logindialog.cpp b/src/blackgui/components/logindialog.cpp new file mode 100644 index 000000000..459cfcb5d --- /dev/null +++ b/src/blackgui/components/logindialog.cpp @@ -0,0 +1,28 @@ +/* Copyright (C) 2019 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated, + * or distributed except according to the terms contained in the LICENSE file. + */ + +#include "logindialog.h" +#include "ui_logindialog.h" + +namespace BlackGui +{ + namespace Components + { + CLoginDialog::CLoginDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::CLoginDialog) + { + ui->setupUi(this); + this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); + } + + CLoginDialog::~CLoginDialog() + { } + + } // ns +}// ns diff --git a/src/blackgui/components/logindialog.h b/src/blackgui/components/logindialog.h new file mode 100644 index 000000000..a731f78f0 --- /dev/null +++ b/src/blackgui/components/logindialog.h @@ -0,0 +1,43 @@ +/* Copyright (C) 2019 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated, + * or distributed except according to the terms contained in the LICENSE file. + */ + +//! \file + +#ifndef BLACKGUI_COMPONENTS_LOGINDIALOG_H +#define BLACKGUI_COMPONENTS_LOGINDIALOG_H + +#include "blackgui/blackguiexport.h" +#include "blackmisc/aviation/airport.h" +#include +#include + +namespace Ui { class CLoginDialog; } +namespace BlackGui +{ + namespace Components + { + //! Login dialog + class BLACKGUI_EXPORT CLoginDialog : public QDialog + { + Q_OBJECT + + public: + //! Constructor + explicit CLoginDialog(QWidget *parent = nullptr); + + //! Destructor + virtual ~CLoginDialog() override; + + private: + QScopedPointer ui; + }; + + } // ns +}// ns + +#endif // guard diff --git a/src/blackgui/components/logindialog.ui b/src/blackgui/components/logindialog.ui new file mode 100644 index 000000000..7447b9aab --- /dev/null +++ b/src/blackgui/components/logindialog.ui @@ -0,0 +1,39 @@ + + + CLoginDialog + + + + 0 + 0 + 640 + 480 + + + + Login dialog + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + BlackGui::Components::CLoginAdvComponent + QFrame +
blackgui/components/loginadvcomponent.h
+ 1 + + + + + diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 8383ad7c9..d3e81774b 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -10,6 +10,7 @@ #include "blackgui/components/logcomponent.h" #include "blackgui/components/dbloaddatadialog.h" #include "blackgui/components/autopublishdialog.h" +#include "blackgui/components/logindialog.h" #include "blackgui/components/settingscomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" @@ -239,6 +240,7 @@ bool SwiftGuiStd::isMainPageSelected(SwiftGuiStd::MainPageIndex mainPage) const void SwiftGuiStd::loginRequested() { + if (!sGui || sGui->isShuttingDown() || !sGui->getIContextNetwork()) { return; } if (ui->sw_MainMiddle->currentIndex() == static_cast(MainPageLogin)) { // already main page, we fake a re-trigger here @@ -247,7 +249,17 @@ void SwiftGuiStd::loginRequested() } else { - this->setMainPage(MainPageLogin); + const bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier; + const bool connected = sGui->getIContextNetwork()->isConnected(); + if (!connected && shift) + { + if (!m_loginDialog) { m_loginDialog.reset(new CLoginDialog(this)); } + m_loginDialog->show(); + } + else + { + this->setMainPage(MainPageLogin); + } } } diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index 21a657285..3ae03792c 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -54,6 +54,7 @@ namespace BlackGui { class CDbLoadDataDialog; class CAutoPublishDialog; + class CLoginDialog; } } namespace Ui { class SwiftGuiStd; } @@ -114,18 +115,18 @@ private: QScopedPointer m_navigator{ new BlackGui::Components::CNavigatorDialog() }; //!< navigator dialog bar, if I pass the parent, the dialog is always centered over the parent QScopedPointer m_dbLoadDialog; //!< load DB data, lazy init UI component QScopedPointer m_autoPublishDialog; //!< auto publish dialog + QScopedPointer m_loginDialog; //!< login dialog QScopedPointer m_validationDialog; //!< aircraft model validation dialog BlackMisc::CData m_lastAutoPublish { this }; BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::CIcons::radio16(), this, &SwiftGuiStd::onPttChanged }; BlackCore::CActionBindings m_menuHotkeyHandlers; BlackGui::CManagedStatusBar m_statusBar; BlackMisc::CLogSubscriber m_logSubscriber { this, &SwiftGuiStd::displayStatusMessageInGui }; - bool m_init = false; - // contexts static constexpr int MaxCoreFailures = 5; //!< Failures counted before reconnecting int m_coreFailures = 0; //!< failed access to core + bool m_init = false; bool m_coreAvailable = false; //!< core already available? bool m_contextNetworkAvailable = false; //!< network context available? bool m_contextAudioAvailable = false; //!< audio context available?