ripple edge drag_handle tweaks, sync_parameter fix, shuttlerc, shortcuts

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

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index e88b9a3f0e6d95ca88caa67dbc2c6d433fe2ed8c..02ed52d32ad93ae559acb39554362dd0ce85e5d1 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -572,10 +572,7 @@ int CWindowGUI::keypress_event()
 
        if( !result && cwindow_operation < 0 && ctrl_down() && shift_down() ) {
                switch( get_keypress() ) {
 
        if( !result && cwindow_operation < 0 && ctrl_down() && shift_down() ) {
                switch( get_keypress() ) {

-               case KEY_F1:
-               case KEY_F2:
-               case KEY_F3:
-               case KEY_F4:
+               case KEY_F1 ... KEY_F4: // mainmenu, load layout

                        resend_event(mwindow->gui);
                        result = 1;
                        break;
                        resend_event(mwindow->gui);
                        result = 1;
                        break;


@@ -671,14 +668,17 @@ void CWindowGUI::keyboard_zoomout()
 //     }
 }
 
 //     }
 }
 

-void CWindowGUI::sync_parameters(int change_type, int tool, int overlay)
+void CWindowGUI::sync_parameters(int change_type, int redraw, int overlay)

 {
 {

-       if( tool ) update_tool();
+       if( redraw ) {
+               update_tool();
+               canvas->draw_refresh();
+       }

        if( change_type < 0 && !overlay ) return;
        unlock_window();
        if( change_type >= 0 ) {
                mwindow->restart_brender();
        if( change_type < 0 && !overlay ) return;
        unlock_window();
        if( change_type >= 0 ) {
                mwindow->restart_brender();

-               mwindow->sync_parameters(CHANGE_PARAMS);
+               mwindow->sync_parameters(change_type);

        }
        if( overlay ) {
                mwindow->gui->lock_window("CWindow::camera_keyframe");
        }
        if( overlay ) {
                mwindow->gui->lock_window("CWindow::camera_keyframe");


@@ -841,6 +841,7 @@ CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
 #define panel_btn(fn, args, s) \
  panel_fn(panel_##fn, args, mwindow->gui->mbuttons->edit_panel->panel_##s)
 
 #define panel_btn(fn, args, s) \
  panel_fn(panel_##fn, args, mwindow->gui->mbuttons->edit_panel->panel_##s)
 

+

 double CWindowEditing::get_position()
 {
        relock_cm("get_position");
 double CWindowEditing::get_position()
 {
        relock_cm("get_position");


@@ -852,18 +853,19 @@ double CWindowEditing::get_position()
 void CWindowEditing::set_position(double position)
 {
        relock_cm("set_position");
 void CWindowEditing::set_position(double position)
 {
        relock_cm("set_position");

-       set_position(position);
+       mwindow->gui->mbuttons->edit_panel->set_position(position);

        relock_mc("set_position");
 }
 
 void CWindowEditing::set_click_to_play(int v)
 {
        relock_mc("set_position");
 }
 
 void CWindowEditing::set_click_to_play(int v)
 {

-       relock_cm("set_click_to_play");
+       relock_cm("set_position");

        mwindow->edl->session->cwindow_click2play = v;
        mwindow->edl->session->cwindow_click2play = v;

+       relock_mc("set_position");

        click2play->update(v);
        click2play->update(v);

-       relock_mc("set_click_to_play");

 }
 
 }
 

+

 void panel_btn(stop_transport,(), stop_transport())
 void panel_btn(toggle_label,(), toggle_label())
 void panel_btn(next_label,(int cut), next_label(cut))
 void panel_btn(stop_transport,(), stop_transport())
 void panel_btn(toggle_label,(), toggle_label())
 void panel_btn(next_label,(int cut), next_label(cut))