More menu work

Originally committed to SVN as r638.

core/frame_main.cpp

@@ -261,7 +261,7 @@ void FrameMain::InitMenu() {
 	// Create subtitles menu
 	subtitlesMenu = new wxMenu();
 	wxMenu *InsertMenu = new wxMenu;
-	wxMenuItem *InsertParent = new wxMenuItem(subtitlesMenu,-1,_("&Insert Lines"),_T(""),wxITEM_NORMAL,InsertMenu);
+	wxMenuItem *InsertParent = new wxMenuItem(subtitlesMenu,Menu_Subtitles_Insert,_("&Insert Lines"),_T(""),wxITEM_NORMAL,InsertMenu);
 	InsertParent->SetBitmap(wxBITMAP(blank_button));
 	AppendBitmapMenuItem(InsertMenu,MENU_INSERT_BEFORE,_("&Before Current"),_T("Inserts a line before current"),wxBITMAP(blank_button));
 	AppendBitmapMenuItem(InsertMenu,MENU_INSERT_AFTER,_("&After Current"),_T("Inserts a line after current"),wxBITMAP(blank_button));
@@ -272,7 +272,7 @@ void FrameMain::InitMenu() {
 	AppendBitmapMenuItem(subtitlesMenu,MENU_DUPLICATE_NEXT_FRAME,_("&Duplicate and shift by 1 frame"),_T("Duplicate lines and shift by one frame"),wxBITMAP(blank_button));
 	subtitlesMenu->AppendSeparator();
 	wxMenu *JoinMenu = new wxMenu;
-	wxMenuItem *JoinParent = new wxMenuItem(subtitlesMenu,-1,_("Join Lines"),_T(""),wxITEM_NORMAL,JoinMenu);
+	wxMenuItem *JoinParent = new wxMenuItem(subtitlesMenu,Menu_Subtitles_Join,_("Join Lines"),_T(""),wxITEM_NORMAL,JoinMenu);
 	JoinParent->SetBitmap(wxBITMAP(blank_button));
 	AppendBitmapMenuItem(JoinMenu,MENU_JOIN_CONCAT,_("&Concatenate"),_T("Joins selected lines in a single one, concatenating text together"),wxBITMAP(blank_button));
 	AppendBitmapMenuItem(JoinMenu,MENU_JOIN_REPLACE,_("Keep &First"),_T("Joins selected lines in a single one, keeping text of first and discarding remaining"),wxBITMAP(blank_button));
@@ -280,7 +280,7 @@ void FrameMain::InitMenu() {
 	subtitlesMenu->Append(JoinParent);
 	AppendBitmapMenuItem(subtitlesMenu,MENU_SPLIT_BY_KARAOKE,_("Split Lines (by karaoke)"),_T("Uses karaoke timing to split line into multiple smaller lines"),wxBITMAP(blank_button));
 	wxMenu *RecombineMenu = new wxMenu;
-	wxMenuItem *RecombineParent = new wxMenuItem(subtitlesMenu,-1,_("Recombine"),_T(""),wxITEM_NORMAL,RecombineMenu);
+	wxMenuItem *RecombineParent = new wxMenuItem(subtitlesMenu,Menu_Subtitles_Recombine,_("Recombine"),_T(""),wxITEM_NORMAL,RecombineMenu);
 	RecombineParent->SetBitmap(wxBITMAP(blank_button));
 	AppendBitmapMenuItem(RecombineMenu,MENU_1_12_RECOMBINE,_("Lines (1, 1+2) into (1, 2)"),_T("Recombine subtitles when first one is actually first plus second"),wxBITMAP(blank_button));
 	AppendBitmapMenuItem(RecombineMenu,MENU_12_2_RECOMBINE,_("Lines (1+2, 2) into (1, 2)"),_T("Recombine subtitles when second one is actually first plus second"),wxBITMAP(blank_button));
@@ -308,9 +308,9 @@ void FrameMain::InitMenu() {
 	AppendBitmapMenuItem(timingMenu,Menu_Subs_Snap_End_To_Video, _("Snap end to video\t") + Hotkeys.GetText(_T("Set End to Video")), _("Set end of selected subtitles to current video frame"), wxBITMAP(subend_to_video));
 	AppendBitmapMenuItem(timingMenu,Menu_Video_Snap_To_Scene, _("Snap to scene\t") + Hotkeys.GetText(_T("Snap to Scene")), _("Set start and end of subtitles to the keyframes around current video frame"), wxBITMAP(snap_subs_to_scene));
 	AppendBitmapMenuItem(timingMenu,Menu_Video_Shift_To_Frame, _("Shift to Current Frame\t") + Hotkeys.GetText(_T("Shift by Current Time")), _("Shift selection so first selected line starts at current frame"), wxBITMAP(shift_to_frame));
-	subtitlesMenu->AppendSeparator();
+	timingMenu->AppendSeparator();
-	AppendBitmapMenuItem(subtitlesMenu,MENU_ADJOIN,_("&Make times continuous (change start)"),_T("Changes times of subs so start times begin on previous's end time"),wxBITMAP(blank_button));
+	AppendBitmapMenuItem(timingMenu,MENU_ADJOIN,_("&Make times continuous (change start)"),_T("Changes times of subs so start times begin on previous's end time"),wxBITMAP(blank_button));
-	AppendBitmapMenuItem(subtitlesMenu,MENU_ADJOIN2,_("&Make times continuous (change end)"),_T("Changes times of subs so end times begin on next's start time"),wxBITMAP(blank_button));
+	AppendBitmapMenuItem(timingMenu,MENU_ADJOIN2,_("&Make times continuous (change end)"),_T("Changes times of subs so end times begin on next's start time"),wxBITMAP(blank_button));
 	MenuBar->Append(timingMenu, _("&Timing"));
 
 	// Create video menu

core/frame_main.h

@@ -334,6 +334,10 @@ enum {
 	Menu_View_Video,
 	Menu_View_Subs,
 
+	Menu_Subtitles_Join,
+	Menu_Subtitles_Recombine,
+	Menu_Subtitles_Insert,
+
 	Menu_Tools_Properties,
 	Menu_Tools_Styles_Manager,
 	Menu_Tools_Attachments,

core/frame_main_events.cpp

@@ -397,13 +397,60 @@ void FrameMain::OnMenuOpen (wxMenuEvent &event) {
 		if (added == 0) RecentAuds->Append(Menu_Audio_Recent,_T("Empty"))->Enable(false);
 	}
 
+	// Subtitles menu
+	else if (curMenu == subtitlesMenu) {
+		// Variables
+		bool continuous;
+		wxArrayInt sels = SubsBox->GetSelection(&continuous);
+		int count = sels.Count();
+		bool state,state2;
+
+		// Entries
+		state = count > 0;
+		MenuBar->Enable(MENU_INSERT_BEFORE,state);
+		MenuBar->Enable(MENU_INSERT_AFTER,state);
+		MenuBar->Enable(MENU_SPLIT_BY_KARAOKE,state);
+		state2 = count > 0 && videoBox->videoDisplay->loaded;
+		MenuBar->Enable(MENU_INSERT_BEFORE_VIDEO,state2);
+		MenuBar->Enable(MENU_INSERT_AFTER_VIDEO,state2);
+		MenuBar->Enable(Menu_Subtitles_Insert,state);
+		state = count > 0 && continuous;
+		MenuBar->Enable(MENU_DUPLICATE,state);
+		state = count > 0 && continuous && VFR_Output.IsLoaded();
+		MenuBar->Enable(MENU_DUPLICATE_NEXT_FRAME,state);
+		state = count == 2;
+		MenuBar->Enable(MENU_SWAP,state);
+		state = count >= 2 && continuous;
+		MenuBar->Enable(MENU_JOIN_CONCAT,state);
+		MenuBar->Enable(MENU_JOIN_REPLACE,state);
+		MenuBar->Enable(MENU_JOIN_AS_KARAOKE,state);
+		MenuBar->Enable(Menu_Subtitles_Join,state);
+		state = count == 2 && continuous;
+		MenuBar->Enable(MENU_1_12_RECOMBINE,state);
+		MenuBar->Enable(MENU_12_2_RECOMBINE,state);
+		state2 = count == 3 && continuous;
+		MenuBar->Enable(MENU_1_12_2_RECOMBINE,state2);
+		MenuBar->Enable(Menu_Subtitles_Recombine,state || state2);
+	}
+
 	// Timing menu
 	else if (curMenu == timingMenu) {
+		// Variables
+		bool continuous;
+		wxArrayInt sels = SubsBox->GetSelection(&continuous);
+		int count = sels.Count();
+
+		// Video related
 		bool state = videoBox->videoDisplay->loaded;
 		RebuildMenuItem(timingMenu,Menu_Subs_Snap_Start_To_Video,wxBITMAP(substart_to_video),wxBITMAP(substart_to_video_disable),state);
 		RebuildMenuItem(timingMenu,Menu_Subs_Snap_End_To_Video,wxBITMAP(subend_to_video),wxBITMAP(subend_to_video_disable),state);
 		RebuildMenuItem(timingMenu,Menu_Video_Snap_To_Scene,wxBITMAP(snap_subs_to_scene),wxBITMAP(snap_subs_to_scene_disable),state);
 		RebuildMenuItem(timingMenu,Menu_Video_Shift_To_Frame,wxBITMAP(shift_to_frame),wxBITMAP(shift_to_frame_disable),state);
+
+		// Other
+		state = count >= 2 && continuous;
+		MenuBar->Enable(MENU_ADJOIN,state);
+		MenuBar->Enable(MENU_ADJOIN2,state);
 	}
 
 	// Edit menu