X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fexportedl.C;h=f4e3805cb9787f55737e2f8f4e3abf5e6f2ad4de;hp=73e51cf16167bc165afb9e6af5cca1df6dca459c;hb=3b4b6f588c4f2643316afcbc486ca6a35c16a431;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/exportedl.C b/cinelerra-5.1/cinelerra/exportedl.C
index 73e51cf1..f4e3805c 100644
--- a/cinelerra-5.1/cinelerra/exportedl.C
+++ b/cinelerra-5.1/cinelerra/exportedl.C
@@ -319,24 +319,15 @@ void ExportEDL::run()
 
 }
 
+#define WIDTH xS(410)
+#define HEIGHT yS(400)
 
-
-
-
-
-
-
-#define WIDTH 410
-#define HEIGHT 400
-
-static const char *default_list_titles[] =
-{
+static const char *default_list_titles[] = {
 	N_("No."),
 	N_("Track name")
 };
 
-static int default_list_widths[] =
-{
+static int default_list_widths[] = {
 	40,
 	200
 };
@@ -352,7 +343,7 @@ ExportEDLWindow::ExportEDLWindow(MWindow *mwindow, ExportEDL *exportedl, ExportE
 	this->exportasset = exportasset;
 	for( int i=0; i<2; ++i ) {
 		list_titles[i] = _(default_list_titles[i]);
-		list_widths[i] = default_list_widths[i];
+		list_widths[i] = xS(default_list_widths[i]);
 	}
 }
 
@@ -363,32 +354,33 @@ ExportEDLWindow::~ExportEDLWindow()
 }
 
 
-
 void ExportEDLWindow::create_objects()
 {
+	int xs5 = xS(5);
+	int ys5 = yS(5), ys25 = yS(25);
 	lock_window("ExportEDLWindow::create_objects");
-	int x = 5, y = 5;
+	int x = xs5, y = ys5;
 	add_subwindow(new BC_Title(x, y,
 			_("Select a file to export to:")));
-	y += 25;
+	y += ys25;
 
 	add_subwindow(path_textbox = new ExportEDLPathText(x, y, this));
-	x += 300;
+	x += xS(300);
 	path_recent = new BC_RecentList("EDLPATH", mwindow->defaults,
-					path_textbox, 10, x, y, 300, 100);
+					path_textbox, 10, x, y, xS(300), yS(100));
 	add_subwindow(path_recent);
 // FIX
 	path_recent->load_items("EDLPATH");
 
-	x += 24;
+	x += xS(24);
 	add_subwindow(path_button = new BrowseButton(
 		mwindow->theme, this, path_textbox, x, y - 4, exportasset->path,
 		_("Output to file"), _("Select a file to write to:"), 0));
 
-	y += 34;
-	x = 5;
+	y += xS(34);
+	x = xs5;
 	add_subwindow(new BC_Title(x, y, _("Select track to be exported:")));
-	y += 25;
+	y += ys25;
 
 
 	items_tracks[0].remove_all_objects();
@@ -414,7 +406,7 @@ void ExportEDLWindow::create_objects()
 	}
 
 
-	add_subwindow(track_list = new ExportEDLWindowTrackList(this, x, y, 400, 200));
+	add_subwindow(track_list = new ExportEDLWindowTrackList(this, x, y, xS(400), yS(200)));
 
 	y += 5 + track_list->get_h();
 	add_subwindow(new BC_Title(x, y, _("Currently only CMX 3600 format is supported")));
@@ -428,7 +420,7 @@ void ExportEDLWindow::create_objects()
 
 
 ExportEDLPathText::ExportEDLPathText(int x, int y, ExportEDLWindow *window)
- : BC_TextBox(x, y, 300, 1, window->exportasset->path)
+ : BC_TextBox(x, y, xS(300), 1, window->exportasset->path)
 {
 	this->window = window;
 }
@@ -461,5 +453,3 @@ int ExportEDLWindowTrackList::handle_event()
 	return 1;
 }
 
-
-