X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.C;h=fe52bbd6936336a0ac2a848ae37606f0cac296e7;hb=8bd72f90925843be9ab9182c89761ee0640e7873;hp=059e5850d86de696bbe8462c77bb503c41c7e1fd;hpb=463702f1b724c43a1cb7951ce7d71986f9715d5f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 059e5850..fe52bbd6 100644
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -76,10 +76,7 @@ void AssetPopup::create_objects()
 	BC_SubMenu *submenu;
 	add_item(info = new AssetPopupInfo(mwindow, this));
 	add_item(format = new AWindowListFormat(mwindow, gui));
-	add_item(menu_item = new BC_MenuItem(_("Sort...")));
-	menu_item->add_submenu(submenu = new BC_SubMenu());
-	submenu->add_submenuitem(new AssetPopupSortNames(mwindow, this));
-	submenu->add_submenuitem(new AssetPopupSortTimes(mwindow, this));
+	add_item(new AssetPopupSort(mwindow, this));
 	add_item(index = new AssetPopupBuildIndex(mwindow, this));
 	add_item(view = new AssetPopupView(mwindow, this));
 	add_item(view_window = new AssetPopupViewWindow(mwindow, this));
@@ -107,7 +104,6 @@ void AssetPopup::paste_assets()
 	gui->collect_assets(proxy);
 	mwindow->paste_assets(mwindow->edl->local_session->get_selectionstart(1),
 		mwindow->edl->tracks->first, 0);   // do not overwrite
-	mwindow->session->clear_drag_proxy();
 
 	gui->unlock_window();
 	mwindow->gui->unlock_window();
@@ -200,37 +196,20 @@ int AssetPopupBuildIndex::handle_event()
 }
 
 
-AssetPopupSortNames::AssetPopupSortNames(MWindow *mwindow, AssetPopup *popup)
- : BC_MenuItem(_("Sort names"))
-{
-	this->mwindow = mwindow;
-	this->popup = popup;
-}
-
-AssetPopupSortNames::~AssetPopupSortNames()
-{
-}
-
-int AssetPopupSortNames::handle_event()
-{
-	mwindow->awindow->gui->sort_assets(0);
-	return 1;
-}
-
-AssetPopupSortTimes::AssetPopupSortTimes(MWindow *mwindow, AssetPopup *popup)
- : BC_MenuItem(_("Sort times"))
+AssetPopupSort::AssetPopupSort(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("Sort"))
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
 }
 
-AssetPopupSortTimes::~AssetPopupSortTimes()
+AssetPopupSort::~AssetPopupSort()
 {
 }
 
-int AssetPopupSortTimes::handle_event()
+int AssetPopupSort::handle_event()
 {
-	mwindow->awindow->gui->sort_assets(1);
+	mwindow->awindow->gui->sort_assets();
 	return 1;
 }
 
@@ -580,6 +559,7 @@ AssetCopyWindow::~AssetCopyWindow()
 
 void AssetCopyWindow::create_objects()
 {
+	lock_window("AssetCopyWindow::create_objects");
 	BC_Title *title;
 	int x = 10, y = 10, pad = 5;
 	add_subwindow(title = new BC_Title(x, y, _("List of asset paths:")));
@@ -594,6 +574,7 @@ void AssetCopyWindow::create_objects()
 
 	add_subwindow(new BC_OKButton(this));
 	show_window();
+	unlock_window();
 }
 
 int AssetCopyWindow::resize_event(int w, int h)
@@ -705,6 +686,7 @@ AssetPasteWindow::~AssetPasteWindow()
 
 void AssetPasteWindow::create_objects()
 {
+	lock_window("AssetPasteWindow::create_objects()");
 	BC_Title *title;
 	int x = 10, y = 10, pad = 5;
 	add_subwindow(title = new BC_Title(x, y, _("Enter list of asset paths:")));
@@ -717,6 +699,7 @@ void AssetPasteWindow::create_objects()
 	add_subwindow(new BC_OKButton(this));
 	add_subwindow(new BC_CancelButton(this));
 	show_window();
+	unlock_window();
 }
 
 int AssetPasteWindow::resize_event(int w, int h)