X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flabeledit.C;h=22681918de4c0ae8a245a4126682fc422501604a;hp=bd16321740529bee94d44a349c3cce7a00ecaf39;hb=HEAD;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/labeledit.C b/cinelerra-5.1/cinelerra/labeledit.C
index bd163217..22681918 100644
--- a/cinelerra-5.1/cinelerra/labeledit.C
+++ b/cinelerra-5.1/cinelerra/labeledit.C
@@ -1,91 +1,83 @@
-
 /*
  * CINELERRA
  * Copyright (C) 2006 Pierre Dumuid
- * 
+ * Copyright (C) 1997-2012 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 "awindow.h"
 #include "awindowgui.h"
+#include "bcdialog.h"
 #include "labeledit.h"
-#include "edl.h"
-#include "fonts.h"
 #include "language.h"
-#include "localsession.h"
-#include "mainsession.h"
 #include "mwindow.h"
 #include "mwindowgui.h"
 #include "vwindow.h"
 #include "vwindowgui.h"
 
 
-
 LabelEdit::LabelEdit(MWindow *mwindow, AWindow *awindow, VWindow *vwindow)
- : Thread()
+ : BC_DialogThread()
 {
 	this->mwindow = mwindow;
 	this->awindow = awindow;
 	this->vwindow = vwindow;
-	this->label = 0;
+	label = 0;
+	label_edit_window = 0;
 }
 
 LabelEdit::~LabelEdit()
 {
+	close_window();
 }
 
-void LabelEdit::edit_label(Label *label)
+void LabelEdit::start(Label *label, int x, int y)
 {
-// Allow more than one window so we don't have to delete the clip in handle_event
-	if(label)
-	{
-		this->label = label;
-		Thread::start();
-	}
+	this->label = label;
+	this->x = x;  this->y = y;
+
+	BC_DialogThread::start();
 }
 
-void LabelEdit::run()
+void LabelEdit::handle_close_event(int result)
 {
-	if(label)
-	{
-		LabelEditWindow *window = new LabelEditWindow(mwindow, this);
-		window->create_objects();
-		/*int result = */ window->run_window();
-		delete window;
-		if (awindow) awindow->gui->async_update_assets();
-	}
+	label_edit_window = 0;
 }
 
 
+void LabelEdit::handle_done_event(int result)
+{
+	if( !result ) {
+		strcpy(label->textstr, label_edit_window->textbox->get_text());
+		awindow->gui->async_update_assets();
+	}
+}
 
-
-
-
+BC_Window *LabelEdit::new_gui()
+{
+	label_edit_window = new LabelEditWindow(mwindow, this);
+	label_edit_window->create_objects();
+	return label_edit_window;
+}
 
 LabelEditWindow::LabelEditWindow(MWindow *mwindow, LabelEdit *thread)
- : BC_Window(PROGRAM_NAME ": Label Info", 
- 	mwindow->gui->get_abs_cursor_x(1) - 400 / 2,
-	mwindow->gui->get_abs_cursor_y(1) - 350 / 2,
-	400, 
-	350,
-	400,
-	430,
-	0,
-	0,
-	1)
+ : BC_Window(_(PROGRAM_NAME ": Label Info"),
+	thread->x - 400/2, thread->y - 350/2,
+	400, 350, 400, 430, 0, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
@@ -95,36 +87,27 @@ LabelEditWindow::~LabelEditWindow()
 {
 }
 
-	
 void LabelEditWindow::create_objects()
 {
+	lock_window("LabelEditWindow::create_objects");
 	this->label = thread->label;
 
 	int x = 10, y = 10;
 	int x1 = x;
-	BC_TextBox *textbox;
 	BC_Title *title;
 
 	add_subwindow(title = new BC_Title(x1, y, _("Label Text:")));
 	y += title->get_h() + 5;
-	add_subwindow(textbox = new LabelEditComments(this, 
-		x1, 
-		y, 
-		get_w() - x1 * 2, 
+	add_subwindow(textbox = new LabelEditComments(this, x1, y, get_w() - x1 * 2,
 		BC_TextBox::pixels_to_rows(this, MEDIUMFONT, get_h() - 10 - 40 - y)));
 
-
 	add_subwindow(new BC_OKButton(this));
 	add_subwindow(new BC_CancelButton(this));
 	show_window();
 	textbox->activate();
+	unlock_window();
 }
 
-
-
-
-
-
 LabelEditComments::LabelEditComments(LabelEditWindow *window, int x, int y, int w, int rows)
  : BC_TextBox(x, y, w, rows, window->label->textstr,  1, MEDIUMFONT, 1)
 {
@@ -133,6 +116,6 @@ LabelEditComments::LabelEditComments(LabelEditWindow *window, int x, int y, int
 
 int LabelEditComments::handle_event()
 {
-	strcpy(window->label->textstr, get_text());
 	return 1;
 }
+