X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fswindow.C;h=423dd55d0ada2e3e1ec1cd2fa51346ac65ac3b65;hp=e88a9e1cb8c88f8165467d906586e376f55dc0aa;hb=a4de4732339bf38b5b225c533be1bdf60748f04a;hpb=32fa5523f2d5a7d6abcbdddce56b8d65cd83fb88

diff --git a/cinelerra-5.1/cinelerra/swindow.C b/cinelerra-5.1/cinelerra/swindow.C
index e88a9e1c..423dd55d 100644
--- a/cinelerra-5.1/cinelerra/swindow.C
+++ b/cinelerra-5.1/cinelerra/swindow.C
@@ -76,27 +76,15 @@ SWindowLoadPath::SWindowLoadPath(SWindowGUI *gui, int x, int y, char *path)
  : BC_TextBox(x, y, 200, 1, path)
 {
 	this->sw_gui = gui;
-
-	file_entries = new ArrayList<BC_ListBoxItem*>;
-	FileSystem fs;  char string[BCTEXTLEN];
-// Load current directory
-	fs.update(getcwd(string, BCTEXTLEN));
-	int total_files = fs.total_files();
-	for(int i = 0; i < total_files; i++) {
-		const char *name = fs.get_entry(i)->get_name();
-		file_entries->append(new BC_ListBoxItem(name));
-	}
 }
 
 SWindowLoadPath::~SWindowLoadPath()
 {
-	file_entries->remove_all_objects();
-	delete file_entries;
 }
 
 int SWindowLoadPath::handle_event()
 {
-	calculate_suggestions(file_entries);
+	calculate_suggestions();
 	strcpy(sw_gui->script_path, get_text());
 	return 1;
 }
@@ -114,9 +102,14 @@ SWindowLoadFile::~SWindowLoadFile()
 
 int SWindowLoadFile::handle_event()
 {
-	sw_gui->load_path->set_suggestions(0,0);
-	sw_gui->load_script();
-	sw_gui->set_script_pos(0);
+	if( sw_gui->script_path[0] ) {
+		sw_gui->load_path->set_suggestions(0,0);
+		sw_gui->load_script();
+		sw_gui->set_script_pos(0);
+	}
+	else {
+		eprintf(_("script text file path required"));
+	}
 	return 1;
 }
 
@@ -132,7 +125,12 @@ SWindowSaveFile::~SWindowSaveFile()
 
 int SWindowSaveFile::handle_event()
 {
-	sw_gui->save_spumux_data();
+	if( sw_gui->script_path[0] ) {
+		sw_gui->save_spumux_data();
+	}
+	else {
+		eprintf(_("script microdvd file path required"));
+	}
 	return 1;
 }
 
@@ -183,11 +181,16 @@ void SWindowGUI::create_objects()
 	x1 = x + pad;
 	blank_line = new char[2];
 	blank_line[0] = ' ';  blank_line[1] = 0;
-	int rows = (ok_y - y - 4*pad) / text_rowsz - 3;
-	int w1 = get_w()-x1-pad;
+	add_subwindow(script_title = new BC_Title(x1, y, _("Script Text:")));
+	y += script_title->get_h() + pad;
+	int rows = (ok_y - y - BC_Title::calculate_h(this,_("Line Text:")) -
+		4*pad) / text_rowsz - 3;
+	int w1 = get_w() - x1 - pad;
 	script_entry = new ScriptEntry(this, x1, y, w1, rows, blank_line);
 	script_entry->create_objects();
 	y += script_entry->get_h() + pad;
+	add_subwindow(line_title = new BC_Title(x1, y, _("Line Text:")));
+	y += line_title->get_h() + pad;
 	line_entry = new ScriptEntry(this, x1, y, w1, 3);
 	line_entry->create_objects();
 	ok = new SWindowOK(this, ok_x, ok_y);
@@ -315,10 +318,14 @@ int SWindowGUI::resize_event(int w, int h)
 	int w1 = w - x1 - pad;
 	script_scroll->reposition_window(x1, y, w1);
 	y += hh + 2*pad;
+	script_title->reposition_window(x, y);
+	y += script_title->get_h() + pad;
 	w1 = w - x - pad;
-	int rows = (ok_y - y - 4*pad) / text_rowsz - 3;
+	int rows = (ok_y - y - line_title->get_h() - 4*pad) / text_rowsz - 3;
 	script_entry->reposition_window(x, y, w1, rows);
-	y += script_entry->get_h() + pad;
+	y += script_entry->get_h() + 2*pad;
+	line_title->reposition_window(x, y);
+	y += line_title->get_h() + pad;
 	line_entry->reposition_window(x, y, w1, 3);
 	return 0;
 }
@@ -728,11 +735,26 @@ ScriptEntry::~ScriptEntry()
 void ScriptEntry::set_text(char *text, int isz)
 {
 	if( !text || !*text ) return;
-	if( isz < 0 ) isz = strlen(text);
+	if( isz < 0 ) isz = strlen(text)+1;
 	BC_ScrollTextBox::set_text(text, isz);
 	ttext = text;
 }
 
+int ScriptEntry::handle_event()
+{
+	if( sw_gui->get_button_down() &&
+	    sw_gui->get_buttonpress() == 1 &&
+	    sw_gui->get_triple_click() ) {
+		int ibeam = get_ibeam_letter(), row = 0;
+		const char *tp = ttext;
+		while( *tp && tp-ttext < ibeam ) {
+			if( *tp++ == '\n' ) ++row;
+		}
+		int pos = sw_gui->script_entry_no;
+		sw_gui->load_selection(pos, row);
+	}
+	return 1;
+}
 
 int SWindowGUI::load_script_line(FILE *fp)
 {
@@ -783,11 +805,11 @@ void SWindowGUI::load_script(FILE *fp)
 	char value[64];
 	sprintf(value,"%ld",ftell(fp));
 	script_filesz->update(value);
-	sprintf(value,"%ld",script_line_no);
+	sprintf(value,"%jd",script_line_no);
 	script_lines->update(value);
 	sprintf(value,"%d",script.size());
 	script_entries->update(value);
-	sprintf(value,"%ld",script_text_lines);
+	sprintf(value,"%jd",script_text_lines);
 	script_texts->update(value);
 	int hw = 2*script_scroll->get_h();
 	script_scroll->update_length(script.size(), script_entry_no, hw, 0);
@@ -818,6 +840,10 @@ void SWindowGUI::save_spumux_data()
 		*cp = 0;
 		snprintf(ext,len,"-%s.udvd",track_title);
 		FILE *fp = fopen(filename, "w");
+		if( !fp ) {
+			eprintf(_("Unable to open %s:\n%m"), filename);
+			continue;
+		}
 		int64_t start = 0;
 		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
 			SEdit *sedit = (SEdit *)edit;
@@ -825,7 +851,7 @@ void SWindowGUI::save_spumux_data()
 				int64_t end = start + sedit->length;
 				char *text = sedit->get_text();
 				if( *text ) {
-					fprintf(fp, "{%ld}{%ld}%s\n", start, end-1, text);
+					fprintf(fp, "{%jd}{%jd}%s\n", start, end-1, text);
 				}
 				start = end;
 			}