Add access keys for most entries in the main menu bar and eliminate a few duplicates. Updates #1078.

Originally committed to SVN as r5876.

aegisub/src/command/app.cpp

@@ -78,7 +78,7 @@ struct app_about : public Command {
 /// Display audio and subtitles.
 struct app_display_audio_subs : public Command {
 	CMD_NAME("app/display/audio_subs")
-	STR_MENU("Audio+Subs View")
+	STR_MENU("&Audio+Subs View")
 	STR_DISP("Audio+Subs View")
 	STR_HELP("Display audio and subtitles only.")
 	CMD_TYPE(COMMAND_VALIDATE | COMMAND_RADIO)
@@ -96,7 +96,7 @@ struct app_display_audio_subs : public Command {
 /// Display audio, video and subtitles.
 struct app_display_full : public Command {
 	CMD_NAME("app/display/full")
-	STR_MENU("Full view")
+	STR_MENU("&Full view")
 	STR_DISP("Full view")
 	STR_HELP("Display audio, video and subtitles.")
 	CMD_TYPE(COMMAND_VALIDATE | COMMAND_RADIO)
@@ -114,7 +114,7 @@ struct app_display_full : public Command {
 /// Display subtitles only.
 struct app_display_subs : public Command {
 	CMD_NAME("app/display/subs")
-	STR_MENU("Subs Only View")
+	STR_MENU("S&ubs Only View")
 	STR_DISP("Subs Only View")
 	STR_HELP("Display subtitles only.")
 	CMD_TYPE(COMMAND_VALIDATE | COMMAND_RADIO)
@@ -128,7 +128,7 @@ struct app_display_subs : public Command {
 /// Display video and subtitles only.
 struct app_display_video_subs : public Command {
 	CMD_NAME("app/display/video_subs")
-	STR_MENU("Video+Subs View")
+	STR_MENU("&Video+Subs View")
 	STR_DISP("Video+Subs View")
 	STR_HELP("Display video and subtitles only.")
 	CMD_TYPE(COMMAND_VALIDATE | COMMAND_RADIO)
@@ -201,7 +201,7 @@ struct app_log : public Command {
 /// Open a new application window.
 struct app_new_window : public Command {
 	CMD_NAME("app/new_window")
-	STR_MENU("New Window")
+	STR_MENU("New &Window")
 	STR_DISP("New Window")
 	STR_HELP("Open a new application window.")
 

aegisub/src/command/audio.cpp

@@ -162,7 +162,7 @@ struct audio_open_video : public Command {
 /// Display audio as a frequency-power spectrograph.
 struct audio_view_spectrum : public Command {
 	CMD_NAME("audio/view/spectrum")
-	STR_MENU("Spectrum Display")
+	STR_MENU("&Spectrum Display")
 	STR_DISP("Spectrum Display")
 	STR_HELP("Display audio as a frequency-power spectrograph.")
 	CMD_TYPE(COMMAND_RADIO)
@@ -180,7 +180,7 @@ struct audio_view_spectrum : public Command {
 /// Display audio as a linear amplitude graph.
 struct audio_view_waveform : public Command {
 	CMD_NAME("audio/view/waveform")
-	STR_MENU("Waveform Display")
+	STR_MENU("&Waveform Display")
 	STR_DISP("Waveform Display")
 	STR_HELP("Display audio as a linear amplitude graph.")
 	CMD_TYPE(COMMAND_RADIO)

aegisub/src/command/edit.cpp

@@ -90,7 +90,7 @@ struct edit_find_replace : public Command {
 /// Copy subtitles.
 struct edit_line_copy : public validate_sel_nonempty {
 	CMD_NAME("edit/line/copy")
-	STR_MENU("Copy Lines")
+	STR_MENU("&Copy Lines")
 	STR_DISP("Copy Lines")
 	STR_HELP("Copy subtitles.")
 
@@ -107,7 +107,7 @@ struct edit_line_copy : public validate_sel_nonempty {
 /// Cut subtitles.
 struct edit_line_cut: public validate_sel_nonempty {
 	CMD_NAME("edit/line/cut")
-	STR_MENU("Cut Lines")
+	STR_MENU("Cu&t Lines")
 	STR_DISP("Cut Lines")
 	STR_HELP("Cut subtitles.")
 
@@ -124,7 +124,7 @@ struct edit_line_cut: public validate_sel_nonempty {
 /// Delete currently selected lines.
 struct edit_line_delete : public validate_sel_nonempty {
 	CMD_NAME("edit/line/delete")
-	STR_MENU("Delete Lines")
+	STR_MENU("De&lete Lines")
 	STR_DISP("Delete Lines")
 	STR_HELP("Delete currently selected lines.")
 
@@ -151,7 +151,7 @@ struct edit_line_duplicate : public validate_sel_nonempty {
 /// Duplicate lines and shift by one frame.
 struct edit_line_duplicate_shift : public Command {
 	CMD_NAME("edit/line/duplicate/shift")
-	STR_MENU("&Duplicate and Shift by 1 Frame")
+	STR_MENU("D&uplicate and Shift by 1 Frame")
 	STR_DISP("Duplicate and Shift by 1 Frame")
 	STR_HELP("Duplicate lines and shift by one frame.")
 	CMD_TYPE(COMMAND_VALIDATE)
@@ -249,7 +249,7 @@ struct edit_line_join_keep_first : public validate_sel_multiple {
 /// Paste subtitles.
 struct edit_line_paste : public Command {
 	CMD_NAME("edit/line/paste")
-	STR_MENU("Paste Lines")
+	STR_MENU("&Paste Lines")
 	STR_DISP("Paste Lines")
 	STR_HELP("Paste subtitles.")
 	CMD_TYPE(COMMAND_VALIDATE)
@@ -276,7 +276,7 @@ struct edit_line_paste : public Command {
 /// Paste subtitles over others.
 struct edit_line_paste_over : public Command {
 	CMD_NAME("edit/line/paste/over")
-	STR_MENU("Paste Lines Over...")
+	STR_MENU("Paste Lines &Over...")
 	STR_DISP("Paste Lines Over")
 	STR_HELP("Paste subtitles over others.")
 	CMD_TYPE(COMMAND_VALIDATE)

aegisub/src/command/grid.cpp

@@ -108,7 +108,7 @@ struct grid_tag_cycle_hiding : public Command {
 /// Hide override tags in the subtitle grid.
 struct grid_tags_hide : public Command {
 	CMD_NAME("grid/tags/hide")
-	STR_MENU("Hide Tags")
+	STR_MENU("&Hide Tags")
 	STR_DISP("Hide Tags")
 	STR_HELP("Hide override tags in the subtitle grid.")
 	CMD_TYPE(COMMAND_RADIO)
@@ -126,7 +126,7 @@ struct grid_tags_hide : public Command {
 /// Show full override tags in the subtitle grid.
 struct grid_tags_show : public Command {
 	CMD_NAME("grid/tags/show")
-	STR_MENU("Show Tags")
+	STR_MENU("Sh&ow Tags")
 	STR_DISP("Show Tags")
 	STR_HELP("Show full override tags in the subtitle grid.")
 	CMD_TYPE(COMMAND_RADIO)
@@ -144,7 +144,7 @@ struct grid_tags_show : public Command {
 /// Replace override tags in the subtitle grid with a simplified placeholder.
 struct grid_tags_simplify : public Command {
 	CMD_NAME("grid/tags/simplify")
-	STR_MENU("Simplify Tags")
+	STR_MENU("S&implify Tags")
 	STR_DISP("Simplify Tags")
 	STR_HELP("Replace override tags in the subtitle grid with a simplified placeholder.")
 	CMD_TYPE(COMMAND_RADIO)

aegisub/src/command/help.cpp

@@ -89,24 +89,22 @@ struct help_contents : public Command {
 	}
 };
 
-
+#ifdef __WXMAC__
 /// Resource files.
 struct help_files : public Command {
 	CMD_NAME("help/files")
-	STR_MENU("&All Files")
+	STR_MENU("All Fil&es")
 	STR_DISP("All Files")
 	STR_HELP("Resource files.")
 
 	void operator()(agi::Context *c) {
-#ifdef __WXMAC__
 		char *shared_path = agi::util::OSX_GetBundleSharedSupportDirectory();
 		wxString help_path = wxString::Format("%s/doc", wxString(shared_path, wxConvUTF8));
 		agi::util::OSX_OpenLocation(help_path.c_str());
 		free(shared_path);
-#endif
 	}
 };
-
+#endif
 
 /// Visit Aegisub's forums.
 struct help_forums : public Command {
@@ -163,7 +161,9 @@ namespace cmd {
 	void init_help() {
 		reg(new help_bugs);
 		reg(new help_contents);
+#ifdef __WXMAC__
 		reg(new help_files);
+#endif
 		reg(new help_forums);
 		reg(new help_irc);
 		reg(new help_video);

aegisub/src/command/subtitle.cpp

@@ -84,7 +84,7 @@ struct validate_nonempty_selection_video_loaded : public Command {
 /// Open the attachment list.
 struct subtitle_attachment : public Command {
 	CMD_NAME("subtitle/attachment")
-	STR_MENU("&Attachments...")
+	STR_MENU("A&ttachments...")
 	STR_DISP("Attachments")
 	STR_HELP("Open the attachment list.")
 
@@ -112,7 +112,7 @@ struct subtitle_find : public Command {
 /// Find next match of last word.
 struct subtitle_find_next : public Command {
 	CMD_NAME("subtitle/find/next")
-	STR_MENU("Find Next")
+	STR_MENU("Find &Next")
 	STR_DISP("Find Next")
 	STR_HELP("Find next match of last word.")
 
@@ -270,7 +270,7 @@ struct subtitle_open : public Command {
 /// Opens a subtitles file with a specific charset.
 struct subtitle_open_charset : public Command {
 	CMD_NAME("subtitle/open/charset")
-	STR_MENU("&Open Subtitles with Charset...")
+	STR_MENU("Open Subtitles with &Charset...")
 	STR_DISP("Open Subtitles with Charset")
 	STR_HELP("Opens a subtitles file with a specific charset.")
 
@@ -365,7 +365,7 @@ struct subtitle_save : public Command {
 /// Saves subtitles with another name.
 struct subtitle_save_as : public Command {
 	CMD_NAME("subtitle/save/as")
-	STR_MENU("Save Subtitles as...")
+	STR_MENU("Save Subtitles &as...")
 	STR_DISP("Save Subtitles as")
 	STR_HELP("Saves subtitles with another name.")
 
@@ -377,7 +377,7 @@ struct subtitle_save_as : public Command {
 /// Selects all dialogue lines
 struct subtitle_select_all : public Command {
 	CMD_NAME("subtitle/select/all")
-	STR_MENU("Select All")
+	STR_MENU("Select &All")
 	STR_DISP("Select All")
 	STR_HELP("Selects all dialogue lines.")
 
@@ -429,7 +429,7 @@ struct subtitle_select_visible : public Command {
 /// Open spell checker.
 struct subtitle_spellcheck : public Command {
 	CMD_NAME("subtitle/spellcheck")
-	STR_MENU("Spe&ll Checker...")
+	STR_MENU("Spell &Checker...")
 	STR_DISP("Spell Checker")
 	STR_HELP("Open spell checker.")
 

aegisub/src/command/time.cpp

@@ -123,7 +123,7 @@ struct time_continuous_start : public validate_adjoinable {
 /// Shift selection so first selected line starts at current frame.
 struct time_frame_current : public validate_video_loaded {
 	CMD_NAME("time/frame/current")
-	STR_MENU("Shift to Current Frame")
+	STR_MENU("Shift to &Current Frame")
 	STR_DISP("Shift to Current Frame")
 	STR_HELP("Shift selection so first selected line starts at current frame.")
 
@@ -181,7 +181,7 @@ static void snap_subs_video(agi::Context *c, bool set_start) {
 /// Set end of selected subtitles to current video frame.
 struct time_snap_end_video : public validate_video_loaded {
 	CMD_NAME("time/snap/end_video")
-	STR_MENU("Snap End to Video")
+	STR_MENU("Snap &End to Video")
 	STR_DISP("Snap End to Video")
 	STR_HELP("Set end of selected subtitles to current video frame.")
 
@@ -193,7 +193,7 @@ struct time_snap_end_video : public validate_video_loaded {
 /// Set start and end of subtitles to the keyframes around current video frame.
 struct time_snap_scene : public validate_video_loaded {
 	CMD_NAME("time/snap/scene")
-	STR_MENU("Snap to Scene")
+	STR_MENU("Snap to S&cene")
 	STR_DISP("Snap to Scene")
 	STR_HELP("Set start and end of subtitles to the keyframes around current video frame.")
 
@@ -274,7 +274,7 @@ struct time_add_lead_out : public Command {
 /// Set start of selected subtitles to current video frame.
 struct time_snap_start_video : public validate_video_loaded {
 	CMD_NAME("time/snap/start_video")
-	STR_MENU("Snap Start to Video")
+	STR_MENU("Snap &Start to Video")
 	STR_DISP("Snap Start to Video")
 	STR_HELP("Set start of selected subtitles to current video frame.")
 

aegisub/src/command/tool.cpp

@@ -80,7 +80,7 @@ struct tool_assdraw : public Command {
 /// Saves a copy of subtitles with processing applied to it.
 struct tool_export : public Command {
 	CMD_NAME("tool/export")
-	STR_MENU("Export Subtitles...")
+	STR_MENU("&Export Subtitles...")
 	STR_DISP("Export Subtitles")
 	STR_HELP("Saves a copy of subtitles with processing applied to it.")
 
@@ -108,7 +108,7 @@ struct tool_font_collector : public Command {
 /// Selects lines based on defined criteria.
 struct tool_line_select : public Command {
 	CMD_NAME("tool/line/select")
-	STR_MENU("Select Lines...")
+	STR_MENU("S&elect Lines...")
 	STR_DISP("Select Lines")
 	STR_HELP("Selects lines based on defined criteria.")
 
@@ -121,7 +121,7 @@ struct tool_line_select : public Command {
 /// Changes resolution and modifies subtitles to conform to change.
 struct tool_resampleres : public Command {
 	CMD_NAME("tool/resampleres")
-	STR_MENU("Resample Resolution...")
+	STR_MENU("&Resample Resolution...")
 	STR_DISP("Resample Resolution")
 	STR_HELP("Changes resolution and modifies subtitles to conform to change.")
 
@@ -195,7 +195,7 @@ struct tool_style_manager : public Command {
 /// Open Kanji timer.
 struct tool_time_kanji : public Command {
 	CMD_NAME("tool/time/kanji")
-	STR_MENU("Kanji Timer...")
+	STR_MENU("&Kanji Timer...")
 	STR_DISP("Kanji Timer")
 	STR_HELP("Open Kanji timer.")
 
@@ -208,7 +208,7 @@ struct tool_time_kanji : public Command {
 /// Launch timing post-processor.
 struct tool_time_postprocess : public Command {
 	CMD_NAME("tool/time/postprocess")
-	STR_MENU("Timing Post-Processor...")
+	STR_MENU("&Timing Post-Processor...")
 	STR_DISP("Timing Post-Processor")
 	STR_HELP("Runs a post-processor for timing to deal with lead-ins, lead-outs, scene timing and etc.")
 

aegisub/src/command/video.cpp

@@ -247,7 +247,7 @@ struct video_copy_coordinates : public validator_video_loaded {
 /// Detach video, displaying it in a separate Window.
 struct video_detach : public validator_video_loaded {
 	CMD_NAME("video/detach")
-	STR_MENU("Detach Video")
+	STR_MENU("&Detach Video")
 	STR_DISP("Detach Video")
 	STR_HELP("Detach video, displaying it in a separate Window.")
 	CMD_TYPE(COMMAND_VALIDATE | COMMAND_TOGGLE)
@@ -269,7 +269,7 @@ struct video_detach : public validator_video_loaded {
 /// Shows video details.
 struct video_details : public validator_video_loaded {
 	CMD_NAME("video/details")
-	STR_MENU("Show Video Details...")
+	STR_MENU("Show &Video Details...")
 	STR_DISP("Show Video Details")
 	STR_HELP("Shows video details.")
 
@@ -518,7 +518,7 @@ struct video_jump : public validator_video_loaded {
 /// Jumps the video to the end frame of current subtitle.
 struct video_jump_end : public validator_video_loaded {
 	CMD_NAME("video/jump/end")
-	STR_MENU("Jump Video to End")
+	STR_MENU("Jump Video to &End")
 	STR_DISP("Jump Video to End")
 	STR_HELP("Jumps the video to the end frame of current subtitle.")
 
@@ -532,7 +532,7 @@ struct video_jump_end : public validator_video_loaded {
 /// Jumps the video to the start frame of current subtitle.
 struct video_jump_start : public validator_video_loaded {
 	CMD_NAME("video/jump/start")
-	STR_MENU("Jump Video to Start")
+	STR_MENU("Jump Video to &Start")
 	STR_DISP("Jump Video to Start")
 	STR_HELP("Jumps the video to the start frame of current subtitle.")
 
@@ -565,7 +565,7 @@ struct video_open : public Command {
 /// Opens a video clip with solid colour.
 struct video_open_dummy : public Command {
 	CMD_NAME("video/open/dummy")
-	STR_MENU("Use Dummy Video...")
+	STR_MENU("&Use Dummy Video...")
 	STR_DISP("Use Dummy Video")
 	STR_HELP("Opens a video clip with solid colour.")
 
@@ -621,7 +621,7 @@ struct video_play_line : public validator_video_loaded {
 /// Show a mask over the video.
 struct video_show_overscan : public validator_video_loaded {
 	CMD_NAME("video/show_overscan")
-	STR_MENU("Show Overscan Mask")
+	STR_MENU("Show &Overscan Mask")
 	STR_DISP("Show Overscan Mask")
 	STR_HELP("Show a mask over the video, indicating areas that might get cropped off by overscan on televisions.")
 	CMD_TYPE(COMMAND_VALIDATE | COMMAND_TOGGLE)