X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=inline;f=cinelerra-5.1%2Fcinelerra%2Fdvdcreate.C;h=8779e3c9345bce4120d951aec81aca5525955f02;hb=0df48ad2d876409c5beeae2e21933a728ea76c33;hp=5bbe2efd75b9a5e86237c61190a06c7cd0c7061e;hpb=bd570c5fa5f5473b670673368dc30356aa6c43fa;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/dvdcreate.C b/cinelerra-5.1/cinelerra/dvdcreate.C
index 5bbe2efd..8779e3c9 100644
--- a/cinelerra-5.1/cinelerra/dvdcreate.C
+++ b/cinelerra-5.1/cinelerra/dvdcreate.C
@@ -614,7 +614,7 @@ BC_Window* CreateDVD_Thread::new_gui()
 	int scr_x = mwindow->gui->get_screen_x(0, -1);
 	int scr_w = mwindow->gui->get_screen_w(0, -1);
 	int scr_h = mwindow->gui->get_screen_h(0, -1);
-	int w = 520, h = 280;
+	int w = xS(520), h = yS(280);
 	int x = scr_x + scr_w/2 - w/2, y = scr_h/2 - h/2;
 
 	gui = new CreateDVD_GUI(this, x, y, w, h);
@@ -852,7 +852,7 @@ CreateDVD_UseFFMpeg::~CreateDVD_UseFFMpeg()
 
 
 CreateDVD_GUI::CreateDVD_GUI(CreateDVD_Thread *thread, int x, int y, int w, int h)
- : BC_Window(_(PROGRAM_NAME ": Create DVD"), x, y, w, h, 50, 50, 1, 0, 1)
+ : BC_Window(_(PROGRAM_NAME ": Create DVD"), x, y, w, h, xS(50), yS(50), 1, 0, 1)
 {
 	this->thread = thread;
 	at_x = at_y = tmp_x = tmp_y = 0;
@@ -881,20 +881,22 @@ CreateDVD_GUI::~CreateDVD_GUI()
 
 void CreateDVD_GUI::create_objects()
 {
+	int xs10 = xS(10), xs30 = xS(30), xs35 = xS(35), xs170 = xS(170);
+	int ys5 = yS(5), ys10 = yS(10);
 	lock_window("CreateDVD_GUI::create_objects");
-	int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + 5;
+	int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + ys5;
 	int padx = BC_Title::calculate_w(this, (char*)"X", MEDIUMFONT);
 	int x = padx/2, y = pady/2;
 	BC_Title *title = new BC_Title(x, y, _("Title:"), MEDIUMFONT, YELLOW);
 	add_subwindow(title);
 	at_x = x + title->get_w();  at_y = y;
-	asset_title = new CreateDVD_AssetTitle(this, at_x, at_y, get_w()-at_x-10);
+	asset_title = new CreateDVD_AssetTitle(this, at_x, at_y, get_w()-at_x-xs10);
 	add_subwindow(asset_title);
 	y += title->get_h() + pady/2;
 	title = new BC_Title(x, y, _("Work path:"), MEDIUMFONT, YELLOW);
 	add_subwindow(title);
 	tmp_x = x + title->get_w();  tmp_y = y;
-	tmp_path = new CreateDVD_TmpPath(this, tmp_x, tmp_y,  get_w()-tmp_x-35);
+	tmp_path = new CreateDVD_TmpPath(this, tmp_x, tmp_y,  get_w()-tmp_x-xs35);
 	add_subwindow(tmp_path);
 	btmp_path = new BrowseButton(thread->mwindow->theme, this, tmp_path,
 		tmp_x+tmp_path->get_w(), tmp_y, "/tmp",
@@ -903,7 +905,7 @@ void CreateDVD_GUI::create_objects()
 	y += title->get_h() + pady/2;
 	disk_space = new CreateDVD_DiskSpace(this, x, y);
 	add_subwindow(disk_space);
-	int x0 = get_w() - 170;
+	int x0 = get_w() - xs170;
 	title = new BC_Title(x0, y, _("Media:"), MEDIUMFONT, YELLOW);
 	add_subwindow(title);
 	int x1 = x0+title->get_w()+padx;
@@ -920,7 +922,7 @@ void CreateDVD_GUI::create_objects()
 	standard = new CreateDVD_Format(this, title->get_w() + padx, y);
 	add_subwindow(standard);
 	standard->create_objects();
-	x0 -= 30;
+	x0 -= xs30;
 	title = new BC_Title(x0, y, _("Scale:"), MEDIUMFONT, YELLOW);
 	add_subwindow(title);
 	x1 = x0+title->get_w()+padx;
@@ -934,7 +936,7 @@ void CreateDVD_GUI::create_objects()
 	y += need_deinterlace->get_h() + pady/2;
 	need_histogram = new CreateDVD_Histogram(this, x, y);
 	add_subwindow(need_histogram);
-	y = y1;  x1 += 170;
+	y = y1;  x1 += xs170;
 	need_inverse_telecine = new CreateDVD_InverseTelecine(this, x1, y);
 	add_subwindow(need_inverse_telecine);
 	y += need_inverse_telecine->get_h() + pady/2;
@@ -946,7 +948,7 @@ void CreateDVD_GUI::create_objects()
 	y += need_use_ffmpeg->get_h() + pady/2;
 	need_resize_tracks = new CreateDVD_ResizeTracks(this, x1, y);
 	add_subwindow(need_resize_tracks);
-	y = y1;  x1 += 170;
+	y = y1;  x1 += xs170;
 	need_labeled = new CreateDVD_LabelChapters(this, x1, y);
 	add_subwindow(need_labeled);
 	y += need_labeled->get_h() + pady/2;
@@ -954,14 +956,14 @@ void CreateDVD_GUI::create_objects()
 	add_subwindow(need_farmed);
 	ok_w = BC_OKButton::calculate_w();
 	ok_h = BC_OKButton::calculate_h();
-	ok_x = 10;
-	ok_y = get_h() - ok_h - 10;
+	ok_x = xs10;
+	ok_y = get_h() - ok_h - ys10;
 	ok = new CreateDVD_OK(this, ok_x, ok_y);
 	add_subwindow(ok);
 	cancel_w = BC_CancelButton::calculate_w();
 	cancel_h = BC_CancelButton::calculate_h();
-	cancel_x = get_w() - cancel_w - 10,
-	cancel_y = get_h() - cancel_h - 10;
+	cancel_x = get_w() - cancel_w - xs10,
+	cancel_y = get_h() - cancel_h - ys10;
 	cancel = new CreateDVD_Cancel(this, cancel_x, cancel_y);
 	add_subwindow(cancel);
 	show_window();
@@ -970,13 +972,15 @@ void CreateDVD_GUI::create_objects()
 
 int CreateDVD_GUI::resize_event(int w, int h)
 {
-	asset_title->reposition_window(at_x, at_y, get_w()-at_x-10);
-	tmp_path->reposition_window(tmp_x, tmp_y,  get_w()-tmp_x-35);
+	int xs10 = xS(10), xs35 = xS(35);
+	int ys10 = yS(10);
+	asset_title->reposition_window(at_x, at_y, get_w()-at_x-xs10);
+	tmp_path->reposition_window(tmp_x, tmp_y,  get_w()-tmp_x-xs35);
 	btmp_path->reposition_window(tmp_x+tmp_path->get_w(), tmp_y);
-	ok_y = h - ok_h - 10;
+	ok_y = h - ok_h - ys10;
 	ok->reposition_window(ok_x, ok_y);
-	cancel_x = w - cancel_w - 10,
-	cancel_y = h - cancel_h - 10;
+	cancel_x = w - cancel_w - xs10,
+	cancel_y = h - cancel_h - ys10;
 	cancel->reposition_window(cancel_x, cancel_y);
 	return 0;
 }
@@ -1149,7 +1153,7 @@ int CreateDVD_FormatItem::handle_event()
 
 
 CreateDVD_Format::CreateDVD_Format(CreateDVD_GUI *gui, int x, int y)
- : BC_PopupMenu(x, y, 180, "", 1)
+ : BC_PopupMenu(x, y, xS(180), "", 1)
 {
 	this->gui = gui;
 }
@@ -1201,7 +1205,7 @@ int CreateDVD_ScaleItem::handle_event()
 
 
 CreateDVD_Scale::CreateDVD_Scale(CreateDVD_GUI *gui, int x, int y)
- : BC_PopupMenu(x, y, 100, "", 1)
+ : BC_PopupMenu(x, y, xS(100), "", 1)
 {
 	this->gui = gui;
 }
@@ -1227,7 +1231,7 @@ int CreateDVD_Scale::handle_event()
 
 
 CreateDVD_MediaSize::CreateDVD_MediaSize(CreateDVD_GUI *gui, int x, int y)
- : BC_PopupTextBox(gui, 0, 0, x, y, 70,50)
+ : BC_PopupTextBox(gui, 0, 0, x, y, xS(70), 50)
 {
 	this->gui = gui;
 }