X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_ed.cc;h=35100e940b0e47a3f787c9eeac9d87c91068e632;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=9f6b181b4d97083e488c04082f22dfce35776534;hpb=724771f18a164fe1802ff25eb1887193847e7861;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 9f6b181b4d..35100e940b 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -95,26 +95,28 @@ void
 ARDOUR_UI::install_actions ()
 {
 	Glib::RefPtr<ActionGroup> main_actions = ActionGroup::create (X_("Main"));
+	Glib::RefPtr<ActionGroup> main_menu_actions = ActionGroup::create (X_("Main_menu"));
 	Glib::RefPtr<Action> act;
 
 	/* menus + submenus that need action items */
 
-	ActionManager::register_action (main_actions, X_("Session"), _("Session"));
-	act = ActionManager::register_action (main_actions, X_("Cleanup"), _("Clean-up"));
+	ActionManager::register_action (main_menu_actions, X_("Session"), _("Session"));
+	act = ActionManager::register_action (main_menu_actions, X_("Cleanup"), _("Clean-up"));
 	ActionManager::write_sensitive_actions.push_back (act);
-	ActionManager::register_action (main_actions, X_("Sync"), _("Sync"));
-	ActionManager::register_action (main_actions, X_("TransportOptions"), _("Options"));
-	ActionManager::register_action (main_actions, X_("Help"), _("Help"));
- 	ActionManager::register_action (main_actions, X_("KeyMouseActions"), _("Misc. Shortcuts"));
-	ActionManager::register_action (main_actions, X_("AudioFileFormat"), _("Audio File Format"));
-	ActionManager::register_action (main_actions, X_("AudioFileFormatHeader"), _("File Type"));
-	ActionManager::register_action (main_actions, X_("AudioFileFormatData"), _("Sample Format"));
-	ActionManager::register_action (main_actions, X_("ControlSurfaces"), _("Control Surfaces"));
-	ActionManager::register_action (main_actions, X_("Plugins"), _("Plugins"));
-	ActionManager::register_action (main_actions, X_("Metering"), _("Metering"));
-	ActionManager::register_action (main_actions, X_("MeteringFallOffRate"), _("Fall Off Rate"));
-	ActionManager::register_action (main_actions, X_("MeteringHoldTime"), _("Hold Time"));
-	ActionManager::register_action (main_actions, X_("Denormals"), _("Denormal Handling"));
+	ActionManager::register_action (main_menu_actions, X_("Sync"), _("Sync"));
+	ActionManager::register_action (main_menu_actions, X_("TransportOptions"), _("Options"));
+	ActionManager::register_action (main_menu_actions, X_("WindowMenu"), _("Window"));
+	ActionManager::register_action (main_menu_actions, X_("Help"), _("Help"));
+ 	ActionManager::register_action (main_menu_actions, X_("KeyMouseActions"), _("Misc. Shortcuts"));
+	ActionManager::register_action (main_menu_actions, X_("AudioFileFormat"), _("Audio File Format"));
+	ActionManager::register_action (main_menu_actions, X_("AudioFileFormatHeader"), _("File Type"));
+	ActionManager::register_action (main_menu_actions, X_("AudioFileFormatData"), _("Sample Format"));
+	ActionManager::register_action (main_menu_actions, X_("ControlSurfaces"), _("Control Surfaces"));
+	ActionManager::register_action (main_menu_actions, X_("Plugins"), _("Plugins"));
+	ActionManager::register_action (main_menu_actions, X_("Metering"), _("Metering"));
+	ActionManager::register_action (main_menu_actions, X_("MeteringFallOffRate"), _("Fall Off Rate"));
+	ActionManager::register_action (main_menu_actions, X_("MeteringHoldTime"), _("Hold Time"));
+	ActionManager::register_action (main_menu_actions, X_("Denormals"), _("Denormal Handling"));
 
 	/* the real actions */
 
@@ -218,7 +220,6 @@ ARDOUR_UI::install_actions ()
 	/* these actions are intended to be shared across all windows */
 
 	common_actions = ActionGroup::create (X_("Common"));
-	ActionManager::register_action (main_actions, X_("WindowMenu"), _("Window"));
 	ActionManager::register_action (common_actions, X_("Quit"), _("Quit"), (hide_return (sigc::mem_fun(*this, &ARDOUR_UI::finish))));
 
 	/* windows visibility actions */
@@ -268,8 +269,6 @@ ARDOUR_UI::install_actions ()
 	act = ActionManager::register_action (common_actions, X_("Save"), _("Save"),  sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::save_state), string(""), false));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::write_sensitive_actions.push_back (act);
-	act = ActionManager::register_action (common_actions, X_("RemoveLastCapture"), _("Remove Last Capture"), sigc::mem_fun(*this, &ARDOUR_UI::remove_last_capture));
-	ActionManager::session_sensitive_actions.push_back (act);
 
 	Glib::RefPtr<ActionGroup> transport_actions = ActionGroup::create (X_("Transport"));
 
@@ -288,6 +287,10 @@ ARDOUR_UI::install_actions ()
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
 
+	act = ActionManager::register_toggle_action (transport_actions, X_("AlwaysPlayRange"), _("Always Play Range"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_always_play_range));
+	ActionManager::session_sensitive_actions.push_back (act);
+	ActionManager::transport_sensitive_actions.push_back (act);
+
 	act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
@@ -457,6 +460,7 @@ ARDOUR_UI::install_actions ()
 	ActionManager::add_action_group (jack_actions);
 	ActionManager::add_action_group (transport_actions);
 	ActionManager::add_action_group (main_actions);
+	ActionManager::add_action_group (main_menu_actions);
 	ActionManager::add_action_group (common_actions);
 	ActionManager::add_action_group (midi_actions);
 }
@@ -702,7 +706,7 @@ ARDOUR_UI::float_big_clock (Gtk::Window* parent)
 }
 
 void
-ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation& alloc)
+ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation&)
 {
 	if (!big_clock_resize_in_progress) {
 		Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0));