X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=9259dde163549c657a431c26b7a20304cdaf7ab2;hb=4a028c75bea81ad0f03a8004eb076dfff718a469;hp=ec33eba7b24fe9e4998bc968fe48be937d5f2784;hpb=60f8df69db9ddd8148bfc41a17bb0955b52a45e6;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index ec33eba7..9259dde1 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -356,7 +356,9 @@ void MWindowGUI::create_objects()
 #ifdef HAVE_DVB
 	channel_info = new ChannelInfo(mwindow);
 #endif
+#ifdef HAVE_COMMERCIAL
 	db_window = new DbWindow(mwindow);
+#endif
 	swindow = new SWindow(mwindow);
 
 	if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
@@ -1039,7 +1041,7 @@ int MWindowGUI::drag_stop()
 	}
 
 
-//printf("TrackCanvas::drag_stop %d %d\n", redraw, mwindow->session->current_operation);
+//printf("MWindowGUI::drag_stop %d %d\n", redraw, mwindow->session->current_operation);
 	if(redraw)
 	{
 		mwindow->edl->tracks->update_y_pixels(mwindow->theme);
@@ -1162,6 +1164,8 @@ int MWindowGUI::keypress_event()
 	int result = mbuttons->keypress_event();
 	if( result ) return result;
 
+	Track *this_track = 0;
+
 	switch(get_keypress()) {
 	case 'e':
 		mwindow->toggle_editing_mode();
@@ -1195,6 +1199,13 @@ int MWindowGUI::keypress_event()
 		}
 		break;
 
+	case ',':
+		if( !ctrl_down() && !alt_down() ) {
+			mwindow->move_left();
+			result = 1;
+		}
+		break;
+
 	case RIGHT:
 		if( !ctrl_down() ) {
 			if( alt_down() ) {
@@ -1207,6 +1218,13 @@ int MWindowGUI::keypress_event()
 		}
 		break;
 
+	case '.':
+		if( !ctrl_down() && !alt_down() ) {
+			mwindow->move_right();
+			result = 1;
+		}
+		break;
+
 	case UP:
 		if( ctrl_down() && !alt_down() )
 			mwindow->expand_y();
@@ -1249,7 +1267,6 @@ int MWindowGUI::keypress_event()
 
 	case TAB:
 	case LEFTTAB:
-		Track *this_track = 0;
 		for( int i=0; i<TOTAL_PANES; ++i ) {
 			if( !pane[i] ) continue;
 			if( (this_track = pane[i]->over_track()) != 0 ) break;
@@ -1273,10 +1290,25 @@ int MWindowGUI::keypress_event()
 		update(0, 1, 0, 0, 1, 0, 1);
 		unlock_window();
 		mwindow->cwindow->update(0, 1, 1);
-		lock_window("TrackCanvas::keypress_event 3");
+		lock_window("MWindowGUI::keypress_event 3");
 
 		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:
+		resend_event(mwindow->cwindow->gui);
+		return 1;
 	}
 
 // since things under cursor have changed...
@@ -2300,7 +2332,8 @@ int PaneButton::cursor_motion_event()
 
 int PaneButton::button_release_event()
 {
-	mwindow->gui->stop_pane_drag();
+	if( get_buttonpress() != WHEEL_DOWN && get_buttonpress() != WHEEL_UP )
+		mwindow->gui->stop_pane_drag();
 	int result = BC_Button::button_release_event();
 	return result;
 }