From ab4a62d545afaa3f9fb5e3a41fef51a75545c1a4 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Thu, 11 Jan 2007 21:03:12 +0000 Subject: [PATCH] Replaced the UGLY LIEK XBOX buttons in Visual Typesetting with bitmap buttons. Originally committed to SVN as r777. --- aegisub/bitmaps/visual_clip.bmp | Bin 0 -> 1318 bytes aegisub/bitmaps/visual_move.bmp | Bin 0 -> 1318 bytes aegisub/bitmaps/visual_realtime.bmp | Bin 0 -> 1318 bytes aegisub/bitmaps/visual_rotatexy.bmp | Bin 0 -> 1318 bytes aegisub/bitmaps/visual_rotatez.bmp | Bin 0 -> 1318 bytes aegisub/bitmaps/visual_scale.bmp | Bin 0 -> 1318 bytes aegisub/bitmaps/visual_standard.bmp | Bin 0 -> 1318 bytes aegisub/res.rc | 8 ++++++++ aegisub/video_box.cpp | 29 ++++++++++++++-------------- aegisub/video_box.h | 2 +- 10 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 aegisub/bitmaps/visual_clip.bmp create mode 100644 aegisub/bitmaps/visual_move.bmp create mode 100644 aegisub/bitmaps/visual_realtime.bmp create mode 100644 aegisub/bitmaps/visual_rotatexy.bmp create mode 100644 aegisub/bitmaps/visual_rotatez.bmp create mode 100644 aegisub/bitmaps/visual_scale.bmp create mode 100644 aegisub/bitmaps/visual_standard.bmp diff --git a/aegisub/bitmaps/visual_clip.bmp b/aegisub/bitmaps/visual_clip.bmp new file mode 100644 index 0000000000000000000000000000000000000000..27542ada9c7ea056ba616fd1fd2bec41a6c825a1 GIT binary patch literal 1318 zcmb8tJ#O4U42EGYU?b_0Bd{`Zg4Be2-+@Q@j>5w5IavD)DR_i!7b!OHXpF$v7zixs z(Kq@VX-0f}dbqb^`FUsdgVuL^!^yrL=g-Ifqn*syOxnSorggXVueS5+i5`LygivVAp2~7EkPr%u z+0)!k1`0}@w z6dJRCH!qO_38B!KT?*x7AR!bQv&*EN3?zg?V~!HiI2lL?g~nJj{x(M-Ar#g+yR_WN zKtd=qW|v(!8Au3)#_WwjO^E*4YuW!x1F#3d#cw-;V^Y^p=UnetmlQ!rXT6bIjZoB{bY36|hKX{=r zW?^tJh=fpRj9D5S0S;0qH0JqSCj$wg&=@m@R*pbIC^UvYX>bG*LZLBc>^6=-LMSxG z!uXr!I9fs|G-j9PP6iS}p)tGca59h(3XR!Ul1>H^LZLDHy5wXaAru<3ud)$4rztK5l9qT zOqix9*6s)-3O$deN*Wx2M4{)gO-X|zkSO%L5?9jT2qX$UuPc-^I0A`6&#O!&4URyf z(DRy0NrNMhDD?3Otd%r40*OLP@cbc)_2iDVCkid00)@d5NECWLn<;5<1QLawPwGk< z9Dzik=W}zD2!kV#DD*6aRMOxGBnmytq?9x`0*OK&ODI}NgCmeAv=q-@qA)lDiM97E zEmhLs2qX$U%g&TEI0A`6&ysW{4URyf(6d}aNrNMhDD*7lRMOxGBnmytyp%LJ0x8$u zclpkF!T*Wek3;VF)dTw)qPZN~zVFjHt8Lq!Bm1`9ZZ}5elzmleI|t5M&iZe8o-nmM qFE|EP{d)aNeOdS8-yZk7Ty{oY=EF4poi791%pQbARG;t>n|(O?@5k|f2br;(w1Ok0b+`5Jw)?N2W*$gz!V8Tt z3xk6q5<;OdW@&H)XrxeR%=ug=0|}wf7&A&MM<5{-8p9wBjzB^vG{%hG#t}#eg~nJI z!!*afC4@p_*3{g|Ktd=qW=%Vs3?zg?W7aE4Cj$wg(3thQr8Au3)#;hfoP6iS}p)qT@%E>@NC^Tj*<#IBR5DJZ1%e)iI|YOjmW g^T)~8|9g&!uB-Ps%=0PxP>(C$w%?9_fAI6}f8oezjQ{`u literal 0 HcmV?d00001 diff --git a/aegisub/bitmaps/visual_rotatez.bmp b/aegisub/bitmaps/visual_rotatez.bmp new file mode 100644 index 0000000000000000000000000000000000000000..cdf81356792438be7297b7fd5976c7fc0dddb8f2 GIT binary patch literal 1318 zcmZwFv9Z%Y5XSM<42;QmC2Yh{0r3twJ!~mo2`*s+hB`K;27)cYDMMiX(%Jaod6Itm z?oP6GC+*j7pWfTCeR*g0nbr$FVzUp&_~kgib&?r}Nh>(hwC=Y4)pq&$!^{H-E_k6a zW?^v9h=fpRj9D5S0XiuZ8gqNDlYxX#Xp9+6D@Pz96dJ=M4URxUC^W{5!^ROv2!+O2 z7}GSzz9)o2W7g8#$v{FVG-fS3oD3v{LSxn|Nhbpdq0pH1y5wXaAru<3US&BMNC<_- ztk>L51`v7oiy0^f-4{=3j%X{~9TCL~){zu!k?eXu@_WP;-bbY`1 c)$ObM`1xtg=r&A`{$qap@c;Sm1NVFX0*%IB{Qv*} literal 0 HcmV?d00001 diff --git a/aegisub/bitmaps/visual_scale.bmp b/aegisub/bitmaps/visual_scale.bmp new file mode 100644 index 0000000000000000000000000000000000000000..cb8d4290fb285aa42841763f656e8c68f07e7ee8 GIT binary patch literal 1318 zcmajdy{#2N42EH^1Uh8g5*#5aAhyWq!KJu_Ex`ez4#(6$;1W){A~?J=zW0hNAu+qp ze)F?`vpZkEeR?mue0eAGnc5RR;*bx!|Gtm^I)n(jL`-m`Dpe)*tK|Okhlm;+3}~Xz zA|_B!F-IU#Xb~4E3^Y8DDD?All{7d4i9(A|l~foUfkdHsNrA%P2qX$E!Y-{aI0A`6 ziwUnOinTcci9*lRR7ry)kSO#_+mtjo0*OM;CvhbWjzFT&^SMGvgCmeA^nA)x(%=Xr z3O%2>lr%U3i9+vRV6CLV5l9qTg87Fi*32DiOB7l{1qy>BkSO&0HdE5z2qX$Uztoj9 zI0A`6&+q0T5e7#fQRrC;sieUXNECXONhxV?1QLbbODI}NgCmeAv=s9%Q5YP7#M*k6 zmMUp*1QLawWoJqn9DzikXGyw}21g)K=vl6zq`?tL6nd6&Drs;85`~^+UP>Aqft362 zhkWO};C>>Hz02dVYG7Mk9B%(D*Gajq*YnO*J#W`b7u93R^qjY2jjuvwRo}L+^Wc7K nWX7)@yJMfv?bg`p_`AJ2-n8kM_C9rA^3r~OpJSe~hF;4b5#?(P literal 0 HcmV?d00001 diff --git a/aegisub/bitmaps/visual_standard.bmp b/aegisub/bitmaps/visual_standard.bmp new file mode 100644 index 0000000000000000000000000000000000000000..60582ee206bc21f676bc0096f7e55a66ff711359 GIT binary patch literal 1318 zcmb8tv5nk7425ADuyM|OB``9s0>^}N_rOwKDGUtP!Pqr8U|$v{FVG{%gsl_QW43XS0*4URxUC^W{5!^ROv2!+O2 z7>{X=V^0W$#_ZDE$v{FVG-j6_P6iS}p)vbP(#b$VC^TkYmz)eFghFHXRhE;1givVA zzUFo^kPr%uIX^*+lYxX#XpD*V%N)nb6USa?jL8j-Ktd=qWK6pnqiwA{%+ zLMSw5%PyP@B!og^wj|TZKtd=qX3JGh1`JerW$-#aJO3Fo|D1fzf9LbuP2c<7 Jop|(r{{R}0Of&!h literal 0 HcmV?d00001 diff --git a/aegisub/res.rc b/aegisub/res.rc index 995bace7e..f201134eb 100644 --- a/aegisub/res.rc +++ b/aegisub/res.rc @@ -140,6 +140,14 @@ toggle_audio_spectrum BITMAP "bitmaps/toggle_audio_spectrum.bmp" toggle_audio_link BITMAP "bitmaps/toggle_audio_link.bmp" toggle_video_autoscroll BITMAP "bitmaps/toggle_video_autoscroll.bmp" +visual_standard BITMAP "bitmaps/visual_standard.bmp" +visual_move BITMAP "bitmaps/visual_move.bmp" +visual_rotatez BITMAP "bitmaps/visual_rotatez.bmp" +visual_rotatexy BITMAP "bitmaps/visual_rotatexy.bmp" +visual_scale BITMAP "bitmaps/visual_scale.bmp" +visual_clip BITMAP "bitmaps/visual_clip.bmp" +visual_realtime BITMAP "bitmaps/visual_realtime.bmp" + arrow_up BITMAP "bitmaps/arrow_up.bmp" arrow_down BITMAP "bitmaps/arrow_down.bmp" diff --git a/aegisub/video_box.cpp b/aegisub/video_box.cpp index 59cced8d0..d829b9786 100644 --- a/aegisub/video_box.cpp +++ b/aegisub/video_box.cpp @@ -63,6 +63,7 @@ #include "dialog_fextracker.h" #include "utils.h" #include "main.h" +#include "toggle_bitmap.h" /////////////// @@ -117,30 +118,30 @@ VideoBox::VideoBox(wxWindow *parent) videoSlider->Display = videoDisplay; // Typesetting buttons - standard = new wxButton(videoPage,Video_Mode_Standard,_T("n"),wxDefaultPosition,wxSize(20,20)); + standard = new wxBitmapButton(videoPage,Video_Mode_Standard,wxBITMAP(visual_standard)); standard->SetToolTip(_("Standard mode, double click sets position.")); - drag = new wxButton(videoPage,Video_Mode_Drag,_T("d"),wxDefaultPosition,wxSize(20,20)); + drag = new wxBitmapButton(videoPage,Video_Mode_Drag,wxBITMAP(visual_move)); drag->SetToolTip(_("Drag subtitles.")); - rotatez = new wxButton(videoPage,Video_Mode_Rotate_Z,_T("z"),wxDefaultPosition,wxSize(20,20)); + rotatez = new wxBitmapButton(videoPage,Video_Mode_Rotate_Z,wxBITMAP(visual_rotatez)); rotatez->SetToolTip(_("Rotate subtitles on their Z axis.")); - rotatexy = new wxButton(videoPage,Video_Mode_Rotate_XY,_T("x"),wxDefaultPosition,wxSize(20,20)); + rotatexy = new wxBitmapButton(videoPage,Video_Mode_Rotate_XY,wxBITMAP(visual_rotatexy)); rotatexy->SetToolTip(_("Rotate subtitles on their X and Y axes.")); - scale = new wxButton(videoPage,Video_Mode_Scale,_T("s"),wxDefaultPosition,wxSize(20,20)); + scale = new wxBitmapButton(videoPage,Video_Mode_Scale,wxBITMAP(visual_scale)); scale->SetToolTip(_("Scale subtitles on X and Y axes.")); - clip = new wxButton(videoPage,Video_Mode_Clip,_T("c"),wxDefaultPosition,wxSize(20,20)); + clip = new wxBitmapButton(videoPage,Video_Mode_Clip,wxBITMAP(visual_clip)); clip->SetToolTip(_("Clip subtitles to a rectangle.")); - realtime = new wxToggleButton(videoPage,Video_Mode_Realtime,_T("r"),wxDefaultPosition,wxSize(20,20)); + realtime = new ToggleBitmap(videoPage,Video_Mode_Realtime,wxBITMAP(visual_realtime),wxSize(20,20)); realtime->SetToolTip(_("Toggle realtime display of changes.")); bool isRealtime = Options.AsBool(_T("Video Visual Realtime")); realtime->SetValue(isRealtime); wxSizer *typeSizer = new wxBoxSizer(wxVERTICAL); - typeSizer->Add(standard,0,0,0); - typeSizer->Add(drag,0,0,0); - typeSizer->Add(rotatez,0,0,0); - typeSizer->Add(rotatexy,0,0,0); - typeSizer->Add(scale,0,0,0); - typeSizer->Add(clip,0,wxBOTTOM,5); - typeSizer->Add(realtime,0,0,0); + typeSizer->Add(standard,0,wxEXPAND,0); + typeSizer->Add(drag,0,wxEXPAND,0); + typeSizer->Add(rotatez,0,wxEXPAND,0); + typeSizer->Add(rotatexy,0,wxEXPAND,0); + typeSizer->Add(scale,0,wxEXPAND,0); + typeSizer->Add(clip,0,wxEXPAND | wxBOTTOM,5); + typeSizer->Add(realtime,0,wxEXPAND,0); typeSizer->AddStretchSpacer(1); // Top sizer diff --git a/aegisub/video_box.h b/aegisub/video_box.h index 5ff52dcd7..5cee81fe3 100644 --- a/aegisub/video_box.h +++ b/aegisub/video_box.h @@ -62,7 +62,7 @@ private: wxButton *rotatexy; wxButton *scale; wxButton *clip; - wxToggleButton *realtime; + ToggleBitmap *realtime; void OnVideoPlay(wxCommandEvent &event); void OnVideoPlayLine(wxCommandEvent &event);