Edit menu reorganization, abort if problems with ardour.menus.

git-svn-id: svn://localhost/trunk/ardour2@304 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Sampo Savolainen 2006-01-28 23:45:06 +00:00
parent fd4c231041
commit 60dc0ef48f
3 changed files with 21 additions and 11 deletions

View File

@ -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>

View File

@ -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'/>

View File

@ -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"));