diff --git a/aegisub/src/bitmaps/16/close_audio_menu.png b/aegisub/src/bitmaps/16/close_audio_menu.png new file mode 100644 index 000000000..11cfe1ec7 Binary files /dev/null and b/aegisub/src/bitmaps/16/close_audio_menu.png differ diff --git a/aegisub/src/bitmaps/16/close_video_menu.png b/aegisub/src/bitmaps/16/close_video_menu.png new file mode 100644 index 000000000..bb5cb3940 Binary files /dev/null and b/aegisub/src/bitmaps/16/close_video_menu.png differ diff --git a/aegisub/src/bitmaps/16/find_next_button.png b/aegisub/src/bitmaps/16/find_next_button.png deleted file mode 100644 index f6f8b6631..000000000 Binary files a/aegisub/src/bitmaps/16/find_next_button.png and /dev/null differ diff --git a/aegisub/src/bitmaps/16/find_next_menu.png b/aegisub/src/bitmaps/16/find_next_menu.png new file mode 100644 index 000000000..73d4a0619 Binary files /dev/null and b/aegisub/src/bitmaps/16/find_next_menu.png differ diff --git a/aegisub/src/bitmaps/16/find_replace_menu.png b/aegisub/src/bitmaps/16/find_replace_menu.png new file mode 100644 index 000000000..a42550c8f Binary files /dev/null and b/aegisub/src/bitmaps/16/find_replace_menu.png differ diff --git a/aegisub/src/bitmaps/16/open_audio_from_video_menu.png b/aegisub/src/bitmaps/16/open_audio_from_video_menu.png new file mode 100644 index 000000000..793f80f50 Binary files /dev/null and b/aegisub/src/bitmaps/16/open_audio_from_video_menu.png differ diff --git a/aegisub/src/bitmaps/16/open_audio_menu.png b/aegisub/src/bitmaps/16/open_audio_menu.png new file mode 100644 index 000000000..dacc06bd0 Binary files /dev/null and b/aegisub/src/bitmaps/16/open_audio_menu.png differ diff --git a/aegisub/src/bitmaps/16/replace_button.png b/aegisub/src/bitmaps/16/replace_button.png deleted file mode 100644 index f6f8b6631..000000000 Binary files a/aegisub/src/bitmaps/16/replace_button.png and /dev/null differ diff --git a/aegisub/src/bitmaps/24/close_audio_menu.png b/aegisub/src/bitmaps/24/close_audio_menu.png new file mode 100644 index 000000000..fca1603d4 Binary files /dev/null and b/aegisub/src/bitmaps/24/close_audio_menu.png differ diff --git a/aegisub/src/bitmaps/24/close_video_menu.png b/aegisub/src/bitmaps/24/close_video_menu.png new file mode 100644 index 000000000..f7d0cbf5a Binary files /dev/null and b/aegisub/src/bitmaps/24/close_video_menu.png differ diff --git a/aegisub/src/bitmaps/24/find_next_button.png b/aegisub/src/bitmaps/24/find_next_button.png deleted file mode 100644 index a74ba2420..000000000 Binary files a/aegisub/src/bitmaps/24/find_next_button.png and /dev/null differ diff --git a/aegisub/src/bitmaps/24/find_next_menu.png b/aegisub/src/bitmaps/24/find_next_menu.png new file mode 100644 index 000000000..532ba36c0 Binary files /dev/null and b/aegisub/src/bitmaps/24/find_next_menu.png differ diff --git a/aegisub/src/bitmaps/24/find_replace_menu.png b/aegisub/src/bitmaps/24/find_replace_menu.png new file mode 100644 index 000000000..ddbb7330a Binary files /dev/null and b/aegisub/src/bitmaps/24/find_replace_menu.png differ diff --git a/aegisub/src/bitmaps/24/open_audio_from_video_menu.png b/aegisub/src/bitmaps/24/open_audio_from_video_menu.png new file mode 100644 index 000000000..98033e4c7 Binary files /dev/null and b/aegisub/src/bitmaps/24/open_audio_from_video_menu.png differ diff --git a/aegisub/src/bitmaps/24/open_audio_menu.png b/aegisub/src/bitmaps/24/open_audio_menu.png new file mode 100644 index 000000000..1781d90b6 Binary files /dev/null and b/aegisub/src/bitmaps/24/open_audio_menu.png differ diff --git a/aegisub/src/bitmaps/24/replace_button.png b/aegisub/src/bitmaps/24/replace_button.png deleted file mode 100644 index a74ba2420..000000000 Binary files a/aegisub/src/bitmaps/24/replace_button.png and /dev/null differ diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 7e7885012..b0bb008c0 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -398,8 +398,8 @@ void FrameMain::InitMenu() { AppendBitmapMenuItem(editMenu,Menu_Edit_Paste_Over, MakeHotkeyText(_("Paste Lines Over..."), _T("Paste Over")) , _("Paste subtitles over others"),GETIMAGE(paste_over_button_16)); editMenu->AppendSeparator(); AppendBitmapMenuItem(editMenu,Menu_Edit_Find, MakeHotkeyText(_("&Find..."), _T("Find")), _("Find words in subtitles"),GETIMAGE(find_button_16)); - AppendBitmapMenuItem(editMenu,Menu_Edit_Find_Next, MakeHotkeyText(_("Find Next"), _T("Find Next")), _("Find next match of last word"),GETIMAGE(find_next_button_16)); - AppendBitmapMenuItem(editMenu,Menu_Edit_Replace, MakeHotkeyText(_("Search and &Replace..."), _T("Replace")) , _("Find and replace words in subtitles"),GETIMAGE(replace_button_16)); + AppendBitmapMenuItem(editMenu,Menu_Edit_Find_Next, MakeHotkeyText(_("Find Next"), _T("Find Next")), _("Find next match of last word"),GETIMAGE(find_next_menu_16)); + AppendBitmapMenuItem(editMenu,Menu_Edit_Replace, MakeHotkeyText(_("Search and &Replace..."), _T("Replace")) , _("Find and replace words in subtitles"),GETIMAGE(find_replace_menu_16)); MenuBar->Append(editMenu, _("&Edit")); // Create subtitles menu @@ -469,7 +469,7 @@ void FrameMain::InitMenu() { // Create video menu videoMenu = new wxMenu(); videoMenu->Append(Menu_File_Open_Video, _("&Open Video..."), _("Opens a video file")); - videoMenu->Append(Menu_File_Close_Video, _("&Close Video"), _("Closes the currently open video file")); + AppendBitmapMenuItem(videoMenu, Menu_File_Close_Video, _("&Close Video"), _("Closes the currently open video file"), GETIMAGE(close_video_menu_16)); wxMenuItem *RecentVidParent = new wxMenuItem(videoMenu, Menu_File_Recent_Vids_Parent, _("Recent"), _T(""), wxITEM_NORMAL, RecentVids); videoMenu->Append(RecentVidParent); videoMenu->Append(Menu_Video_Dummy, _("Use Dummy Video..."), _("Opens a video clip with solid colour")); @@ -517,9 +517,9 @@ void FrameMain::InitMenu() { // Create audio menu audioMenu = new wxMenu(); - audioMenu->Append(Menu_Audio_Open_File, _("&Open Audio File..."), _("Opens an audio file")); - audioMenu->Append(Menu_Audio_Open_From_Video, _("Open Audio from &Video"), _("Opens the audio from the current video file")); - audioMenu->Append(Menu_Audio_Close, _("&Close Audio"), _("Closes the currently open audio file")); + AppendBitmapMenuItem(audioMenu, Menu_Audio_Open_File, _("&Open Audio File..."), _("Opens an audio file"), GETIMAGE(open_audio_menu_16)); + AppendBitmapMenuItem(audioMenu, Menu_Audio_Open_From_Video, _("Open Audio from &Video"), _("Opens the audio from the current video file"), GETIMAGE(open_audio_from_video_menu_16)); + AppendBitmapMenuItem(audioMenu, Menu_Audio_Close, _("&Close Audio"), _("Closes the currently open audio file"), GETIMAGE(close_audio_menu_16)); wxMenuItem *RecentAudParent = new wxMenuItem(audioMenu, Menu_File_Recent_Auds_Parent, _("Recent"), _T(""), wxITEM_NORMAL, RecentAuds); audioMenu->Append(RecentAudParent); #ifdef _DEBUG