clip folder bug on reload, expander user folder drag/drop segv, remove libfdk src...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / editpanel.C

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index 32b2e848481e5dcd8a1e13081660df9b1e5a1f2a..b370723a0a4a8f0f49acec859d6eae32c38df2e4 100644 (file)
--- 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;
@@ -1011,14 +1013,16 @@ EditCommercial::EditCommercial(MWindow *mwindow, EditPanel *panel, int x, int y)
 {
        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;
 }
@@ -1180,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;
@@ -1202,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;
@@ -1398,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()