X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpanel.C;h=32b2e848481e5dcd8a1e13081660df9b1e5a1f2a;hp=75ee8d4288d67f6cc1cbd50f57938ff59ecf7026;hb=9d8694b7d2e0f4202e025eaf78d096340184b4e6;hpb=021254e59b5296d0d174b53661acf2064b7292cb

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index 75ee8d42..32b2e848 100644
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -979,7 +979,7 @@ EditClick2Play::EditClick2Play(MWindow *mwindow, EditPanel *panel, int x, int y)
 {
         this->mwindow = mwindow;
         this->panel = panel;
-        set_tooltip(_("Click to play"));
+        set_tooltip(_("Click to play (p)"));
 }
 int EditClick2Play::handle_event()
 {
@@ -990,6 +990,21 @@ int EditClick2Play::handle_event()
 		mwindow->edl->session->vwindow_click2play = value;
 	return 1;
 }
+int EditClick2Play::keypress_event()
+{
+	int key = get_keypress();
+	if( key == 'p' && !ctrl_down() && !shift_down() && !alt_down() ) {
+		int value = get_value() ? 0 : 1;
+		update(value);
+		if( !panel->is_vwindow() )
+			mwindow->edl->session->cwindow_click2play = value;
+		else
+			mwindow->edl->session->vwindow_click2play = value;
+		return 1;
+	}
+	return 0;
+}
+
 
 EditCommercial::EditCommercial(MWindow *mwindow, EditPanel *panel, int x, int y)
  : BC_Button(x, y, mwindow->theme->get_image_set("commercial"))
@@ -1353,7 +1368,7 @@ KeyFrameButton::KeyFrameButton(MWindow *mwindow, EditPanel *panel, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->panel = panel;
-	set_tooltip(_("Generate keyframes while tweeking"));
+	set_tooltip(_("Generate keyframes while tweeking (j)"));
 }
 
 int KeyFrameButton::handle_event()
@@ -1363,6 +1378,18 @@ int KeyFrameButton::handle_event()
 	return 1;
 }
 
+int KeyFrameButton::keypress_event()
+{
+	int key = get_keypress();
+	if( key == 'j' && !ctrl_down() && !shift_down() && !alt_down() ) {
+		int value = get_value() ? 0 : 1;
+		update(value);
+		mwindow->set_auto_keyframes(value,
+			!panel->is_mwindow(), panel->is_mwindow());
+		return 1;
+	}
+	return 0;
+}
 
 LockLabelsButton::LockLabelsButton(MWindow *mwindow, int x, int y)
  : BC_Toggle(x, y,