projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge hv v6, rework trace methods
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mainmenu.C
diff --git
a/cinelerra-5.1/cinelerra/mainmenu.C
b/cinelerra-5.1/cinelerra/mainmenu.C
index 273390537a20bb694601267434f6ce7ac975df5e..06a12becdb551f45533a07bd5d9217eb8637570c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainmenu.C
+++ b/
cinelerra-5.1/cinelerra/mainmenu.C
@@
-212,7
+212,7
@@
void MainMenu::create_objects()
settingsmenu->add_item(new BC_MenuItem("-"));
settingsmenu->add_item(new SaveSettingsNow(mwindow));
settingsmenu->add_item(loop_playback = new LoopPlayback(mwindow));
settingsmenu->add_item(new BC_MenuItem("-"));
settingsmenu->add_item(new SaveSettingsNow(mwindow));
settingsmenu->add_item(loop_playback = new LoopPlayback(mwindow));
- settingsmenu->add_item(new SetBRender
Start
(mwindow));
+ settingsmenu->add_item(new SetBRender
Range
(mwindow));
// set scrubbing speed
// ScrubSpeed *scrub_speed;
// settingsmenu->add_item(scrub_speed = new ScrubSpeed(mwindow));
// set scrubbing speed
// ScrubSpeed *scrub_speed;
// settingsmenu->add_item(scrub_speed = new ScrubSpeed(mwindow));
@@
-1241,15
+1241,15
@@
int PasteSubttl::handle_event()
-SetBRender
Start::SetBRenderStart
(MWindow *mwindow)
- : BC_MenuItem(_("Set background render"))
+SetBRender
Range::SetBRenderRange
(MWindow *mwindow)
+ : BC_MenuItem(_("Set background render
ing
"))
{
this->mwindow = mwindow;
}
{
this->mwindow = mwindow;
}
-int SetBRender
Start
::handle_event()
+int SetBRender
Range
::handle_event()
{
{
- mwindow->set_brender_
start
();
+ mwindow->set_brender_
range
();
return 1;
}
return 1;
}
@@
-1417,14
+1417,19
@@
int ShowCWindow::handle_event()
ShowGWindow::ShowGWindow(MWindow *mwindow)
ShowGWindow::ShowGWindow(MWindow *mwindow)
- : BC_MenuItem(_("Show Overlays"))
+ : BC_MenuItem(_("Show Overlays")
, _("Ctrl-0"), '0'
)
{
this->mwindow = mwindow;
{
this->mwindow = mwindow;
+ set_ctrl(1);
set_checked(mwindow->session->show_gwindow);
}
int ShowGWindow::handle_event()
{
set_checked(mwindow->session->show_gwindow);
}
int ShowGWindow::handle_event()
{
- mwindow->show_gwindow();
+ if( !mwindow->session->show_gwindow )
+ mwindow->show_gwindow();
+ else
+ mwindow->hide_gwindow();
+ set_checked(mwindow->session->show_gwindow);
return 1;
}
return 1;
}