From 50d9dbd4f146cd7ed76dd66feb1811ebe112cbe4 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 19 Aug 2009 07:03:39 +0000 Subject: [PATCH] Add detach_video_menu and show_overscan_menu_checked <- this one isn't in use as you can't Check() a menu item that has a bitmap, we need to figure out an alternate solution. This probably involves flipping the bitmap to our own of a checkmark. Originally committed to SVN as r3430. --- aegisub/src/bitmaps/16/detach_video_menu.png | Bin 0 -> 624 bytes .../src/bitmaps/16/show_overscan_menu_checked.png | Bin 0 -> 549 bytes aegisub/src/bitmaps/24/detach_video_menu.png | Bin 0 -> 855 bytes .../src/bitmaps/24/show_overscan_menu_checked.png | Bin 0 -> 822 bytes aegisub/src/frame_main.cpp | 4 +++- 5 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 aegisub/src/bitmaps/16/detach_video_menu.png create mode 100644 aegisub/src/bitmaps/16/show_overscan_menu_checked.png create mode 100644 aegisub/src/bitmaps/24/detach_video_menu.png create mode 100644 aegisub/src/bitmaps/24/show_overscan_menu_checked.png diff --git a/aegisub/src/bitmaps/16/detach_video_menu.png b/aegisub/src/bitmaps/16/detach_video_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..78dfcbfc01f132d33b90d45aa8e77534f02f9857 GIT binary patch literal 624 zcmV-$0+0QPP)LlD}(HQ5c4wd+tpdV-uUC zIH>7VG-*c{hs3G63yLCi5jUMh=;G|)f1rX;P%5GhqR=f}y4l5Ev_mmYC0Kfs`{Uem z&OHvd4HmUfeBp(&d=Jm}ao|7Wz?G|$XD+=iO->{T4;&Xn0fYy_#T6bU4_~F@e~xRl*?tNYS64h)&Gd26z8Tjsc5mW z{%O_&P}X5D^FW9rbtk53oNzRgHBBf>0C=#~Zl`}lAwZZI zhLJ|9EQiQ_NNRG3%59DSXoj&yriSDIvj0xf45@O9e*#94BnTDCIE?RJ~(ubg@xy;g|yVUFTF~9-NFDxv)Y&M$#$4I~5udc4H-a5|AU-Jt`QY%;tP`c;<0000< KMNUMnLSTXhGa9h~ literal 0 HcmV?d00001 diff --git a/aegisub/src/bitmaps/16/show_overscan_menu_checked.png b/aegisub/src/bitmaps/16/show_overscan_menu_checked.png new file mode 100644 index 0000000000000000000000000000000000000000..350160c3cebed33e0caf5292cbab22a3ddab9304 GIT binary patch literal 549 zcmV+=0^0qFP)rlgmz2K@f(&GiQbw1OyWo z5TijQ8X`|1Yu)I=cV*+&Cva(^5)xx#aKvF?IDM;&i#`nOSy)MTbuH@4UzdjeZ4J=w zK6`OA9W+w$iju|1 z#Ym<4*vC05)6*aO=cgxchQMSpnY52~wmCd}O%kVz%2gB=L8|ZLs~}u+B^!jF2nf zq7$+hAt^Cy54vfnm}6QevIG=$La*TBDp3?tF}kEZs7@m0f`}nznB7uPdIgIpeEoLJ zaD0zaj98SAl`bk>Qs(muk{F_(Za09e&e`7?54H=J-3+xEMQZ)2R0XjpAu1^ei}@L* zHzmXvqfV#4+v%r|xPzHv?uhos3=yZOlSOM&OI9E@K>KiK_h>v>d(N#@_WJ5q+UrUi nxL0@%-Eo@#e1F%!ba(p)^=y|a6#8!F00000NkvXXu0mjfdCcwH literal 0 HcmV?d00001 diff --git a/aegisub/src/bitmaps/24/detach_video_menu.png b/aegisub/src/bitmaps/24/detach_video_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..c01af493cd39ea07e101449b3b9459a0fad7bbec GIT binary patch literal 855 zcmV-d1E~CoP)Y(RdfYzE?2=x$Z0n~%6j)MF;gh0dhU*8MF-clhzIPUH7lPAJ6 z3pIYZFZ|J3fM6WLMxIq&t4ADfLVE(*O*rPesGn|9(-518rxrD_o8-5WBQ{#xop%c*V>0yI_3%;r5nfl}GoTPuZDpcQm9?B?~Zf`5M9Mk}~` z`#$@RI<9<+`T6>d=SE$??8KH`g;ACa2NTzu<7U%!Es z`TY8IE?j(@dNhHt4lBM)5s&j8aUSQvIdC4rsKGNYzQ)I&d^WHI0}70>#ED?Uks3#8 zT@G?sSAoP;=^Qu|2ZbfEVse!QY#3pvMcu^WJf%&AlEm}?ZS|~x4U6FlQo%WL z>Ar8^iRlLwmKmFUFCzgcMVv^fppakqpP2rc^v*_UH5xEGJIlt#22<^sat)33x!=_s z{%hC6zjrwKDuy2b000JJOGiWi{{a60|De66lK=n$*hxe|R7l6|RoiM5K@hF!om>pb?j}KV z6A|KrlDB{)KKMa?k$#acf}rF@7LR@+CQpYP0$4}qyzUKpXa4->$@}7__c~WFzyJKjfoT|k zMr7~|LIe!voPsh416b5Oi+atZdA%24eQDL4cRn33PM%)Z5copgfaBvM*xufe2TSXr ztPl$Fg++QEV>L5a zZ9Rmgm9?queD*=>G+J3*gRRyk6!fMe&Vr2nsEiilVdVu@r z>*?+j5||F>bR$Qx&>%DFJ)2Q$Z!SW=KOo$o*kMiv49=o)Z6y=T^c5xls*(vnPI zl}OA+G8~gR&){y?&vZ_rg*=zi5Ok&x=2^hiGGg|Pt=NuCCqCGY`(o}K-H z*7_rziUDG$us&gC9{E}~^$6Dk`rwAwb3~3MG9KaU$;SvD;&|59<7;h4CDn=QYjH6S zK8%*Wh+M}=_Wk#dZ-=eTEi*fGe4MNyD7cS8O3Yw!oF^hCF0Rf!fu2tNaF!o5-{y-8 z&u&e%IRkD|M4x^+L9^De<4&=VA5QQ7pMK~14^^BkHbSZ~*#H0l07*qoM6N<$f)|~9 A+yDRo literal 0 HcmV?d00001 diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index b0bb008c0..5aa2cb0d2 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -487,7 +487,7 @@ void FrameMain::InitMenu() { wxMenuItem *RecentKeyframesParent = new wxMenuItem(videoMenu, Menu_File_Recent_Keyframes_Parent, _("Recent"), _T(""), wxITEM_NORMAL, RecentKeyframes); videoMenu->Append(RecentKeyframesParent); videoMenu->AppendSeparator(); - videoMenu->Append(Menu_Video_Detach, _("Detach Video"), _("Detach video, displaying it in a separate Window.")); + AppendBitmapMenuItem(videoMenu, Menu_Video_Detach, _("Detach Video"), _("Detach video, displaying it in a separate Window."), GETIMAGE(detach_video_menu_16)); wxMenu *ZoomMenu = new wxMenu; wxMenuItem *ZoomParent = new wxMenuItem(subtitlesMenu,Menu_View_Zoom,_("Set Zoom"),_T(""),wxITEM_NORMAL,ZoomMenu); #ifndef __APPLE__ @@ -509,6 +509,8 @@ void FrameMain::InitMenu() { AspectMenu->AppendCheckItem(Menu_Video_AR_Custom, _("Custom..."), _("Forces video to a custom aspect ratio")); videoMenu->Append(AspectParent); videoMenu->AppendCheckItem(Menu_Video_Overscan, _("Show Overscan Mask"), _("Show a mask over the video, indicating areas that might get cropped off by overscan on televisions.")); +// This is broken as you can't use Check() on a menu item that has a bitmap. +// AppendBitmapMenuItem(videoMenu, Menu_Video_Overscan, _("Show Overscan Mask"), _("Show a mask over the video, indicating areas that might get cropped off by overscan on televisions."), GETIMAGE(show_overscan_menu_checked_16)); videoMenu->AppendSeparator(); AppendBitmapMenuItem(videoMenu,Menu_Video_JumpTo, MakeHotkeyText(_("&Jump to..."), _T("Video Jump")), _("Jump to frame or time"), GETIMAGE(jumpto_button_16)); AppendBitmapMenuItem(videoMenu,Menu_Subs_Snap_Video_To_Start, MakeHotkeyText(_("Jump Video to Start"), _T("Jump Video To Start")), _("Jumps the video to the start frame of current subtitle"), GETIMAGE(video_to_substart_16));