X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.C;h=cf119d61f749a318de7adb611b517f1a28842bb1;hb=f110e7626d433b4724befe0871a3a35f9f81f264;hp=273390537a20bb694601267434f6ce7ac975df5e;hpb=6fd57106820e676e368399d16b925bdc78d34621;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 27339053..cf119d61 100644
--- 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 SetBRenderStart(mwindow));
+	settingsmenu->add_item(new SetBRenderRange(mwindow));
 // set scrubbing speed
 //	ScrubSpeed *scrub_speed;
 //	settingsmenu->add_item(scrub_speed = new ScrubSpeed(mwindow));
@@ -1241,15 +1241,15 @@ int PasteSubttl::handle_event()
 
 
 
-SetBRenderStart::SetBRenderStart(MWindow *mwindow)
- : BC_MenuItem(_("Set background render"))
+SetBRenderRange::SetBRenderRange(MWindow *mwindow)
+ : BC_MenuItem(_("Set background rendering"))
 {
 	this->mwindow = mwindow;
 }
 
-int SetBRenderStart::handle_event()
+int SetBRenderRange::handle_event()
 {
-	mwindow->set_brender_start();
+	mwindow->set_brender_range();
 	return 1;
 }
 
@@ -1277,16 +1277,16 @@ int LabelsFollowEdits::handle_event()
 
 
 PluginsFollowEdits::PluginsFollowEdits(MWindow *mwindow)
- : BC_MenuItem(_("Edit effects")) 
-{ 
-	this->mwindow = mwindow; 
+ : BC_MenuItem(_("Edit effects"))
+{
+	this->mwindow = mwindow;
 	set_checked(mwindow->edl->session->plugins_follow_edits);
 }
 
 int PluginsFollowEdits::handle_event()
 {
 	set_checked(get_checked() ^ 1);
-	mwindow->edl->session->plugins_follow_edits = get_checked(); 
+	mwindow->edl->session->plugins_follow_edits = get_checked();
 	return 1;
 }
 
@@ -1294,45 +1294,45 @@ int PluginsFollowEdits::handle_event()
 
 
 KeyframesFollowEdits::KeyframesFollowEdits(MWindow *mwindow)
- : BC_MenuItem(_("Keyframes follow edits")) 
-{ 
-	this->mwindow = mwindow; 
+ : BC_MenuItem(_("Keyframes follow edits"))
+{
+	this->mwindow = mwindow;
 	set_checked(mwindow->edl->session->autos_follow_edits);
 }
 
 int KeyframesFollowEdits::handle_event()
-{ 
-	mwindow->edl->session->autos_follow_edits ^= 1; 
+{
+	mwindow->edl->session->autos_follow_edits ^= 1;
 	set_checked(!get_checked());
 	return 1;
 }
 
 
 CursorOnFrames::CursorOnFrames(MWindow *mwindow)
- : BC_MenuItem(_("Align cursor on frames")) 
-{ 
-	this->mwindow = mwindow; 
+ : BC_MenuItem(_("Align cursor on frames"))
+{
+	this->mwindow = mwindow;
 	set_checked(mwindow->edl->session->cursor_on_frames);
 }
 
 int CursorOnFrames::handle_event()
 {
-	mwindow->edl->session->cursor_on_frames = !mwindow->edl->session->cursor_on_frames; 
+	mwindow->edl->session->cursor_on_frames = !mwindow->edl->session->cursor_on_frames;
 	set_checked(mwindow->edl->session->cursor_on_frames);
 	return 1;
 }
 
 
 TypelessKeyframes::TypelessKeyframes(MWindow *mwindow)
- : BC_MenuItem(_("Typeless keyframes")) 
-{ 
-	this->mwindow = mwindow; 
+ : BC_MenuItem(_("Typeless keyframes"))
+{
+	this->mwindow = mwindow;
 	set_checked(mwindow->edl->session->typeless_keyframes);
 }
 
 int TypelessKeyframes::handle_event()
 {
-	mwindow->edl->session->typeless_keyframes = !mwindow->edl->session->typeless_keyframes; 
+	mwindow->edl->session->typeless_keyframes = !mwindow->edl->session->typeless_keyframes;
 	set_checked(mwindow->edl->session->typeless_keyframes);
 	return 1;
 }
@@ -1358,9 +1358,9 @@ int ScrubSpeed::handle_event()
 	return 1;
 }
 
-SaveSettingsNow::SaveSettingsNow(MWindow *mwindow) : BC_MenuItem(_("Save settings now")) 
-{ 
-	this->mwindow = mwindow; 
+SaveSettingsNow::SaveSettingsNow(MWindow *mwindow) : BC_MenuItem(_("Save settings now"))
+{
+	this->mwindow = mwindow;
 }
 
 int SaveSettingsNow::handle_event()
@@ -1417,14 +1417,19 @@ int ShowCWindow::handle_event()
 
 
 ShowGWindow::ShowGWindow(MWindow *mwindow)
- : BC_MenuItem(_("Show Overlays"))
+ : BC_MenuItem(_("Show Overlays"), _("Ctrl-0"), '0')
 {
 	this->mwindow = mwindow;
+	set_ctrl(1);
 	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;
 }