diff --git a/core/bitmaps/about.bmp b/core/bitmaps/about.bmp new file mode 100644 index 000000000..4afd00449 Binary files /dev/null and b/core/bitmaps/about.bmp differ diff --git a/core/bitmaps/blank.bmp b/core/bitmaps/blank.bmp new file mode 100644 index 000000000..4afd00449 Binary files /dev/null and b/core/bitmaps/blank.bmp differ diff --git a/core/bitmaps/bugtracker.bmp b/core/bitmaps/bugtracker.bmp new file mode 100644 index 000000000..3bfcdb580 Binary files /dev/null and b/core/bitmaps/bugtracker.bmp differ diff --git a/core/bitmaps/exit.bmp b/core/bitmaps/exit.bmp new file mode 100644 index 000000000..4afd00449 Binary files /dev/null and b/core/bitmaps/exit.bmp differ diff --git a/core/bitmaps/forums.bmp b/core/bitmaps/forums.bmp new file mode 100644 index 000000000..5c81aaea6 Binary files /dev/null and b/core/bitmaps/forums.bmp differ diff --git a/core/bitmaps/open_with.bmp b/core/bitmaps/open_with.bmp new file mode 100644 index 000000000..748fdaa54 Binary files /dev/null and b/core/bitmaps/open_with.bmp differ diff --git a/core/bitmaps/options.bmp b/core/bitmaps/options.bmp index d5b381c4f..ad1e34f6a 100644 Binary files a/core/bitmaps/options.bmp and b/core/bitmaps/options.bmp differ diff --git a/core/bitmaps/save.bmp b/core/bitmaps/save.bmp index 2c1d18a58..96ab1731c 100644 Binary files a/core/bitmaps/save.bmp and b/core/bitmaps/save.bmp differ diff --git a/core/bitmaps/save_as.bmp b/core/bitmaps/save_as.bmp new file mode 100644 index 000000000..39ab4664e Binary files /dev/null and b/core/bitmaps/save_as.bmp differ diff --git a/core/bitmaps/website.bmp b/core/bitmaps/website.bmp new file mode 100644 index 000000000..a98daf6ac Binary files /dev/null and b/core/bitmaps/website.bmp differ diff --git a/core/frame_main.cpp b/core/frame_main.cpp index a35cf8af5..f63e41155 100644 --- a/core/frame_main.cpp +++ b/core/frame_main.cpp @@ -225,17 +225,19 @@ void FrameMain::InitMenu() { fileMenu = new wxMenu(); AppendBitmapMenuItem(fileMenu,Menu_File_New_Subtitles, _("&New Subtitles\t") + Hotkeys.GetText(_T("New Subtitles")), _("New subtitles"),wxBITMAP(new_toolbutton)); AppendBitmapMenuItem(fileMenu,Menu_File_Open_Subtitles, _("&Open Subtitles...\t") + Hotkeys.GetText(_T("Open Subtitles")), _("Opens a subtitles file"),wxBITMAP(open_toolbutton)); - fileMenu->Append(Menu_File_Open_Subtitles_Charset, _("&Open Subtitles with Charset..."), _("Opens a subtitles file with a specific charset")); + //fileMenu->Append(Menu_File_Open_Subtitles_Charset, _("&Open Subtitles with Charset..."), _("Opens a subtitles file with a specific charset")); + AppendBitmapMenuItem(fileMenu,Menu_File_Open_Subtitles_Charset, _("&Open Subtitles with Charset..."), _("Opens a subtitles file with a specific charset"),wxBITMAP(open_with_toolbutton)); AppendBitmapMenuItem(fileMenu,Menu_File_Save_Subtitles, _("&Save Subtitles\t") + Hotkeys.GetText(_T("Save Subtitles")), _("Saves subtitles"),wxBITMAP(save_toolbutton)); - fileMenu->Append(Menu_File_Save_Subtitles_As, _("Save Subtitles as..."), _("Saves subtitles with another name")); - fileMenu->Append(Menu_File_Export_Subtitles, _("Export Subtitles..."), _("Saves a copy of subtitles with processing applied to it.")); + AppendBitmapMenuItem(fileMenu,Menu_File_Save_Subtitles_As, _("Save Subtitles as..."), _("Saves subtitles with another name"), wxBITMAP(save_as_toolbutton)); + AppendBitmapMenuItem(fileMenu,Menu_File_Export_Subtitles, _("Export Subtitles..."), _("Saves a copy of subtitles with processing applied to it."), wxBITMAP(blank_button)); wxMenuItem *RecentParent = new wxMenuItem(fileMenu, Menu_File_Recent_Subs_Parent, _("Recent"), _T(""), wxITEM_NORMAL, RecentSubs); + RecentParent->SetBitmap(wxBITMAP(blank_button)); fileMenu->Append(RecentParent); fileMenu->AppendSeparator(); AppendBitmapMenuItem (fileMenu,Menu_Tools_Properties, _("&Properties..."), _("Open script properties window"),wxBITMAP(properties_toolbutton)); AppendBitmapMenuItem (fileMenu,Menu_Tools_Attachments, _("&Attachments..."), _("Open the attachment list"), wxBITMAP(attach_button)); fileMenu->AppendSeparator(); - fileMenu->Append(Menu_File_Exit, _("E&xit\t") + Hotkeys.GetText(_T("Exit")), _("Exit the application")); + AppendBitmapMenuItem(fileMenu,Menu_File_Exit, _("E&xit\t") + Hotkeys.GetText(_T("Exit")), _("Exit the application"),wxBITMAP(exit_button)); MenuBar->Append(fileMenu, _("&File")); // Create Edit menu @@ -256,11 +258,13 @@ void FrameMain::InitMenu() { // Create subtitles menu subtitlesMenu = new wxMenu(); subtitlesMenu->Append(Menu_Edit_Select, _("&Select lines...\t") + Hotkeys.GetText(_T("Select lines")), _("Selects lines based on defined criterea")); + 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)); AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Translation, _("&Translation Assistant..."),_("Open translation assistant"), wxBITMAP(translation_toolbutton)); - AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Fonts_Collector, _("&Fonts Collector..."),_("Open fonts collector"), wxBITMAP(font_collector_button)); AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Resample,_("Resample resolution..."), _("Changes resolution and modifies subtitles to conform to change"), wxBITMAP(resample_toolbutton)); + AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Fonts_Collector, _("&Fonts Collector..."),_("Open fonts collector"), wxBITMAP(font_collector_button)); + AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_SpellCheck, _("Spe&ll checker..."),_("Open spell checker"), wxBITMAP(spellcheck_toolbutton)); MenuBar->Append(subtitlesMenu, _("&Subtitles")); // Create timing menu @@ -338,12 +342,12 @@ void FrameMain::InitMenu() { helpMenu = new wxMenu(); AppendBitmapMenuItem (helpMenu,Menu_Help_Contents, _("&Contents...\t") + Hotkeys.GetText(_T("Help")), _("Help topics"), wxBITMAP(contents_button)); helpMenu->AppendSeparator(); - helpMenu->Append(Menu_Help_Website, _("&Website..."), _("Visit Aegisub's official website")); - helpMenu->Append(Menu_Help_Forums, _("&Forums..."), _("Visit Aegisub's forums")); - helpMenu->Append(Menu_Help_BugTracker, _("&Bug tracker..."), _("Visit Aegisub's bug tracker")); + AppendBitmapMenuItem(helpMenu,Menu_Help_Website, _("&Website..."), _("Visit Aegisub's official website"),wxBITMAP(website_button)); + AppendBitmapMenuItem(helpMenu,Menu_Help_Forums, _("&Forums..."), _("Visit Aegisub's forums"),wxBITMAP(forums_button)); + AppendBitmapMenuItem(helpMenu,Menu_Help_BugTracker, _("&Bug tracker..."), _("Visit Aegisub's bug tracker"),wxBITMAP(bugtracker_button)); AppendBitmapMenuItem (helpMenu,Menu_Help_IRCChannel, _("&IRC channel..."), _("Visit Aegisub's official IRC channel"), wxBITMAP(irc_button)); helpMenu->AppendSeparator(); - helpMenu->Append(Menu_Help_About, _("&About..."), _("About Aegisub")); + AppendBitmapMenuItem(helpMenu,Menu_Help_About, _("&About..."), _("About Aegisub"),wxBITMAP(about_button)); MenuBar->Append(helpMenu, _("&Help")); // Set the bar as this frame's diff --git a/core/res.rc b/core/res.rc index 5251f4f0b..97e9d345c 100644 --- a/core/res.rc +++ b/core/res.rc @@ -33,9 +33,13 @@ // Contact: mailto:zeratul@cellosoft.com // +blank_button BITMAP "bitmaps/blank.bmp" + new_toolbutton BITMAP "bitmaps/new.bmp" open_toolbutton BITMAP "bitmaps/open.bmp" +open_with_toolbutton BITMAP "bitmaps/open_with.bmp" save_toolbutton BITMAP "bitmaps/save.bmp" +save_as_toolbutton BITMAP "bitmaps/save_as.bmp" style_toolbutton BITMAP "bitmaps/style_manager.bmp" styling_toolbutton BITMAP "bitmaps/styling_assistant.bmp" translation_toolbutton BITMAP "bitmaps/translation.bmp" @@ -80,6 +84,11 @@ select_visible_button BITMAP "bitmaps/select_visible.bmp" toggle_tag_hiding BITMAP "bitmaps/toggle_tag_hiding.bmp" shift_to_frame BITMAP "bitmaps/shift_to_frame.bmp" shift_to_frame_disable BITMAP "bitmaps/shift_to_frame_disable.bmp" +bugtracker_button BITMAP "bitmaps/bugtracker.bmp" +website_button BITMAP "bitmaps/website.bmp" +forums_button BITMAP "bitmaps/forums.bmp" +about_button BITMAP "bitmaps/about.bmp" +exit_button BITMAP "bitmaps/exit.bmp" button_play BITMAP "bitmaps/button_play.bmp" button_stop BITMAP "bitmaps/button_stop.bmp"