X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.C;h=1deb52a11e3f7dba190ad553543cb31a788dda7e;hb=568bf4145a8bc66472ea3625741dacbd3b56ccc0;hp=0bf2973d6273f21afabb506091b95586a234acd2;hpb=0513350234a8dcd08e5a0117d5121724ef7b76b6;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 0bf2973d..1deb52a1 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -98,7 +98,7 @@ void MainMenu::create_objects()
 	total_loads = 0;
 
 	add_menu(filemenu = new BC_Menu(_("File")));
-	filemenu->add_item(new_project = new New(mwindow));
+	filemenu->add_item(new_project = new NewProject(mwindow));
 	new_project->create_objects();
 
 // file loaders
@@ -112,12 +112,17 @@ void MainMenu::create_objects()
 	filemenu->add_item(saveas = new SaveAs(mwindow));
 	save->create_objects(saveas);
 	saveas->set_mainmenu(this);
+	SaveProject *save_project;
+	filemenu->add_item(save_project = new SaveProject(mwindow));
+
 	filemenu->add_item(record_menu_item = new RecordMenuItem(mwindow));
 #ifdef HAVE_DVB
 	filemenu->add_item(new ChannelScan(mwindow));
 #endif
+#ifdef HAVE_COMMERCIAL
 	if( mwindow->has_commercials() )
 		filemenu->add_item(new DbWindowScan(mwindow));
+#endif
 	filemenu->add_item(new SubttlSWin(mwindow));
 
 	filemenu->add_item(render = new RenderItem(mwindow));
@@ -198,6 +203,9 @@ void MainMenu::create_objects()
 	trackmenu->add_item(new DeleteTracks(mwindow));
 	trackmenu->add_item(new DeleteTrack(mwindow));
 	trackmenu->add_item(new ConcatenateTracks(mwindow));
+	AppendTracks *append_tracks;
+	trackmenu->add_item(append_tracks = new AppendTracks(mwindow));
+	append_tracks->create_objects();
 	trackmenu->add_item(new AddSubttlTrack(mwindow));
 
 	add_menu(settingsmenu = new BC_Menu(_("Settings")));
@@ -257,6 +265,7 @@ void MainMenu::create_objects()
 	windowmenu->add_item(split_x = new SplitX(mwindow));
 	windowmenu->add_item(split_y = new SplitY(mwindow));
 	windowmenu->add_item(mixer_viewer = new MixerViewer(mwindow));
+	windowmenu->add_item(new TileMixers(mwindow));
 	windowmenu->add_item(new TileWindows(mwindow,_("Default positions"),-1,_("Ctrl-P"),'p'));
 	windowmenu->add_item(new TileWindows(mwindow,_("Tile left"),0));
 	windowmenu->add_item(new TileWindows(mwindow,_("Tile right"),1));
@@ -857,7 +866,7 @@ int ClearDefaultKeyframe::handle_event()
 }
 
 Cut::Cut(MWindow *mwindow)
- : BC_MenuItem(_("Cut"), "x", 'x')
+ : BC_MenuItem(_("Split | Cut"), "x", 'x')
 {
 	this->mwindow = mwindow;
 }
@@ -1540,3 +1549,16 @@ int MixerViewer::handle_event()
 	return 1;
 }
 
+TileMixers::TileMixers(MWindow *mwindow)
+ : BC_MenuItem(_("Tile mixers"), "Alt-t", 't')
+{
+	this->mwindow = mwindow;
+	set_alt();
+}
+
+int TileMixers::handle_event()
+{
+	mwindow->tile_mixers();
+	return 1;
+}
+