diff options
| author | Sampo Savolainen <v2@iki.fi> | 2006-01-28 23:45:06 +0000 |
|---|---|---|
| committer | Sampo Savolainen <v2@iki.fi> | 2006-01-28 23:45:06 +0000 |
| commit | 60dc0ef48f0b4d56faf5b80242d85549e0791628 (patch) | |
| tree | 59087b9d307fda765ffc3eaea82442d34ea5b0f6 /gtk2_ardour | |
| parent | fd4c2310412fbdba85a5decd6b9d7f7b8962b8a8 (diff) | |
Edit menu reorganization, abort if problems with ardour.menus.
git-svn-id: svn://localhost/trunk/ardour2@304 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/actions.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/ardour.menus | 21 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 3 |
3 files changed, 21 insertions, 11 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index c60fa824dd..9f8c95ce2c 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -65,13 +65,21 @@ ActionManager::init () std::cout << "Loading UI definition file " << ui_file << std::endl; + bool loaded = false; + try { ui_manager->add_ui_from_file (ui_file); + loaded = true; } catch (Glib::MarkupError& err) { error << "badly formatted UI definition file" << endmsg; } catch (...) { error << "Ardour menu definition file not found" << endmsg; } + + if (!loaded) { + error << "ardour will not work without a valid ardour.menus file" << endmsg; + exit(1); + } } RefPtr<Action> diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index aca4152f7a..3ebf8c9e5f 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -67,18 +67,19 @@ <menuitem action='editor-cut'/> <menuitem action='editor-copy'/> <menuitem action='editor-paste'/> - <separator/> - <menuitem action='select-all'/> - <menuitem action='select-all-after-edit-cursor'/> - <menuitem action='select-all-before-edit-cursor'/> - <menuitem action='select-all-after-playhead'/> - <menuitem action='select-all-before-playhead'/> - <menuitem action='select-all-in-punch-range'/> - <menuitem action='select-all-in-loop-range'/> - <separator/> + <separator/> <menuitem action='extend-range-to-start-of-region'/> <menuitem action='extend-range-to-end-of-region'/> - <separator/> + <separator/> + <menu action="EditSelectRegionOptions"> + <menuitem action='select-all'/> + <menuitem action='select-all-after-edit-cursor'/> + <menuitem action='select-all-before-edit-cursor'/> + <menuitem action='select-all-after-playhead'/> + <menuitem action='select-all-before-playhead'/> + <menuitem action='select-all-in-punch-range'/> + <menuitem action='select-all-in-loop-range'/> + </menu> <menu action='EditCursorMovementOptions'> <menuitem action='edit-cursor-to-next-region-start'/> <menuitem action='edit-cursor-to-next-region-end'/> diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index e3dcfac15a..544035f33e 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -23,8 +23,9 @@ Editor::register_actions () /* non-operative menu items for menu bar */ ActionManager::register_action (editor_actions, X_("Edit"), _("Edit")); + ActionManager::register_action (editor_actions, X_("EditSelectRegionOptions"), _("Select regions")); ActionManager::register_action (editor_actions, X_("EditCursorMovementOptions"), _("Move edit cursor")); - ActionManager::register_action (editor_actions, X_("RegionEditOps"), _("Region")); + ActionManager::register_action (editor_actions, X_("RegionEditOps"), _("Region operations")); ActionManager::register_action (editor_actions, X_("View"), _("View")); ActionManager::register_action (editor_actions, X_("ZoomFocus"), _("ZoomFocus")); ActionManager::register_action (editor_actions, X_("MeterHold"), _("Meter hold")); |