X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.C;h=8370ab97167c705e9aef302452c8ac8e3fa31407;hp=a7e4f3b977302b4753db0bd2f78458abadaf2ea2;hb=7ffa6954689f14a41a3bae7a0fdb3f2abeaa9679;hpb=33aae273918725085d841a8af927bfccd2aa9364

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index a7e4f3b9..8370ab97 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -37,6 +37,7 @@
 #include "filexml.h"
 #include "floatauto.h"
 #include "floatautos.h"
+#include "gwindowgui.h"
 #include "keys.h"
 #include "language.h"
 #include "localsession.h"
@@ -52,6 +53,7 @@
 #include "tracks.h"
 #include "trackcanvas.h"
 #include "transportque.h"
+#include "zoombar.h"
 
 
 CWindowTool::CWindowTool(MWindow *mwindow, CWindowGUI *gui)
@@ -133,6 +135,7 @@ void CWindowTool::start_tool(int operation)
 				mwindow->edl->session->tool_window = 1;
 				gui->composite_panel->operation[CWINDOW_TOOL_WINDOW]->update(1);
 			}
+			mwindow->edl->session->tool_window = new_gui ? 1 : 0;
 			update_show_window();
 
 // Signal thread to run next tool GUI
@@ -262,20 +265,10 @@ void CWindowTool::update_values()
 
 
 CWindowToolGUI::CWindowToolGUI(MWindow *mwindow,
-	CWindowTool *thread,
-	const char *title,
-	int w,
-	int h)
+	CWindowTool *thread, const char *title, int w, int h)
  : BC_Window(title,
- 	mwindow->session->ctool_x,
-	mwindow->session->ctool_y,
-	w,
-	h,
-	w,
-	h,
-	0,
-	0,
-	1)
+		mwindow->session->ctool_x, mwindow->session->ctool_y,
+		w, h, w, h, 0, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
@@ -352,25 +345,149 @@ void CWindowToolGUI::draw_preview(int changed_edl)
 }
 
 
-CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int log_increment = 0)
- : BC_TumbleTextBox(gui, (float)value, (float)-65536, (float)65536, x, y, 70, 3)
+CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int type)
+ : BC_TumbleTextBox(gui, (float)value, (float)-65536, (float)65536, x, y, xS(70), 3)
 {
 	this->gui = gui;
-	set_log_floatincrement(log_increment);
+	this->type = type;
+	slider = 0;
+	range = 0;
 }
 
-CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, int value)
- : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, 70, 3)
+CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, int value, int type)
+ : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, xS(70))
 {
 	this->gui = gui;
+	this->type = type;
+	slider = 0;
+	range = 0;
+}
+
+void CWindowCoord::create_objects()
+{
+	BC_TumbleTextBox::create_objects();
+	if( type >= 0 ) {
+		int x1 = get_x() + BC_TumbleTextBox::get_w() + xS(10), y1 = get_y();
+		int group = Automation::autogrouptype(type, 0);
+		float min = gui->mwindow->edl->local_session->automation_mins[group];
+		float max = gui->mwindow->edl->local_session->automation_maxs[group];
+		float v = atof(get_text());
+		gui->add_subwindow(slider = new CWindowCoordSlider(this,
+				x1, y1, xS(150), min, max, v));
+		x1 += slider->get_w() + xS(5);
+		gui->add_subwindow(range = new CWindowCoordRange(this, x1, y1));
+	}
+}
+
+void CWindowCoord::update_gui(float value)
+{
+	BC_TumbleTextBox::update(value);
+	if( slider ) {
+		int group = Automation::autogrouptype(type, 0);
+		LocalSession *local_session = gui->mwindow->edl->local_session;
+		slider->update(slider->get_pointer_motion_range(), value,
+			local_session->automation_mins[group],
+			local_session->automation_maxs[group]);
+		int x1 = range->get_x() + range->get_w() + xS(5);
+		int y1 = range->get_y() - yS(2), d = xS(16);
+		gui->set_color(GWindowGUI::auto_colors[type]);
+		gui->draw_disc(x1, y1, d, d);
+	}
 }
+
 int CWindowCoord::handle_event()
 {
+	if( slider )
+		slider->update(atof(get_text()));
 	gui->event_caller = this;
 	gui->handle_event();
 	return 1;
 }
 
+CWindowCoordSlider::CWindowCoordSlider(CWindowCoord *coord,
+		int x, int y, int w, float mn, float mx, float value)
+ : BC_FSlider(x, y, 0, w, w, mn, mx, value)
+{
+	this->coord = coord;
+	set_precision(0.01);
+}
+
+CWindowCoordSlider::~CWindowCoordSlider()
+{
+}
+
+int CWindowCoordSlider::handle_event()
+{
+	float value = get_value();
+	coord->update(value);
+	coord->gui->event_caller = coord;
+	coord->gui->handle_event();
+	return 1;
+}
+
+CWindowCoordRange::CWindowCoordRange(CWindowCoord *coord, int x, int y)
+ : BC_Tumbler(x, y)
+{
+	this->coord = coord;
+}
+CWindowCoordRange::~CWindowCoordRange()
+{
+}
+
+int CWindowCoordRange::update(float scale)
+{
+	MWindow *mwindow = coord->gui->mwindow;
+	LocalSession *local_session = mwindow->edl->local_session;
+	int group = Automation::autogrouptype(coord->type, 0);
+	float min = local_session->automation_mins[group];
+	float max = local_session->automation_maxs[group];
+	if( min >= max ) {
+		switch( group ) {
+		case AUTOGROUPTYPE_ZOOM: min = 0.005;  max = 5.0;  break;
+		case AUTOGROUPTYPE_X:    min = -100;   max = 100;  break;
+		case AUTOGROUPTYPE_Y:    min = -100;   max = 100;  break;
+		}
+	}
+	float range = max - min;
+	min -= range * scale;
+	max += range * scale;
+	switch( group ) {
+	case AUTOGROUPTYPE_ZOOM:
+		if( min < 0.001 ) min = 0.001;
+		if( max > 1000. ) max = 1000.;
+		break;
+	case AUTOGROUPTYPE_X:
+	case AUTOGROUPTYPE_Y:
+		if( min < -32767 ) min = -32767;
+		if( max >  32767 ) max =  32767;
+		break;
+	}
+	CWindowCoordSlider *slider = coord->slider;
+	coord->slider->update(slider->get_pointer_motion_range(),
+			slider->get_value(), min, max);
+	unlock_window();
+	MWindowGUI *mgui = mwindow->gui;
+	mgui->lock_window("CWindowCoordRange::update");
+	local_session->zoombar_showautotype = group;
+	local_session->automation_mins[group] = min;
+	local_session->automation_maxs[group] = max;
+	mgui->zoombar->update_autozoom();
+	mgui->draw_overlays(0);
+	mgui->update_patchbay();
+	mgui->flash_canvas(1);
+	mgui->unlock_window();
+	lock_window("CWindowCoordRange::update");
+	return 1;
+}
+
+int CWindowCoordRange::handle_up_event()
+{
+	return update(0.5);
+}
+int CWindowCoordRange::handle_down_event()
+{
+	return update(-0.25);
+}
 
 CWindowCropApply::CWindowCropApply(MWindow *mwindow, CWindowCropGUI *crop_gui, int x, int y)
  : BC_GenericButton(x, y, _("Apply"))
@@ -403,11 +520,11 @@ const char *CWindowCropOpMode::crop_ops[] = {
 
 CWindowCropOpMode::CWindowCropOpMode(MWindow *mwindow, CWindowCropGUI *crop_gui,
 			int mode, int x, int y)
- : BC_PopupMenu(x, y, 140, _(crop_ops[mode]), 1)
+ : BC_PopupMenu(x, y, xS(140), _(crop_ops[mode]), 1)
 {
-        this->mwindow = mwindow;
-        this->crop_gui = crop_gui;
-        this->mode = mode;
+	this->mwindow = mwindow;
+	this->crop_gui = crop_gui;
+	this->mode = mode;
 }
 CWindowCropOpMode::~CWindowCropOpMode()
 {
@@ -445,11 +562,7 @@ int CWindowCropOpItem::handle_event()
 
 
 CWindowCropGUI::CWindowCropGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
- 	thread,
-	_(PROGRAM_NAME ": Crop"),
-	330,
-	100)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Crop"), xS(330), yS(100))
 {
 }
 
@@ -460,13 +573,15 @@ CWindowCropGUI::~CWindowCropGUI()
 
 void CWindowCropGUI::create_objects()
 {
-	int x = 10, y = 10;
+	int xs5 = xS(5), xs10 = xS(10);
+	int ys5 = yS(5), ys10 = yS(10);
+	int x = xs10, y = ys10;
 	BC_Title *title;
 
 	lock_window("CWindowCropGUI::create_objects");
 	int column1 = 0;
 	int pad = MAX(BC_TextBox::calculate_h(this, MEDIUMFONT, 1, 1),
-		BC_Title::calculate_h(this, "X")) + 5;
+		BC_Title::calculate_h(this, "X")) + ys5;
 	add_subwindow(title = new BC_Title(x, y, "X1:"));
 	column1 = MAX(column1, title->get_w());
 	y += pad;
@@ -475,19 +590,21 @@ void CWindowCropGUI::create_objects()
 	y += pad;
 	add_subwindow(new CWindowCropApply(mwindow, this, x, y));
 
-	x += column1 + 5;
-	y = 10;
+	x += column1 + xs5;
+	y = ys10;
 	x1 = new CWindowCoord(thread->tool_gui, x, y,
 		mwindow->edl->session->crop_x1);
 	x1->create_objects();
+	x1->set_boundaries((int64_t)0, (int64_t)65536);
 	y += pad;
 	width = new CWindowCoord(thread->tool_gui, x, y,
 		mwindow->edl->session->crop_x2 - mwindow->edl->session->crop_x1);
 	width->create_objects();
+	width->set_boundaries((int64_t)1, (int64_t)65536);
 
 
-	x += x1->get_w() + 10;
-	y = 10;
+	x += x1->get_w() + xs10;
+	y = ys10;
 	int column2 = 0;
 	add_subwindow(title = new BC_Title(x, y, "Y1:"));
 	column2 = MAX(column2, title->get_w());
@@ -496,16 +613,18 @@ void CWindowCropGUI::create_objects()
 	column2 = MAX(column2, title->get_w());
 	y += pad;
 
-	y = 10;
-	x += column2 + 5;
+	y = ys10;
+	x += column2 + xs5;
 	y1 = new CWindowCoord(thread->tool_gui, x, y,
 		mwindow->edl->session->crop_y1);
 	y1->create_objects();
+	y1->set_boundaries((int64_t)0, (int64_t)65536);
 	y += pad;
 
 	height = new CWindowCoord(thread->tool_gui, x, y,
 		mwindow->edl->session->crop_y2 - mwindow->edl->session->crop_y1);
 	height->create_objects();
+	height->set_boundaries((int64_t)1, (int64_t)65536);
 	y += pad;
 
 	add_subwindow(crop_mode = new CWindowCropOpMode(mwindow, this,
@@ -534,10 +653,10 @@ void CWindowCropGUI::handle_event()
 			mwindow->edl->session->crop_y1;
 		mwindow->edl->session->crop_y1 = atol(y1->get_text());
 	}
- 	mwindow->edl->session->crop_x2 = atol(width->get_text()) +
- 		mwindow->edl->session->crop_x1;
- 	mwindow->edl->session->crop_y2 = atol(height->get_text()) +
- 		mwindow->edl->session->crop_y1;
+	mwindow->edl->session->crop_x2 = atol(width->get_text()) +
+		mwindow->edl->session->crop_x1;
+	mwindow->edl->session->crop_y2 = atol(height->get_text()) +
+		mwindow->edl->session->crop_y1;
 	update();
 	mwindow->cwindow->gui->canvas->redraw(1);
 }
@@ -554,7 +673,7 @@ void CWindowCropGUI::update()
 
 
 CWindowEyedropGUI::CWindowEyedropGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Color"), 220, 290)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Color"), xS(220), yS(290))
 {
 }
 
@@ -564,10 +683,11 @@ CWindowEyedropGUI::~CWindowEyedropGUI()
 
 void CWindowEyedropGUI::create_objects()
 {
+	int xs10 = xS(10), ys10 = yS(10);
 	int margin = mwindow->theme->widget_border;
-	int x = 10 + margin;
-	int y = 10 + margin;
-	int x2 = 70, x3 = x2 + 60;
+	int x = xs10 + margin;
+	int y = ys10 + margin;
+	int x2 = xS(70), x3 = x2 + xS(60);
 	lock_window("CWindowEyedropGUI::create_objects");
 	BC_Title *title0, *title1, *title2, *title3, *title4, *title5, *title6, *title7;
 	add_subwindow(title0 = new BC_Title(x, y,_("X,Y:")));
@@ -606,7 +726,7 @@ void CWindowEyedropGUI::create_objects()
 	add_subwindow(yuv_hex = new BC_Title(x3, this->y->get_y(), "#000000"));
 
 	y = title6->get_y() + this->v->get_h() + 2*margin;
-	add_subwindow(sample = new BC_SubWindow(x, y, 50, 50));
+	add_subwindow(sample = new BC_SubWindow(x, y, xS(50), yS(50)));
 	y += sample->get_h() + margin;
 	add_subwindow(use_max = new CWindowEyedropCheckBox(mwindow, this, x, y));
 	update();
@@ -642,8 +762,8 @@ void CWindowEyedropGUI::update()
 	float y, u, v;
 	YUV::yuv.rgb_to_yuv_f(r, g, b, y, u, v);
 	this->y->update(y);
-	this->u->update(u);  u += 0.5;
-	this->v->update(v);  v += 0.5;
+	this->u->update(u += 0.5);
+	this->v->update(v += 0.5);
 
 	int yx = 255*y + 0.5;  bclamp(yx,0,255);
 	int ux = 255*u + 0.5;  bclamp(ux,0,255);
@@ -784,7 +904,7 @@ int CWindowCurveToggle::handle_event()
 }
 
 
-CWindowEyedropCheckBox::CWindowEyedropCheckBox(MWindow *mwindow, 
+CWindowEyedropCheckBox::CWindowEyedropCheckBox(MWindow *mwindow,
 	CWindowEyedropGUI *gui, int x, int y)
  : BC_CheckBox(x, y, mwindow->edl->local_session->use_max, _("Use maximum"))
 {
@@ -802,11 +922,7 @@ int CWindowEyedropCheckBox::handle_event()
 
 
 CWindowCameraGUI::CWindowCameraGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
- 	thread,
-	_(PROGRAM_NAME ": Camera"),
-	170,
-	170)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Camera"), xS(340), yS(170))
 {
 }
 CWindowCameraGUI::~CWindowCameraGUI()
@@ -815,7 +931,9 @@ CWindowCameraGUI::~CWindowCameraGUI()
 
 void CWindowCameraGUI::create_objects()
 {
-	int x = 10, y = 10, x1;
+	int xs10 = xS(10), xs15 = xS(15);
+	int ys10 = yS(10), ys30 = yS(30);
+	int x = xs10, y = ys10;
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	FloatAuto *x_auto = 0, *y_auto = 0, *z_auto = 0;
 	BC_Title *title;
@@ -828,48 +946,50 @@ void CWindowCameraGUI::create_objects()
 	}
 
 	add_subwindow(title = new BC_Title(x, y, "X:"));
-	x += title->get_w();
-	this->x = new CWindowCoord(this, x, y,
-		x_auto ? x_auto->get_value() : (float)0);
+	int x1 = x + title->get_w() + xS(3);
+	float xvalue = x_auto ? x_auto->get_value() : 0;
+	this->x = new CWindowCoord(this, x1, y, xvalue, AUTOMATION_CAMERA_X);
 	this->x->create_objects();
-
-
-	y += 30;
-	x = 10;
-	add_subwindow(title = new BC_Title(x, y, "Y:"));
-	x += title->get_w();
-	this->y = new CWindowCoord(this, x, y,
-		y_auto ? y_auto->get_value() : (float)0);
+	this->x->range->set_tooltip(_("expand X range"));
+	y += ys30;
+	add_subwindow(title = new BC_Title(x = xs10, y, "Y:"));
+	float yvalue = y_auto ? y_auto->get_value() : 0;
+	this->y = new CWindowCoord(this, x1, y, yvalue, AUTOMATION_CAMERA_Y);
 	this->y->create_objects();
-	y += 30;
-	x = 10;
-	add_subwindow(title = new BC_Title(x, y, "Z:"));
+	this->y->range->set_tooltip(_("expand Y range"));
+	y += ys30;
+	add_subwindow(title = new BC_Title(x = xs10, y, "Z:"));
 	x += title->get_w();
-	this->z = new CWindowCoord(this, x, y,
-		z_auto ? z_auto->get_value() : (float)1);
+	float zvalue = z_auto ? z_auto->get_value() : 1;
+	this->z = new CWindowCoord(this, x1, y, zvalue, AUTOMATION_CAMERA_Z);
 	this->z->create_objects();
 	this->z->set_increment(0.01);
+	this->z->range->set_tooltip(_("expand Zoom range"));
 
-	y += 30;
-	x1 = 10;
+	y += ys30;
+	x1 = xs10;
 	add_subwindow(button = new CWindowCameraLeft(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraCenter(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraRight(mwindow, this, x1, y));
+// additional Buttons to control the curve mode of the "current" keyframe
+	x1 += button->get_w() + xs15;
+	add_subwindow(this->t_smooth = new CWindowCurveToggle(Camera_Crv_Smooth, mwindow, this, x1, y));
+	x1 += button->get_w() + xs10;
+	add_subwindow(this->t_linear = new CWindowCurveToggle(Camera_Crv_Linear, mwindow, this, x1, y));
 
 	y += button->get_h();
-	x1 = 10;
+	x1 = xs10;
 	add_subwindow(button = new CWindowCameraTop(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraMiddle(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraBottom(mwindow, this, x1, y));
-// additional Buttons to control the curve mode of the "current" keyframe
-	x1 += button->get_w() + 15;
-	add_subwindow(this->t_smooth = new CWindowCurveToggle(Camera_Crv_Smooth, mwindow, this, x1, y));
-	x1 += button->get_w();
-	add_subwindow(this->t_linear = new CWindowCurveToggle(Camera_Crv_Linear, mwindow, this, x1, y));
+	x1 += button->get_w() + xs15;
+	add_subwindow(this->add_keyframe = new CWindowCameraAddKeyframe(mwindow, this, x1, y));
+	x1 += button->get_w() + xs10;
+	add_subwindow(this->reset = new CWindowCameraReset(mwindow, this, x1, y));
 
 // fill in current auto keyframe values, set toggle states.
 	this->update();
@@ -888,8 +1008,7 @@ void CWindowCameraGUI::handle_event()
 		if(event_caller == x)
 		{
 			x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_X],
-				1);
+				track->automation->autos[AUTOMATION_CAMERA_X], 1);
 			if(x_auto)
 			{
 				x_auto->set_value(atof(x->get_text()));
@@ -901,8 +1020,7 @@ void CWindowCameraGUI::handle_event()
 		if(event_caller == y)
 		{
 			y_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_Y],
-				1);
+				track->automation->autos[AUTOMATION_CAMERA_Y], 1);
 			if(y_auto)
 			{
 				y_auto->set_value(atof(y->get_text()));
@@ -914,8 +1032,7 @@ void CWindowCameraGUI::handle_event()
 		if(event_caller == z)
 		{
 			z_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_Z],
-				1);
+				track->automation->autos[AUTOMATION_CAMERA_Z], 1);
 			if(z_auto)
 			{
 				float zoom = atof(z->get_text());
@@ -950,20 +1067,23 @@ void CWindowCameraGUI::update()
 			&x_auto, &y_auto, &z_auto, 1, 0, 0, 0);
 	}
 
-	if(x_auto)
-		x->update(x_auto->get_value());
-	if(y_auto)
-		y->update(y_auto->get_value());
-	if(z_auto) {
-		float value = z_auto->get_value();
-		z->update(value);
+	if( x_auto ) {
+		float xvalue = x_auto->get_value();
+		x->update_gui(xvalue);
+	}
+	if( y_auto ) {
+		float yvalue = y_auto->get_value();
+		y->update_gui(yvalue);
+	}
+	if( z_auto ) {
+		float zvalue = z_auto->get_value();
+		z->update_gui(zvalue);
 		thread->gui->lock_window("CWindowCameraGUI::update");
-		thread->gui->composite_panel->cpanel_zoom->update(value);
+		thread->gui->composite_panel->cpanel_zoom->update(zvalue);
 		thread->gui->unlock_window();
 	}
 
-	if( x_auto && y_auto && z_auto )
-	{
+	if( x_auto && y_auto && z_auto ) {
 		t_smooth->check_toggle_state(x_auto, y_auto, z_auto);
 		t_linear->check_toggle_state(x_auto, y_auto, z_auto);
 	}
@@ -994,8 +1114,7 @@ int CWindowCameraLeft::handle_event()
 		int w = 0, h = 0;
 		track->get_source_dimensions(
 			mwindow->edl->local_session->get_selectionstart(1),
-			w,
-			h);
+			w, h);
 
 		if(w && h)
 		{
@@ -1026,8 +1145,7 @@ int CWindowCameraCenter::handle_event()
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	if(track)
 		x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-			track->automation->autos[AUTOMATION_CAMERA_X],
-			1);
+			track->automation->autos[AUTOMATION_CAMERA_X], 1);
 
 	if(x_auto)
 	{
@@ -1064,8 +1182,7 @@ int CWindowCameraRight::handle_event()
 		int w = 0, h = 0;
 		track->get_source_dimensions(
 			mwindow->edl->local_session->get_selectionstart(1),
-			w,
-			h);
+			w, h);
 
 		if(w && h)
 		{
@@ -1104,8 +1221,7 @@ int CWindowCameraTop::handle_event()
 		int w = 0, h = 0;
 		track->get_source_dimensions(
 			mwindow->edl->local_session->get_selectionstart(1),
-			w,
-			h);
+			w, h);
 
 		if(w && h)
 		{
@@ -1172,8 +1288,7 @@ int CWindowCameraBottom::handle_event()
 		int w = 0, h = 0;
 		track->get_source_dimensions(
 			mwindow->edl->local_session->get_selectionstart(1),
-			w,
-			h);
+			w, h);
 
 		if(w && h)
 		{
@@ -1189,13 +1304,37 @@ int CWindowCameraBottom::handle_event()
 	return 1;
 }
 
+CWindowCameraAddKeyframe::CWindowCameraAddKeyframe(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("keyframe_button"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Add Keyframe: Shift-F11"));
+}
+
+int CWindowCameraAddKeyframe::handle_event()
+{
+	return gui->press(&CWindowCanvas::camera_keyframe);
+}
+
+CWindowCameraReset::CWindowCameraReset(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("reset_button"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Reset Camera: F11"));
+}
+
+int CWindowCameraReset::handle_event()
+{
+	return gui->press(&CWindowCanvas::reset_camera);
+}
+
 
 CWindowProjectorGUI::CWindowProjectorGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
- 	thread,
-	_(PROGRAM_NAME ": Projector"),
-	170,
-	170)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Projector"), xS(340), yS(170))
 {
 }
 CWindowProjectorGUI::~CWindowProjectorGUI()
@@ -1203,7 +1342,9 @@ CWindowProjectorGUI::~CWindowProjectorGUI()
 }
 void CWindowProjectorGUI::create_objects()
 {
-	int x = 10, y = 10, x1;
+	int xs10 = xS(10), xs15 = xS(15);
+	int ys30 = yS(30);
+	int x = xs10, y = yS(10);
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	FloatAuto *x_auto = 0;
 	FloatAuto *y_auto = 0;
@@ -1217,48 +1358,50 @@ void CWindowProjectorGUI::create_objects()
 			&x_auto, &y_auto, &z_auto, 0, 0, 0, 0);
 	}
 
-	add_subwindow(title = new BC_Title(x, y, "X:"));
-	x += title->get_w();
-	this->x = new CWindowCoord(this, x, y,
-		x_auto ? x_auto->get_value() : (float)0);
+	add_subwindow(title = new BC_Title(x = xs10, y, "X:"));
+	int x1 = x + title->get_w() + xS(3);
+	float xvalue = x_auto ? x_auto->get_value() : 0;
+	this->x = new CWindowCoord(this, x1, y, xvalue, AUTOMATION_PROJECTOR_X);
 	this->x->create_objects();
-	y += 30;
-	x = 10;
-	add_subwindow(title = new BC_Title(x, y, "Y:"));
-	x += title->get_w();
-	this->y = new CWindowCoord(this, x, y,
-		y_auto ? y_auto->get_value() : (float)0);
+	this->x->range->set_tooltip(_("expand X range"));
+	y += ys30;
+	add_subwindow(title = new BC_Title(x = xs10, y, "Y:"));
+	float yvalue = y_auto ? y_auto->get_value() : 0;
+	this->y = new CWindowCoord(this, x1, y, yvalue, AUTOMATION_PROJECTOR_Y);
 	this->y->create_objects();
-	y += 30;
-	x = 10;
-	add_subwindow(title = new BC_Title(x, y, "Z:"));
-	x += title->get_w();
-	this->z = new CWindowCoord(this, x, y,
-		z_auto ? z_auto->get_value() : (float)1);
+	this->y->range->set_tooltip(_("expand Y range"));
+	y += ys30;
+	add_subwindow(title = new BC_Title(x = xs10, y, "Z:"));
+	float zvalue = z_auto ? z_auto->get_value() : 1;
+	this->z = new CWindowCoord(this, x1, y, zvalue, AUTOMATION_PROJECTOR_Z);
 	this->z->create_objects();
+	this->z->range->set_tooltip(_("expand Zoom range"));
 	this->z->set_increment(0.01);
 
-	y += 30;
-	x1 = 10;
+	y += ys30;
+	x1 = xs10;
 	add_subwindow(button = new CWindowProjectorLeft(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorCenter(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorRight(mwindow, this, x1, y));
+// additional Buttons to control the curve mode of the "current" keyframe
+	x1 += button->get_w() + xs15;
+	add_subwindow(this->t_smooth = new CWindowCurveToggle(Projector_Crv_Smooth, mwindow, this, x1, y));
+	x1 += button->get_w() + xs10;
+	add_subwindow(this->t_linear = new CWindowCurveToggle(Projector_Crv_Linear, mwindow, this, x1, y));
 
 	y += button->get_h();
-	x1 = 10;
+	x1 = xs10;
 	add_subwindow(button = new CWindowProjectorTop(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorMiddle(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorBottom(mwindow, this, x1, y));
-
-// additional Buttons to control the curve mode of the "current" keyframe
-	x1 += button->get_w() + 15;
-	add_subwindow(this->t_smooth = new CWindowCurveToggle(Projector_Crv_Smooth, mwindow, this, x1, y));
-	x1 += button->get_w();
-	add_subwindow(this->t_linear = new CWindowCurveToggle(Projector_Crv_Linear, mwindow, this, x1, y));
+	x1 += button->get_w() + xs15;
+	add_subwindow(this->add_keyframe = new CWindowProjectorAddKeyframe(mwindow, this, x1, y));
+	x1 += button->get_w() + xs10;
+	add_subwindow(this->reset = new CWindowProjectorReset(mwindow, this, x1, y));
 
 // fill in current auto keyframe values, set toggle states.
 	this->update();
@@ -1278,8 +1421,7 @@ void CWindowProjectorGUI::handle_event()
 		if(event_caller == x)
 		{
 			x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_X],
-				1);
+				track->automation->autos[AUTOMATION_PROJECTOR_X], 1);
 			if(x_auto)
 			{
 				x_auto->set_value(atof(x->get_text()));
@@ -1291,8 +1433,7 @@ void CWindowProjectorGUI::handle_event()
 		if(event_caller == y)
 		{
 			y_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_Y],
-				1);
+				track->automation->autos[AUTOMATION_PROJECTOR_Y], 1);
 			if(y_auto)
 			{
 				y_auto->set_value(atof(y->get_text()));
@@ -1304,8 +1445,7 @@ void CWindowProjectorGUI::handle_event()
 		if(event_caller == z)
 		{
 			z_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_Z],
-				1);
+				track->automation->autos[AUTOMATION_PROJECTOR_Z], 1);
 			if(z_auto)
 			{
 				float zoom = atof(z->get_text());
@@ -1338,20 +1478,23 @@ void CWindowProjectorGUI::update()
 			&x_auto, &y_auto, &z_auto, 0, 0, 0, 0);
 	}
 
-	if(x_auto)
-		x->update(x_auto->get_value());
-	if(y_auto)
-		y->update(y_auto->get_value());
-	if(z_auto) {
-		float value = z_auto->get_value();
-		z->update(value);
+	if( x_auto ) {
+		float xvalue = x_auto->get_value();
+		x->update_gui(xvalue);
+	}
+	if( y_auto ) {
+		float yvalue = y_auto->get_value();
+		y->update_gui(yvalue);
+	}
+	if( z_auto ) {
+		float zvalue = z_auto->get_value();
+		z->update_gui(zvalue);
 		thread->gui->lock_window("CWindowProjectorGUI::update");
-		thread->gui->composite_panel->cpanel_zoom->update(value);
+		thread->gui->composite_panel->cpanel_zoom->update(zvalue);
 		thread->gui->unlock_window();
 	}
 
-	if( x_auto && y_auto && z_auto )
-	{
+	if( x_auto && y_auto && z_auto ) {
 		t_smooth->check_toggle_state(x_auto, y_auto, z_auto);
 		t_linear->check_toggle_state(x_auto, y_auto, z_auto);
 	}
@@ -1400,8 +1543,7 @@ int CWindowProjectorCenter::handle_event()
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	if(track)
 		x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-			track->automation->autos[AUTOMATION_PROJECTOR_X],
-			1);
+			track->automation->autos[AUTOMATION_PROJECTOR_X], 1);
 
 	if(x_auto)
 	{
@@ -1536,10 +1678,48 @@ int CWindowProjectorBottom::handle_event()
 	return 1;
 }
 
+CWindowProjectorAddKeyframe::CWindowProjectorAddKeyframe(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("keyframe_button"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Add Keyframe: Shift-F12"));
+}
+
+int CWindowProjectorAddKeyframe::handle_event()
+{
+	return gui->press(&CWindowCanvas::projector_keyframe);
+}
+
+CWindowProjectorReset::CWindowProjectorReset(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("reset_button"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Reset Projector: F12"));
+}
+
+int CWindowProjectorReset::handle_event()
+{
+	return gui->press(&CWindowCanvas::reset_projector);
+}
+
+int CWindowToolGUI::press(void (CWindowCanvas::*fn)())
+{
+	unlock_window();
+	CWindowGUI *cw_gui = thread->gui;
+	cw_gui->lock_window("CWindowGUI::press");
+	(cw_gui->canvas->*fn)();
+	cw_gui->unlock_window();
+	lock_window("CWindowToolGUI::press");
+	return 1;
+}
 
 CWindowMaskOnTrack::CWindowMaskOnTrack(MWindow *mwindow, CWindowMaskGUI *gui,
 		int x, int y, int w, const char *text)
- : BC_PopupTextBox(gui, 0, text, x, y, w, 120)
+ : BC_PopupTextBox(gui, 0, text, x, y, w, yS(120))
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -1645,7 +1825,7 @@ int CWindowMaskTrackTumbler::do_event(int dir)
 
 CWindowMaskName::CWindowMaskName(MWindow *mwindow, CWindowMaskGUI *gui,
 		int x, int y, const char *text)
- : BC_PopupTextBox(gui, 0, text, x, y, 100, 160)
+ : BC_PopupTextBox(gui, 0, text, x, y, xS(100), yS(160))
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -1977,7 +2157,7 @@ CWindowMaskAffectedPoint::CWindowMaskAffectedPoint(MWindow *mwindow,
 	CWindowMaskGUI *gui, int x, int y)
  : BC_TumbleTextBox(gui,
 		(int64_t)mwindow->cwindow->gui->affected_point,
-		(int64_t)0, INT64_MAX, x, y, 70)
+		(int64_t)0, INT64_MAX, x, y, xS(70))
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -2127,7 +2307,7 @@ int CWindowMaskDrawBoundary::handle_event()
 
 
 CWindowMaskFeather::CWindowMaskFeather(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
- : BC_TumbleTextBox(gui, 0, INT_MIN, INT_MAX, x, y, 64, 2)
+ : BC_TumbleTextBox(gui, 0, INT_MIN, INT_MAX, x, y, xS(64), 2)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -2258,7 +2438,7 @@ int CWindowMaskFeatherSlider::update(int r, float v, float mn, float mx)
 }
 
 CWindowMaskFade::CWindowMaskFade(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
- : BC_TumbleTextBox(gui, 0, -100.f, 100.f, x, y, 64, 2)
+ : BC_TumbleTextBox(gui, 0, -100.f, 100.f, x, y, xS(64), 2)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -2565,7 +2745,7 @@ int CWindowMaskGangFeather::handle_event()
 
 CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow, thread,
-	_(PROGRAM_NAME ": Mask"), 440, 700)
+	_(PROGRAM_NAME ": Mask"), xS(440), yS(700))
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
@@ -2591,24 +2771,28 @@ CWindowMaskGUI::~CWindowMaskGUI()
 
 void CWindowMaskGUI::create_objects()
 {
+	int t[SUBMASKS];
 	Theme *theme = mwindow->theme;
-	int x = 10, y = 10, margin = theme->widget_border, t[SUBMASKS];
+	int xs10 = xS(10), ys10 = yS(10);
+	int x = xs10, y = ys10;
+	int margin = theme->widget_border;
 	int clr_w = CWindowMaskClrMask::calculate_w(mwindow);
 	int clr_x = get_w()-x - clr_w;
 
 	lock_window("CWindowMaskGUI::create_objects");
 	BC_TitleBar *title_bar;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Masks on Track")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Masks on Track")));
 	y += title_bar->get_h() + margin;
 	BC_Title *title;
 	add_subwindow(title = new BC_Title(x,y, _("Track:")));
-	int x1 = x + 90, ww = clr_x-2*margin - x1;
+	int x1 = x + xS(90), ww = clr_x-2*margin - x1;
 	for( int i=0,n=sizeof(t)/sizeof(t[0]); i<n; ++i ) t[i] = x1+(i*ww)/n;
 	int del_x = t[5];
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	const char *text = track ? track->title : "";
 	mwindow->cwindow->mask_track_id = track ? track->get_id() : -1;
-	mask_on_track = new CWindowMaskOnTrack(mwindow, this, x1, y, 100, text);
+	mask_on_track = new CWindowMaskOnTrack(mwindow, this, x1, y, xS(100), text);
 	mask_on_track->create_objects();
 	mask_on_track->set_tooltip(_("Video track"));
 	int x2 = x1 + mask_on_track->get_w();
@@ -2616,7 +2800,8 @@ void CWindowMaskGUI::create_objects()
 	mwindow->edl->local_session->solo_track_id = -1;
 	add_subwindow(mask_solo_track = new CWindowMaskSoloTrack(mwindow, this, del_x, y, 0));
 	y += mask_on_track->get_h() + margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Masks")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Masks")));
 	y += title_bar->get_h() + margin;
 	add_subwindow(title = new BC_Title(x, y, _("Mask:")));
 	mask_name = new CWindowMaskName(mwindow, this, x1, y, "");
@@ -2653,7 +2838,8 @@ void CWindowMaskGUI::create_objects()
 	}
 	add_subwindow(mask_unclr = new CWindowMaskUnclear(mwindow, this, clr_x, y));
 	y += mask_enables[0]->get_h() + 2*margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Preset Shapes")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Preset Shapes")));
 	y += title_bar->get_h() + margin;
 	add_subwindow(mask_shape_sqr = new CWindowMaskShape(mwindow, this,
 		"mask_prst_sqr_images", MASK_SHAPE_SQUARE, t[0], y, _("Square")));
@@ -2664,14 +2850,15 @@ void CWindowMaskGUI::create_objects()
 	add_subwindow(mask_shape_ovl = new CWindowMaskShape(mwindow, this,
 		"mask_prst_ovl_images", MASK_SHAPE_OVAL, t[3], y, _("Oval")));
 	add_subwindow(mask_load_list = new CWindowMaskLoadList(mwindow, this));
-	add_subwindow(mask_load = new CWindowMaskLoad(mwindow, this, t[5], y, 80));
-	add_subwindow(mask_save = new CWindowMaskSave(mwindow, this, t[6], y, 80));
-	add_subwindow(mask_delete = new CWindowMaskDelete(mwindow, this, t[7], y, 80));
+	add_subwindow(mask_load = new CWindowMaskLoad(mwindow, this, t[5], y, xS(80)));
+	add_subwindow(mask_save = new CWindowMaskSave(mwindow, this, t[6], y, xS(80)));
+	add_subwindow(mask_delete = new CWindowMaskDelete(mwindow, this, t[7], y, xS(80)));
 	y += mask_load->get_h() + 2*margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Position & Scale")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Position & Scale")));
 	y += title_bar->get_h() + 2*margin;
-	add_subwindow(mask_center = new CWindowMaskCenter(mwindow, this, t[0], y, 80));
-	add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, t[1], y, 80));
+	add_subwindow(mask_center = new CWindowMaskCenter(mwindow, this, t[0], y, xS(80)));
+	add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, t[1], y, xS(80)));
 
 	add_subwindow(mask_scale_x = new CWindowMaskScaleXY(mwindow, this,
 		t[5], y, theme->get_image_set("mask_scale_x"), 0, MASK_SCALE_X, _("xlate/scale x")));
@@ -2680,7 +2867,8 @@ void CWindowMaskGUI::create_objects()
 	add_subwindow(mask_scale_xy = new CWindowMaskScaleXY(mwindow, this,
 		t[7], y, theme->get_image_set("mask_scale_xy"), 1, MASK_SCALE_XY, _("xlate/scale xy")));
 	y += mask_center->get_h() + 2*margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Fade & Feather")));
 	y += title_bar->get_h() + 2*margin;
 
 	add_subwindow(title = new BC_Title(x, y, _("Fade:")));
@@ -2699,7 +2887,8 @@ void CWindowMaskGUI::create_objects()
 	add_subwindow(feather_slider);
 	add_subwindow(gang_feather = new CWindowMaskGangFeather(mwindow, this, clr_x, y));
 	y += feather->get_h() + 2*margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Mask Points")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Mask Points")));
 	y += title_bar->get_h() + margin;
 
 	add_subwindow(title = new BC_Title(x, y, _("Point:")));
@@ -2733,7 +2922,8 @@ void CWindowMaskGUI::create_objects()
 		_("smooth all"), -1, 1, t[4], y, "mask_all_smooth_images"));
 	add_subwindow(draw_boundary = new CWindowMaskDrawBoundary(mwindow, this, del_x, y));
 	y += this->y->get_h() + 2*margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Pivot Point")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Pivot Point")));
 	y += title_bar->get_h() + margin;
 
 	add_subwindow(title = new BC_Title(x, y, "X:"));
@@ -2750,9 +2940,9 @@ void CWindowMaskGUI::create_objects()
 	y += focus_y->get_h() + 2*margin;
 	add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
 	y += bar->get_h() + margin;
-	add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this, 10, y));
+	add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this, x, y));
 	y += this->apply_before_plugins->get_h();
-	add_subwindow(this->disable_opengl_masking = new CWindowDisableOpenGLMasking(this, 10, y));
+	add_subwindow(this->disable_opengl_masking = new CWindowDisableOpenGLMasking(this, x, y));
 	add_subwindow(help = new CWindowMaskHelp(mwindow, this, del_x, y));
 	y += this->disable_opengl_masking->get_h() + 2*margin;
 	help_y = y;
@@ -3021,7 +3211,7 @@ int CWindowMaskGUI::save_mask(const char *nm)
 	int i = masks.size();
 	while( --i >= 0 ) {
 		if( strcmp(masks[i]->name, nm) ) continue;
-		masks.remove_object_number(i);
+		masks.remove_object_number(i++);
 	}
 	mask = new SubMask(0, -1);
 	strncpy(mask->name, nm, sizeof(mask->name)-1);
@@ -3039,7 +3229,7 @@ int CWindowMaskGUI::del_mask(const char *nm)
 	int i = masks.size();
 	while( --i >= 0 ) {
 		if( strcmp(masks[i]->name, nm) ) continue;
-		masks.remove_object_number(i);
+		masks.remove_object_number(i++);
 	}
 	save_masks(masks);
 	masks.remove_all_objects();
@@ -3239,7 +3429,7 @@ int CWindowMaskLoad::handle_event()
 	gui->mask_load_list->create_objects();
 	int px, py;
 	get_abs_cursor(px, py);
-	return gui->mask_load_list->activate(px, py, 120,160);
+	return gui->mask_load_list->activate(px, py, xS(120),yS(160));
 }
 
 
@@ -3321,24 +3511,26 @@ void CWindowMaskPresetDialog::start_dialog(int sx, int sy, MaskAuto *keyframe)
 
 CWindowMaskPresetGUI::CWindowMaskPresetGUI(CWindowMaskPresetDialog *preset_dialog,
 			int x, int y, const char *title)
- : BC_Window(title, x, y, 320, 100, 320, 100, 0, 0, 1)
+ : BC_Window(title, x, y, xS(320), yS(100), xS(320), yS(100), 0, 0, 1)
 {
 	this->preset_dialog = preset_dialog;
 }
 
 void CWindowMaskPresetGUI::create_objects()
 {
-	int x = 10, y = 10, pad = 8;
+	int xs8 = xS(8), xs10 = xS(10);
+	int ys10 = yS(10);
+	int x = xs10, y = ys10;
 	lock_window("CWindowMaskPresetGUI::create_objects");
 	BC_Title *title;
 	add_subwindow(title = new BC_Title(x, y,
 		preset_dialog->keyframe ? _("Save mask:") : _("Delete mask:")));
-	int x1 = x + title->get_w() + pad;
-	int x2 = get_w() - x - pad - x1 -
+	int x1 = x + title->get_w() + xs8;
+	int x2 = get_w() - x - xs8 - x1 -
 		BC_WindowBase::get_resources()->listbox_button[0]->get_w();
 	CWindowMaskGUI *gui = preset_dialog->gui;
 	preset_text = new CWindowMaskPresetText(this,
-		x1, y, x2, 120, gui->mask_name->get_text());
+		x1, y, x2, yS(120), gui->mask_name->get_text());
 	preset_text->create_objects();
 	preset_text->set_tooltip(_("Mask name"));
 	preset_text->update_items();
@@ -3591,7 +3783,7 @@ void CWindowMaskGUI::save_masks(ArrayList<SubMask *> &masks)
 
 
 CWindowRulerGUI::CWindowRulerGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Ruler"), 320, 240)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Ruler"), xS(320), yS(240))
 {
 }
 
@@ -3601,28 +3793,30 @@ CWindowRulerGUI::~CWindowRulerGUI()
 
 void CWindowRulerGUI::create_objects()
 {
-	int x = 10, y = 10, x1 = 100;
+	int xs10 = xS(10), xs200 = xS(200);
+	int ys5 = yS(5), ys10 = yS(10);
+	int x = xs10, y = ys10, x1 = xS(100);
 	BC_Title *title;
 
 	lock_window("CWindowRulerGUI::create_objects");
 	add_subwindow(title = new BC_Title(x, y, _("Current:")));
-	add_subwindow(current = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(current = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Point 1:")));
-	add_subwindow(point1 = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(point1 = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Point 2:")));
-	add_subwindow(point2 = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(point2 = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Deltas:")));
-	add_subwindow(deltas = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(deltas = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Distance:")));
-	add_subwindow(distance = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(distance = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Angle:")));
-	add_subwindow(angle = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 10;
+	add_subwindow(angle = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys10;
 	char string[BCTEXTLEN];
 	sprintf(string,
 		 _("Press Ctrl to lock ruler to the\nnearest 45%c%c angle."),
@@ -3630,7 +3824,7 @@ void CWindowRulerGUI::create_objects()
 	add_subwindow(title = new BC_Title(x,
 		y,
 		string));
-	y += title->get_h() + 10;
+	y += title->get_h() + ys10;
 	sprintf(string, _("Press Alt to translate the ruler."));
 	add_subwindow(title = new BC_Title(x,
 		y,
@@ -3669,6 +3863,3 @@ void CWindowRulerGUI::handle_event()
 {
 }
 
-
-
-