Finished adding help buttons to every relevant dialog.

Originally committed to SVN as r1706.

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);

aegisub/dialog_automation.cpp

@@ -41,6 +41,7 @@
 #include "auto4_base.h"
 #include "options.h"
 #include "utils.h"
+#include "help_button.h"
 #include <wx/filename.h>
 #include <wx/filedlg.h>
 #include <wx/log.h>
@@ -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);
 

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);
+	wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer();
-	ButtonSizer->AddStretchSpacer(1);
+	wxButton *process = new wxButton(this,Button_Process,_("Export..."));
-#ifndef __WXMAC__
+	ButtonSizer->AddButton(process);
-	ButtonSizer->Add(new wxButton(this,Button_Process,_("Export...")),0,wxRIGHT,5);
+	ButtonSizer->AddButton(new wxButton(this,wxID_CANCEL));
-	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,0);
+	ButtonSizer->AddButton(new HelpButton(this,_T("Export")));
-#else
+	ButtonSizer->SetAffirmativeButton(process);
-	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5);
+	ButtonSizer->Realize();
-	ButtonSizer->Add(new wxButton(this,Button_Process,_("Export...")),0,wxRIGHT,0);
-#endif
 
 	// Draw stuff sizer
 	HorizSizer = new wxBoxSizer(wxHORIZONTAL);

aegisub/dialog_paste_over.cpp

@@ -42,6 +42,7 @@
 #include <wx/button.h>
 #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);
+	wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer();
-	ButtonSizer->AddStretchSpacer(1);
+	ButtonSizer->AddButton(new wxButton(this, wxID_OK));
-	ButtonSizer->Add(new wxButton(this, wxID_OK),0,wxRIGHT,5);
+	ButtonSizer->AddButton(new wxButton(this, wxID_CANCEL));
-	ButtonSizer->Add(new wxButton(this, wxID_CANCEL),0,0,0);
+	ButtonSizer->AddButton(new HelpButton(this,_T("Paste Over")));
+	ButtonSizer->Realize();
 
 	// Main sizer
 	wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);

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);
+	wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer();
-	ButtonOK->SetDefault();
+	ButtonSizer->AddButton(new wxButton(this,wxID_OK));
-	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+	ButtonSizer->AddButton(new HelpButton(this,_T("Properties")));
-	ButtonSizer->AddStretchSpacer(1);
+	ButtonSizer->Realize();
-	ButtonSizer->Add(ButtonOK,0,0,0);
 
 	// MainSizer
 	wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);

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);
+	wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer();
-	ButtonSizer->AddStretchSpacer(1);
+	ButtonSizer->AddButton(new wxButton(this,wxID_OK));
-#ifndef __WXMAC__
+	ButtonSizer->AddButton(new wxButton(this,wxID_CANCEL));
-	ButtonSizer->Add(new wxButton(this,wxID_OK),0,wxRIGHT,5);
+	ButtonSizer->AddButton(new HelpButton(this,_T("Select Lines")));
-	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,0);
+	ButtonSizer->Realize();
-#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
 
 	// Main sizer
 	wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);

aegisub/help_button.cpp

@@ -95,15 +95,21 @@ void HelpButton::InitStatic() {
 	if (!pages) {
 		pages = new std::map<wxString,wxString>;
 		std::map<wxString,wxString> &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("Shift Times")] = _T("Shift_Times");
-		page[_T("Spell Checker")] = _T("Other_Tools#Spell_Checker");
+		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");