diff --git a/aegisub/src/bitmaps/16/about_button.png b/aegisub/src/bitmaps/16/about_button.png deleted file mode 100644 index f6f8b6631..000000000 Binary files a/aegisub/src/bitmaps/16/about_button.png and /dev/null differ diff --git a/aegisub/src/bitmaps/16/about_menu.png b/aegisub/src/bitmaps/16/about_menu.png new file mode 100644 index 000000000..485e83247 Binary files /dev/null and b/aegisub/src/bitmaps/16/about_menu.png differ diff --git a/aegisub/src/bitmaps/16/close_keyframes_menu.png b/aegisub/src/bitmaps/16/close_keyframes_menu.png new file mode 100644 index 000000000..2cd1f793c Binary files /dev/null and b/aegisub/src/bitmaps/16/close_keyframes_menu.png differ diff --git a/aegisub/src/bitmaps/16/close_timecodes_menu.png b/aegisub/src/bitmaps/16/close_timecodes_menu.png new file mode 100644 index 000000000..fc32e498d Binary files /dev/null and b/aegisub/src/bitmaps/16/close_timecodes_menu.png differ diff --git a/aegisub/src/bitmaps/16/languages_menu.png b/aegisub/src/bitmaps/16/languages_menu.png new file mode 100644 index 000000000..4a4c9e0be Binary files /dev/null and b/aegisub/src/bitmaps/16/languages_menu.png differ diff --git a/aegisub/src/bitmaps/16/menu_check.png b/aegisub/src/bitmaps/16/menu_check.png new file mode 100644 index 000000000..25134f818 Binary files /dev/null and b/aegisub/src/bitmaps/16/menu_check.png differ diff --git a/aegisub/src/bitmaps/16/open_keyframes_menu.png b/aegisub/src/bitmaps/16/open_keyframes_menu.png new file mode 100644 index 000000000..5d0e19c7a Binary files /dev/null and b/aegisub/src/bitmaps/16/open_keyframes_menu.png differ diff --git a/aegisub/src/bitmaps/16/open_video_menu.png b/aegisub/src/bitmaps/16/open_video_menu.png new file mode 100644 index 000000000..e55c9adf6 Binary files /dev/null and b/aegisub/src/bitmaps/16/open_video_menu.png differ diff --git a/aegisub/src/bitmaps/16/save_keyframes_menu.png b/aegisub/src/bitmaps/16/save_keyframes_menu.png new file mode 100644 index 000000000..50cc189ae Binary files /dev/null and b/aegisub/src/bitmaps/16/save_keyframes_menu.png differ diff --git a/aegisub/src/bitmaps/16/save_timecodes_menu.png b/aegisub/src/bitmaps/16/save_timecodes_menu.png new file mode 100644 index 000000000..da068dbaf Binary files /dev/null and b/aegisub/src/bitmaps/16/save_timecodes_menu.png differ diff --git a/aegisub/src/bitmaps/16/show_video_details_menu.png b/aegisub/src/bitmaps/16/show_video_details_menu.png new file mode 100644 index 000000000..2696d8e00 Binary files /dev/null and b/aegisub/src/bitmaps/16/show_video_details_menu.png differ diff --git a/aegisub/src/bitmaps/16/use_dummy_video_menu.png b/aegisub/src/bitmaps/16/use_dummy_video_menu.png new file mode 100644 index 000000000..8ec39a2f8 Binary files /dev/null and b/aegisub/src/bitmaps/16/use_dummy_video_menu.png differ diff --git a/aegisub/src/bitmaps/24/about_button.png b/aegisub/src/bitmaps/24/about_button.png deleted file mode 100644 index a74ba2420..000000000 Binary files a/aegisub/src/bitmaps/24/about_button.png and /dev/null differ diff --git a/aegisub/src/bitmaps/24/about_menu.png b/aegisub/src/bitmaps/24/about_menu.png new file mode 100644 index 000000000..e580a9b70 Binary files /dev/null and b/aegisub/src/bitmaps/24/about_menu.png differ diff --git a/aegisub/src/bitmaps/24/close_keyframes_menu.png b/aegisub/src/bitmaps/24/close_keyframes_menu.png new file mode 100644 index 000000000..0c7bbcda4 Binary files /dev/null and b/aegisub/src/bitmaps/24/close_keyframes_menu.png differ diff --git a/aegisub/src/bitmaps/24/close_timecodes_menu.png b/aegisub/src/bitmaps/24/close_timecodes_menu.png new file mode 100644 index 000000000..070acf2c7 Binary files /dev/null and b/aegisub/src/bitmaps/24/close_timecodes_menu.png differ diff --git a/aegisub/src/bitmaps/24/languages_menu.png b/aegisub/src/bitmaps/24/languages_menu.png new file mode 100644 index 000000000..0024b5bf3 Binary files /dev/null and b/aegisub/src/bitmaps/24/languages_menu.png differ diff --git a/aegisub/src/bitmaps/24/menu_check.png b/aegisub/src/bitmaps/24/menu_check.png new file mode 100644 index 000000000..767ccf86c Binary files /dev/null and b/aegisub/src/bitmaps/24/menu_check.png differ diff --git a/aegisub/src/bitmaps/24/open_keyframes_menu.png b/aegisub/src/bitmaps/24/open_keyframes_menu.png new file mode 100644 index 000000000..9786a374b Binary files /dev/null and b/aegisub/src/bitmaps/24/open_keyframes_menu.png differ diff --git a/aegisub/src/bitmaps/24/open_video_menu.png b/aegisub/src/bitmaps/24/open_video_menu.png new file mode 100644 index 000000000..f4cc274ba Binary files /dev/null and b/aegisub/src/bitmaps/24/open_video_menu.png differ diff --git a/aegisub/src/bitmaps/24/save_keyframes_menu.png b/aegisub/src/bitmaps/24/save_keyframes_menu.png new file mode 100644 index 000000000..9e9ab033b Binary files /dev/null and b/aegisub/src/bitmaps/24/save_keyframes_menu.png differ diff --git a/aegisub/src/bitmaps/24/save_timecodes_menu.png b/aegisub/src/bitmaps/24/save_timecodes_menu.png new file mode 100644 index 000000000..2aee80d60 Binary files /dev/null and b/aegisub/src/bitmaps/24/save_timecodes_menu.png differ diff --git a/aegisub/src/bitmaps/24/show_video_details_menu.png b/aegisub/src/bitmaps/24/show_video_details_menu.png new file mode 100644 index 000000000..5f445b864 Binary files /dev/null and b/aegisub/src/bitmaps/24/show_video_details_menu.png differ diff --git a/aegisub/src/bitmaps/24/use_dummy_video_menu.png b/aegisub/src/bitmaps/24/use_dummy_video_menu.png new file mode 100644 index 000000000..5d43b4732 Binary files /dev/null and b/aegisub/src/bitmaps/24/use_dummy_video_menu.png differ diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 5aa2cb0d2..046ba1554 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -468,22 +468,22 @@ void FrameMain::InitMenu() { // Create video menu videoMenu = new wxMenu(); - videoMenu->Append(Menu_File_Open_Video, _("&Open Video..."), _("Opens a video file")); + AppendBitmapMenuItem(videoMenu, Menu_File_Open_Video, _("&Open Video..."), _("Opens a video file"), GETIMAGE(open_video_menu_16)); 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")); - videoMenu->Append(Menu_Video_Details, _("Show Video Details..."), _("Shows video details")); + AppendBitmapMenuItem(videoMenu, Menu_Video_Dummy, _("Use Dummy Video..."), _("Opens a video clip with solid colour"), GETIMAGE(use_dummy_video_menu_16)); + AppendBitmapMenuItem(videoMenu, Menu_Video_Details, _("Show Video Details..."), _("Shows video details"), GETIMAGE(show_video_details_menu_16)); videoMenu->AppendSeparator(); AppendBitmapMenuItem(videoMenu, Menu_File_Open_VFR, _("Open Timecodes File..."), _("Opens a VFR timecodes v1 or v2 file"), GETIMAGE(open_timecodes_menu_16)); - videoMenu->Append(Menu_File_Save_VFR, _("Save Timecodes File..."), _("Saves a VFR timecodes v2 file")); - videoMenu->Append(Menu_File_Close_VFR, _("Close Timecodes File"), _("Closes the currently open timecodes file"))->Enable(false); + AppendBitmapMenuItem(videoMenu, Menu_File_Save_VFR, _("Save Timecodes File..."), _("Saves a VFR timecodes v2 file"), GETIMAGE(save_timecodes_menu_16)); + AppendBitmapMenuItem(videoMenu, Menu_File_Close_VFR, _("Close Timecodes File"), _("Closes the currently open timecodes file"), GETIMAGE(close_timecodes_menu_16))->Enable(false); wxMenuItem *RecentTimesParent = new wxMenuItem(videoMenu, Menu_File_Recent_Timecodes_Parent, _("Recent"), _T(""), wxITEM_NORMAL, RecentTimecodes); videoMenu->Append(RecentTimesParent); videoMenu->AppendSeparator(); - videoMenu->Append(Menu_Video_Load_Keyframes, _("Open Keyframes..."), _("Opens a keyframe list file")); - videoMenu->Append(Menu_Video_Save_Keyframes, _("Save Keyframes..."), _("Saves the current keyframe list"))->Enable(false); - videoMenu->Append(Menu_Video_Close_Keyframes, _("Close Keyframes"), _("Closes the currently open keyframes list"))->Enable(false); + AppendBitmapMenuItem(videoMenu, Menu_Video_Load_Keyframes, _("Open Keyframes..."), _("Opens a keyframe list file"), GETIMAGE(open_keyframes_menu_16)); + AppendBitmapMenuItem(videoMenu, Menu_Video_Save_Keyframes, _("Save Keyframes..."), _("Saves the current keyframe list"), GETIMAGE(save_keyframes_menu_16))->Enable(false); + AppendBitmapMenuItem(videoMenu, Menu_Video_Close_Keyframes, _("Close Keyframes"), _("Closes the currently open keyframes list"), GETIMAGE(close_keyframes_menu_16))->Enable(false); wxMenuItem *RecentKeyframesParent = new wxMenuItem(videoMenu, Menu_File_Recent_Keyframes_Parent, _("Recent"), _T(""), wxITEM_NORMAL, RecentKeyframes); videoMenu->Append(RecentKeyframesParent); videoMenu->AppendSeparator(); @@ -570,7 +570,7 @@ void FrameMain::InitMenu() { #ifdef __WXMSW__ AppendBitmapMenuItem(helpMenu,Menu_Help_Check_Updates, _("&Check for Updates..."), _("Check to see if there is a new version of Aegisub available"),GETIMAGE(blank_button_16)); #endif - AppendBitmapMenuItem(helpMenu,Menu_Help_About, _("&About..."), _("About Aegisub"),GETIMAGE(about_button_16)); + AppendBitmapMenuItem(helpMenu,Menu_Help_About, _("&About..."), _("About Aegisub"),GETIMAGE(about_menu_16)); MenuBar->Append(helpMenu, _("&Help")); // Set the bar as this frame's