From cb38df86a895fe14abc5b49c506cce3e4894732a Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Wed, 27 Dec 2006 03:03:18 +0000 Subject: [PATCH] Menu changes and new icons Originally committed to SVN as r634. --- core/bitmaps/about.bmp | Bin 0 -> 1318 bytes core/bitmaps/blank.bmp | Bin 0 -> 1318 bytes core/bitmaps/bugtracker.bmp | Bin 0 -> 1318 bytes core/bitmaps/exit.bmp | Bin 0 -> 1318 bytes core/bitmaps/forums.bmp | Bin 0 -> 1318 bytes core/bitmaps/open_with.bmp | Bin 0 -> 1318 bytes core/bitmaps/options.bmp | Bin 1318 -> 1318 bytes core/bitmaps/save.bmp | Bin 238 -> 1318 bytes core/bitmaps/save_as.bmp | Bin 0 -> 1318 bytes core/bitmaps/website.bmp | Bin 0 -> 1318 bytes core/frame_main.cpp | 22 +++++++++++++--------- core/res.rc | 9 +++++++++ 12 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 core/bitmaps/about.bmp create mode 100644 core/bitmaps/blank.bmp create mode 100644 core/bitmaps/bugtracker.bmp create mode 100644 core/bitmaps/exit.bmp create mode 100644 core/bitmaps/forums.bmp create mode 100644 core/bitmaps/open_with.bmp create mode 100644 core/bitmaps/save_as.bmp create mode 100644 core/bitmaps/website.bmp diff --git a/core/bitmaps/about.bmp b/core/bitmaps/about.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4afd004495554ba604ccea32cfd806c40babdef4 GIT binary patch literal 1318 zcmd_ov5^!p5QX7K6%=?7LR(ivfZc^p4jsx1r48!hXqy-?I)wExmVZWPk^v)qdfM5o zosrbvf4qFqeSLc`eP#9qpYcwg?)#5>{MTTKF8c%{Q_YO#_vrEKRf~R#$eAjPmqa% z(HQJ~1i3*b3PxkFGV8Yj*UAf5YYbKnA&@8-jlrH{%ODd4qcPZXq!nbMU^E7Mj+=+r ziGtA>>?wr~GEp!ZgFR(3K_&`DW3YD#d4o(8jK*L!tbY_p6pY5z_LNoxnJ5^I!Je|q zAQJ_nG1ya*6=b4dGzNRh)j=i-Mq{w2lsm{o!DtNjl=%diC>X8BpQnEEJM(|i^X_^+ OuNi39EryT(+4UFSeoc}9 literal 0 HcmV?d00001 diff --git a/core/bitmaps/blank.bmp b/core/bitmaps/blank.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4afd004495554ba604ccea32cfd806c40babdef4 GIT binary patch literal 1318 zcmd_ov5^!p5QX7K6%=?7LR(ivfZc^p4jsx1r48!hXqy-?I)wExmVZWPk^v)qdfM5o zosrbvf4qFqeSLc`eP#9qpYcwg?)#5>{MTTKF8c%{Q_YO#_vrEKRf~R#$eAjPmqa% z(HQJ~1i3*b3PxkFGV8Yj*UAf5YYbKnA&@8-jlrH{%ODd4qcPZXq!nbMU^E7Mj+=+r ziGtA>>?wr~GEp!ZgFR(3K_&`DW3YD#d4o(8jK*L!tbY_p6pY5z_LNoxnJ5^I!Je|q zAQJ_nG1ya*6=b4dGzNRh)j=i-Mq{w2lsm{o!DtNjl=%diC>X8BpQnEEJM(|i^X_^+ OuNi39EryT(+4UFSeoc}9 literal 0 HcmV?d00001 diff --git a/core/bitmaps/bugtracker.bmp b/core/bitmaps/bugtracker.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3bfcdb5804f8df6accc2c717045ca2b7888b2624 GIT binary patch literal 1318 zcmZwFJ+9PH42EGNaW!b9=&}S?h!s#<^z6Y)@lsqM*5R5pP#RG{#U(Z$2;0PoNEkaRJVQ>Tzh2|v%3WFn%D6|NNw8G#BBnmAi zyrwAD?g%6bJyTO94URyf&@*jQ(%=Xr3O%31l{7d4i9*lk3MCDWK%&s|DN{*1qRc zNECX0HxG$0I0A`6&r(Pw4URyf(6dZRNrNMhDD=66qLnl_0*OLPG5->U!4XKTy=Q5u zk_Ja0QRrEArli3UNECXOq$_D~1QLawt3>L8x5;vZm`MJ z=knEk4Vdmjju~+cKlatakbiYKjzhNfNUo4W_MMh()uv(J>Az}g#M)Nh>V4a$_6M0K BU)}%! literal 0 HcmV?d00001 diff --git a/core/bitmaps/exit.bmp b/core/bitmaps/exit.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4afd004495554ba604ccea32cfd806c40babdef4 GIT binary patch literal 1318 zcmd_ov5^!p5QX7K6%=?7LR(ivfZc^p4jsx1r48!hXqy-?I)wExmVZWPk^v)qdfM5o zosrbvf4qFqeSLc`eP#9qpYcwg?)#5>{MTTKF8c%{Q_YO#_vrEKRf~R#$eAjPmqa% z(HQJ~1i3*b3PxkFGV8Yj*UAf5YYbKnA&@8-jlrH{%ODd4qcPZXq!nbMU^E7Mj+=+r ziGtA>>?wr~GEp!ZgFR(3K_&`DW3YD#d4o(8jK*L!tbY_p6pY5z_LNoxnJ5^I!Je|q zAQJ_nG1ya*6=b4dGzNRh)j=i-Mq{w2lsm{o!DtNjl=%diC>X8BpQnEEJM(|i^X_^+ OuNi39EryT(+4UFSeoc}9 literal 0 HcmV?d00001 diff --git a/core/bitmaps/forums.bmp b/core/bitmaps/forums.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5c81aaea6ced254571dc4b10b8133f099c4a6d3a GIT binary patch literal 1318 zcmZwFJ}8S7$|rkQRr)2B^n%oM4?5~ohY<~3KRxMAW`V~ZKgznBakTc{8Cq< z!4XIldVV*9L>L@_M4{&>q!JB|K%&rdOiGCcM<7w?^9V&N(clOq3N6L@OB4o2AhGVA zqoqnTI0A`6&#^Nl8XSQ{q31}t5)F<(qR?|(Lx~1QAW`T!%Be(yBakTc9P?75!4XJ# z98dX4yWo2w&-0PzbLGIjUae%m-S(a2b`yEyl9i=ACCV}-`knP}vhO0>wmPi#s|EeH zZ8dncSe5HL(}emp1kc%E73se5nQO#t-?*;c%wXG&V?U19_oZ+?42EHF#vUoNOF-mN1&T4w-2+NNDF{5S1F>sxfD$g%TtL0MIBFbd$!EX) zJMu{G&tE^j$}X>8L|$lp$2T1EyvJ|5{;UcSPKlVHrYTh=^{?di_m7Ag9874U&>|*K z&@e|JQD_ktC=7HwkSO%yzDgP#fkdH2Xi6#!jzFT&{7Her;0PoNEy5|SFgOBE1 zQxxlP1QLawM^hyYjzFT&^Vp`O!4XIldR~buX>bG*g`U?HN*Wx2M4{(ZrjiCnAW`Uf z&84Kl5l9qze*$YI4URyf&=NdcNECXuYba@O1QLawt(;049DzikXPcLj21g*}c0c7e z>w@cvocomXTrF^{A*!d3avaBMGe6~cd-PwYT>ZPyXEFWtlXWHfZ&T>sPgeXtzXm9* rr{41?L+5q9-C literal 0 HcmV?d00001 diff --git a/core/bitmaps/options.bmp b/core/bitmaps/options.bmp index d5b381c4fa057fc049f5ca1b96fbb34a50d198a8..ad1e34f6a8b667202a0f2b488c20320f5d333e8f 100644 GIT binary patch delta 248 zcmZ3+wTx?nIZHhk7dtZG3JzvK;rj*$qo`m&7vO>kz)XS)aIL)q)d&#)^8X_XtX&Hd vD1cbT<;%5p?SCMG*#+d@0ZPNT>_FXjVCI3efcS7pEZnsStw32IfO!f4-gYT; delta 248 zcmaKlu?>JQ3uH321JjBp6aWAK diff --git a/core/bitmaps/save.bmp b/core/bitmaps/save.bmp index 2c1d18a58f2372705f3b37c2992ff59bf25b3c3f..96ab1731c3dc9385eb67b773dd33927c8f01e99f 100644 GIT binary patch literal 1318 zcmbW#J&qJX42Izk2{dGI1V@My5L@Kj!AJ2?9IUv;IOYrlKEmV#!`toAE?N;Fs{84$ zs{gCoU%!2Nr?Y)|D}AQ-5g+hI@6Y|WbNjbVO03GSfU6sKRNE8~wO9}=@AW>+H#Hukk0*OLn-7(3qW?8R-Zl3XR!myOEASqR^QABw?f@kSH`}KUW&*2qX%P*-u$UIs%D8WA-z* zk&Zy3(3tZV_!#L3BnpjDGXIp}n0eq>3XM^kU~mKyg~se}b0ZyrM4>VJOT$P+{ z{%#(U=?EkWjoDHtBOQT6p)p$~ZKNZRC^Y6Qp&TO}fkdG(YUbZEI0A{nvCNj18R-Zl z3XR#ab0ZyrM4>TTl3}DHkSH`}%QcO31QLbDY$=zKjzFT&m@V@*(h*3MZolq&;=JU3 z(*0a@zaKrY9J|AJbY}g3@aDbh9 zR60W6BukWXZidpTl!ALuqg1PRkmVy}XAdmRX#Ksrd>&}IPD>NF{rso%ZscYuzLD(@ EZkUxo1poj5 diff --git a/core/bitmaps/save_as.bmp b/core/bitmaps/save_as.bmp new file mode 100644 index 0000000000000000000000000000000000000000..39ab4664ee642603b6e380c471ad475fe1a59dd1 GIT binary patch literal 1318 zcmbW#y=@#p42I#)fQ55rm%zwS1&#^l?t!JS6b6FoVC)(cu!PGUoZnp@Btvjucy^!t zX7+z}`TfV&2c7NPN9mE?7ktJCeLDAF&+XqfDX}VZgDqWkxB8`Z{rN1JBftSGG)8j4 zK*s}#LSv*53=Rg7C^Y8&Tq7NUM4>SfU6sKRNE8~wO9}=@AW>+H#Hukk0*OLn-7(3qW?8R-Zl3XR!myOEASqR^QABw?f@kSH`}KUW&*2qX%P*-u$UIs%D8WA-z* zk&Zy3(3tZV_!#L3BnpjDGXIp}n0eq>3XM^kU~mKyg~se}b0ZyrM4>VJOT$P+{ z{%#(U=?EkWjoDHtBOQT6p)p$~ZKNZRC^Y6Qp&TO}fkdG(YUbZEI0A{nvCNj18R-Zl z3XR#ab0ZyrM4>TTl3}DHkSH`}%QcO31QLbDY$=zKjzFT&m@V@*(h*3MuD@=2;=JU3 z((PPzyB$5S9J|zJ$V=g({V^LpuNj~~xH+x`6iAM3pT+x3_C J(_#Fs{RY&*pArB7 literal 0 HcmV?d00001 diff --git a/core/bitmaps/website.bmp b/core/bitmaps/website.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a98daf6aca19e37c9e27926e418d9b3672532986 GIT binary patch literal 1318 zcmZwFF_P6V41i&gXJ%hVj-ZO6q@vc)a|azoM^W*HbExJF6gtB8yqWB8n=P2Z&KFsZ zh-R{1tWzR)`H2_NLX`d`=if2R=Pkcb^P)0C=``d#w+>!*ks99+;up+!uf zpka17ti3Ud?QRw}-LWu@PAW`W3DN~6CM<7w? z{h3RN21g)K==BS%m1uAT5`~sv{UM6Ea>uNRLQAMXVQ>Tzh2Fo-lxT1S5{2Hs)Rky( z1QLbbznh0d7#x8_q4!ouB^n%oM4|UKDJ2>lfkdI#7K&D)!4XIlT8j0TC=8B3V%FYU zOO3|a0C*C-doa@XmA7)h2GmWlxT1S5{2GdIhAN|1QLbb+q{%$a0F6b z|6KB5Tri)=wGO$i*#dQTaeA4BKH06Eo##2mdykB9JXTplNNr@nyqPoqecV?* T@8A;IPUmXY9PjV{@A}>VuRU|= literal 0 HcmV?d00001 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"