X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.C;h=9fe3c292fe40489b544be6128632707d3504b136;hb=c5451a0a1f2a69ffea5e8b85d05787466f355481;hp=11edba8fc44f8795f682bc275a23dc7289a5b88c;hpb=c3edaf190bc7ba23acdddded9635aad2d0fe9124;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 11edba8f..9fe3c292 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -55,6 +55,7 @@
 #include "menueditlength.h"
 #include "menutransitionlength.h"
 #include "menuveffects.h"
+#include "mixersalign.h"
 #include "mwindowgui.h"
 #include "mwindow.h"
 #include "new.h"
@@ -134,8 +135,8 @@ void MainMenu::create_objects()
 	filemenu->add_item(new BC_MenuItem("-"));
 	filemenu->add_item(quit_program = new Quit(mwindow));
 	quit_program->create_objects(save);
-	filemenu->add_item(new DumpEDL(mwindow));
-	filemenu->add_item(new DumpPlugins(mwindow));
+	filemenu->add_item(dump_menu = new MainDumpsMenu(mwindow));
+	dump_menu->create_objects();
 	filemenu->add_item(new LoadBackup(mwindow));
 	filemenu->add_item(new SaveBackup(mwindow));
 
@@ -147,9 +148,9 @@ void MainMenu::create_objects()
 	editmenu->add_item(new Cut(mwindow));
 	editmenu->add_item(new Copy(mwindow));
 	editmenu->add_item(new Paste(mwindow));
-	editmenu->add_item(new Clear(mwindow));
 	editmenu->add_item(new PasteSilence(mwindow));
-	editmenu->add_item(new MuteSelection(mwindow));
+	editmenu->add_item(clear_menu = new EditClearMenu(mwindow));
+	clear_menu->create_objects();
 	editmenu->add_item(new TrimSelection(mwindow));
 	editmenu->add_item(new SelectAll(mwindow));
 	editmenu->add_item(new BC_MenuItem("-"));
@@ -160,7 +161,6 @@ void MainMenu::create_objects()
 	editmenu->add_item(new MenuTransitionLength(mwindow));
 	editmenu->add_item(new DetachTransitions(mwindow));
 	editmenu->add_item(new BC_MenuItem("-"));
-	editmenu->add_item(new ClearLabels(mwindow));
 	editmenu->add_item(new CutCommercials(mwindow));
 	editmenu->add_item(new PasteSubttl(mwindow));
 
@@ -202,7 +202,8 @@ void MainMenu::create_objects()
 	trackmenu->add_item(new MoveTracksUp(mwindow));
 	trackmenu->add_item(new MoveTracksDown(mwindow));
 	trackmenu->add_item(new DeleteTracks(mwindow));
-	trackmenu->add_item(new DeleteTrack(mwindow));
+	trackmenu->add_item(new DeleteFirstTrack(mwindow));
+	trackmenu->add_item(new DeleteLastTrack(mwindow));
 	trackmenu->add_item(new ConcatenateTracks(mwindow));
 	AppendTracks *append_tracks;
 	trackmenu->add_item(append_tracks = new AppendTracks(mwindow));
@@ -271,8 +272,8 @@ void MainMenu::create_objects()
 	windowmenu->add_item(new BC_MenuItem("-"));
 	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(mixer_items = new MixerItems(mwindow));
+	mixer_items->create_objects();
 	windowmenu->add_item(new TileWindows(mwindow,_("Tile left"),0));
 	windowmenu->add_item(new TileWindows(mwindow,_("Tile right"),1));
 	windowmenu->add_item(new BC_MenuItem("-"));
@@ -585,6 +586,36 @@ int MainMenu::add_load(char *path)
 
 // ================================== menu items
 
+MainDumpsSubMenu::MainDumpsSubMenu(BC_MenuItem *menu_item)
+ : BC_SubMenu()
+{
+	this->menu_item = menu_item;
+}
+MainDumpsSubMenu::~MainDumpsSubMenu()
+{
+}
+
+
+MainDumpsMenu::MainDumpsMenu(MWindow *mwindow)
+ : BC_MenuItem(_("Dumps..."))
+{
+	this->mwindow = mwindow;
+	this->dumps_menu = 0;
+}
+MainDumpsMenu::~MainDumpsMenu()
+{
+}
+
+void MainDumpsMenu::create_objects()
+{
+	add_submenu(dumps_menu = new MainDumpsSubMenu(this));
+//	dumps_menu->add_item(new DumpCICache(mwindow));
+	dumps_menu->add_item(new DumpEDL(mwindow));
+	dumps_menu->add_item(new DumpPlugins(mwindow));
+	dumps_menu->add_item(new DumpAssets(mwindow));
+	dumps_menu->add_item(new DumpUndo(mwindow));
+};
+
 
 DumpCICache::DumpCICache(MWindow *mwindow)
  : BC_MenuItem(_("Dump CICache"))
@@ -604,9 +635,7 @@ DumpEDL::DumpEDL(MWindow *mwindow)
 
 int DumpEDL::handle_event()
 {
-//printf("DumpEDL::handle_event 1\n");
 	mwindow->dump_edl();
-//printf("DumpEDL::handle_event 2\n");
 	return 1;
 }
 
@@ -618,20 +647,29 @@ DumpPlugins::DumpPlugins(MWindow *mwindow)
 
 int DumpPlugins::handle_event()
 {
-//printf("DumpEDL::handle_event 1\n");
 	mwindow->dump_plugins();
-//printf("DumpEDL::handle_event 2\n");
 	return 1;
 }
 
-
 DumpAssets::DumpAssets(MWindow *mwindow)
  : BC_MenuItem(_("Dump Assets"))
 { this->mwindow = mwindow; }
 
 int DumpAssets::handle_event()
 {
-	mwindow->assets->dump();
+	mwindow->edl->assets->dump();
+	return 1;
+}
+
+DumpUndo::DumpUndo(MWindow *mwindow)
+ : BC_MenuItem(_("Dump Undo"))
+{
+	this->mwindow = mwindow;
+}
+
+int DumpUndo::handle_event()
+{
+	mwindow->dump_undo();
 	return 1;
 }
 
@@ -917,6 +955,35 @@ int Paste::handle_event()
 	return 1;
 }
 
+EditClearSubMenu::EditClearSubMenu(BC_MenuItem *menu_item)
+ : BC_SubMenu()
+{
+	this->menu_item = menu_item;
+}
+EditClearSubMenu::~EditClearSubMenu()
+{
+}
+
+EditClearMenu::EditClearMenu(MWindow *mwindow)
+ : BC_MenuItem(_("Clear..."))
+{
+	this->mwindow = mwindow;
+	this->clear_sub_menu = 0;
+}
+EditClearMenu::~EditClearMenu()
+{
+}
+
+void EditClearMenu::create_objects()
+{
+	add_submenu(clear_sub_menu = new EditClearSubMenu(this));
+	clear_sub_menu->add_item(new Clear(mwindow));
+	clear_sub_menu->add_item(new MuteSelection(mwindow));
+	clear_sub_menu->add_item(new ClearSelect(mwindow));
+	clear_sub_menu->add_item(new ClearLabels(mwindow));
+	clear_sub_menu->add_item(new ClearHardEdges(mwindow));
+};
+
 Clear::Clear(MWindow *mwindow)
  : BC_MenuItem(_("Clear"), _("Del"), DELETE)
 {
@@ -960,6 +1027,17 @@ int SelectAll::handle_event()
 	return 1;
 }
 
+ClearHardEdges::ClearHardEdges(MWindow *mwindow) : BC_MenuItem(_("Clear Hard Edges"))
+{
+	this->mwindow = mwindow;
+}
+
+int ClearHardEdges::handle_event()
+{
+	mwindow->clear_hard_edges();
+	return 1;
+}
+
 ClearLabels::ClearLabels(MWindow *mwindow) : BC_MenuItem(_("Clear labels"))
 {
 	this->mwindow = mwindow;
@@ -971,6 +1049,19 @@ int ClearLabels::handle_event()
 	return 1;
 }
 
+ClearSelect::ClearSelect(MWindow *mwindow) : BC_MenuItem(_("Clear Select"),"Ctrl-Shift-A",'A')
+{
+	set_ctrl(1);
+	set_shift(1);
+	this->mwindow = mwindow;
+}
+
+int ClearSelect::handle_event()
+{
+	mwindow->clear_select();
+	return 1;
+}
+
 CutCommercials::CutCommercials(MWindow *mwindow) : BC_MenuItem(_("Cut ads"))
 {
 	this->mwindow = mwindow;
@@ -1183,23 +1274,42 @@ int DeleteTracks::handle_event()
 	return 1;
 }
 
-DeleteTrack::DeleteTrack(MWindow *mwindow)
+DeleteFirstTrack::DeleteFirstTrack(MWindow *mwindow)
+ : BC_MenuItem(_("Delete first track"), "Shift-D", 'D')
+{
+	set_shift(1);
+	this->mwindow = mwindow;
+}
+
+int DeleteFirstTrack::handle_event()
+{
+	if( mwindow->session->current_operation == NO_OPERATION ) {
+		Track *track = mwindow->edl->tracks->first;
+		if( track ) mwindow->delete_track(track);
+	}
+	return 1;
+}
+
+DeleteLastTrack::DeleteLastTrack(MWindow *mwindow)
  : BC_MenuItem(_("Delete last track"), "d", 'd')
 {
 	this->mwindow = mwindow;
 }
 
-int DeleteTrack::handle_event()
+int DeleteLastTrack::handle_event()
 {
-	if( mwindow->session->current_operation == NO_OPERATION )
-		mwindow->delete_track();
+	if( mwindow->session->current_operation == NO_OPERATION ) {
+		Track *track = mwindow->edl->tracks->last;
+		if( track ) mwindow->delete_track(track);
+	}
 	return 1;
 }
 
 MoveTracksUp::MoveTracksUp(MWindow *mwindow)
  : BC_MenuItem(_("Move tracks up"), _("Shift-Up"), UP)
 {
-	set_shift(); this->mwindow = mwindow;
+	this->mwindow = mwindow;
+	set_shift();
 }
 
 int MoveTracksUp::handle_event()
@@ -1553,6 +1663,21 @@ int SplitY::handle_event()
 }
 
 
+MixerItems::MixerItems(MWindow *mwindow)
+ : BC_MenuItem(_("Mixers..."))
+{
+	this->mwindow = mwindow;
+}
+
+void MixerItems::create_objects()
+{
+	BC_SubMenu *mixer_submenu = new BC_SubMenu();
+	add_submenu(mixer_submenu);
+	mixer_submenu->add_submenuitem(new MixerViewer(mwindow));
+	mixer_submenu->add_submenuitem(new TileMixers(mwindow));
+	mixer_submenu->add_submenuitem(new AlignMixers(mwindow));
+}
+
 MixerViewer::MixerViewer(MWindow *mwindow)
  : BC_MenuItem(_("Mixer Viewer"), _("Shift-M"), 'M')
 {
@@ -1579,11 +1704,25 @@ int TileMixers::handle_event()
 	return 1;
 }
 
+AlignMixers::AlignMixers(MWindow *mwindow)
+ : BC_MenuItem(_("Align mixers"))
+{
+	this->mwindow = mwindow;
+}
+
+int AlignMixers::handle_event()
+{
+	int wx, wy;
+	mwindow->gui->get_abs_cursor(wx, wy);
+	mwindow->mixers_align->start_dialog(wx, wy);
+	return 1;
+}
 
-LoadLayoutItem::LoadLayoutItem(LoadLayout *load_layout, const char *text, int no, int hotkey)
+
+LoadLayoutItem::LoadLayoutItem(LoadLayout *load_layout, const char *text, int idx, int hotkey)
  : BC_MenuItem(text, "", hotkey)
 {
-	this->no = no;
+	this->idx = idx;
 	this->load_layout = load_layout;
 	if( hotkey ) {
 		char hot_txt[BCSTRLEN];
@@ -1593,16 +1732,21 @@ LoadLayoutItem::LoadLayoutItem(LoadLayout *load_layout, const char *text, int no
 	}
 }
 
+
 int LoadLayoutItem::handle_event()
 {
+// key_press hotkey skips over activate_submenu
+	load_layout->update();
 	MWindow *mwindow = load_layout->mwindow;
 	switch( load_layout->action ) {
 	case LAYOUT_LOAD:
-		mwindow->load_layout(no);
-		break;
-	case LAYOUT_SAVE:
-		mwindow->save_layout(no);
+		mwindow->load_layout(layout_file);
 		break;
+	case LAYOUT_SAVE: {
+		int wx = 0, wy = 0;
+		mwindow->gui->get_abs_cursor(wx, wy);
+		load_layout->layout_dialog->start_confirm_dialog(wx, wy, idx);
+		break; }
 	}
 	return 1;
 }
@@ -1612,19 +1756,185 @@ LoadLayout::LoadLayout(MWindow *mwindow, const char *text, int action)
 {
 	this->mwindow = mwindow;
 	this->action = action;
+	this->layout_dialog = new LoadLayoutDialog(this);
+}
+
+LoadLayout::~LoadLayout()
+{
+	delete layout_dialog;
 }
 
 void LoadLayout::create_objects()
 {
 	BC_SubMenu *layout_submenu = new BC_SubMenu();
 	add_submenu(layout_submenu);
-	for( int i=1; i<=4; ++i ) {
+
+	for( int i=0; i<LAYOUTS_MAX; ++i ) {
 		char text[BCSTRLEN];
-		sprintf(text, _("Layout %d"), i);
-		LoadLayoutItem *load_layout_item =
-			new LoadLayoutItem(this, text, i,
-				action==LAYOUT_LOAD ? KEY_F1-1+i : 0);
-		layout_submenu->add_submenuitem(load_layout_item);
+		sprintf(text, _("Layout %d"), i+1);
+		LoadLayoutItem *item = new LoadLayoutItem(this, text, i,
+				action==LAYOUT_LOAD ? KEY_F1+i : 0);
+		layout_submenu->add_submenuitem(item);
+	}
+}
+
+int LoadLayout::activate_submenu()
+{
+	update();
+	return BC_MenuItem::activate_submenu();
+}
+
+void LoadLayout::update()
+{
+	FileSystem fs;
+	fs.set_filter("layout*_rc");
+	int ret = fs.update(File::get_config_path());
+	int sz = !ret ? fs.dir_list.size() : 0;
+	BC_SubMenu *layout_submenu = get_submenu();
+
+	for( int i=0; i<LAYOUTS_MAX; ++i ) {
+		LoadLayoutItem* item = (LoadLayoutItem *)
+			layout_submenu->get_item(i);
+		char layout_text[BCSTRLEN];  layout_text[0] = 0;
+		int n = sz, id = i+1;
+		while( --n >= 0 ) {
+			char *np = fs.dir_list[n]->name;
+			char *cp = strrchr(np, '_'), *bp = 0;
+			int no = strtol(np+6, &bp, 10);
+			if( no != id || !bp ) continue;
+			if( bp == cp ) {  n = -1;  break; }
+			if( *bp++ == '_' && bp < cp && !strcmp(cp, "_rc") ) {
+				int k = cp - bp;  char *tp = layout_text;
+				if( k > LAYOUT_NAME_LEN ) k = LAYOUT_NAME_LEN;
+				while( --k >= 0 ) *tp++ = *bp++;
+				*tp = 0;
+				break;
+			}
+		}
+		strcpy(item->layout_text, layout_text);
+		char *lp = item->layout_file;
+		int k = sprintf(lp, LAYOUT_FILE, id);
+		if( n >= 0 && layout_text[0] )
+			sprintf(lp + k-2, "%s_rc", layout_text);
+		else
+			sprintf(layout_text, _("Layout %d"), id);
+		item->set_text(layout_text);
 	}
 }
 
+LoadLayoutDialog::LoadLayoutDialog(LoadLayout *load_layout)
+{
+	this->load_layout = load_layout;
+	wx = 0;  wy = 0;
+	idx = -1;
+	lgui = 0;
+}
+
+LoadLayoutDialog::~LoadLayoutDialog()
+{
+	close_window();
+}
+
+void LoadLayoutDialog::handle_done_event(int result)
+{
+	if( result ) return;
+	char layout_file[BCSTRLEN];
+	BC_SubMenu *layout_submenu = load_layout->get_submenu();
+	LoadLayoutItem* item =
+		(LoadLayoutItem *) layout_submenu->get_item(idx);
+	snprintf(layout_file, sizeof(layout_file), "%s", item->layout_file);
+	load_layout->mwindow->delete_layout(layout_file);
+	int k = sprintf(layout_file, LAYOUT_FILE, idx+1);
+	const char *text = lgui->name_text->get_text();
+	if( text[0] )
+		snprintf(layout_file + k-2, sizeof(layout_file)-k+2, "%s_rc", text);
+	load_layout->mwindow->save_layout(layout_file);
+}
+
+void LoadLayoutDialog::handle_close_event(int result)
+{
+	lgui = 0;
+}
+
+BC_Window *LoadLayoutDialog::new_gui()
+{
+	lgui = new LoadLayoutConfirm(this, wx, wy);
+	lgui->create_objects();
+	return lgui;
+}
+
+void LoadLayoutDialog::start_confirm_dialog(int wx, int wy, int idx)
+{
+	close_window();
+	this->wx = wx;  this->wy = wy;
+	this->idx = idx;
+	start();
+}
+
+LoadLayoutNameText::LoadLayoutNameText(LoadLayoutConfirm *confirm,
+		int x, int y, int w, const char *text)
+ : BC_TextBox(x, y, w, 1, text)
+{
+	this->confirm = confirm;
+}
+
+LoadLayoutNameText::~LoadLayoutNameText()
+{
+}
+
+int LoadLayoutNameText::handle_event()
+{
+	const char *text = get_text();
+	int len = strlen(text), k = 0;
+	char new_text[BCTEXTLEN];
+	for( int i=0; i<len; ++i ) {
+		int ch = text[i];
+		if( (ch>='A' && ch<='Z') || (ch>='a' && ch<='z') ||
+		    (ch>='0' && ch<='9') || ch=='_' )
+			new_text[k++] = ch;
+	}
+	new_text[k] = 0;  len = k;
+	int i = len - LAYOUT_NAME_LEN;
+	if( i >= 0 ) {
+		k = 0;
+		while( i < len ) new_text[k++] = new_text[i++];
+		new_text[k] = 0;
+	}
+	update(new_text);
+	return 1;
+}
+
+LoadLayoutConfirm::LoadLayoutConfirm(LoadLayoutDialog *layout_dialog, int x, int y)
+ : BC_Window(_(PROGRAM_NAME ": Layout"), x, y, 300,140, 300,140, 0)
+{
+	this->layout_dialog = layout_dialog;
+}
+
+LoadLayoutConfirm::~LoadLayoutConfirm()
+{
+}
+
+void LoadLayoutConfirm::create_objects()
+{
+	lock_window("LoadLayoutConfirm::create_objects");
+	int x = 10, y = 10, pad = 10;
+	BC_SubMenu *layout_submenu = layout_dialog->load_layout->get_submenu();
+	LoadLayoutItem *item = (LoadLayoutItem *)
+		layout_submenu->get_item(layout_dialog->idx);
+	BC_Title *title;
+	add_subwindow(title = new BC_Title(x, y, _("Layout Name:")));
+	int x1 = x + title->get_w() + 10;
+	add_subwindow(title = new BC_Title(x1, y, item->get_text()));
+	y += title->get_h() + pad;
+	add_subwindow(name_text = new LoadLayoutNameText(this,
+		x, y, get_w()-x-20, item->layout_text));
+	y += name_text->get_h();
+	x1 = x + 80;
+	char legend[BCTEXTLEN];
+	sprintf(legend, _("a-z,A-Z,0-9_ only, %dch max"), LAYOUT_NAME_LEN);
+	add_subwindow(title = new BC_Title(x1, y, legend));
+	add_subwindow(new BC_OKButton(this));
+	add_subwindow(new BC_CancelButton(this));
+	unlock_window();
+}
+