From 58965afc9a400ea713786b7ffc18bfebda6dcbd6 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Tue, 18 Aug 2009 01:28:15 +0000 Subject: [PATCH] * Delete find_replace_button and find_next_button (these were blank anyway) and replace them with find_next_menu and find_replace_menu. * Add new buttons open_audio_menu, open_audio_from_video_menu, close_audio_menu and close_video_menu. Originally committed to SVN as r3425. --- aegisub/src/bitmaps/16/close_audio_menu.png | Bin 0 -> 614 bytes aegisub/src/bitmaps/16/close_video_menu.png | Bin 0 -> 371 bytes aegisub/src/bitmaps/16/find_next_button.png | Bin 96 -> 0 bytes aegisub/src/bitmaps/16/find_next_menu.png | Bin 0 -> 370 bytes aegisub/src/bitmaps/16/find_replace_menu.png | Bin 0 -> 605 bytes .../bitmaps/16/open_audio_from_video_menu.png | Bin 0 -> 423 bytes aegisub/src/bitmaps/16/open_audio_menu.png | Bin 0 -> 543 bytes aegisub/src/bitmaps/16/replace_button.png | Bin 96 -> 0 bytes aegisub/src/bitmaps/24/close_audio_menu.png | Bin 0 -> 1021 bytes aegisub/src/bitmaps/24/close_video_menu.png | Bin 0 -> 594 bytes aegisub/src/bitmaps/24/find_next_button.png | Bin 102 -> 0 bytes aegisub/src/bitmaps/24/find_next_menu.png | Bin 0 -> 468 bytes aegisub/src/bitmaps/24/find_replace_menu.png | Bin 0 -> 967 bytes .../bitmaps/24/open_audio_from_video_menu.png | Bin 0 -> 602 bytes aegisub/src/bitmaps/24/open_audio_menu.png | Bin 0 -> 756 bytes aegisub/src/bitmaps/24/replace_button.png | Bin 102 -> 0 bytes aegisub/src/frame_main.cpp | 12 ++++++------ 17 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 aegisub/src/bitmaps/16/close_audio_menu.png create mode 100644 aegisub/src/bitmaps/16/close_video_menu.png delete mode 100644 aegisub/src/bitmaps/16/find_next_button.png create mode 100644 aegisub/src/bitmaps/16/find_next_menu.png create mode 100644 aegisub/src/bitmaps/16/find_replace_menu.png create mode 100644 aegisub/src/bitmaps/16/open_audio_from_video_menu.png create mode 100644 aegisub/src/bitmaps/16/open_audio_menu.png delete mode 100644 aegisub/src/bitmaps/16/replace_button.png create mode 100644 aegisub/src/bitmaps/24/close_audio_menu.png create mode 100644 aegisub/src/bitmaps/24/close_video_menu.png delete mode 100644 aegisub/src/bitmaps/24/find_next_button.png create mode 100644 aegisub/src/bitmaps/24/find_next_menu.png create mode 100644 aegisub/src/bitmaps/24/find_replace_menu.png create mode 100644 aegisub/src/bitmaps/24/open_audio_from_video_menu.png create mode 100644 aegisub/src/bitmaps/24/open_audio_menu.png delete mode 100644 aegisub/src/bitmaps/24/replace_button.png 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 0000000000000000000000000000000000000000..11cfe1ec7f9b5c27bb8e1089ec3deb4caa3308c8 GIT binary patch literal 614 zcmV-s0-61ZP)kZIvX*iP$-lH z5d<;4!sQ}5_GrRMu$NHfvBkp^o#j1?B<}ts& zw2gIb3F=dR1d#NTsmh2cuYPWW@x}NRW#gx+j7a*)G<)!eYPDLqUavm}YKJYzb7ov) z^KTQyuOW9$_hY#3da|!eaC4^2%e9)&q}Jd07w-_D>aH9Q*#H0l07*qoM6N<$f+b5E AoB#j- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bb5cb3940d93a6ac9dd8e4b79590c9e5f7a1ad74 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBj3jAqFEMT_3U4K%x8q zpAc6d4Fny=5Sn3zCWDfJi>^b2fpen0V?cDn*7(ZhiCu>qHvdm;-rTVAb;JCd$z4Yy zt2a#5VyKNs?8&X`)@GZm#iL^6(XGcl$5wNWtyZ78^h7(QNp>nrbOo2_2`<$W`oPBU zpMl~3|Npg_Yj**yQYs1Z3ua*C*U-%`=$J5f_x}C+4<9~$`uyeFx1YUu`TEnRFJHd= z{P}a8epnk&HDi*uyNk*ewx2VBoI+0*#}En0)`J(hnhYe`9)AD7?couQgTMD5^>bRe z?DydajgkwW57?)jw5aIpQVh)4=DX~KquL9vhYA%%Y7v&gzH+U{e3ra?oGLd-Sfux^ z_fGHrYC+#vn;$_F!|hCNWHnbG*z;~(<-V2a&$NA=f*&21URtBvd8K#;8z_i8UHx3v IIVCg!00QEVs{jB1 literal 0 HcmV?d00001 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 f6f8b6631fd0295b62da91a2ecc269d6087d852e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!2%@RtJ;?UDbBJ2$8?wk!^Am@V}TqYPZ!4! miST5b0}b*9eOeN3Tnr1&a0jg5mlOfYGI+ZBxvXFMk1>*wbe92^`P8X6T96&o8H z7Z>;c|NrU2?`Ht*mMaPJ3ufTsxAF@J3@#`vn=ohTs%;0396xpD?9F=*A3lEa^qF^n zlq66kW0JSKi^kp!TQ>nY8J;eVArhC96Ap0AIJ(2)$c%|B7NHe8LM;Sq#7tQwGg(c= zb};N-)wF3-la{rULu_DJn5V4b0X5B&T!%EoJ{m2&siV@PqIBZ?d40Wh6(v=ErlLhX s7OXBTEG#M$wkAk$G1d6o_FVdQ&MBb@02SPAjsO4v literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a42550c8f9a74933b2095a4d24432428d404fb3d GIT binary patch literal 605 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBj3jAqFGiC~q}e1_nls z0G|+7pcD!ah4MHpIfaCTARHcd9%MB+8Th}qfMxwyF4+S*F!`X^fm0=c3MqCjQwrUF&wa*{J7&CSh4 zO;g3i#pUGWgoTBTjEuDYYZ)6GJ32Z#IXO8yJG;BPdw6*G`uaviMU}+c*VorKH8r)h zwM}bvoYv~Rpx<}V?CFaq`!Ab6YuSR?YuB#by?gh;g9i^EK78WDiEG!c-MV$_?%lhO z9zA;Y?AgngFWrStV^7I|rcE zE?x;~8Chks7pz*fdEc?)XU?6wc;)J~>o@P+fAZq($6vpG|KZr4DhM=yG0EHACA^mF zraX|d-qXb~MB;LC!U2||S$Ad?dDQsjO2+MzjA&mXyxwMZ1jO??blD6p0`@FJTXv6U}ShuBypBMaEdP|wmn__T-G@yGywp~ CUeN0R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..793f80f505daee89e9267713780e3f83bd10baee GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBj3jAqFFnBl?@?0fklv z_=LCuX*f_aaM87oFmOqXZrCOvry-~PUtasag3f;h-T#WZ|CRLrD;fM(HvF$@@?XpP zzoq|w%Ygs(k^ddM!W{zA9fI?neWILwqnu;^d!+mitN0&Q`9Hkse^lN7=-PEL4gZrm z52y5;Nb5UYwBUa+5H0*)viN`L(*G4J{#UO2U$yFg&D!s^>;E@w{@>El+Sb-SbLPx> zNB_@1`hV4#|L?#42ZEbt*4+TQm7^rcFPMSR)MnbY13$~BS}y>KF(!GtyI3q>UwRG5 zY4&t+43W6p+UF_OWFWvQ-0_H~&+#B*z`=?A8GHVp%}Ghzy=dCkxc_>JQWIAl4G4p95iP{ShQedFZi87rD~?vxg*n01=JW#zy5iFn0|fei?dHmcJO91#!i!3yt@2l z@k67B`ttwPufCYl8^pBN_i*m}-_s6t{MGkaW!8L2`X|E?cM<)6al3BgTe~ HDWM4fxV^O2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dacc06bd07da41d3171d8087859415bb14b81159 GIT binary patch literal 543 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBj3jAqFFnBl?@?F)%PP z1^9%x0;SM^x3_mtP>_+4k%@_koSdA6g@w4dxU8(Knc06!%l|eu|LyGl+uQ$la{BM; z>gwU~-^=U2pWlCf|Np_k!C_(l!^8haMn=ZO#KeNY|G2og#Kgpul$7-J^vul6oSgq9 zCI3rH|5sL4R#jEi)ckL1YHDfu-`?Kd+1c6E^}oNre*y^npEz;i%$YOi%$c)b!T-gJ z|1Vwof7PmkJ9g~YxpU91UH^CQ-hJS}fy0LnA3OH{TOXy7m9wz5fp${D1W5|C1;GU%dGL^5y>zA3pr}@&D(~|Gz=t|DQkqf#9u^iYzb) zcuRu(f*B-bwOqXRAHQ(@`Ile9CHgf$3C1LEcbCw~EIW*WocW$Ejv*44lM@mW(ioY; z+}Jc8Y+z;1l~Y^65Un9`L%PU#A=ivsj;;%s-WAQ#iZN(Zh+WVz(O1LT$H8CaiubMN z^Xys=-fOJZdAMd-@-i;b2_Yt7Wukmy9D*%e8nb6;w0HgL{I!UKgO!V&!;zIo#AM3W zD|3(79(}Owghph==iMh}A7;H%;p{B)W$A)<43+1&I&|0OS{`Hyc;C!m%*@OnJ6XPW T%j4f-pg8q(^>bP0l+XkKwDs}y literal 0 HcmV?d00001 diff --git a/aegisub/src/bitmaps/16/replace_button.png b/aegisub/src/bitmaps/16/replace_button.png deleted file mode 100644 index f6f8b6631fd0295b62da91a2ecc269d6087d852e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!2%@RtJ;?UDbBJ2$8?wk!^Am@V}TqYPZ!4! miST5b0}b*9eOeN3Tnr1&a0jg5mlOfYGI+ZBxvXH^O0?&ZF49YO@1+W$55#W7b0eB+Sk0EWnA-T@ATCH!iwYAw) zb(w~bfZKs4kjubv;67jnC|`p70JuTSpoG#1wmTe-L#3sqe@7w_wXw0$X0zGS;!@%u z9l*Q5F5m+2ovvCo0+)ctfQNyBbON=twbfKxTWjJ!p+rIYfmeY#pbuyPnt_wREO6&d zg0*(x5HJN)gAxF)0h&(EHS`K&9Rx}o2%=XJ=$C6vu0z1TSul_xJZ>z;I6wap+;P3f zKhU@AUkznKR{O=jI{GhM)omF^U`#Oaq@Rt=v9GthbjL$=Npqg-Hm}hh#e3kFgt~LX zn@vY*czmq{Lq4k^+A|QeNyjR<{4w zB{RUWQY~_3`n~ouzH>wA;tW7h@+-^F&p+GM)#dH(?)FwzR-Oa2|6*TNQc1BFneu^+wZ?nxYtb=}iH@FD@>2^z`)1ClZNN5qp7czE-$2CnG&{L$BVpoNEcFu&%nUHrXmC4sD zoTGi4a-#w=SVHjaDvqv}0MZ^Dj~kgb-*Udau(Ju|^z*KkiGdPjUODP7x*(dz{Pghha`~I}@T*$yr2{@HW6wALXG6}gJ2EH5yfiwfw z69j-W0D&_B=m`Mq2mtK|0Q&*}`~d*}00960|EA#N-~a#sL3C11QveAHA|yjpU1w^8 zhnAS9r>Uy8yT8A}!^FkM$H>UY%g)Z!)YjhP<>lt)=j`q6^7Qxj`1ttv`1tz!`~3a= z{{HEM6bJwS00Cl4M?^`71>}4H006>CL_t(2&tqVqB4Fg;#sD0QKnX5k5ey*A1(e_y z6_rv|l@dh(0ze5qQ3)AURcTZSL9m3Tf+#wGNa!fxkWi7tA%O)DD#sCc0K0R%%?R5#{LYs?W=+74Cm>3xui95Dhfq@MeXliOQOEEJGF|*3DvIw)d zy1Fv5GXfEB2(O=?pR!xEvU`nzfdRWVyMu!Rw*$9Ofe>FXpL*OzCSE3>$*K=kHNI$Q z{ns)#H@CC11FG@x@bLBZ_4oG=4GoQoii(boj*X2?NJ#kq|Nobc837fMJAU%vddxM$A`)WDeJ?e1c-a^uUt zK+b$m7sn8d^Su{t@--QVxL#E1^5L>ru&ASp*?Hlqpa1KPGdezAbNl8jzw6SL?LB|J z%YA%}Wn-H(6Cw||F!685J+Sz9U4*D(K*&OWg{luyD}LH8QgGpRIx*q%rYAdjGA3F0 zNd??k`f^+JexsP{3AeKUUd&qeW7^S7x9x3|yp@pMzB^&KOv-)p*0uy6Xj<2vV4 m*;C<~&nvcv`PwDeRxxQCitO8)efJ8`sSKX3elF{r5}E*@HKVQo literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ddbb7330ad7ae5f5e02f1f6befb2ea6877bdaaab GIT binary patch literal 967 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv6p!Iy0YKo5MnUmT&{WFoq>Vz zVt`MGD^Q9skYSLNl;kkr5Ed4ODCQP778e)iG~fhsIV?DsrIQ5aMsQ)zR?MpS=og}#U~6>=+Wb+&!4||_4@7G&tJZN z{r2tqkDtH)0KwmlH@ND6mN6!IySvPqaX(!M$X4-maSYKopPX=jx#j9o$sbomW*VsY zNIhmPk$SBHWJznYmP)@?z1ULuwYkVRWbI|H+$jO7DzCLSWxsk|TrBN-QPu0zs@JbS zdmE^J3hD|f-ZaTjRch6r#m%Q*UrxfsTO~xI8MnekH6tF!NsdEh-nkc_MbhHxxwlT2e(Ad z`F(M0Oe6I4-%tc*nN0GcMk_XUM5` zFkS4C*sPg(2cOz(&MnGScVcJmp0h1{*?Okt&ucoD>iXISKM-De0qOEfj0|hjQXeqKaqs98zvAJAP^TJ5*Z^B86;G7rT_o{3lRSd z5&sPm{|^=a6Br*88vhp{{}>!07$W}}BL5pD{~IR%94P-CDE}QP{~#tXAtWgwF8?AY zE+aDkBquB-EH@=I|0Xs6C^-KuKmRU4|1d-UF+~3|M*lTR|20ehJ5&EWRR2R-eM4S_ zNMw#kWdBHI|5|?kTYt4(UtwT||6z##Vu}A`jQ?kl|7eo`X_EhGlmBa#|8JY!aGn2h zpZ{{8|8}MSdaM6?tp9wi|9r0aeXsw1vHyRv|A4dqjl2Jlz5kWK|CYf2n3$NEnVG1| z|F_itz1aWJ zL|1(Z*&hG^0M|)GK~yNuV_={nU}R#!08ETP31&_^48X|@lwkAn@(T&^^V0VM0UI?> z5XBCZVD<6_O86Rc0r{p*mI4|e2@bGCXrPyuo0O23tCyUpvpJ6uTp}#U%S+cp)|SuA zMN-X6O9n0x?8C1h?Jw)4CFpL&YwyVI0F&_Yk_`w5koEEqG4N8-@scn^m+;b5_0m%D zQr0F~!b8~5OA*y5eg%1;<(in5gPm*5XYL}d=B0^nE(m};=Gado;;>V7TrI(-@c~Dx>Bu9y)H;@BIKL{J8t|Vh_JHsG^3hcak<>c$Vj13$mjFf zY<5&slvpg5N~IAI5dwigBofhq?Cfkh$zriclB5GX9{79+1fYKjh1k9wbW9{dObo^Dgzda z#cD-ELqlUD91e%m`NQc%TN~Qj(b3V-*$J1+b&mnJ`@6@3o*wk|p}!wqulLzA_b81@FD_SG zI!kQb<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