From f65d54d750fd39842eb01bd52ad49edaa6c4d79c Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Fri, 23 Aug 2024 21:07:28 +0200 Subject: [PATCH] fix(ui): Disable broken quick mapping wizard --- src/blackgui/CMakeLists.txt | 6 ++-- src/blackgui/components/loginadvcomponent.cpp | 1 - src/blackgui/components/loginadvcomponent.h | 2 -- src/blackgui/components/logincomponent.cpp | 33 ------------------- src/blackgui/components/logincomponent.h | 7 ---- src/blackgui/components/logincomponent.ui | 18 ---------- .../components/loginoverviewcomponent.cpp | 1 - .../components/ownaircraftcomponent.cpp | 33 ------------------- .../components/ownaircraftcomponent.h | 7 ---- .../components/ownaircraftcomponent.ui | 18 ---------- 10 files changed, 3 insertions(+), 123 deletions(-) diff --git a/src/blackgui/CMakeLists.txt b/src/blackgui/CMakeLists.txt index 5923ba74c..62bcc4987 100644 --- a/src/blackgui/CMakeLists.txt +++ b/src/blackgui/CMakeLists.txt @@ -384,7 +384,7 @@ add_library(gui SHARED components/dbreducemodelduplicates.cpp components/countryselector.ui components/coordinatedialog.ui - components/dbquickmappingwizard.h + #components/dbquickmappingwizard.h components/dbmodelcomponent.cpp components/modelconverterxsetupcomponent.cpp components/logcomponent.h @@ -509,7 +509,7 @@ add_library(gui SHARED components/mappingcomponent.ui components/datasettingscomponent.h components/dbmodelworkbenchcomponent.cpp - components/dbquickmappingwizard.ui + #components/dbquickmappingwizard.ui components/aircraftpartshistory.cpp components/radarcomponent.ui components/simbriefdownloaddialog.h @@ -677,7 +677,7 @@ add_library(gui SHARED components/logcomponent.cpp components/configurationwizard.cpp components/downloadcomponent.ui - components/dbquickmappingwizard.cpp + #components/dbquickmappingwizard.cpp components/aircraftcombinedtypeselector.h components/dbownmodelsetformdialog.cpp components/dbmodelworkbenchcomponent.ui diff --git a/src/blackgui/components/loginadvcomponent.cpp b/src/blackgui/components/loginadvcomponent.cpp index 944b72d5e..45570662e 100644 --- a/src/blackgui/components/loginadvcomponent.cpp +++ b/src/blackgui/components/loginadvcomponent.cpp @@ -4,7 +4,6 @@ #include "ui_loginadvcomponent.h" #include "loginadvcomponent.h" #include "blackgui/components/serverlistselector.h" -#include "blackgui/components/dbquickmappingwizard.h" #include "blackgui/editors/serverform.h" #include "blackgui/editors/pilotform.h" #include "blackgui/guiapplication.h" diff --git a/src/blackgui/components/loginadvcomponent.h b/src/blackgui/components/loginadvcomponent.h index 8394efe71..c2d51c1a7 100644 --- a/src/blackgui/components/loginadvcomponent.h +++ b/src/blackgui/components/loginadvcomponent.h @@ -38,8 +38,6 @@ namespace BlackMisc::Simulation } namespace BlackGui::Components { - class CDbQuickMappingWizard; - /*! * Login component to flight network */ diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 46e5ea9af..822d0e32d 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -4,7 +4,6 @@ #include "ui_logincomponent.h" #include "logincomponent.h" #include "blackgui/components/serverlistselector.h" -#include "blackgui/components/dbquickmappingwizard.h" #include "blackgui/editors/serverform.h" #include "blackgui/editors/pilotform.h" #include "blackgui/guiapplication.h" @@ -88,7 +87,6 @@ namespace BlackGui::Components connect(ui->pb_Cancel, &QPushButton::clicked, this, &CLoginComponent::loginCancelled, Qt::QueuedConnection); connect(ui->pb_Ok, &QPushButton::clicked, this, &CLoginComponent::toggleNetworkConnection, Qt::QueuedConnection); connect(ui->pb_OtherServersGotoSettings, &QPushButton::pressed, this, &CLoginComponent::requestNetworkSettings); - connect(ui->pb_MappingWizard, &QToolButton::clicked, this, &CLoginComponent::mappingWizard, Qt::QueuedConnection); connect(&m_networkSetup, &CNetworkSetup::setupChanged, this, &CLoginComponent::reloadOtherServersSetup, Qt::QueuedConnection); ui->form_FsdDetails->showEnableInfo(true); @@ -728,12 +726,6 @@ namespace BlackGui::Components } this->setOwnModelAndIcaoValues(reverseModel); - // open dialog for model mapping - if (m_autoPopupWizard && !reverseModel.isLoadedFromDb()) - { - this->mappingWizard(); - } - // check state of own aircraft this->updateOwnAircraftCallsignAndPilotFromGuiValues(); @@ -741,31 +733,6 @@ namespace BlackGui::Components m_changedLoginDataDigestSignal.inputSignal(); } - void CLoginComponent::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 CLoginComponent::toggleTimeout() { if (m_logoffCountdownTimer.isActive()) diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h index 527d41418..36892cab5 100644 --- a/src/blackgui/components/logincomponent.h +++ b/src/blackgui/components/logincomponent.h @@ -41,8 +41,6 @@ namespace BlackMisc::Simulation } namespace BlackGui::Components { - class CDbQuickMappingWizard; - /*! * Login component to flight network */ @@ -184,9 +182,6 @@ namespace BlackGui::Components //! Simulator model has been changed void onSimulatorModelChanged(const BlackMisc::Simulation::CAircraftModel &model); - //! Launch mapping wizard - void mappingWizard(); - //! Pause/Continue timeout void toggleTimeout(); @@ -242,9 +237,7 @@ namespace BlackGui::Components static constexpr int LogoffIntervalSeconds = 20; //!< time before logoff QScopedPointer ui; - QScopedPointer m_mappingWizard; //!< mapping wizard BlackMisc::CDigestSignal m_changedLoginDataDigestSignal { this, &CLoginComponent::loginDataChangedDigest, 1500, 10 }; - bool m_autoPopupWizard = false; //!< automatically popup wizard if mapping is needed bool m_updatePilotOnServerChanges = true; bool m_networkConnected = false; bool m_simulatorConnected = false; diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui index ea2e48267..b25ce0c8b 100644 --- a/src/blackgui/components/logincomponent.ui +++ b/src/blackgui/components/logincomponent.ui @@ -467,23 +467,6 @@ - - - - - 35 - 16777215 - - - - quick mapping wizard - - - - :/own/icons/own/swift3D/sw3DGreen-24.png:/own/icons/own/swift3D/sw3DGreen-24.png - - - @@ -906,7 +889,6 @@ form_Pilot le_SimulatorModel pb_SimulatorLookup - pb_MappingWizard le_Callsign selector_AircraftIcao le_AircraftCombinedType diff --git a/src/blackgui/components/loginoverviewcomponent.cpp b/src/blackgui/components/loginoverviewcomponent.cpp index 876ec2bdd..0b57e7bf1 100644 --- a/src/blackgui/components/loginoverviewcomponent.cpp +++ b/src/blackgui/components/loginoverviewcomponent.cpp @@ -4,7 +4,6 @@ #include "ui_loginoverviewcomponent.h" #include "loginoverviewcomponent.h" #include "blackgui/components/serverlistselector.h" -#include "blackgui/components/dbquickmappingwizard.h" #include "blackgui/editors/serverform.h" #include "blackgui/editors/pilotform.h" #include "blackgui/guiapplication.h" diff --git a/src/blackgui/components/ownaircraftcomponent.cpp b/src/blackgui/components/ownaircraftcomponent.cpp index 27e24c340..375d5ccd9 100644 --- a/src/blackgui/components/ownaircraftcomponent.cpp +++ b/src/blackgui/components/ownaircraftcomponent.cpp @@ -3,7 +3,6 @@ #include "ownaircraftcomponent.h" #include "ui_ownaircraftcomponent.h" -#include "blackgui/components/dbquickmappingwizard.h" #include "blackgui/uppercasevalidator.h" #include "blackgui/guiapplication.h" @@ -65,7 +64,6 @@ namespace BlackGui::Components connect(ui->selector_AircraftIcao, &CDbAircraftIcaoSelectorComponent::changedAircraftIcao, this, &COwnAircraftComponent::changedAircraftIcao, Qt::QueuedConnection); connect(ui->selector_AirlineIcao, &CDbAirlineIcaoSelectorComponent::changedAirlineIcao, this, &COwnAircraftComponent::changedAirlineIcao, Qt::QueuedConnection); connect(ui->pb_SimulatorLookup, &QPushButton::clicked, this, &COwnAircraftComponent::lookupOwnAircraftModel); - connect(ui->pb_MappingWizard, &QPushButton::clicked, this, &COwnAircraftComponent::mappingWizard, Qt::QueuedConnection); connect(ui->pb_Clear, &QPushButton::clicked, this, &COwnAircraftComponent::clearLivery, Qt::QueuedConnection); if (sGui && sGui->getIContextSimulator()) @@ -126,12 +124,6 @@ namespace BlackGui::Components } this->setOwnModelAndIcaoValues(reverseModel); - // open dialog for model mapping - if (m_autoPopupWizard && !reverseModel.isLoadedFromDb()) - { - this->mappingWizard(); - } - emit this->aircraftDataChanged(); } @@ -349,31 +341,6 @@ namespace BlackGui::Components } } - void COwnAircraftComponent::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(); - } - bool COwnAircraftComponent::updateOwnAircaftIcaoValuesFromGuiValues() { if (!this->hasValidContexts()) { return false; } diff --git a/src/blackgui/components/ownaircraftcomponent.h b/src/blackgui/components/ownaircraftcomponent.h index da3eb49bd..1755f3c1a 100644 --- a/src/blackgui/components/ownaircraftcomponent.h +++ b/src/blackgui/components/ownaircraftcomponent.h @@ -22,8 +22,6 @@ namespace Ui } namespace BlackGui::Components { - class CDbQuickMappingWizard; - //! Own aircraft class COwnAircraftComponent : public QFrame { @@ -74,9 +72,6 @@ namespace BlackGui::Components void aircraftDataChanged(); private: - //! Launch mapping wizard - void mappingWizard(); - //! Lookup own model void lookupOwnAircraftModel(); @@ -111,8 +106,6 @@ namespace BlackGui::Components //! Get a prefill model BlackMisc::Simulation::CAircraftModel getPrefillModel() const; - bool m_autoPopupWizard = false; //!< automatically popup wizard if mapping is needed - QScopedPointer m_mappingWizard; //!< mapping wizard BlackMisc::CData m_lastAircraftModel { this }; //!< recently used aircraft model QScopedPointer ui; }; diff --git a/src/blackgui/components/ownaircraftcomponent.ui b/src/blackgui/components/ownaircraftcomponent.ui index 596bfd0ac..22ab8f4d0 100644 --- a/src/blackgui/components/ownaircraftcomponent.ui +++ b/src/blackgui/components/ownaircraftcomponent.ui @@ -140,23 +140,6 @@ - - - - - 35 - 16777215 - - - - quick mapping wizard - - - - :/own/icons/own/swift3D/sw3DGreen-24.png:/own/icons/own/swift3D/sw3DGreen-24.png - - - @@ -325,7 +308,6 @@ le_SimulatorModel pb_SimulatorLookup - pb_MappingWizard cb_Model comp_ModelStringCompleter cb_Livery