ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove menu items from the keybindings dialog 

git-svn-id: svn://localhost/ardour2/branches/3.0@11654 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Ben Loftis 2012-03-12 19:24:16 +00:00
parent 1b19db251b
commit b4999fbc14
4 changed files with 91 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk2_ardour/ardour_ui_ed.cc
View File

@ -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 */
@ -459,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);
}

114
gtk2_ardour/editor_actions.cc
View File

@ -82,65 +82,66 @@ Editor::register_actions ()
RefPtr<Action> act;
editor_actions = ActionGroup::create (X_("Editor"));
editor_menu_actions = ActionGroup::create (X_("Editor"));
/* 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_("RegionMenu"), _("Region"));
ActionManager::register_action (editor_actions, X_("RegionMenuLayering"), _("Layering"));
ActionManager::register_action (editor_actions, X_("RegionMenuPosition"), _("Position"));
ActionManager::register_action (editor_actions, X_("RegionMenuEdit"), _("Edit"));
ActionManager::register_action (editor_actions, X_("RegionMenuTrim"), _("Trim"));
ActionManager::register_action (editor_actions, X_("RegionMenuGain"), _("Gain"));
ActionManager::register_action (editor_actions, X_("RegionMenuRanges"), _("Ranges"));
ActionManager::register_action (editor_actions, X_("RegionMenuFades"), _("Fades"));
ActionManager::register_action (editor_actions, X_("RegionMenuMIDI"), _("MIDI"));
ActionManager::register_action (editor_actions, X_("RegionMenuDuplicate"), _("Duplicate"));
ActionManager::register_action (editor_actions, X_("Link"), _("Link"));
ActionManager::register_action (editor_actions, X_("ZoomFocusMenu"), _("Zoom Focus"));
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_("MIDI"), _("MIDI Options"));
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_("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_("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_("View"), _("View"));
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_("RegionMenu"), _("Region"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuLayering"), _("Layering"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuPosition"), _("Position"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuEdit"), _("Edit"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuTrim"), _("Trim"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuGain"), _("Gain"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuRanges"), _("Ranges"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuFades"), _("Fades"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuMIDI"), _("MIDI"));
ActionManager::register_action (editor_menu_actions, X_("RegionMenuDuplicate"), _("Duplicate"));
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_("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_("MIDI"), _("MIDI Options"));
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_("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_("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_("View"), _("View"));
ActionManager::register_action (editor_menu_actions, X_("ZoomFocus"), _("Zoom Focus"));
ActionManager::register_action (editor_menu_actions, X_("ZoomMenu"), _("Zoom"));
register_region_actions ();
@ -631,6 +632,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

14
gtk2_ardour/keyeditor.cc
View File

@ -250,6 +250,20 @@ 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 ( parts[1] == _("ProcessorMenu") )
continue;
if ((r = nodes.find (parts[1])) == nodes.end()) {
/* top level is missing */

1
gtk2_ardour/public_editor.h
View File

@ -305,6 +305,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
static sigc::signal<void> DropDownKeys;
Glib::RefPtr<Gtk::ActionGroup> editor_actions;
Glib::RefPtr<Gtk::ActionGroup> editor_menu_actions;
Glib::RefPtr<Gtk::ActionGroup> _region_actions;
virtual void reset_focus () = 0;