X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=2e90892602e8e1faac227f4410af62064923fdc6;hb=0df48ad2d876409c5beeae2e21933a728ea76c33;hp=73d8d5d4e4ab06b717729af0bee3911d5d9c5334;hpb=bd570c5fa5f5473b670673368dc30356aa6c43fa;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 73d8d5d4..2e908926 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -64,8 +64,8 @@
 
 
 
-#define WIDTH 860
-#define HEIGHT 700
+#define WIDTH xS(860)
+#define HEIGHT yS(700)
 
 
 PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
@@ -125,7 +125,7 @@ BC_Window* PreferencesThread::new_gui()
 	//int need_new_indexes = 0;
 	rerender = 0;
 
- 	mwindow->gui->lock_window("NewThread::new_gui");
+	mwindow->gui->lock_window("NewThread::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);
@@ -406,12 +406,6 @@ SET_TRACE
 }
 
 
-
-
-
-
-
-
 PreferencesWindow::PreferencesWindow(MWindow *mwindow,
 	PreferencesThread *thread, int x, int y, int w, int h)
  : BC_Window(_(PROGRAM_NAME ": Preferences"), x,y, w,h,w,h, 1)
@@ -586,15 +580,6 @@ int PreferencesWindow::set_current_dialog(int number)
 }
 
 
-
-
-
-
-
-
-
-
-
 PreferencesButton::PreferencesButton(MWindow *mwindow,
 	PreferencesThread *thread,
 	int x,
@@ -616,19 +601,11 @@ int PreferencesButton::handle_event()
 }
 
 
-
-
-
-
-
-
-
 PreferencesDialog::PreferencesDialog(MWindow *mwindow,
 	PreferencesWindow *pwindow)
- : BC_SubWindow(10,
- 	40,
-	pwindow->get_w() - 20,
- 	pwindow->get_h() - BC_GenericButton::calculate_h() - 10 - 40)
+ : BC_SubWindow(xS(10), yS(40),
+	pwindow->get_w() - xS(20),
+	pwindow->get_h() - BC_GenericButton::calculate_h() - yS(10 + 40))
 {
 	this->pwindow = pwindow;
 	this->mwindow = mwindow;
@@ -639,14 +616,12 @@ PreferencesDialog::~PreferencesDialog()
 {
 }
 
-// ============================== category window
-
-
 
+// ============================== category window
 
 PreferencesApply::PreferencesApply(MWindow *mwindow, PreferencesThread *thread)
  : BC_GenericButton(thread->window->get_w() / 2 - BC_GenericButton::calculate_w(thread->window, _("Apply")) / 2,
- 	thread->window->get_h() - BC_GenericButton::calculate_h() - 10,
+	thread->window->get_h() - BC_GenericButton::calculate_h() - yS(10),
 	_("Apply"))
 {
 	this->mwindow = mwindow;
@@ -660,16 +635,14 @@ int PreferencesApply::handle_event()
 }
 int PreferencesApply::resize_event(int w, int h)
 {
-	reposition_window(w/2 - get_w()/2, h-get_h()-10);
+	reposition_window(w/2 - get_w()/2, h-get_h()-yS(10));
 	return 1;
 }
 
 
-
-
 PreferencesOK::PreferencesOK(MWindow *mwindow, PreferencesThread *thread)
- : BC_GenericButton(10,
- 	thread->window->get_h() - BC_GenericButton::calculate_h() - 10,
+ : BC_GenericButton(xS(10),
+	thread->window->get_h() - BC_GenericButton::calculate_h() - yS(10),
 	_("OK"))
 {
 	this->mwindow = mwindow;
@@ -691,16 +664,15 @@ int PreferencesOK::handle_event()
 }
 int PreferencesOK::resize_event(int w, int h)
 {
-	reposition_window(10, h-get_h()-10);
+	reposition_window(xS(10), h-get_h()-yS(10));
 	return 1;
 }
 
 
-
 PreferencesCancel::PreferencesCancel(MWindow *mwindow, PreferencesThread *thread)
- : BC_GenericButton(thread->window->get_w() - BC_GenericButton::calculate_w(thread->window, _("Cancel")) - 10,
- 	thread->window->get_h() - BC_GenericButton::calculate_h() - 10,
- 	_("Cancel"))
+ : BC_GenericButton(thread->window->get_w() - BC_GenericButton::calculate_w(thread->window, _("Cancel")) - xS(10),
+	thread->window->get_h() - BC_GenericButton::calculate_h() - yS(10),
+	_("Cancel"))
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
@@ -721,27 +693,16 @@ int PreferencesCancel::handle_event()
 }
 int PreferencesCancel::resize_event(int w, int h)
 {
-	reposition_window(w-get_w()-10, h-get_h()-10);
+	reposition_window(w-get_w()-xS(10), h-get_h()-yS(10));
 	return 1;
 }
 
 
-
-
-
-
-
-
-
-
 PreferencesCategory::PreferencesCategory(MWindow *mwindow, PreferencesThread *thread, int x, int y)
  : BC_PopupTextBox(thread->window,
 		&thread->window->categories,
 		thread->category_to_text(thread->current_dialog),
-		x,
-		y,
-		200,
-		150)
+		x, y, xS(200), yS(150))
 {
 	this->mwindow = mwindow;
 	this->thread = thread;