X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpanel.C;h=b370723a0a4a8f0f49acec859d6eae32c38df2e4;hb=0d3917a4eda0344055badf0bd6e235c15c3b6cb8;hp=75ee8d4288d67f6cc1cbd50f57938ff59ecf7026;hpb=717c4ad1dac14387ac7519228b904026a3a7d493;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index 75ee8d42..b370723a 100644
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -953,6 +953,8 @@ EditCut::~EditCut()
 }
 int EditCut::keypress_event()
 {
+	if( ctrl_down() || shift_down() || alt_down() )
+		return 0;
 	if( get_keypress() == 'x' )
 		return handle_event();
 	return 0;
@@ -979,7 +981,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,20 +992,37 @@ 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"))
 {
 	this->mwindow = mwindow;
 	this->panel = panel;
-	set_tooltip(_("Commercial ( shift X )"));
+	set_tooltip(_("Commercial ( shift A )"));
 }
 EditCommercial::~EditCommercial()
 {
 }
 int EditCommercial::keypress_event()
 {
-	if( get_keypress() == 'X' )
+	if( ctrl_down() || !shift_down() || alt_down() )
+		return 0;
+	if( get_keypress() == 'A' )
 		return handle_event();
 	return 0;
 }
@@ -1165,6 +1184,8 @@ EditUndo::~EditUndo()
 }
 int EditUndo::keypress_event()
 {
+	if( ctrl_down() || shift_down() || alt_down() )
+		return 0;
 	if( get_keypress() == 'z' )
 		return handle_event();
 	return 0;
@@ -1187,6 +1208,8 @@ EditRedo::~EditRedo()
 }
 int EditRedo::keypress_event()
 {
+	if( ctrl_down() || !shift_down() || alt_down() )
+		return 0;
 	if( get_keypress() == 'Z' )
 		return handle_event();
 	return 0;
@@ -1353,7 +1376,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 +1386,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,
@@ -1371,7 +1406,7 @@ LockLabelsButton::LockLabelsButton(MWindow *mwindow, int x, int y)
 	"", 0, 0, 0)
 {
 	this->mwindow = mwindow;
-	set_tooltip(_("Lock labels from moving"));
+	set_tooltip(_("Lock labels from moving with edits"));
 }
 
 int LockLabelsButton::handle_event()