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

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index bc12bed7..9fe3c292 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -148,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("-"));
@@ -161,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));
 
@@ -956,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)
 {
@@ -999,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;
@@ -1010,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;