tweak up the region context menu quite a bit

git-svn-id: svn://localhost/ardour2/branches/3.0@11285 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index faa3e6ac06a9b418630fd832bcda6f7704da59b7..52f4f902f656dacc4097955dfa4e991d7120b9cf 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -226,34 +226,25 @@
 
     <menu name='RegionMenu' action='RegionMenu'>
       <menuitem action='insert-region-from-region-list'/>
-      <menuitem action='rename-region'/>
-      <menuitem action='show-region-properties'/>
-      <menuitem action='set-region-sync-position'/>
-      <menuitem action='remove-region-sync'/>
       <menuitem action='play-selected-regions'/>
-      <menuitem action='export-region'/>
-      <menuitem action='bounce-regions-processed'/>
-      <menuitem action='bounce-regions-unprocessed'/>
-      <menuitem action='combine-regions'/>
-      <menuitem action='uncombine-regions'/>
-      <menuitem action='analyze-region'/>
-      <menuitem action='toggle-region-lock'/>
-      <menuitem action='toggle-region-lock-style'/>
-      <menuitem action='toggle-opaque-region'/>
-      <menuitem action='toggle-region-mute'/>
-      <menuitem action='pitch-shift-region'/>
-      <menuitem action='transpose-region'/>
-      <menuitem action='naturalize-region'/>
-      <menuitem action='split-region'/>
-      <menuitem action='split-multichannel-region'/>
-      <menuitem action='remove-region'/>
       <menuitem action='loop-region'/>
-      <menuitem action='snap-regions-to-grid'/>
-      <menuitem action='close-region-gaps'/>
-      <menuitem action='place-transient' />
-      <menuitem action='show-rhythm-ferret'/>
-      <menuitem action='strip-region-silence'/>
-      <menuitem action='reverse-region'/>    
+      <menuitem action='rename-region'/>
+      <menuitem action='show-region-properties'/>
+      <menu action='RegionMenuEdit'>
+         <menuitem action='combine-regions'/>
+         <menuitem action='uncombine-regions'/>
+         <menuitem action='analyze-region'/>
+         <menuitem action='toggle-opaque-region'/>
+         <menuitem action='toggle-region-mute'/>
+         <menuitem action='pitch-shift-region'/>
+         <menuitem action='split-region'/>
+         <menuitem action='split-multichannel-region'/>
+         <menuitem action='close-region-gaps'/>
+         <menuitem action='place-transient' />
+         <menuitem action='show-rhythm-ferret'/>
+         <menuitem action='strip-region-silence'/>
+         <menuitem action='reverse-region'/>    
+      </menu>
       <menu action='RegionMenuLayering'>
         <menuitem action='raise-region-to-top'/>
         <menuitem action='raise-region'/>
@@ -261,20 +252,27 @@
         <menuitem action='lower-region-to-bottom'/>
       </menu>
       <menu action='RegionMenuMIDI'>
+        <menuitem action='transpose-region'/>
         <menuitem action='insert-patch-change'/>
         <menuitem action='quantize-region'/>
         <menuitem action='fork-region'/>
         <menuitem action='show-region-list-editor'/>
       </menu>
       <menu action='RegionMenuGain'>
+        <menuitem action='normalize-region'/>
         <menuitem action='boost-region-gain'/>
         <menuitem action='cut-region-gain'/>                      
         <menuitem action='reset-region-gain-envelopes'/>
         <menuitem action='toggle-region-gain-envelope-visible'/>
         <menuitem action='toggle-region-gain-envelope-active'/>
-        <menuitem action='normalize-region'/>
       </menu>
-      <menu action='RegionMenuNudge'>
+      <menu action='RegionMenuPosition'>
+        <menuitem action='naturalize-region'/>
+        <menuitem action='snap-regions-to-grid'/>
+        <menuitem action='toggle-region-lock'/>
+        <menuitem action='toggle-region-lock-style'/>
+        <menuitem action='set-region-sync-position'/>
+        <menuitem action='remove-region-sync'/>
         <menuitem action='nudge-forward'/>
         <menuitem action='nudge-backward'/>
         <menuitem action='nudge-forward-by-capture-offset'/>
@@ -305,6 +303,11 @@
         <menuitem action='multi-duplicate-region'/>
         <menuitem action='region-fill-track'/>
       </menu>
+      <menuitem action='export-region'/>
+      <menuitem action='bounce-regions-processed'/>
+      <menuitem action='bounce-regions-unprocessed'/>
+      <separator/>
+      <menuitem action='remove-region'/>
     </menu>
 
     <menu action='TrackMenu'>
@@ -580,55 +583,38 @@
   </popup>
 
   <popup name='PopupRegionMenu' action='PopupRegionMenu'>
-    <menuitem action='rename-region'/>
-    <menuitem action='show-region-properties'/>
-    <menuitem action='combine-regions'/>
-    <menuitem action='uncombine-regions'/>
-    <menuitem action='split-region'/>
-    <menuitem action='split-multichannel-region'/>
-    <menuitem action='set-region-sync-position'/>
-    <menuitem action='remove-region-sync'/>
     <menuitem action='play-selected-regions'/>
-    <menuitem action='export-region'/>
-    <menuitem action='bounce-regions-processed'/>
-    <menuitem action='bounce-regions-unprocessed'/>
-    <menuitem action='analyze-region'/>
-    <menuitem action='toggle-region-lock'/>
-    <menuitem action='toggle-region-lock-style'/>
-    <menuitem action='toggle-opaque-region'/>
-    <menuitem action='toggle-region-mute'/>
-    <menuitem action='pitch-shift-region'/>
-    <menuitem action='transpose-region'/>
-    <menuitem action='naturalize-region'/>
-    <menuitem action='reverse-region'/>    
     <menuitem action='loop-region'/>
-    <menuitem action='snap-regions-to-grid'/>
-    <menuitem action='close-region-gaps'/>
-    <menuitem action='place-transient' />
-    <menuitem action='show-rhythm-ferret'/>
-    <menuitem action='strip-region-silence'/>
-    <menuitem action='remove-region'/>
-    <menu action='RegionMenuLayering'>
-      <menuitem action='raise-region-to-top'/>
-      <menuitem action='raise-region'/>
-      <menuitem action='lower-region'/>
-      <menuitem action='lower-region-to-bottom'/>
+    <menuitem action='rename-region'/>
+    <menuitem action='show-region-properties'/>
+    <menu action='RegionMenuEdit'>
+       <menuitem action='combine-regions'/>
+       <menuitem action='uncombine-regions'/>
+       <menuitem action='split-region'/>
+       <menuitem action='split-multichannel-region'/>
+       <menuitem action='toggle-opaque-region'/>
+       <menuitem action='toggle-region-mute'/>
+       <menuitem action='pitch-shift-region'/>
+       <menuitem action='reverse-region'/>    
+       <menuitem action='close-region-gaps'/>
+       <menuitem action='place-transient' />
+       <menuitem action='show-rhythm-ferret'/>
+       <menuitem action='strip-region-silence'/>
     </menu>
     <menu action='RegionMenuMIDI'>
+      <menuitem action='transpose-region'/>
       <menuitem action='insert-patch-change-context'/>
       <menuitem action='quantize-region'/>
       <menuitem action='fork-region'/>
       <menuitem action='show-region-list-editor'/>
     </menu>
-    <menu action='RegionMenuGain'>
-      <menuitem action='boost-region-gain'/>
-      <menuitem action='cut-region-gain'/>                        
-      <menuitem action='reset-region-gain-envelopes'/>
-      <menuitem action='toggle-region-gain-envelope-visible'/>
-      <menuitem action='toggle-region-gain-envelope-active'/>
-      <menuitem action='normalize-region'/>
-    </menu>
-    <menu action='RegionMenuNudge'>
+    <menu action='RegionMenuPosition'>
+      <menuitem action='naturalize-region'/>
+      <menuitem action='toggle-region-lock'/>
+      <menuitem action='toggle-region-lock-style'/>
+      <menuitem action='snap-regions-to-grid'/>
+      <menuitem action='set-region-sync-position'/>
+      <menuitem action='remove-region-sync'/>
       <menuitem action='nudge-forward'/>
       <menuitem action='nudge-backward'/>
       <menuitem action='nudge-forward-by-capture-offset'/>
@@ -642,6 +628,12 @@
       <menuitem action='trim-to-previous-region'/>
       <menuitem action='trim-to-next-region'/>
     </menu>
+    <menu action='RegionMenuLayering'>
+      <menuitem action='raise-region-to-top'/>
+      <menuitem action='raise-region'/>
+      <menuitem action='lower-region'/>
+      <menuitem action='lower-region-to-bottom'/>
+    </menu>
     <menu action='RegionMenuRanges'>
       <menuitem action='set-loop-from-region'/>
       <menuitem action='set-punch-from-region'/>
@@ -649,6 +641,14 @@
       <menuitem action='add-range-markers-from-region'/>
       <menuitem action='set-selection-from-region'/>
     </menu>
+    <menu action='RegionMenuGain'>
+      <menuitem action='normalize-region'/>
+      <menuitem action='boost-region-gain'/>
+      <menuitem action='cut-region-gain'/>                        
+      <menuitem action='reset-region-gain-envelopes'/>
+      <menuitem action='toggle-region-gain-envelope-visible'/>
+      <menuitem action='toggle-region-gain-envelope-active'/>
+    </menu>
     <menu action='RegionMenuFades'>
       <menuitem action='toggle-region-fade-in'/>
       <menuitem action='toggle-region-fade-out'/>
@@ -659,6 +659,12 @@
       <menuitem action='multi-duplicate-region'/>
       <menuitem action='region-fill-track'/>
     </menu>
+    <menuitem action='export-region'/>
+    <menuitem action='bounce-regions-processed'/>
+    <menuitem action='bounce-regions-unprocessed'/>
+    <menuitem action='analyze-region'/>
+    <separator/>
+    <menuitem action='remove-region'/>
     
   </popup>
 

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 61f1055a91e34da80984ab00dfd83e418315e3fa..1d33a2bdbaa33d77a8803acde0c72f30e889cf3a 100644 (file)
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -97,7 +97,8 @@ Editor::register_actions ()
        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_("RegionMenuNudge"), _("Nudge"));
+       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"));
@@ -1334,16 +1335,16 @@ Editor::register_region_actions ()
 
        /* Add a single range marker around all selected regions */
        reg_sens (
-               _region_actions, "add-range-marker-from-region", _("Add 1 Range Marker"), sigc::mem_fun (*this, &Editor::add_location_from_region)
+               _region_actions, "add-range-marker-from-region", _("Add Single Range Marker"), sigc::mem_fun (*this, &Editor::add_location_from_region)
                );
 
        /* Add a range marker around each selected region */
        reg_sens (
-               _region_actions, "add-range-markers-from-region", _("Add Range Marker(s)"), sigc::mem_fun (*this, &Editor::add_locations_from_region)
+               _region_actions, "add-range-markers-from-region", _("Add Range Marker Per Region"), sigc::mem_fun (*this, &Editor::add_locations_from_region)
                );
 
        /* Snap selected regions to the grid */
-       reg_sens (_region_actions, "snap-regions-to-grid", _("Snap to Grid"), sigc::mem_fun (*this, &Editor::snap_regions_to_grid));
+       reg_sens (_region_actions, "snap-regions-to-grid", _("Snap Position To Grid"), sigc::mem_fun (*this, &Editor::snap_regions_to_grid));
 
        /* Close gaps in selected regions */
        reg_sens (_region_actions, "close-region-gaps", _("Close Gaps"), sigc::mem_fun (*this, &Editor::close_region_gaps));

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 142204f9b4864992404e73146cd8a6db68cd4d85..b7b0019b892e184e3c377f2d3d839ec8691c8ecb 100644 (file)
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1147,10 +1147,16 @@ Editor::sensitize_the_right_region_actions ()
        }
 
        if (!have_midi) {
+               editor_actions->get_action("RegionMenuMIDI")->set_sensitive (false);
                _region_actions->get_action("show-region-list-editor")->set_sensitive (false);
                _region_actions->get_action("quantize-region")->set_sensitive (false);
                _region_actions->get_action("fork-region")->set_sensitive (false);
+               _region_actions->get_action("insert-patch-change-context")->set_sensitive (false);
+               _region_actions->get_action("insert-patch-change")->set_sensitive (false);
                _region_actions->get_action("transpose-region")->set_sensitive (false);
+       } else {
+               editor_actions->get_action("RegionMenuMIDI")->set_sensitive (true);
+               /* others were already marked sensitive */
        }
 
        if (_edit_point == EditAtMouse) {