projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
zoombar.C
diff --git
a/cinelerra-5.1/cinelerra/zoombar.C
b/cinelerra-5.1/cinelerra/zoombar.C
index 79d862fb2c0237406b5098a60f29db105f95801a..b09223ad895674616ceef6ce04cc49fd1737ec10 100644
(file)
--- a/
cinelerra-5.1/cinelerra/zoombar.C
+++ b/
cinelerra-5.1/cinelerra/zoombar.C
@@
-50,6
+50,8
@@
ZoomBar::ZoomBar(MWindow *mwindow, MWindowGUI *gui)
{
this->gui = gui;
this->mwindow = mwindow;
{
this->gui = gui;
this->mwindow = mwindow;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Zoom Panel");
}
ZoomBar::~ZoomBar()
}
ZoomBar::~ZoomBar()
@@
-77,11
+79,11
@@
void ZoomBar::create_objects()
x += amp_zoom->get_w();
atrack_zoom = new ATrackZoomPanel(mwindow, this, x, y);
atrack_zoom->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();
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);
x += vtrack_zoom->get_w() + xs10;
int wid = xS(120);
@@
-388,6
+390,8
@@
AmpZoomPanel::AmpZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
}
int AmpZoomPanel::handle_event()
{
}
int AmpZoomPanel::handle_event()
{
+ if( zoombar->shift_down() )
+ update(DEFAULT_ZOOM_TRACK);
mwindow->zoom_amp((int64_t)get_value());
return 1;
}
mwindow->zoom_amp((int64_t)get_value());
return 1;
}
@@
-401,6
+405,8
@@
ATrackZoomPanel::ATrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int
}
int ATrackZoomPanel::handle_event()
{
}
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;
mwindow->zoom_atrack((int64_t)get_value());
zoombar->amp_zoom->update(mwindow->edl->local_session->zoom_y);
return 1;
@@
-415,6
+421,8
@@
VTrackZoomPanel::VTrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int
}
int VTrackZoomPanel::handle_event()
{
}
int VTrackZoomPanel::handle_event()
{
+ if( zoombar->shift_down() )
+ update(DEFAULT_ZOOM_TRACK);
mwindow->zoom_vtrack((int64_t)get_value());
return 1;
}
mwindow->zoom_vtrack((int64_t)get_value());
return 1;
}
@@
-606,7
+614,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->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;
//printf("FromTextBox::update_position %f %s\n", new_position, string);
update(string);
return 0;
@@
-675,7
+684,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->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;
}
update(string);
return 0;
}