Added a help button to visual typesetting and added an icon for the select lines tool.

Originally committed to SVN as r1719.

aegisub/frame_main.cpp

@@ -365,8 +365,8 @@ void FrameMain::InitMenu() {
 	AppendBitmapMenuItem(subtitlesMenu,MENU_RECOMBINE,_("Recombine Lines"),_("Recombine subtitles when they have been split and merged"),wxBITMAP(blank_button));
 	AppendBitmapMenuItem(subtitlesMenu,MENU_SPLIT_BY_KARAOKE,_("Split Lines (by karaoke)"),_("Uses karaoke timing to split line into multiple smaller lines"),wxBITMAP(blank_button));
 	subtitlesMenu->AppendSeparator();
-	AppendBitmapMenuItem(subtitlesMenu,MENU_SWAP,_("Swap Lines"),_("Swaps the two selected lines"),wxBITMAP(blank_button));
+	AppendBitmapMenuItem(subtitlesMenu,MENU_SWAP,_("Swap Lines"),_("Swaps the two selected lines"),wxBITMAP(arrow_sort));
-	AppendBitmapMenuItem (subtitlesMenu,Menu_Edit_Select, MakeHotkeyText(_("Select Lines..."), _T("Select lines")), _("Selects lines based on defined criterea"),wxBITMAP(blank_button));
+	AppendBitmapMenuItem (subtitlesMenu,Menu_Edit_Select, MakeHotkeyText(_("Select Lines..."), _T("Select lines")), _("Selects lines based on defined criterea"),wxBITMAP(select_lines_button));
 	subtitlesMenu->AppendSeparator();
 	AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Styles_Manager, _("&Styles Manager..."), _("Open styles manager"), wxBITMAP(style_toolbutton));
 	AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Styling, _("St&yling Assistant..."), _("Open styling assistant"), wxBITMAP(styling_toolbutton));

aegisub/help_button.cpp

@@ -114,5 +114,6 @@ void HelpButton::InitStatic() {
 		page[_T("Styles Manager")] = _T("Styles");
 		page[_T("Styling Assistant")] = _T("Styling_Assistant");
 		page[_T("Timing Processor")] = _T("Timing_Post-Processor");
+		page[_T("Visual Typesetting")] = _T("Visual_Typesetting");
 	}
 }

aegisub/res.rc

@@ -88,6 +88,7 @@ about_button BITMAP "bitmaps/about.bmp"
 exit_button BITMAP "bitmaps/exit.bmp"
 sort_times_button BITMAP "bitmaps/sort_times.bmp"
 kanji_timer_button BITMAP "bitmaps/kanji_timer.bmp"
+select_lines_button BITMAP "bitmaps/select_lines.bmp"
 
 button_play BITMAP "bitmaps/button_play.bmp"
 button_pause BITMAP "bitmaps/button_pause.bmp"
@@ -152,6 +153,7 @@ visual_vector_clip_insert BITMAP "bitmaps/visual_vector_clip_insert.bmp"
 visual_vector_clip_freehand BITMAP "bitmaps/visual_vector_clip_freehand.bmp"
 visual_vector_clip_freehand_smooth BITMAP "bitmaps/visual_vector_clip_freehand_smooth.bmp"
 visual_realtime BITMAP "bitmaps/visual_realtime.bmp"
+visual_help BITMAP "bitmaps/visual_help.bmp"
 
 arrow_up BITMAP "bitmaps/arrow_up.bmp"
 arrow_down BITMAP "bitmaps/arrow_down.bmp"

aegisub/video_box.cpp

@@ -58,6 +58,7 @@
 #include "main.h"
 #include "toggle_bitmap.h"
 #include "visual_tool.h"
+#include "help_button.h"
 
 
 ///////////////
@@ -118,6 +119,7 @@ VideoBox::VideoBox(wxWindow *parent)
 	visualToolBar->AddSeparator();
 	visualToolBar->AddTool(Video_Mode_Realtime,_("Realtime"),wxBITMAP(visual_realtime),_("Toggle realtime display of changes."),wxITEM_CHECK);
 	visualToolBar->ToggleTool(Video_Mode_Realtime,Options.AsBool(_T("Video Visual Realtime")));
+	visualToolBar->AddTool(Video_Mode_Help,_("Help"),wxBITMAP(visual_help),_("Open the manual page for Visual Typesetting."));
 	visualToolBar->Realize();
 
 	// Top sizer
@@ -160,6 +162,7 @@ BEGIN_EVENT_TABLE(VideoBox, wxPanel)
 	EVT_TOOL_RANGE(Video_Mode_Standard, Video_Mode_Vector_Clip, VideoBox::OnModeChange)
 	EVT_TOOL_RANGE(VISUAL_SUB_TOOL_START,VISUAL_SUB_TOOL_END, VideoBox::OnSubTool)
 	EVT_TOOL(Video_Mode_Realtime, VideoBox::OnToggleRealtime)
+	EVT_TOOL(Video_Mode_Help, VideoBox::OnHelp)
 END_EVENT_TABLE()
 
 
@@ -226,3 +229,10 @@ void VideoBox::OnToggleRealtime(wxCommandEvent &event) {
 }
 
 
+////////
+// Help
+void VideoBox::OnHelp(wxCommandEvent &event) {
+	HelpButton::OpenPage(_T("Visual Typesetting"));
+}
+
+

aegisub/video_box.h

@@ -67,6 +67,7 @@ private:
 	void OnModeChange(wxCommandEvent &event);
 	void OnSubTool(wxCommandEvent &event);
 	void OnToggleRealtime(wxCommandEvent &event);
+	void OnHelp(wxCommandEvent &event);
 
 public:
 	wxToolBar *visualToolBar;
@@ -104,4 +105,5 @@ enum {
 	Video_Mode_Clip,
 	Video_Mode_Vector_Clip,
 	Video_Mode_Realtime,
+	Video_Mode_Help
 };