diff --git a/src/blackgui/components/aircraftmodelsetvalidationdialog.cpp b/src/blackgui/components/aircraftmodelsetvalidationdialog.cpp index 28fda83c9..56cba2a1b 100644 --- a/src/blackgui/components/aircraftmodelsetvalidationdialog.cpp +++ b/src/blackgui/components/aircraftmodelsetvalidationdialog.cpp @@ -7,6 +7,7 @@ */ #include "aircraftmodelsetvalidationdialog.h" +#include "guiapplication.h" #include "blackmisc/simulation/simulatorinfo.h" #include "ui_aircraftmodelsetvalidationdialog.h" @@ -22,7 +23,7 @@ namespace BlackGui ui(new Ui::CAircraftModelSetValidationDialog) { ui->setupUi(this); - this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); + this->setWindowFlags(this->windowFlags() | Qt::WindowContextHelpButtonHint); } CAircraftModelSetValidationDialog::~CAircraftModelSetValidationDialog() @@ -33,5 +34,11 @@ namespace BlackGui ui->comp_AircraftModelValidation->validatedModelSet(simulator, valid, invalid, stopped, msgs); this->setWindowTitle(QStringLiteral("Model validation for '%1'").arg(simulator.toQString(true))); } + + bool CAircraftModelSetValidationDialog::event(QEvent *event) + { + if (CGuiApplication::triggerShowHelp(this, event)) { return true; } + return QDialog::event(event); + } } // ns } // ns diff --git a/src/blackgui/components/aircraftmodelsetvalidationdialog.h b/src/blackgui/components/aircraftmodelsetvalidationdialog.h index d59e6c06b..016623537 100644 --- a/src/blackgui/components/aircraftmodelsetvalidationdialog.h +++ b/src/blackgui/components/aircraftmodelsetvalidationdialog.h @@ -43,11 +43,15 @@ namespace BlackGui explicit CAircraftModelSetValidationDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelSetValidationDialog(); + virtual ~CAircraftModelSetValidationDialog() override; //! \copydoc CAircraftModelValidationComponent::validatedModelSet void validatedModelSet(const BlackMisc::Simulation::CSimulatorInfo &simulator, const BlackMisc::Simulation::CAircraftModelList &valid, const BlackMisc::Simulation::CAircraftModelList &invalid, bool stopped, const BlackMisc::CStatusMessageList &msgs); + protected: + //! \copydoc QObject::event + virtual bool event(QEvent *event) override; + private: QScopedPointer ui; }; diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp b/src/blackgui/components/aircraftmodelvalidationcomponent.cpp index cec9e47f4..6477d33ae 100644 --- a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp +++ b/src/blackgui/components/aircraftmodelvalidationcomponent.cpp @@ -37,6 +37,7 @@ namespace BlackGui connect(ui->pb_TempDisableInvalid, &QPushButton::released, this, &CAircraftModelValidationComponent::onButtonClicked); connect(ui->pb_TempDisableSelected, &QPushButton::released, this, &CAircraftModelValidationComponent::onButtonClicked); connect(ui->pb_TriggerValidation, &QPushButton::released, this, &CAircraftModelValidationComponent::triggerValidation); + connect(ui->pb_help, &QPushButton::released, this, &CAircraftModelValidationComponent::showHelp); // 1st init when running in distributed environment QPointer myself(this); @@ -148,6 +149,12 @@ namespace BlackGui } } + void CAircraftModelValidationComponent::showHelp() + { + if (!sGui || sGui->isShuttingDown()) { return; } + sGui->showHelp(this); + } + void CAircraftModelValidationComponent::saveInvalidModels(const CAircraftModelList &models) const { const CStatusMessage m = models.saveInvalidModels(); diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.h b/src/blackgui/components/aircraftmodelvalidationcomponent.h index 8d7921a7c..c3c5e9bd8 100644 --- a/src/blackgui/components/aircraftmodelvalidationcomponent.h +++ b/src/blackgui/components/aircraftmodelvalidationcomponent.h @@ -71,6 +71,9 @@ namespace BlackGui //! Button has been clicked void onButtonClicked(); + //! Show help + void showHelp(); + //! Save invalid models void saveInvalidModels(const BlackMisc::Simulation::CAircraftModelList &models) const; }; diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.ui b/src/blackgui/components/aircraftmodelvalidationcomponent.ui index bf9495a00..8d1b02c00 100644 --- a/src/blackgui/components/aircraftmodelvalidationcomponent.ui +++ b/src/blackgui/components/aircraftmodelvalidationcomponent.ui @@ -2,6 +2,14 @@ CAircraftModelValidationComponent + + + 0 + 0 + 552 + 298 + + Model validation @@ -57,6 +65,13 @@ + + + + temp.disable invalid + + + @@ -80,7 +95,7 @@ - + temp.disable selected @@ -88,16 +103,16 @@ - + - temp.disable invalid + trigger validation - + - trigger validation + help @@ -129,6 +144,7 @@ tw_CAircraftModelValidationComponent tvp_InvalidModels cb_EnableStartupCheck + pb_help pb_TriggerValidation pb_TempDisableInvalid pb_TempDisableSelected