Re-order redirect-box (plugin) context menu

* move plugin-specific items (presets, edit, rename, etc) to the top
* group related items together

gtk2_ardour/ardour.menus.in

@@ -789,6 +789,16 @@
   </popup>
 
   <popup name='ProcessorMenu' accelerators='true'>
+    <menuitem action='presets'/>
+    <menuitem action='edit'/>
+    <menuitem action='edit-generic'/>
+    <menuitem action='controls'/>
+    <menuitem action='rename'/>
+    <separator/>
+    <menuitem action='manage-pins'/>
+    <separator/>
+    <menuitem action='send_options'/>
+    <separator/>
     <menuitem action='newplugin'/>
     <menuitem action='newinsert'/>
     <menuitem action='newsend'/>
@@ -796,19 +806,6 @@
     <menuitem action='newlisten'/>
     <menuitem action='removelisten'/>
     <separator/>
-    <menuitem action='controls'/>
-    <menuitem action='send_options'/>
-    <menuitem action='presets'/>
-    <separator/>
-#ifndef MIXBUS
-    <menu action="disk-io-menu">
-      <menuitem action='disk-io-prefader'/>
-      <menuitem action='disk-io-postfader'/>
-      <menuitem action='disk-io-custom'/>
-    </menu>
-#endif
-    <menuitem action='custom-volume-pos'/>
-    <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
     <menuitem action='clear_post'/>
@@ -818,8 +815,6 @@
     <menuitem action='paste'/>
     <menuitem action='delete'/>
     <separator/>
-    <menuitem action='rename'/>
-    <separator/>
     <menuitem action='selectall'/>
     <menuitem action='deselectall'/>
     <separator/>
@@ -829,10 +824,15 @@
     <menuitem action='ab_plugins'/>
 #endif
     <separator/>
-    <menuitem action='manage-pins'/>
+#ifndef MIXBUS
+    <menu action="disk-io-menu">
+      <menuitem action='disk-io-prefader'/>
+      <menuitem action='disk-io-postfader'/>
+      <menuitem action='disk-io-custom'/>
+    </menu>
+#endif
+    <menuitem action='custom-volume-pos'/>
     <separator/>
-    <menuitem action='edit'/>
-    <menuitem action='edit-generic'/>
   </popup>
 
   <popup name='ShuttleUnitPopup' accelerators='true'>

gtk2_ardour/processor_box.cc

@@ -4102,7 +4102,7 @@ ProcessorBox::register_actions ()
 	ActionManager::register_action (processor_box_actions, X_("newlisten"), _("New Foldback Send ..."));
 	ActionManager::register_action (processor_box_actions, X_("removelisten"), _("Remove Foldback Send ..."));
 
-	ActionManager::register_action (processor_box_actions, X_("controls"), _("Controls"));
+	ActionManager::register_action (processor_box_actions, X_("controls"), _("Inline Controls"));
 	ActionManager::register_action (processor_box_actions, X_("send_options"), _("Send Options"));
 	ActionManager::register_action (processor_box_actions, X_("presets"), _("Presets"));