rework histogram_bezier, init wm icon set_icon(gg), update de.po+msg/txt

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

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index c854ce31cac4eeb8c0dbb6b79ecf5856102f723c..19ff101e3f0383a56ba20b8e9df6a2c981922416 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -488,6 +488,7 @@ int CWindowGUI::keypress_event()
                        lock_window("CWindowGUI::keypress_event 1");
                        break;
                case 'x':
+                       if( ctrl_down() || shift_down() || alt_down() ) break;
                        unlock_window();
                        mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
                        mwindow->cut();
@@ -565,8 +566,10 @@ int CWindowGUI::keypress_event()
                        }
                        break;
 
-               case KEY_F1:    cwindow_operation = CWINDOW_PROTECT;    break;
-               case KEY_F2:    cwindow_operation = CWINDOW_ZOOM;       break;
+               case KEY_F1: if( shift_down() ) { mwindow->toggle_camera_xyz();  break; }
+                               cwindow_operation = CWINDOW_PROTECT;    break;
+               case KEY_F2: if( shift_down() ) { mwindow->toggle_projector_xyz();  break; }
+                               cwindow_operation = CWINDOW_ZOOM;       break;
                case KEY_F3:    cwindow_operation = CWINDOW_MASK;       break;
                case KEY_F4:    cwindow_operation = CWINDOW_RULER;      break;
                case KEY_F5:    cwindow_operation = CWINDOW_CAMERA;     break;