diff --git a/src/BatchCommandDialog.cpp b/src/BatchCommandDialog.cpp index 24c764326..92c6d9d1b 100644 --- a/src/BatchCommandDialog.cpp +++ b/src/BatchCommandDialog.cpp @@ -41,6 +41,7 @@ selected command. #include "effects/EffectManager.h" #include "BatchCommands.h" #include "ShuttleGui.h" +#include "widgets/HelpSystem.h" #define CommandsListID 7001 @@ -50,6 +51,7 @@ selected command. BEGIN_EVENT_TABLE(BatchCommandDialog, wxDialogWrapper) EVT_BUTTON(wxID_OK, BatchCommandDialog::OnOk) EVT_BUTTON(wxID_CANCEL, BatchCommandDialog::OnCancel) + EVT_BUTTON(wxID_HELP, BatchCommandDialog::OnHelp) EVT_BUTTON(EditParamsButtonID, BatchCommandDialog::OnEditParams) EVT_BUTTON(UsePresetButtonID, BatchCommandDialog::OnUsePreset) EVT_LIST_ITEM_ACTIVATED(CommandsListID, BatchCommandDialog::OnItemSelected) @@ -110,7 +112,7 @@ void BatchCommandDialog::PopulateOrExchange(ShuttleGui &S) } S.EndVerticalLay(); - S.AddStandardButtons(); + S.AddStandardButtons( eOkButton | eCancelButton | eHelpButton); PopulateCommandList(); @@ -149,6 +151,12 @@ void BatchCommandDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) EndModal(false); } +void BatchCommandDialog::OnHelp(wxCommandEvent & WXUNUSED(event)) +{ + wxString page = GetHelpPageName(); + HelpSystem::ShowHelp(this, page, true); +} + void BatchCommandDialog::OnItemSelected(wxListEvent &event) { const auto &command = mCommandNames[ event.GetIndex() ]; diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h index a5b64e749..29da783d9 100644 --- a/src/BatchCommandDialog.h +++ b/src/BatchCommandDialog.h @@ -53,7 +53,9 @@ class BatchCommandDialog final : public wxDialogWrapper { void OnChoice(wxCommandEvent &event); void OnOk(wxCommandEvent &event); void OnCancel(wxCommandEvent &event); + void OnHelp(wxCommandEvent &event); void OnItemSelected(wxListEvent &event); + wxString GetHelpPageName() { return wxT("Scripting Reference") ; } void ValidateChoices(); void PopulateCommandList(); diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index fe8dac057..0ad5a268a 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -53,6 +53,7 @@ #include "FileNames.h" #include "import/Import.h" #include "widgets/ErrorDialog.h" +#include "widgets/HelpSystem.h" #define ChainsListID 7001 #define CommandsListID 7002 @@ -63,6 +64,7 @@ BEGIN_EVENT_TABLE(BatchProcessDialog, wxDialogWrapper) EVT_BUTTON(ApplyToProjectID, BatchProcessDialog::OnApplyToProject) EVT_BUTTON(ApplyToFilesID, BatchProcessDialog::OnApplyToFiles) EVT_BUTTON(wxID_CANCEL, BatchProcessDialog::OnCancel) + EVT_BUTTON(wxID_HELP, BatchProcessDialog::OnHelp) END_EVENT_TABLE() BatchProcessDialog::BatchProcessDialog(wxWindow * parent, bool bInherited): @@ -115,7 +117,8 @@ void BatchProcessDialog::PopulateOrExchange(ShuttleGui &S) S.Id(ApplyToProjectID).AddButton(_("&Project")); S.Id(ApplyToFilesID).AddButton(_("&Files...")); S.AddSpace( 40 ); - S.Id(wxID_CANCEL).AddButton(_("&Cancel")); + //S.Id(wxID_CANCEL).AddButton(_("&Cancel")); + S.AddStandardButtons( eCancelButton | eHelpButton); } S.EndHorizontalLay(); } @@ -148,6 +151,12 @@ void BatchProcessDialog::PopulateOrExchange(ShuttleGui &S) mChains->SetColumnWidth(0, sz.x); } +void BatchProcessDialog::OnHelp(wxCommandEvent & WXUNUSED(event)) +{ + wxString page = GetHelpPageName(); + HelpSystem::ShowHelp(this, page, true); +} + void BatchProcessDialog::OnApplyToProject(wxCommandEvent & WXUNUSED(event)) { long item = mChains->GetNextItem(-1, @@ -600,7 +609,7 @@ void EditChainsDialog::PopulateOrExchange(ShuttleGui & S) S.Id(ApplyToProjectButtonID).AddButton(_("&Project"), wxALIGN_LEFT); S.Id(ApplyToFilesButtonID).AddButton(_("&Files..."), wxALIGN_LEFT); S.AddSpace( 40 ); - S.AddStandardButtons(); + S.AddStandardButtons( eOkButton | eCancelButton | eHelpButton); } S.EndHorizontalLay(); } diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h index 744faf794..203371405 100644 --- a/src/BatchProcessDialog.h +++ b/src/BatchProcessDialog.h @@ -50,6 +50,10 @@ class BatchProcessDialog : public wxDialogWrapper { virtual void OnApplyToProject(wxCommandEvent & event); virtual void OnApplyToFiles(wxCommandEvent & event); virtual void OnCancel(wxCommandEvent & event); + virtual void OnHelp(wxCommandEvent & event); + + virtual wxString GetHelpPageName() {return "Tools_Menu#chains_compact_dialog";}; + // These will be reused in the derived class... wxListCtrl *mList; @@ -77,6 +81,7 @@ private: void OnApplyToFiles(wxCommandEvent & event) override; void OnCancel(wxCommandEvent &event) override; + virtual wxString GetHelpPageName() override {return "Tools_Menu#chains_full_dialog";}; void PopulateChains(); void PopulateList();