diff --git a/aegisub/bitmaps/visual_clip.bmp b/aegisub/bitmaps/visual_clip.bmp new file mode 100644 index 000000000..27542ada9 Binary files /dev/null and b/aegisub/bitmaps/visual_clip.bmp differ diff --git a/aegisub/bitmaps/visual_move.bmp b/aegisub/bitmaps/visual_move.bmp new file mode 100644 index 000000000..5b15ac721 Binary files /dev/null and b/aegisub/bitmaps/visual_move.bmp differ diff --git a/aegisub/bitmaps/visual_realtime.bmp b/aegisub/bitmaps/visual_realtime.bmp new file mode 100644 index 000000000..d1bae0b4b Binary files /dev/null and b/aegisub/bitmaps/visual_realtime.bmp differ diff --git a/aegisub/bitmaps/visual_rotatexy.bmp b/aegisub/bitmaps/visual_rotatexy.bmp new file mode 100644 index 000000000..ac76be51a Binary files /dev/null and b/aegisub/bitmaps/visual_rotatexy.bmp differ diff --git a/aegisub/bitmaps/visual_rotatez.bmp b/aegisub/bitmaps/visual_rotatez.bmp new file mode 100644 index 000000000..cdf813567 Binary files /dev/null and b/aegisub/bitmaps/visual_rotatez.bmp differ diff --git a/aegisub/bitmaps/visual_scale.bmp b/aegisub/bitmaps/visual_scale.bmp new file mode 100644 index 000000000..cb8d4290f Binary files /dev/null and b/aegisub/bitmaps/visual_scale.bmp differ diff --git a/aegisub/bitmaps/visual_standard.bmp b/aegisub/bitmaps/visual_standard.bmp new file mode 100644 index 000000000..60582ee20 Binary files /dev/null and b/aegisub/bitmaps/visual_standard.bmp differ 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);