remove menu items from the keybindings dialog

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@11657 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 85 insertions, 68 deletions

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 4e6121bd28..f1d683fd88 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -83,26 +83,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"), _("Cleanup"));
+	ActionManager::register_action (main_menu_actions, X_("Session"), _("Session"));
+	act = ActionManager::register_action (main_menu_actions, X_("Cleanup"), _("Cleanup"));
 	ActionManager::write_sensitive_actions.push_back (act);
-	ActionManager::register_action (main_actions, X_("Sync"), _("Sync"));
-	ActionManager::register_action (main_actions, X_("Options"), _("Options"));
-	ActionManager::register_action (main_actions, X_("TransportOptions"), _("Options"));
-	ActionManager::register_action (main_actions, X_("Help"), _("Help"));
- 	ActionManager::register_action (main_actions, X_("KeyMouseActions"), _("Editing Modes"));
-	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_("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_("Options"), _("Options"));
+	ActionManager::register_action (main_menu_actions, X_("WindowMenu"), _("Window"));
+	ActionManager::register_action (main_menu_actions, X_("TransportOptions"), _("Options"));
+	ActionManager::register_action (main_menu_actions, X_("Help"), _("Help"));
+ 	ActionManager::register_action (main_menu_actions, X_("KeyMouseActions"), _("Editing Modes"));
+	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_("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 */
 
@@ -201,7 +203,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 (mem_fun(*this, &ARDOUR_UI::finish))));
 
         /* windows visibility actions */
@@ -635,6 +636,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);
 }
 
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index e6b2397188..3365e7b9b9 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -42,61 +42,62 @@ Editor::register_actions ()
 	RefPtr<Action> act;
 
 	editor_actions = ActionGroup::create (X_("Editor"));
+	editor_menu_actions = ActionGroup::create (X_("Editor_menus"));
 	
 	/* non-operative menu items for menu bar */
 
-	ActionManager::register_action (editor_actions, X_("AlignMenu"), _("Align"));
-	ActionManager::register_action (editor_actions, X_("Autoconnect"), _("Autoconnect"));
-	ActionManager::register_action (editor_actions, X_("Crossfades"), _("Crossfades"));
-	ActionManager::register_action (editor_actions, X_("Edit"), _("Edit"));
-	ActionManager::register_action (editor_actions, X_("EditCursorMovementOptions"), _("Move Selected Marker"));
-	ActionManager::register_action (editor_actions, X_("EditSelectRangeOptions"), _("Select Range Operations"));
-	ActionManager::register_action (editor_actions, X_("EditSelectRegionOptions"), _("Select Regions"));
-	ActionManager::register_action (editor_actions, X_("EditPointMenu"), _("Edit Point"));
-	ActionManager::register_action (editor_actions, X_("FadeMenu"), _("Fade"));
-	ActionManager::register_action (editor_actions, X_("LatchMenu"), _("Latch"));
-	ActionManager::register_action (editor_actions, X_("Layering"), _("Layering"));
-	ActionManager::register_action (editor_actions, X_("Link"), _("Link"));
-	ActionManager::register_action (editor_actions, X_("ZoomFocusMenu"), _("Zoom Focus"));
-	ActionManager::register_action (editor_actions, X_("KeyMouseActions"), _("Key Mouse"));
-	ActionManager::register_action (editor_actions, X_("LocateToMarker"), _("Locate To Markers"));
-	ActionManager::register_action (editor_actions, X_("MarkerMenu"), _("Markers"));
-	ActionManager::register_action (editor_actions, X_("MeterFalloff"), _("Meter falloff"));
-	ActionManager::register_action (editor_actions, X_("MeterHold"), _("Meter hold"));
-	ActionManager::register_action (editor_actions, X_("Performance"), _("Performance"));
-	ActionManager::register_action (editor_actions, X_("MiscOptions"), _("Misc Options"));
-	ActionManager::register_action (editor_actions, X_("Monitoring"), _("Monitoring"));
-	ActionManager::register_action (editor_actions, X_("MoveActiveMarkMenu"), _("Active Mark"));
-	ActionManager::register_action (editor_actions, X_("MovePlayHeadMenu"), _("Playhead"));
-	ActionManager::register_action (editor_actions, X_("NudgeRegionMenu"), _("Nudge"));
-	ActionManager::register_action (editor_actions, X_("PlayMenu"), _("Play"));
-	ActionManager::register_action (editor_actions, X_("PrimaryClockMenu"), _("Primary Clock"));
-	ActionManager::register_action (editor_actions, X_("Pullup"), _("Pullup / Pulldown"));
-	ActionManager::register_action (editor_actions, X_("RegionMenu"), _("Region"));
-	ActionManager::register_action (editor_actions, X_("RegionEditOps"), _("Region operations"));
-	ActionManager::register_action (editor_actions, X_("RegionGainMenu"), _("Gain"));
-	ActionManager::register_action (editor_actions, X_("RulerMenu"), _("Rulers"));
-	ActionManager::register_action (editor_actions, X_("SavedViewMenu"), _("Views"));
-	ActionManager::register_action (editor_actions, X_("ScrollMenu"), _("Scroll"));
-	ActionManager::register_action (editor_actions, X_("SecondaryClockMenu"), _("Secondary Clock"));
-	ActionManager::register_action (editor_actions, X_("Select"), _("Select"));
-	ActionManager::register_action (editor_actions, X_("SelectMenu"), _("Select"));
-	ActionManager::register_action (editor_actions, X_("SeparateMenu"), _("Separate"));
-	ActionManager::register_action (editor_actions, X_("SetLoopMenu"), _("Loop"));
-	ActionManager::register_action (editor_actions, X_("SetPunchMenu"), _("Punch"));
-	ActionManager::register_action (editor_actions, X_("Solo"), _("Solo"));
-	ActionManager::register_action (editor_actions, X_("Subframes"), _("Subframes"));
-	ActionManager::register_action (editor_actions, X_("SyncMenu"), _("Sync"));
-	ActionManager::register_action (editor_actions, X_("TempoMenu"), _("Tempo"));
-	ActionManager::register_action (editor_actions, X_("Timecode"), _("Timecode fps"));
-	ActionManager::register_action (editor_actions, X_("TrackHeightMenu"), _("Height"));
-	ActionManager::register_action (editor_actions, X_("TrackMenu"), _("Track"));
-	ActionManager::register_action (editor_actions, X_("Tools"), _("Tools"));
-	ActionManager::register_action (editor_actions, X_("TrimMenu"), _("Trim"));
-	ActionManager::register_action (editor_actions, X_("View"), _("View"));
-	ActionManager::register_action (editor_actions, X_("WaveformMenu"), _("Waveforms"));
-	ActionManager::register_action (editor_actions, X_("ZoomFocus"), _("Zoom Focus"));
-	ActionManager::register_action (editor_actions, X_("ZoomMenu"), _("Zoom"));
+	ActionManager::register_action (editor_menu_actions, X_("AlignMenu"), _("Align"));
+	ActionManager::register_action (editor_menu_actions, X_("Autoconnect"), _("Autoconnect"));
+	ActionManager::register_action (editor_menu_actions, X_("Crossfades"), _("Crossfades"));
+	ActionManager::register_action (editor_menu_actions, X_("Edit"), _("Edit"));
+	ActionManager::register_action (editor_menu_actions, X_("EditCursorMovementOptions"), _("Move Selected Marker"));
+	ActionManager::register_action (editor_menu_actions, X_("EditSelectRangeOptions"), _("Select Range Operations"));
+	ActionManager::register_action (editor_menu_actions, X_("EditSelectRegionOptions"), _("Select Regions"));
+	ActionManager::register_action (editor_menu_actions, X_("EditPointMenu"), _("Edit Point"));
+	ActionManager::register_action (editor_menu_actions, X_("FadeMenu"), _("Fade"));
+	ActionManager::register_action (editor_menu_actions, X_("LatchMenu"), _("Latch"));
+	ActionManager::register_action (editor_menu_actions, X_("Layering"), _("Layering"));
+	ActionManager::register_action (editor_menu_actions, X_("Link"), _("Link"));
+	ActionManager::register_action (editor_menu_actions, X_("ZoomFocusMenu"), _("Zoom Focus"));
+	ActionManager::register_action (editor_menu_actions, X_("KeyMouseActions"), _("Key Mouse"));
+	ActionManager::register_action (editor_menu_actions, X_("LocateToMarker"), _("Locate To Markers"));
+	ActionManager::register_action (editor_menu_actions, X_("MarkerMenu"), _("Markers"));
+	ActionManager::register_action (editor_menu_actions, X_("MeterFalloff"), _("Meter falloff"));
+	ActionManager::register_action (editor_menu_actions, X_("MeterHold"), _("Meter hold"));
+	ActionManager::register_action (editor_menu_actions, X_("Performance"), _("Performance"));
+	ActionManager::register_action (editor_menu_actions, X_("MiscOptions"), _("Misc Options"));
+	ActionManager::register_action (editor_menu_actions, X_("Monitoring"), _("Monitoring"));
+	ActionManager::register_action (editor_menu_actions, X_("MoveActiveMarkMenu"), _("Active Mark"));
+	ActionManager::register_action (editor_menu_actions, X_("MovePlayHeadMenu"), _("Playhead"));
+	ActionManager::register_action (editor_menu_actions, X_("NudgeRegionMenu"), _("Nudge"));
+	ActionManager::register_action (editor_menu_actions, X_("PlayMenu"), _("Play"));
+	ActionManager::register_action (editor_menu_actions, X_("PrimaryClockMenu"), _("Primary Clock"));
+	ActionManager::register_action (editor_menu_actions, X_("Pullup"), _("Pullup / Pulldown"));
+	ActionManager::register_action (editor_menu_actions, X_("RegionMenu"), _("Region"));
+	ActionManager::register_action (editor_menu_actions, X_("RegionEditOps"), _("Region operations"));
+	ActionManager::register_action (editor_menu_actions, X_("RegionGainMenu"), _("Gain"));
+	ActionManager::register_action (editor_menu_actions, X_("RulerMenu"), _("Rulers"));
+	ActionManager::register_action (editor_menu_actions, X_("SavedViewMenu"), _("Views"));
+	ActionManager::register_action (editor_menu_actions, X_("ScrollMenu"), _("Scroll"));
+	ActionManager::register_action (editor_menu_actions, X_("SecondaryClockMenu"), _("Secondary Clock"));
+	ActionManager::register_action (editor_menu_actions, X_("Select"), _("Select"));
+	ActionManager::register_action (editor_menu_actions, X_("SelectMenu"), _("Select"));
+	ActionManager::register_action (editor_menu_actions, X_("SeparateMenu"), _("Separate"));
+	ActionManager::register_action (editor_menu_actions, X_("SetLoopMenu"), _("Loop"));
+	ActionManager::register_action (editor_menu_actions, X_("SetPunchMenu"), _("Punch"));
+	ActionManager::register_action (editor_menu_actions, X_("Solo"), _("Solo"));
+	ActionManager::register_action (editor_menu_actions, X_("Subframes"), _("Subframes"));
+	ActionManager::register_action (editor_menu_actions, X_("SyncMenu"), _("Sync"));
+	ActionManager::register_action (editor_menu_actions, X_("TempoMenu"), _("Tempo"));
+	ActionManager::register_action (editor_menu_actions, X_("Timecode"), _("Timecode fps"));
+	ActionManager::register_action (editor_menu_actions, X_("TrackHeightMenu"), _("Height"));
+	ActionManager::register_action (editor_menu_actions, X_("TrackMenu"), _("Track"));
+	ActionManager::register_action (editor_menu_actions, X_("Tools"), _("Tools"));
+	ActionManager::register_action (editor_menu_actions, X_("TrimMenu"), _("Trim"));
+	ActionManager::register_action (editor_menu_actions, X_("View"), _("View"));
+	ActionManager::register_action (editor_menu_actions, X_("WaveformMenu"), _("Waveforms"));
+	ActionManager::register_action (editor_menu_actions, X_("ZoomFocus"), _("Zoom Focus"));
+	ActionManager::register_action (editor_menu_actions, X_("ZoomMenu"), _("Zoom"));
 
 	ActionManager::register_toggle_action (editor_actions, "link-region-and-track-selection", _("Link Region/Track Selection"), mem_fun (*this, &Editor::toggle_link_region_and_track_selection));
 	ActionManager::register_action (editor_actions, "break-drag", _("Break drag"), mem_fun (*this, &Editor::break_drag));
@@ -869,6 +870,7 @@ Editor::register_actions ()
 	ActionManager::add_action_group (mouse_mode_actions);
 	ActionManager::add_action_group (snap_actions);
 	ActionManager::add_action_group (editor_actions);
+	ActionManager::add_action_group (editor_menu_actions);
 }
 
 void
diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 5cc7e5f2b8..f650be1394 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -226,6 +226,18 @@ KeyEditor::populate ()
 			continue;
 		}
 
+		//kinda kludgy way to avoid displaying menu items as mappable
+		if ( parts[1] == _("Main_menu") )
+			continue;
+		if ( parts[1] == _("JACK") )
+			continue;
+		if ( parts[1] == _("redirectmenu") )
+			continue;
+		if ( parts[1] == _("Editor_menus") )
+			continue;
+		if ( parts[1] == _("RegionList") )
+			continue;
+
 		if ((r = nodes.find (parts[1])) == nodes.end()) {
 
 			/* top level is missing */
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 74e6c36c8a..58c657ab2a 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -182,6 +182,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway
 	sigc::signal<void,nframes64_t> UpdateAllTransportClocks;
 
 	Glib::RefPtr<Gtk::ActionGroup> editor_actions;
+	Glib::RefPtr<Gtk::ActionGroup> editor_menu_actions;
 
 	virtual void reset_focus() = 0;