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

git-svn-id: svn://localhost/trunk/ardour2@304 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index c60fa824dd6b638c011594ad606332a3f5a59867..9f8c95ce2c72637200948743d8702719167b0f44 100644 (file)
--- 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 aca4152f7ae6c696b6591eff83db956e4aaca81c..3ebf8c9e5ff345f41211a517f88711d008e21feb 100644 (file)
--- 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 e3dcfac15ad6c9cca3e83271763d72673bcb87f2..544035f33ee02356a4fe78cf1c8b0119ba5414fe 100644 (file)
--- 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"));