X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzoombar.C;h=d8d3ccc35faf001b8869e1965bf6d66db3d8e2ff;hp=79d862fb2c0237406b5098a60f29db105f95801a;hb=refs%2Fheads%2Fmaster;hpb=fbdd13b462256ed4f3b35dc114385fe0b0de0dcd

diff --git a/cinelerra-5.1/cinelerra/zoombar.C b/cinelerra-5.1/cinelerra/zoombar.C
index 79d862fb..be95a980 100644
--- a/cinelerra-5.1/cinelerra/zoombar.C
+++ b/cinelerra-5.1/cinelerra/zoombar.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 1997-2014 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,6 +51,8 @@ ZoomBar::ZoomBar(MWindow *mwindow, MWindowGUI *gui)
 {
 	this->gui = gui;
 	this->mwindow = mwindow;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Zoom Panel");
 }
 
 ZoomBar::~ZoomBar()
@@ -77,11 +80,11 @@ void ZoomBar::create_objects()
 	x += amp_zoom->get_w();
 	atrack_zoom = new ATrackZoomPanel(mwindow, this, x, y);
 	atrack_zoom->create_objects();
-	atrack_zoom->set_tooltip(_("Height of audio tracks in the timeline"));
+	atrack_zoom->set_tooltip(_("Height of audio tracks"));
 	x += atrack_zoom->get_w() + xs10;
 	vtrack_zoom = new VTrackZoomPanel(mwindow, this, x, y);
 	vtrack_zoom->create_objects();
-	vtrack_zoom->set_tooltip(_("Height of video tracks in the timeline"));
+	vtrack_zoom->set_tooltip(_("Height of video tracks"));
 	x += vtrack_zoom->get_w() + xs10;
 
 	int wid = xS(120);
@@ -388,6 +391,8 @@ AmpZoomPanel::AmpZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
 }
 int AmpZoomPanel::handle_event()
 {
+	if( zoombar->shift_down() )
+		update(DEFAULT_ZOOM_TRACK);
 	mwindow->zoom_amp((int64_t)get_value());
 	return 1;
 }
@@ -401,6 +406,8 @@ ATrackZoomPanel::ATrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int
 }
 int ATrackZoomPanel::handle_event()
 {
+	if( zoombar->shift_down() )
+		update(DEFAULT_ZOOM_TRACK);
 	mwindow->zoom_atrack((int64_t)get_value());
 	zoombar->amp_zoom->update(mwindow->edl->local_session->zoom_y);
 	return 1;
@@ -415,6 +422,8 @@ VTrackZoomPanel::VTrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int
 }
 int VTrackZoomPanel::handle_event()
 {
+	if( zoombar->shift_down() )
+		update(DEFAULT_ZOOM_TRACK);
 	mwindow->zoom_vtrack((int64_t)get_value());
 	return 1;
 }
@@ -606,7 +615,8 @@ int FromTextBox::update_position(double new_position)
 		mwindow->edl->session->time_format,
 		mwindow->edl->session->sample_rate,
 		mwindow->edl->session->frame_rate,
-		mwindow->edl->session->frames_per_foot);
+		mwindow->edl->session->frames_per_foot,
+		mwindow->get_timecode_offset());
 //printf("FromTextBox::update_position %f %s\n", new_position, string);
 	update(string);
 	return 0;
@@ -675,7 +685,8 @@ int ToTextBox::update_position(double new_position)
 		mwindow->edl->session->time_format,
 		mwindow->edl->session->sample_rate,
 		mwindow->edl->session->frame_rate,
-		mwindow->edl->session->frames_per_foot);
+		mwindow->edl->session->frames_per_foot,
+		mwindow->get_timecode_offset());
 	update(string);
 	return 0;
 }