From 74e6a888da8c0dee1d6cf5c71c20b7c9e77098b9 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Mon, 14 Jan 2008 19:46:46 +0000 Subject: [PATCH] Added a help button to visual typesetting and added an icon for the select lines tool. Originally committed to SVN as r1719. --- aegisub/bitmaps/select_lines.bmp | Bin 0 -> 1318 bytes aegisub/bitmaps/visual_help.bmp | Bin 0 -> 1318 bytes aegisub/frame_main.cpp | 4 ++-- aegisub/help_button.cpp | 1 + aegisub/res.rc | 2 ++ aegisub/video_box.cpp | 10 ++++++++++ aegisub/video_box.h | 2 ++ 7 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 aegisub/bitmaps/select_lines.bmp create mode 100644 aegisub/bitmaps/visual_help.bmp diff --git a/aegisub/bitmaps/select_lines.bmp b/aegisub/bitmaps/select_lines.bmp new file mode 100644 index 0000000000000000000000000000000000000000..64501345cd6198da2a11b30c40b6fb65977cc92e GIT binary patch literal 1318 zcmbu8F>6#&5QUEraf^VaNtMPFV(I}&+U*z8q)s<~A&tdWsRbc$I|~&oY(jp(Ru*RJ zq%l>BKoCs2fW`RDY+;Ckg>QH6eRJM@bG|qCz3J@5WA*WBMS98EGvX=nNR!rYdi>ik zm-uTwUrvmiYOz>o@ok}-uOGFtvZBdkqSe(^t*xzTeSKXU8yni(+|<_AmiG4cG@H#d zoldp0v!nUz)b4KTtI+FrD&;vaX0zJu-JfoeB(eO7488?|yZO>pZ7z_r3!O%!B7z_r3!C){n zCJY9H!C){L42=$h!C){L39vK$L+%a;BIxO7=E;=U; zi^I}wfy3c&I2;a#qgw@s!{9JD4AnY^!(nh30 z9T*Il2Ht~35d!yq&@E`cs77hFdy%{hJ7zTZ)ZKEsw^eD`XwT<*3@C(=i zj=-sez>qK`3;_dW2-d@pFeD5K1EmRc7!rnrApuDIgJQ{z$s(tQlRF&Q zwQG&*xjtxre_sa&2Rb}F)X~wAPESvDe0;3)^K)HXTUa_ZsO4Bnpj@XsQg3K%&qXK2k6^0*OLnBsPt~5l9poBNv}3 z!?p$zg~qI*nURh_qR^N%Y&X&oNE8~grX-AX1QLbDtm#T49f3rlF>5NzNJk)1Xv~`C zHqsGD6dJSt0v{tCfkdG(O2(fuY$FeBYoRep6AX?(qR^Q2+uTS;AW>+{`lVr{BakRG zX8mqnlIaK}3XNH%P)0fei9%ymnY59PK%&r?y@Ya%bOaKG#;6&8%istk3fnrXw9H6H zAW>+{DmypQ5l9povr00IbOaKG#;kHpBOQT6p)sqJ%ScBcQE1F6^ET2ENR-Z(tA21@ z@;vFfZ@ON$7Ff4K><(+uy>aUvkFO5sa(dN2{O|hHoBQ8Cus@48+^*1iw;uh~(CPjO b+ZoY)^tttTd~^>7T`qsmZUf@-`v?C4$k14* literal 0 HcmV?d00001 diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp index 76f4e6f3d..2c19f765b 100644 --- a/aegisub/frame_main.cpp +++ b/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_Edit_Select, MakeHotkeyText(_("Select Lines..."), _T("Select lines")), _("Selects lines based on defined criterea"),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(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)); diff --git a/aegisub/help_button.cpp b/aegisub/help_button.cpp index 5a9d4c1d1..daa0d4cb2 100644 --- a/aegisub/help_button.cpp +++ b/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"); } } diff --git a/aegisub/res.rc b/aegisub/res.rc index c9010c76d..d1fbca7cb 100644 --- a/aegisub/res.rc +++ b/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" diff --git a/aegisub/video_box.cpp b/aegisub/video_box.cpp index 584e2234d..8260391fa 100644 --- a/aegisub/video_box.cpp +++ b/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")); +} + + diff --git a/aegisub/video_box.h b/aegisub/video_box.h index 3a274a87a..0b82a83cc 100644 --- a/aegisub/video_box.h +++ b/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 };