X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=bee6da43413f3ff4d3b8ca9e155472ac0d802330;hp=0a8fcf26566b8ec8417e9d91f85bff069fae5287;hb=2ba7e9962ea989863e152373e96a09b00a0b4eb8;hpb=9e779f63289f91f132569a933ddc93f4c1487751

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 0a8fcf26..bee6da43 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -536,19 +536,19 @@ SET_TRACE
 SET_TRACE
 
 // Mandatory folders
-	folders.append(picon = new AssetPicon(mwindow, this, AEFFECT_FOLDER));
+	folders.append(picon = new AssetPicon(mwindow, this, _(AEFFECT_FOLDER)));
 	picon->persistent = 1;
-	folders.append(picon = new AssetPicon(mwindow, this, VEFFECT_FOLDER));
+	folders.append(picon = new AssetPicon(mwindow, this, _(VEFFECT_FOLDER)));
 	picon->persistent = 1;
-	folders.append(picon = new AssetPicon(mwindow, this, ATRANSITION_FOLDER));
+	folders.append(picon = new AssetPicon(mwindow, this, _(ATRANSITION_FOLDER)));
 	picon->persistent = 1;
-	folders.append(picon = new AssetPicon(mwindow, this, VTRANSITION_FOLDER));
+	folders.append(picon = new AssetPicon(mwindow, this, _(VTRANSITION_FOLDER)));
 	picon->persistent = 1;
-	folders.append(picon = new AssetPicon(mwindow, this, LABEL_FOLDER));
+	folders.append(picon = new AssetPicon(mwindow, this, _(LABEL_FOLDER)));
 	picon->persistent = 1;
-	folders.append(picon = new AssetPicon(mwindow, this, CLIP_FOLDER));
+	folders.append(picon = new AssetPicon(mwindow, this, _(CLIP_FOLDER)));
 	picon->persistent = 1;
-	folders.append(picon = new AssetPicon(mwindow, this, MEDIA_FOLDER));
+	folders.append(picon = new AssetPicon(mwindow, this, _(MEDIA_FOLDER)));
 	picon->persistent = 1;
 
 	create_label_folder();
@@ -1481,6 +1481,12 @@ int AWindowFolders::selection_changed()
 	{
 		gui->stop_vicon_drawing();
 
+		if(get_button_down() && get_buttonpress() == 3)
+		{
+			gui->folderlist_menu->update_titles();
+			gui->folderlist_menu->activate_menu();
+		}
+
 		strcpy(mwindow->edl->session->current_folder, picon->get_text());
 //printf("AWindowFolders::selection_changed 1\n");
 		gui->asset_list->draw_background();
@@ -1492,21 +1498,22 @@ int AWindowFolders::selection_changed()
 }
 
 int AWindowFolders::button_press_event()
-{
-	return BC_ListBox::button_press_event();
-}
-
-int AWindowFolders::button_release_event()
 {
 	int result = 0;
-	if(get_buttonpress() == 3 && is_event_win() && cursor_inside())
+
+	result = BC_ListBox::button_press_event();
+
+	if(!result)
 	{
-		gui->folderlist_menu->update_titles();
-		gui->folderlist_menu->activate_menu();
-		result = 1;
+		if(get_buttonpress() == 3 && is_event_win() && cursor_inside())
+		{
+			gui->folderlist_menu->update_titles();
+			gui->folderlist_menu->activate_menu();
+			result = 1;
+		}
 	}
-	else
-		result = BC_ListBox::button_release_event();
+
+
 	return result;
 }
 
@@ -1515,6 +1522,7 @@ int AWindowFolders::button_release_event()
 
 
 
+
 AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, int w, int h)
  : BC_ListBox(x,
  		y,
@@ -1542,34 +1550,20 @@ AWindowAssets::~AWindowAssets()
 }
 
 int AWindowAssets::button_press_event()
-{
-	return BC_ListBox::button_press_event();
-}
-
-int AWindowAssets::button_release_event()
 {
 	int result = 0;
-	if(get_buttonpress() == 3 && is_event_win() && cursor_inside()) {
-		if( !strcasecmp(mwindow->edl->session->current_folder, AEFFECT_FOLDER) ||
-		    !strcasecmp(mwindow->edl->session->current_folder, VEFFECT_FOLDER) ||
-		    !strcasecmp(mwindow->edl->session->current_folder, ATRANSITION_FOLDER) ||
-		    !strcasecmp(mwindow->edl->session->current_folder, VTRANSITION_FOLDER)) {
-			BC_ListBox::deactivate_selection();
-			gui->assetlist_menu->update_titles();
-			gui->assetlist_menu->activate_menu();
-		}
-                else if (!strcasecmp(mwindow->edl->session->current_folder, LABEL_FOLDER)) {
-			gui->label_menu->update();
-			gui->label_menu->activate_menu();
-		}
-		else {
-			gui->asset_menu->update();
-			gui->asset_menu->activate_menu();
-		}
+
+	result = BC_ListBox::button_press_event();
+
+	if(!result && get_buttonpress() == 3 && is_event_win() && cursor_inside())
+	{
+		BC_ListBox::deactivate_selection();
+		gui->assetlist_menu->update_titles();
+		gui->assetlist_menu->activate_menu();
 		result = 1;
 	}
-	else
-		result = BC_ListBox::button_release_event();
+
+
 	return result;
 }
 
@@ -1601,7 +1595,39 @@ int AWindowAssets::handle_event()
 int AWindowAssets::selection_changed()
 {
 // Show popup window
-	if( get_button_down() && get_buttonpress() == 1 && get_selection(0, 0) ) {
+	if(get_button_down() && get_buttonpress() == 3 && get_selection(0, 0))
+	{
+		if(!strcasecmp(mwindow->edl->session->current_folder, AEFFECT_FOLDER) ||
+			!strcasecmp(mwindow->edl->session->current_folder, VEFFECT_FOLDER) ||
+			!strcasecmp(mwindow->edl->session->current_folder, ATRANSITION_FOLDER) ||
+			!strcasecmp(mwindow->edl->session->current_folder, VTRANSITION_FOLDER))
+		{
+			gui->assetlist_menu->update_titles();
+			gui->assetlist_menu->activate_menu();
+		}
+		else
+                if (!strcasecmp(mwindow->edl->session->current_folder, LABEL_FOLDER))
+		{
+			if(((AssetPicon*)get_selection(0, 0))->label)
+				gui->label_menu->activate_menu();
+		}
+		else
+		{
+			if(((AssetPicon*)get_selection(0, 0))->indexable)
+				gui->asset_menu->update();
+			else
+			if(((AssetPicon*)get_selection(0, 0))->edl)
+				gui->asset_menu->update();
+
+
+
+			gui->asset_menu->activate_menu();
+		}
+
+		BC_ListBox::deactivate_selection();
+		return 1;
+	}
+	else if( get_button_down() && get_buttonpress() == 1 && get_selection(0, 0) ) {
 		VIcon *vicon = 0;
 		if( !gui->vicon_thread->viewing ) {
 			AssetPicon *picon = (AssetPicon*)get_selection(0, 0);