diff --git a/core/fextracker_main_events.cpp b/core/fextracker_main_events.cpp index 37849301d..8c37a66e9 100644 --- a/core/fextracker_main_events.cpp +++ b/core/fextracker_main_events.cpp @@ -70,7 +70,10 @@ void FrameMain::OnVideoTrackerMenu(wxCommandEvent &event) { void FrameMain::OnVideoTrackerMenu2(wxCommandEvent &event) { wxMenu menu( _("FexMovement") ); AppendBitmapMenuItem(&menu, Video_Track_Movement_MoveAll, _("Move subtitle"), _(""), wxBITMAP(button_track_move)); - AppendBitmapMenuItem(&menu, Video_Track_Movement_MoveOne, _("Move subtitle only in this frame"), _(""), wxBITMAP(button_track_move)); + menu.AppendSeparator(); + AppendBitmapMenuItem(&menu, Video_Track_Movement_MoveBefore, _("Move subtitle (this frame and preceeding frames)"), _(""), wxBITMAP(button_track_move)); + AppendBitmapMenuItem(&menu, Video_Track_Movement_MoveOne, _("Move subtitle (this frame)"), _(""), wxBITMAP(button_track_move)); + AppendBitmapMenuItem(&menu, Video_Track_Movement_MoveAfter, _("Move subtitle (this frame and following frames)"), _(""), wxBITMAP(button_track_move)); menu.AppendSeparator(); AppendBitmapMenuItem(&menu, Video_Track_Split_Line, _("Split line for movement"), _(""), wxBITMAP(button_track_split_line)); PopupMenu(&menu); @@ -244,3 +247,19 @@ void FrameMain::OnVideoTrackMovementMoveOne(wxCommandEvent &event) { } +/////////////////// +// Move Before +void FrameMain::OnVideoTrackMovementMoveBefore(wxCommandEvent &event) { + videoBox->videoDisplay->MovementEdit = 3; + videoBox->videoDisplay->bTrackerEditing = 0; +} + + +/////////////////// +// Move After +void FrameMain::OnVideoTrackMovementMoveAfter(wxCommandEvent &event) { + videoBox->videoDisplay->MovementEdit = 4; + videoBox->videoDisplay->bTrackerEditing = 0; +} + + diff --git a/core/frame_main.h b/core/frame_main.h index ee81e7675..72a022403 100644 --- a/core/frame_main.h +++ b/core/frame_main.h @@ -115,6 +115,8 @@ private: void OnVideoTrackMovement(wxCommandEvent &event); void OnVideoTrackMovementMoveAll(wxCommandEvent &event); void OnVideoTrackMovementMoveOne(wxCommandEvent &event); + void OnVideoTrackMovementMoveBefore(wxCommandEvent &event); + void OnVideoTrackMovementMoveAfter(wxCommandEvent &event); void OnVideoTrackSplitLine(wxCommandEvent &event); void OnKeyDown(wxKeyEvent &event); @@ -342,6 +344,8 @@ enum { Video_Track_Movement, Video_Track_Movement_MoveAll, Video_Track_Movement_MoveOne, + Video_Track_Movement_MoveBefore, + Video_Track_Movement_MoveAfter, Video_Track_Split_Line, Menu_File_Recent = 2000, diff --git a/core/frame_main_events.cpp b/core/frame_main_events.cpp index 123b362c8..293bb9ba4 100644 --- a/core/frame_main_events.cpp +++ b/core/frame_main_events.cpp @@ -98,6 +98,8 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame) EVT_BUTTON(Video_Tracker_Menu2, FrameMain::OnVideoTrackerMenu2) EVT_MENU(Video_Track_Movement_MoveAll, FrameMain::OnVideoTrackMovementMoveAll) EVT_MENU(Video_Track_Movement_MoveOne, FrameMain::OnVideoTrackMovementMoveOne) + EVT_MENU(Video_Track_Movement_MoveBefore, FrameMain::OnVideoTrackMovementMoveBefore) + EVT_MENU(Video_Track_Movement_MoveAfter, FrameMain::OnVideoTrackMovementMoveAfter) EVT_MENU(Video_Track_Split_Line, FrameMain::OnVideoTrackSplitLine) EVT_CLOSE(FrameMain::OnCloseWindow)