From 984438618f4abbd5bb83cbf52f7b2ae5e0f15d0e Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Sun, 13 Jan 2008 23:34:38 +0000 Subject: [PATCH] Finished adding help buttons to every relevant dialog. Originally committed to SVN as r1706. --- aegisub/dialog_attachments.cpp | 4 +++- aegisub/dialog_automation.cpp | 2 ++ aegisub/dialog_export.cpp | 17 ++++++++--------- aegisub/dialog_paste_over.cpp | 10 ++++++---- aegisub/dialog_properties.cpp | 10 +++++----- aegisub/dialog_selection.cpp | 17 ++++++----------- aegisub/help_button.cpp | 12 +++++++++--- 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/aegisub/dialog_attachments.cpp b/aegisub/dialog_attachments.cpp index dc948ce56..19043bad8 100644 --- a/aegisub/dialog_attachments.cpp +++ b/aegisub/dialog_attachments.cpp @@ -47,6 +47,7 @@ #include "ass_attachment.h" #include "utils.h" #include "options.h" +#include "help_button.h" /////////////// @@ -73,7 +74,8 @@ DialogAttachments::DialogAttachments(wxWindow *parent) buttonSizer->Add(new wxButton(this,BUTTON_ATTACH_GRAPHICS,_("Attach &Graphics")),1,0,0); buttonSizer->Add(extractButton,1,0,0); buttonSizer->Add(deleteButton,1,0,0); - buttonSizer->Add(new wxButton(this,wxID_CANCEL,_("&Close")),1,wxLEFT,5); + buttonSizer->Add(new HelpButton(this,_T("Attachment Manager")),1,wxLEFT,5); + buttonSizer->Add(new wxButton(this,wxID_CANCEL,_("&Close")),1,0,0); // Main sizer wxSizer *mainSizer = new wxBoxSizer(wxVERTICAL); diff --git a/aegisub/dialog_automation.cpp b/aegisub/dialog_automation.cpp index ef2103252..7ed601908 100644 --- a/aegisub/dialog_automation.cpp +++ b/aegisub/dialog_automation.cpp @@ -41,6 +41,7 @@ #include "auto4_base.h" #include "options.h" #include "utils.h" +#include "help_button.h" #include #include #include @@ -82,6 +83,7 @@ DialogAutomation::DialogAutomation(wxWindow *parent, Automation4::ScriptManager button_box->AddSpacer(10); button_box->Add(reload_autoload_button, 0); button_box->AddSpacer(10); + button_box->Add(new HelpButton(this,_T("Automation Manager")), 0); button_box->Add(close_button, 0); button_box->AddStretchSpacer(2); diff --git a/aegisub/dialog_export.cpp b/aegisub/dialog_export.cpp index d892b2a76..cdaa8b8ed 100644 --- a/aegisub/dialog_export.cpp +++ b/aegisub/dialog_export.cpp @@ -45,6 +45,7 @@ #include "ass_file.h" #include "ass_exporter.h" #include "frame_main.h" +#include "help_button.h" /////////////// @@ -109,15 +110,13 @@ DialogExport::DialogExport (wxWindow *parent) TopSizer->Add(charset_list_sizer, 0, wxEXPAND | wxTOP, 5); // Button sizer - wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); - ButtonSizer->AddStretchSpacer(1); -#ifndef __WXMAC__ - ButtonSizer->Add(new wxButton(this,Button_Process,_("Export...")),0,wxRIGHT,5); - ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,0); -#else - ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5); - ButtonSizer->Add(new wxButton(this,Button_Process,_("Export...")),0,wxRIGHT,0); -#endif + wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer(); + wxButton *process = new wxButton(this,Button_Process,_("Export...")); + ButtonSizer->AddButton(process); + ButtonSizer->AddButton(new wxButton(this,wxID_CANCEL)); + ButtonSizer->AddButton(new HelpButton(this,_T("Export"))); + ButtonSizer->SetAffirmativeButton(process); + ButtonSizer->Realize(); // Draw stuff sizer HorizSizer = new wxBoxSizer(wxHORIZONTAL); diff --git a/aegisub/dialog_paste_over.cpp b/aegisub/dialog_paste_over.cpp index 7051f9a9f..f648e465a 100644 --- a/aegisub/dialog_paste_over.cpp +++ b/aegisub/dialog_paste_over.cpp @@ -42,6 +42,7 @@ #include #include "dialog_paste_over.h" #include "options.h" +#include "help_button.h" /////////////// @@ -89,10 +90,11 @@ DialogPasteOver::DialogPasteOver (wxWindow *parent) TopButtonSizer->Add(new wxButton(this, Paste_Over_Text, _("Text")),1,0,0); // Buttons - wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); - ButtonSizer->AddStretchSpacer(1); - ButtonSizer->Add(new wxButton(this, wxID_OK),0,wxRIGHT,5); - ButtonSizer->Add(new wxButton(this, wxID_CANCEL),0,0,0); + wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer(); + ButtonSizer->AddButton(new wxButton(this, wxID_OK)); + ButtonSizer->AddButton(new wxButton(this, wxID_CANCEL)); + ButtonSizer->AddButton(new HelpButton(this,_T("Paste Over"))); + ButtonSizer->Realize(); // Main sizer wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL); diff --git a/aegisub/dialog_properties.cpp b/aegisub/dialog_properties.cpp index dc54261cc..3f8a4d049 100644 --- a/aegisub/dialog_properties.cpp +++ b/aegisub/dialog_properties.cpp @@ -47,6 +47,7 @@ #include "validators.h" #include "video_provider.h" #include "utils.h" +#include "help_button.h" /////////////// @@ -144,11 +145,10 @@ DialogProperties::DialogProperties (wxWindow *parent) optionsBox->Add(optionsGrid,1,wxEXPAND,0); // Button sizer - wxButton *ButtonOK = new wxButton(this,wxID_OK); - ButtonOK->SetDefault(); - wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); - ButtonSizer->AddStretchSpacer(1); - ButtonSizer->Add(ButtonOK,0,0,0); + wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer(); + ButtonSizer->AddButton(new wxButton(this,wxID_OK)); + ButtonSizer->AddButton(new HelpButton(this,_T("Properties"))); + ButtonSizer->Realize(); // MainSizer wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL); diff --git a/aegisub/dialog_selection.cpp b/aegisub/dialog_selection.cpp index f1c405e64..b0b44b84e 100644 --- a/aegisub/dialog_selection.cpp +++ b/aegisub/dialog_selection.cpp @@ -43,6 +43,7 @@ #include "subs_grid.h" #include "ass_dialogue.h" #include "options.h" +#include "help_button.h" /////////////// @@ -103,17 +104,11 @@ wxDialog (parent,-1,_("Select"),wxDefaultPosition,wxDefaultSize,wxCAPTION) DialogueSizer->Add(MatchComments,0, wxEXPAND); // Buttons sizer - wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); - ButtonSizer->AddStretchSpacer(1); -#ifndef __WXMAC__ - ButtonSizer->Add(new wxButton(this,wxID_OK),0,wxRIGHT,5); - ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,0); -#else - wxButton *okButton = new wxButton(this,wxID_OK); - ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5); - ButtonSizer->Add(okButton,0,wxRIGHT,0); - okButton->SetDefault(); -#endif + wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer(); + ButtonSizer->AddButton(new wxButton(this,wxID_OK)); + ButtonSizer->AddButton(new wxButton(this,wxID_CANCEL)); + ButtonSizer->AddButton(new HelpButton(this,_T("Select Lines"))); + ButtonSizer->Realize(); // Main sizer wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL); diff --git a/aegisub/help_button.cpp b/aegisub/help_button.cpp index b2a9c3c5e..c3ee546c2 100644 --- a/aegisub/help_button.cpp +++ b/aegisub/help_button.cpp @@ -95,15 +95,21 @@ void HelpButton::InitStatic() { if (!pages) { pages = new std::map; std::map &page = *pages; + page[_T("Attachment Manager")] = _T("Attachment_Manager"); + page[_T("Automation Manager")] = _T("Automation_Manager"); page[_T("Colour Picker")] = _T("Colour_Picker"); - page[_T("Dummy Video")] = _T("Video#Dummy_video"); + page[_T("Dummy Video")] = _T("Dummy_video"); + page[_T("Export")] = _T("Export"); page[_T("Fonts Collector")] = _T("Fonts_Collector"); page[_T("Kanji Timer")] = _T("Kanji_Timer"); page[_T("Main")] = _T(""); page[_T("Options")] = _T("Options"); + page[_T("Paste Over")] = _T("Paste_Over"); + page[_T("Properties")] = _T("Properties"); page[_T("Resampler")] = _T("Resolution_Resampler"); - page[_T("Shift Times")] = _T("Other_Tools#Shift_Times"); - page[_T("Spell Checker")] = _T("Other_Tools#Spell_Checker"); + page[_T("Shift Times")] = _T("Shift_Times"); + page[_T("Select Lines")] = _T("Select_Lines"); + page[_T("Spell Checker")] = _T("Spell_Checker"); page[_T("Style Editor")] = _T("Styles"); page[_T("Styles Manager")] = _T("Styles"); page[_T("Styling Assistant")] = _T("Styling_Assistant");