diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp index 5e9f8416c..c64b66a1e 100644 --- a/aegisub/dialog_options.cpp +++ b/aegisub/dialog_options.cpp @@ -63,6 +63,7 @@ #include "browse_button.h" #include "tooltip_manager.h" #include "utils.h" +#include "help_button.h" /////// @@ -629,12 +630,17 @@ DialogOptions::DialogOptions(wxWindow *parent) #endif // Buttons Sizer + wxStdDialogButtonSizer *stdButtonSizer = new wxStdDialogButtonSizer(); + stdButtonSizer->AddButton(new wxButton(this,wxID_OK)); + stdButtonSizer->AddButton(new wxButton(this,wxID_CANCEL)); + stdButtonSizer->AddButton(new wxButton(this,wxID_APPLY)); + stdButtonSizer->AddButton(new HelpButton(this,_T("Options"))); + stdButtonSizer->Realize(); wxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL); - buttonSizer->Add(new wxButton(this,BUTTON_DEFAULTS,_("Defaults")),0); + wxButton *defaultButton = new wxButton(this,BUTTON_DEFAULTS,_("Restore Defaults")); + buttonSizer->Add(defaultButton,0,wxEXPAND); buttonSizer->AddStretchSpacer(1); - buttonSizer->Add(new wxButton(this,wxID_OK),0,wxRIGHT,5); - buttonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5); - buttonSizer->Add(new wxButton(this,wxID_APPLY),0); + buttonSizer->Add(stdButtonSizer,0,wxEXPAND); // Main Sizer wxSizer *mainSizer = new wxBoxSizer(wxVERTICAL); diff --git a/aegisub/dialog_style_editor.cpp b/aegisub/dialog_style_editor.cpp index 67c76d4f0..c87ab8b89 100644 --- a/aegisub/dialog_style_editor.cpp +++ b/aegisub/dialog_style_editor.cpp @@ -53,6 +53,7 @@ #include "options.h" #include "subtitles_provider.h" #include "ass_style_storage.h" +#include "help_button.h" /////// @@ -331,7 +332,7 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit okButton->SetDefault(); ButtonSizer->AddButton(new wxButton(this, wxID_CANCEL)); ButtonSizer->AddButton(new wxButton(this, wxID_APPLY)); - ButtonSizer->AddButton(new wxButton(this, wxID_HELP)); + ButtonSizer->AddButton(new HelpButton(this, _T("Style Editor"))); ButtonSizer->AddButton(okButton); ButtonSizer->Realize(); diff --git a/aegisub/dialog_styling_assistant.cpp b/aegisub/dialog_styling_assistant.cpp index 19f327964..852afeea5 100644 --- a/aegisub/dialog_styling_assistant.cpp +++ b/aegisub/dialog_styling_assistant.cpp @@ -114,13 +114,14 @@ wxDialog (parent, -1, _("Styling assistant"), wxDefaultPosition, wxDefaultSize, BottomSizer->Add(RightSizer,1,wxEXPAND,0); // Button sizer - wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); - ButtonSizer->Add(new HelpButton(this,_T("Styling Assistant")),0,wxRIGHT,0); - ButtonSizer->AddStretchSpacer(1); + wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer(); + ButtonSizer->AddButton(new wxButton(this,wxID_OK)); wxButton *PlayButton = new wxButton(this,BUTTON_PLAY,_("Play Audio")); PlayButton->Enable(audio->loaded); - ButtonSizer->Add(PlayButton,0,wxRIGHT,5); - ButtonSizer->Add(new wxButton(this,wxID_OK),0,wxRIGHT,0); + ButtonSizer->AddButton(PlayButton); + ButtonSizer->AddButton(new HelpButton(this,_T("Styling Assistant"))); + ButtonSizer->SetNegativeButton(PlayButton); + ButtonSizer->Realize(); // Main sizer wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL); diff --git a/aegisub/dialog_timing_processor.cpp b/aegisub/dialog_timing_processor.cpp index b28f75937..f8fc92a23 100644 --- a/aegisub/dialog_timing_processor.cpp +++ b/aegisub/dialog_timing_processor.cpp @@ -46,6 +46,7 @@ #include "ass_time.h" #include "vfr.h" #include "utils.h" +#include "help_button.h" /////////////// @@ -153,7 +154,7 @@ DialogTimingProcessor::DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *_gr ApplyButton = new wxButton(this,wxID_OK); ButtonSizer->AddButton(ApplyButton); ButtonSizer->AddButton(new wxButton(this,wxID_CANCEL)); - ButtonSizer->AddButton(new wxButton(this,wxID_HELP)); + ButtonSizer->AddButton(new HelpButton(this,_T("Timing Processor"))); ButtonSizer->Realize(); // Right Sizer diff --git a/aegisub/help_button.cpp b/aegisub/help_button.cpp index 0feb62db8..ca8329661 100644 --- a/aegisub/help_button.cpp +++ b/aegisub/help_button.cpp @@ -95,10 +95,13 @@ void HelpButton::InitStatic() { if (!pages) { pages = new std::map; std::map &page = *pages; - page[_T("Main")] = _T(""); - page[_T("Styling Assistant")] = _T("Styling_Assistant"); - page[_T("Styles Manager")] = _T("Styles"); page[_T("Kanji Timer")] = _T("Kanji_Timer"); + page[_T("Main")] = _T(""); + page[_T("Options")] = _T("Options"); page[_T("Resampler")] = _T("Resolution_Resampler"); + page[_T("Style Editor")] = _T("Styles"); + page[_T("Styles Manager")] = _T("Styles"); + page[_T("Styling Assistant")] = _T("Styling_Assistant"); + page[_T("Timing Processor")] = _T("Timing_Post-Processor"); } }