X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fclippopup.C;fp=cinelerra-5.1%2Fcinelerra%2Fclippopup.C;h=b8a235a5cedfbaff4b8ca8b4eb3087a0444f011c;hb=8b0d4fea3dbf5321d0688eb75f25be77f751d003;hp=e3cc1a533f0492a821dfe467a5b96ae66d2933c0;hpb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index e3cc1a53..b8a235a5 100644
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -69,10 +69,7 @@ void ClipPopup::create_objects()
 	submenu->add_submenuitem(new ClipMatchSize(mwindow, this));
 	submenu->add_submenuitem(new ClipMatchRate(mwindow, this));
 	submenu->add_submenuitem(new ClipMatchAll(mwindow, this));
-	add_item(menu_item = new BC_MenuItem(_("Remove...")));
-	menu_item->add_submenu(submenu = new BC_SubMenu());
-	submenu->add_submenuitem(new ClipPopupProjectRemove(mwindow, this));
-	submenu->add_submenuitem(new ClipPopupDiskRemove(mwindow, this));
+	add_item(new ClipPopupDelete(mwindow, this));
 }
 
 void ClipPopup::paste_assets()
@@ -325,46 +322,27 @@ int ClipMatchAll::handle_event()
 }
 
 
-ClipPopupProjectRemove::ClipPopupProjectRemove(MWindow *mwindow, ClipPopup *popup)
- : BC_MenuItem(_("Remove from project"))
+ClipPopupDelete::ClipPopupDelete(MWindow *mwindow, ClipPopup *popup)
+ : BC_MenuItem(_("Delete"))
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
 }
 
 
-ClipPopupProjectRemove::~ClipPopupProjectRemove()
+ClipPopupDelete::~ClipPopupDelete()
 {
 }
 
-int ClipPopupProjectRemove::handle_event()
+int ClipPopupDelete::handle_event()
 {
-	mwindow->remove_assets_from_project(1,
-		1,
+	mwindow->remove_assets_from_project(1, 1,
 		mwindow->session->drag_assets,
 		mwindow->session->drag_clips);
 	return 1;
 }
 
 
-ClipPopupDiskRemove::ClipPopupDiskRemove(MWindow *mwindow, ClipPopup *popup)
- : BC_MenuItem(_("Remove from disk"))
-{
-	this->mwindow = mwindow;
-	this->popup = popup;
-}
-
-ClipPopupDiskRemove::~ClipPopupDiskRemove()
-{
-}
-
-int ClipPopupDiskRemove::handle_event()
-{
-	mwindow->awindow->asset_remove->start();
-	return 1;
-}
-
-
 ClipPasteToFolder::ClipPasteToFolder(MWindow *mwindow)
  : BC_MenuItem(_("Paste Clip"))
 {