upgrade ffmpeg to 3.4.2, add proxy popup, undo/redo deadlock fix, rework nested edl

[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 7d21602f26f5ec15738fc8ab6c75e7dcf37e2805..75ee8d4288d67f6cc1cbd50f57938ff59ecf7026 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -552,6 +552,10 @@ void EditPanel::reposition_buttons(int x, int y)
                mangoto->reposition_window(x1, y1);
                x1 += mangoto->get_w();
        }
+       if( use_clk2play ) {
+               click2play->reposition_window(x1, y1+5);
+               x1 += click2play->get_w();
+       }
 }
 
 
@@ -831,7 +835,9 @@ int EditOverwrite::handle_event()
 }
 int EditOverwrite::keypress_event()
 {
-       if( get_keypress() == 'b' ) {
+       if( alt_down() ) return 0;
+       if( get_keypress() == 'b' ||
+           (panel->is_vwindow() && get_keypress() == 'B') ) {
                handle_event();
                return 1;
        }
@@ -872,7 +878,9 @@ int EditToClip::handle_event()
 
 int EditToClip::keypress_event()
 {
-       if( get_keypress() == 'i' && !alt_down() ) {
+       if( alt_down() ) return 0;
+       if( get_keypress() == 'i' ||
+           (panel->is_vwindow() && get_keypress() == 'I') ) {
                handle_event();
                return 1;
        }
@@ -924,7 +932,9 @@ int EditSplice::handle_event()
 }
 int EditSplice::keypress_event()
 {
-       if( get_keypress() == 'v' ) {
+       if( alt_down() ) return 0;
+       if( get_keypress() == 'v' ||
+           (panel->is_vwindow() && get_keypress() == 'V') ) {
                handle_event();
                return 1;
        }
@@ -936,7 +946,7 @@ EditCut::EditCut(MWindow *mwindow, EditPanel *panel, int x, int y)
 {
        this->mwindow = mwindow;
        this->panel = panel;
-       set_tooltip(_("Cut ( x )"));
+       set_tooltip(_("Split | Cut ( x )"));
 }
 EditCut::~EditCut()
 {
@@ -1031,8 +1041,11 @@ EditCopy::~EditCopy()
 
 int EditCopy::keypress_event()
 {
-       if( get_keypress() == 'c' )
+       if( alt_down() ) return 0;
+       if( get_keypress() == 'c' ||
+           (panel->is_vwindow() && get_keypress() == 'C') ) {
                return handle_event();
+       }
        return 0;
 }
 int EditCopy::handle_event()