edit group selection and cut/copy/paste/del shortcuts, interview mode tweaks

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

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index 530d530c42fe1ef4ed925254644738c765a08d98..26e5b7d071115c80ac91d206a01249afe03499d8 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -933,7 +933,7 @@ int EditSplice::handle_event()
 int EditSplice::keypress_event()
 {
        if( alt_down() ) return 0;
 int EditSplice::keypress_event()
 {
        if( alt_down() ) return 0;

-       if( get_keypress() == 'v' ||
+       if( (get_keypress() == 'v' && !ctrl_down()) ||

            (panel->is_vwindow() && get_keypress() == 'V') ) {
                handle_event();
                return 1;
            (panel->is_vwindow() && get_keypress() == 'V') ) {
                handle_event();
                return 1;


@@ -1065,7 +1065,7 @@ EditCopy::~EditCopy()
 int EditCopy::keypress_event()
 {
        if( alt_down() ) return 0;
 int EditCopy::keypress_event()
 {
        if( alt_down() ) return 0;

-       if( get_keypress() == 'c' ||
+       if( (get_keypress() == 'c' && !ctrl_down()) ||

            (panel->is_vwindow() && get_keypress() == 'C') ) {
                return handle_event();
        }
            (panel->is_vwindow() && get_keypress() == 'C') ) {
                return handle_event();
        }


@@ -1127,7 +1127,7 @@ EditPaste::~EditPaste()
 
 int EditPaste::keypress_event()
 {
 
 int EditPaste::keypress_event()
 {

-       if( get_keypress() == 'v' )
+       if( get_keypress() == 'v' && !ctrl_down() )

                return handle_event();
        return 0;
 }
                return handle_event();
        return 0;
 }