X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=7cdd58f72b5711af5df8a0c385d3429fcf36dab2;hp=d66cf3b1caea8f102852a884596a901d8b76c187;hb=94fc059e6ed3f77f20531338cbb03bdb3b4d9eab;hpb=66e8a774858a7bfefc565d77cde63bbc15769991

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index d66cf3b1..7cdd58f7 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -36,6 +36,7 @@
 #include "edl.h"
 #include "edlsession.h"
 #include "filesystem.h"
+#include "filexml.h"
 #include "keyframepopup.h"
 #include "keys.h"
 #include "language.h"
@@ -931,9 +932,9 @@ int MWindowGUI::visible(int64_t x1, int64_t x2, int64_t view_x1, int64_t view_x2
 }
 
 
-void MWindowGUI::show_message(const char *message, int color)
+void MWindowGUI::show_message(const char *message, int msg_color, int bar_color)
 {
-	statusbar->show_message(message, color);
+	statusbar->show_message(message, msg_color, bar_color);
 }
 
 void MWindowGUI::update_default_message()
@@ -1007,6 +1008,7 @@ int MWindowGUI::drag_motion()
 
 	if( mwindow->session->current_operation == DRAG_ASSET ||
 	    mwindow->session->current_operation == DRAG_EDIT ||
+	    mwindow->session->current_operation == DRAG_GROUP ||
 	    mwindow->session->current_operation == DRAG_AEFFECT_COPY ||
 	    mwindow->session->current_operation == DRAG_VEFFECT_COPY )
         {
@@ -1171,7 +1173,7 @@ int MWindowGUI::keypress_event()
 	if( result ) return result;
 
 	Track *this_track = 0, *first_track = 0;
-	int collapse = 0, packed = 0, overwrite = 0;
+	int collapse = 0, packed = 0, overwrite = 0, plugins = 0;
 	double position = 0;
 
 	switch( get_keypress() ) {
@@ -1198,9 +1200,11 @@ int MWindowGUI::keypress_event()
 		packed = 1;
 	case 'c':
 		if( !ctrl_down() || alt_down() ) break;
-		mwindow->selected_to_clipboard(packed);
+		mwindow->selected_edits_to_clipboard(packed);
 		result = 1;
 		break;
+	case 'P':
+		plugins = 1;
 	case 'b':
 		overwrite = -1; // fall thru
 	case 'v':
@@ -1221,7 +1225,12 @@ int MWindowGUI::keypress_event()
 		}
 		else
 			position = mwindow->edl->local_session->get_selectionstart();
-		mwindow->paste(position, first_track, 0, overwrite);
+		if( !plugins )
+			mwindow->paste(position, first_track, 0, overwrite);
+		else
+			mwindow->paste_clipboard(first_track, position, 1, 0, 1, 1, 1);
+		mwindow->edl->tracks->clear_selected_edits();
+		draw_overlays(1);
 		result = 1;
 		break;
 	case 'M':
@@ -1238,8 +1247,7 @@ int MWindowGUI::keypress_event()
 		result = 1;
 		break;
 
-	case '1': case '2': case '3': case '4':
-	case '5': case '6': case '7': case '8':
+	case '1' ... '8':
 		if( !alt_down() || shift_down() ) break;
 		if( !mwindow->select_asset(get_keypress()-'1',1) )
 			result = 1;
@@ -1353,18 +1361,7 @@ int MWindowGUI::keypress_event()
 		result = 1;
 		break;
 
-	case KEY_F1:
-	case KEY_F2:
-	case KEY_F3:
-	case KEY_F4:
-	case KEY_F5:
-	case KEY_F6:
-	case KEY_F7:
-	case KEY_F8:
-	case KEY_F9:
-	case KEY_F10:
-	case KEY_F11:
-	case KEY_F12:
+	case KEY_F1 ... KEY_F12:
 		resend_event(mwindow->cwindow->gui);
 		return 1;
 	}
@@ -2351,7 +2348,7 @@ void MWindowGUI::stop_transport(const char *lock_msg)
 {
 	if( !mbuttons->transport->is_stopped() ) {
 		if( lock_msg ) unlock_window();
-		mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+		mbuttons->transport->handle_transport(STOP, 1);
 		if( lock_msg ) lock_window(lock_msg);
 	}
 }