Use the word Remove consistently for the remove regions
[ardour.git] / gtk2_ardour / editor_actions.cc
index 2687d05befdde43d9a7e0714ef44aab833f51894..abf61f868baa034234ff20adcafb8a752c97a034 100644 (file)
@@ -397,62 +397,46 @@ Editor::register_actions ()
        RadioAction::Group mouse_mode_group;
 
        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));
-       act->connect_proxy (mouse_move_button);
-       mouse_move_button.set_image (*(manage (new Image (::get_icon("tool_object")))));
-       mouse_move_button.set_label ("");
-       mouse_move_button.set_name ("MouseModeButton");
-       mouse_move_button.get_image ()->show ();
-
-       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));
-       act->connect_proxy (mouse_select_button);
-       mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range")))));
-       mouse_select_button.set_label ("");
-       mouse_select_button.set_name ("MouseModeButton");
-       mouse_select_button.get_image ()->show ();
-
-       act = ActionManager::register_toggle_action (mouse_mode_actions, "set-mouse-mode-object-range", _("Link Object / Range Tools"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled));
-       act->connect_proxy (join_object_range_button);
-       join_object_range_button.set_image (*(manage (new Image (::get_icon ("tool_object_range")))));
-       join_object_range_button.set_label ("");
-       join_object_range_button.set_name ("MouseModeButton");
-       join_object_range_button.get_image ()->show ();
-
-       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));
-       act->connect_proxy (mouse_gain_button);
-       mouse_gain_button.set_image (*(manage (new Image (::get_icon("tool_gain")))));
-       mouse_gain_button.set_label ("");
-       mouse_gain_button.set_name ("MouseModeButton");
-       mouse_gain_button.get_image ()->show ();
-
-       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));
-       act->connect_proxy (mouse_zoom_button);
-       mouse_zoom_button.set_image (*(manage (new Image (::get_icon("tool_zoom")))));
-       mouse_zoom_button.set_label ("");
-       mouse_zoom_button.set_name ("MouseModeButton");
-       mouse_zoom_button.get_image ()->show ();
-
-       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));
-       act->connect_proxy (mouse_audition_button);
-       mouse_audition_button.set_image (*(manage (new Image (::get_icon("tool_audition")))));
-       mouse_audition_button.set_label ("");
-       mouse_audition_button.set_name ("MouseModeButton");
-       mouse_audition_button.get_image ()->show ();
-
-       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));
-       act->connect_proxy (mouse_timefx_button);
-       mouse_timefx_button.set_image (*(manage (new Image (::get_icon("tool_stretch")))));
-       mouse_timefx_button.set_label ("");
-       mouse_timefx_button.set_name ("MouseModeButton");
-       mouse_timefx_button.get_image ()->show ();
+       mouse_move_button.set_related_action (act);
+       mouse_move_button.set_image (::get_icon("tool_object"));
+       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.set_name ("mouse mode button");
+
+       act = ActionManager::register_toggle_action (mouse_mode_actions, "set-mouse-mode-object-range", _("Link Object / Range Tools"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled));       
+       join_object_range_button.set_related_action (act);
+       join_object_range_button.set_image (::get_icon ("tool_object_range"));
+       join_object_range_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.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.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.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.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));
 
        act = ActionManager::register_toggle_action (mouse_mode_actions, "toggle-internal-edit", _("Edit MIDI"), sigc::mem_fun(*this, &Editor::toggle_internal_editing));
-       act->connect_proxy (internal_edit_button);
-       internal_edit_button.set_image (*(manage (new Image (::get_icon("tool_note")))));
-       internal_edit_button.set_label ("");
-       internal_edit_button.set_name ("MouseModeButton");
-       internal_edit_button.get_image ()->show ();
+       internal_edit_button.set_related_action (act);
+       internal_edit_button.set_image (::get_icon("tool_note"));
+       internal_edit_button.set_name ("mouse mode button");
 
        RadioAction::Group edit_point_group;
        ActionManager::register_radio_action (editor_actions, edit_point_group, X_("edit-at-playhead"), _("Playhead"), (sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_chosen), Editing::EditAtPlayhead)));
@@ -599,7 +583,7 @@ Editor::register_actions ()
        ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortBySourceFilesystem"),  _("By Source Filesystem"),
                        sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), BySourceFileFS, false));
 
-       ActionManager::register_action (rl_actions, X_("removeUnusedRegions"), _("Delete Unused"), sigc::mem_fun(*_regions, &EditorRegions::delete_unused_regions));
+       ActionManager::register_action (rl_actions, X_("removeUnusedRegions"), _("Remove Unused"), sigc::mem_fun (*_regions, &EditorRegions::remove_unused_regions));
 
        /* the next two are duplicate items with different names for use in two different contexts */
 
@@ -624,18 +608,12 @@ Editor::register_actions ()
        Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
        tact->set_active (true);
 
-       /* MIDI */
-
-       Glib::RefPtr<ActionGroup> midi_actions = ActionGroup::create (X_("MIDI"));
-       ActionManager::register_action (midi_actions, X_("panic"), _("Panic"), sigc::mem_fun(*this, &Editor::midi_panic));
-
        ActionManager::add_action_group (rl_actions);
        ActionManager::add_action_group (ruler_actions);
        ActionManager::add_action_group (zoom_actions);
        ActionManager::add_action_group (mouse_mode_actions);
        ActionManager::add_action_group (snap_actions);
        ActionManager::add_action_group (editor_actions);
-       ActionManager::add_action_group (midi_actions);
 }
 
 void
@@ -1399,7 +1377,7 @@ Editor::register_region_actions ()
                sigc::mem_fun (*this, &Editor::toggle_gain_envelope_active)
                );
 
-       reg_sens (_region_actions, "quantize-region", _("Quantize"), sigc::mem_fun (*this, &Editor::quantize_region));
+       reg_sens (_region_actions, "quantize-region", _("Quantize..."), sigc::mem_fun (*this, &Editor::quantize_region));
        reg_sens (_region_actions, "insert-patch-change", _("Insert Patch Change..."), sigc::mem_fun (*this, &Editor::insert_patch_change));
        reg_sens (_region_actions, "fork-region", _("Fork"), sigc::mem_fun (*this, &Editor::fork_region));
        reg_sens (_region_actions, "strip-region-silence", _("Strip Silence..."), sigc::mem_fun (*this, &Editor::strip_region_silence));