X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmenuattachtransition.C;h=13307fb9fc695f522a9176fa99d33788c3a24d87;hb=34dd3a28727fc230ba5abbed50766d671a2b8055;hp=57090f0368495eda0b245c2db839864415dc9d40;hpb=d74af873b37515106009148abcc8686836aec72e;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/menuattachtransition.C b/cinelerra-5.1/cinelerra/menuattachtransition.C
index 57090f03..13307fb9 100644
--- a/cinelerra-5.1/cinelerra/menuattachtransition.C
+++ b/cinelerra-5.1/cinelerra/menuattachtransition.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "datatype.h"
@@ -77,14 +77,14 @@ void TransitionDialogThread::start()
 			mwindow->edl->session->default_atransition :
 			mwindow->edl->session->default_vtransition);
 
-// Construct listbox names	
+// Construct listbox names
 		ArrayList<PluginServer*> plugindb;
-		mwindow->search_plugindb(data_type == TRACK_AUDIO, 
+		mwindow->search_plugindb(data_type == TRACK_AUDIO,
 			data_type == TRACK_VIDEO, 0, 1, 0, plugindb);
 		for(int i = 0; i < plugindb.total; i++) {
-			const char *title = _(plugindb.values[i]->title);
+			const char *title = plugindb.values[i]->title;
 			if( !strcmp(transition_title, title) ) number = i;
-			transition_names.append(new BC_ListBoxItem(title));
+			transition_names.append(new BC_ListBoxItem(_(title)));
 		}
 	}
 
@@ -118,31 +118,85 @@ void TransitionDialogThread::handle_close_event(int result)
 
 
 
-TransitionDialog::TransitionDialog(MWindow *mwindow, 
+TransitionDialog::TransitionDialog(MWindow *mwindow,
 	TransitionDialogThread *thread, int x, int y)
  : BC_Window(_("Attach Transition"), x, y,
 	mwindow->session->transitiondialog_w,
-	mwindow->session->transitiondialog_h, 
+	mwindow->session->transitiondialog_h,
 	320, 240, 1, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
 }
 
+TransitionSetDefault::TransitionSetDefault(TransitionDialog *window, int x, int y)
+ : BC_GenericButton(x, y, _("Set Default Transition"))
+{
+	this->window = window;
+}
+
+TransitionSetDefault::~TransitionSetDefault()
+{
+}
+
+int TransitionSetDefault::handle_event()
+{
+	TransitionDialogThread *thread = (TransitionDialogThread *)window->thread;
+	const char *transition_title = thread->transition_title;
+	EDL *edl = window->mwindow->edl;
+	switch( thread->data_type ) {
+	case TRACK_AUDIO:
+		strcpy(edl->session->default_atransition, transition_title);
+		break;
+	case TRACK_VIDEO:
+		strcpy(edl->session->default_vtransition, transition_title);
+		break;
+	}
+	window->set_default_text->update(transition_title);
+	return 1;
+}
+
+TransitionDefaultText::TransitionDefaultText(TransitionDialog *window,
+	int x, int y, int w, const char * text)
+ : BC_TextBox(x, y, w, 1, text)
+{
+	this->window = window;
+}
+
+TransitionDefaultText::~TransitionDefaultText()
+{
+}
+
+
 void TransitionDialog::create_objects()
 {
 	int x = 10;
 	int y = 10;
-	
+
 	lock_window("TransitionDialog::create_objects");
 	add_subwindow(name_title = new BC_Title(x, y, _("Select transition from list")));
 	y += name_title->get_h() + 5;
-	add_subwindow(name_list = new TransitionDialogName(thread, 
-		&thread->transition_names, 
-		x, 
+	add_subwindow(name_list = new TransitionDialogName(thread,
+		&thread->transition_names,
+		x,
 		y,
 		get_w() - x - x,
-		get_h() - y - BC_OKButton::calculate_h() - 10));
+		get_h() - y - BC_OKButton::calculate_h() - 100));
+	y += name_list->get_h() + 20;
+	add_subwindow(set_default = new TransitionSetDefault(this, x, y));
+	y += set_default->get_h() + 10;
+	const char *default_transition = "";
+	EDL *edl = mwindow->edl;
+	switch( thread->data_type ) {
+	case TRACK_AUDIO:
+		default_transition = edl->session->default_atransition;
+		break;
+	case TRACK_VIDEO:
+		default_transition = edl->session->default_vtransition;
+		break;
+	}
+	add_subwindow(set_default_text = new TransitionDefaultText(this, x, y,
+			get_w()-x-20, default_transition));
 	if( thread->number >= 0 ) {
 		name_list->update_selection(&thread->transition_names, thread->number, 0);
 		name_list->draw_items(0);
@@ -161,22 +215,23 @@ int TransitionDialog::resize_event(int w, int h)
 
 	name_title->reposition_window(x, y);
 	y += name_title->get_h() + 5;
-	name_list->reposition_window(x, 
-		y,
-		w - x - x,
-		h - y - BC_OKButton::calculate_h() - 10);
-
+	name_list->reposition_window(x, y,
+		w - x - x, h - y - BC_OKButton::calculate_h() - 100);
+	y += name_list->get_h() + 20;
+	set_default->reposition_window(x, y);
+	y += set_default->get_h() + 10;
+	set_default_text->reposition_window(x, y, get_w()-x-20);
 	return 1;
 }
 
 
 
-TransitionDialogName::TransitionDialogName(TransitionDialogThread *thread, 
+TransitionDialogName::TransitionDialogName(TransitionDialogThread *thread,
 	ArrayList<BC_ListBoxItem*> *standalone_data, int x, int y, int w, int h)
- : BC_ListBox(x, 
- 	y, 
-	w, 
-	h, 
+ : BC_ListBox(x,
+ 	y,
+	w,
+	h,
 	LISTBOX_TEXT,
 	standalone_data)
 {
@@ -192,7 +247,7 @@ int TransitionDialogName::handle_event()
 int TransitionDialogName::selection_changed()
 {
 	thread->number = get_selection_number(0, 0);
-	strcpy(thread->transition_title, 
+	strcpy(thread->transition_title,
 		thread->transition_names.values[thread->number]->get_text());
 	return 1;
 }