X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_actions.cc;h=48d56193a62226d7df4468ff197f7a95777c5a24;hb=152935e736eaf06f85bc7f5cb27337a62d95edd4;hp=8b4ec4034a861b590937f096f4ba259afd913452;hpb=36c233fe6ce570ce85224626ce7aba4a2607537f;p=ardour.git diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 8b4ec4034a..48d56193a6 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -414,49 +414,49 @@ Editor::register_actions () smart_mode_action = Glib::RefPtr::cast_static (act); smart_mode_button.set_related_action (smart_mode_action); smart_mode_button.set_text (_("Smart")); - smart_mode_button.add_elements ( ArdourButton::FlatFace ); + smart_mode_button.add_elements ( ArdourButton::Inset ); smart_mode_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject)); mouse_move_button.set_related_action (act); mouse_move_button.set_image (::get_icon("tool_object")); - mouse_move_button.add_elements ( ArdourButton::FlatFace ); + mouse_move_button.add_elements ( ArdourButton::Inset ); mouse_move_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); mouse_select_button.set_related_action (act); mouse_select_button.set_image (::get_icon("tool_range")); - mouse_select_button.add_elements ( ArdourButton::FlatFace ); + mouse_select_button.add_elements ( ArdourButton::Inset ); mouse_select_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-draw", _("Note Drawing Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseDraw)); mouse_draw_button.set_related_action (act); mouse_draw_button.set_image (::get_icon("midi_tool_pencil")); - mouse_draw_button.add_elements ( ArdourButton::FlatFace ); + mouse_draw_button.add_elements ( ArdourButton::Inset ); mouse_draw_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-gain", _("Gain Tool"), sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain)); mouse_gain_button.set_related_action (act); mouse_gain_button.set_image (::get_icon("tool_gain")); - mouse_gain_button.add_elements ( ArdourButton::FlatFace ); + mouse_gain_button.add_elements ( ArdourButton::Inset ); mouse_gain_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-zoom", _("Zoom Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom)); mouse_zoom_button.set_related_action (act); mouse_zoom_button.set_image (::get_icon("tool_zoom")); - mouse_zoom_button.add_elements ( ArdourButton::FlatFace ); + mouse_zoom_button.add_elements ( ArdourButton::Inset ); mouse_zoom_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition)); mouse_audition_button.set_related_action (act); mouse_audition_button.set_image (::get_icon("tool_audition")); - mouse_audition_button.add_elements ( ArdourButton::FlatFace ); + mouse_audition_button.add_elements ( ArdourButton::Inset ); mouse_audition_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); mouse_timefx_button.set_related_action (act); mouse_timefx_button.set_image (::get_icon("tool_stretch")); - mouse_timefx_button.add_elements ( ArdourButton::FlatFace ); + mouse_timefx_button.add_elements ( ArdourButton::Inset ); mouse_timefx_button.set_name ("mouse mode button"); ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), sigc::bind (sigc::mem_fun(*this, &Editor::step_mouse_mode), true)); @@ -464,7 +464,7 @@ Editor::register_actions () act = ActionManager::register_toggle_action (mouse_mode_actions, "toggle-internal-edit", _("Edit MIDI"), sigc::mem_fun(*this, &Editor::toggle_internal_editing)); internal_edit_button.set_related_action (act); internal_edit_button.set_image (::get_icon("tool_note")); - internal_edit_button.add_elements ( ArdourButton::FlatFace ); + internal_edit_button.add_elements ( ArdourButton::Inset ); internal_edit_button.set_name ("mouse mode button"); RadioAction::Group edit_point_group; @@ -1146,94 +1146,94 @@ Editor::prev_snap_choice () { switch (_snap_type) { case Editing::SnapToCDFrame: - set_snap_to (Editing::SnapToTimecodeFrame); + set_snap_to (Editing::SnapToRegionBoundary); break; case Editing::SnapToTimecodeFrame: - set_snap_to (Editing::SnapToTimecodeSeconds); + set_snap_to (Editing::SnapToCDFrame); break; case Editing::SnapToTimecodeSeconds: - set_snap_to (Editing::SnapToTimecodeMinutes); + set_snap_to (Editing::SnapToTimecodeFrame); break; case Editing::SnapToTimecodeMinutes: - set_snap_to (Editing::SnapToSeconds); + set_snap_to (Editing::SnapToTimecodeSeconds); break; case Editing::SnapToSeconds: - set_snap_to (Editing::SnapToMinutes); + set_snap_to (Editing::SnapToTimecodeMinutes); break; case Editing::SnapToMinutes: - set_snap_to (Editing::SnapToBeatDiv128); + set_snap_to (Editing::SnapToSeconds); break; case Editing::SnapToBeatDiv128: - set_snap_to (Editing::SnapToBeatDiv64); + set_snap_to (Editing::SnapToMinutes); break; case Editing::SnapToBeatDiv64: - set_snap_to (Editing::SnapToBeatDiv32); + set_snap_to (Editing::SnapToBeatDiv128); break; case Editing::SnapToBeatDiv32: - set_snap_to (Editing::SnapToBeatDiv28); + set_snap_to (Editing::SnapToBeatDiv64); break; case Editing::SnapToBeatDiv28: - set_snap_to (Editing::SnapToBeatDiv24); + set_snap_to (Editing::SnapToBeatDiv32); break; case Editing::SnapToBeatDiv24: - set_snap_to (Editing::SnapToBeatDiv20); + set_snap_to (Editing::SnapToBeatDiv28); break; case Editing::SnapToBeatDiv20: - set_snap_to (Editing::SnapToBeatDiv16); + set_snap_to (Editing::SnapToBeatDiv24); break; case Editing::SnapToBeatDiv16: - set_snap_to (Editing::SnapToBeatDiv14); + set_snap_to (Editing::SnapToBeatDiv20); break; case Editing::SnapToBeatDiv14: - set_snap_to (Editing::SnapToBeatDiv12); + set_snap_to (Editing::SnapToBeatDiv16); break; case Editing::SnapToBeatDiv12: - set_snap_to (Editing::SnapToBeatDiv10); + set_snap_to (Editing::SnapToBeatDiv14); break; case Editing::SnapToBeatDiv10: - set_snap_to (Editing::SnapToBeatDiv8); + set_snap_to (Editing::SnapToBeatDiv12); break; case Editing::SnapToBeatDiv8: - set_snap_to (Editing::SnapToBeatDiv7); + set_snap_to (Editing::SnapToBeatDiv10); break; case Editing::SnapToBeatDiv7: - set_snap_to (Editing::SnapToBeatDiv6); + set_snap_to (Editing::SnapToBeatDiv8); break; case Editing::SnapToBeatDiv6: - set_snap_to (Editing::SnapToBeatDiv5); + set_snap_to (Editing::SnapToBeatDiv7); break; case Editing::SnapToBeatDiv5: - set_snap_to (Editing::SnapToBeatDiv4); + set_snap_to (Editing::SnapToBeatDiv6); break; case Editing::SnapToBeatDiv4: - set_snap_to (Editing::SnapToBeatDiv3); + set_snap_to (Editing::SnapToBeatDiv5); break; case Editing::SnapToBeatDiv3: - set_snap_to (Editing::SnapToBeatDiv2); + set_snap_to (Editing::SnapToBeatDiv4); break; case Editing::SnapToBeatDiv2: - set_snap_to (Editing::SnapToBeat); + set_snap_to (Editing::SnapToBeatDiv3); break; case Editing::SnapToBeat: - set_snap_to (Editing::SnapToBar); + set_snap_to (Editing::SnapToBeatDiv2); break; case Editing::SnapToBar: - set_snap_to (Editing::SnapToMark); + set_snap_to (Editing::SnapToBeat); break; case Editing::SnapToMark: - set_snap_to (Editing::SnapToRegionStart); + set_snap_to (Editing::SnapToBar); break; case Editing::SnapToRegionStart: - set_snap_to (Editing::SnapToRegionEnd); + set_snap_to (Editing::SnapToMark); break; case Editing::SnapToRegionEnd: - set_snap_to (Editing::SnapToRegionSync); + set_snap_to (Editing::SnapToRegionStart); break; case Editing::SnapToRegionSync: - set_snap_to (Editing::SnapToRegionBoundary); + set_snap_to (Editing::SnapToRegionEnd); break; case Editing::SnapToRegionBoundary: - set_snap_to (Editing::SnapToCDFrame); + set_snap_to (Editing::SnapToRegionSync); break; } } @@ -1600,17 +1600,17 @@ Editor::parameter_changed (std::string p) ENSURE_GUI_THREAD (*this, &Editor::parameter_changed, p) if (p == "auto-loop") { - update_loop_range_view (true); + update_loop_range_view (); } else if (p == "punch-in") { - update_punch_range_view (true); + update_punch_range_view (); } else if (p == "punch-out") { - update_punch_range_view (true); + update_punch_range_view (); } else if (p == "timecode-format") { update_just_timecode (); } else if (p == "show-region-fades") { update_region_fade_visibility (); } else if (p == "edit-mode") { - edit_mode_selector.set_active_text (edit_mode_to_string (Config->get_edit_mode())); + edit_mode_selector.set_text (edit_mode_to_string (Config->get_edit_mode())); } else if (p == "show-track-meters") { toggle_meter_updating(); } else if (p == "show-summary") { @@ -1650,7 +1650,9 @@ Editor::parameter_changed (std::string p) } else if (p == "timecode-offset" || p == "timecode-offset-negative") { update_just_timecode (); } else if (p == "show-zoom-tools") { - _zoom_tearoff->set_visible (Config->get_show_zoom_tools(), true); + if (_zoom_tearoff) { + _zoom_tearoff->set_visible (Config->get_show_zoom_tools(), true); + } } else if (p == "sound-midi-notes") { Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("sound-midi-notes")); @@ -1895,6 +1897,8 @@ Editor::register_region_actions () reg_sens (_region_actions, "nudge-forward", _("Nudge Later"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_forward), false, false)); reg_sens (_region_actions, "nudge-backward", _("Nudge Earlier"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_backward), false, false)); + reg_sens (_region_actions, "sequence-regions", _("Sequence Regions"), sigc::mem_fun (*this, &Editor::sequence_regions)); + reg_sens ( _region_actions, "nudge-forward-by-capture-offset",