From a626f1f0d529cb8cb7aceab44e51785ff2a5f720 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sat, 1 Oct 2022 18:04:30 +0200
Subject: [PATCH] Synchronize grid menus (#8973)

---
 gtk2_ardour/ardour.menus.in   | 29 +++++++++++++++++++----------
 gtk2_ardour/editor_actions.cc |  4 ++++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 47c33b8f1a..ee392124d6 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -286,16 +286,25 @@
         <menuitem action='grid-type-eighths'/>
         <menuitem action='grid-type-asixteenthbeat'/>
         <menuitem action='grid-type-thirtyseconds'/>
-        <menuitem action='grid-type-thirds'/>
-        <menuitem action='grid-type-sixths'/>
-        <menuitem action='grid-type-twelfths'/>
-        <menuitem action='grid-type-twentyfourths'/>
-        <menuitem action='grid-type-fifths'/>
-        <menuitem action='grid-type-tenths'/>
-        <menuitem action='grid-type-twentieths'/>
-        <menuitem action='grid-type-sevenths'/>
-        <menuitem action='grid-type-fourteenths'/>
-        <menuitem action='grid-type-twentyeighths'/>
+        <menu action='GridChoiceTriplets'>
+          <menuitem action='grid-type-thirds'/>
+          <menuitem action='grid-type-sixths'/>
+          <menuitem action='grid-type-twelfths'/>
+          <menuitem action='grid-type-twentyfourths'/>
+        </menu>
+        <menu action='GridChoiceQuintuplets'>
+          <menuitem action='grid-type-fifths'/>
+          <menuitem action='grid-type-tenths'/>
+          <menuitem action='grid-type-twentieths'/>
+        </menu>
+        <menu action='GridChoiceSeptuplets'>
+          <menuitem action='grid-type-sevenths'/>
+          <menuitem action='grid-type-fourteenths'/>
+          <menuitem action='grid-type-twentyeighths'/>
+        </menu>
+        <menuitem action='grid-type-timecode'/>
+        <menuitem action='grid-type-minsec'/>
+        <menuitem action='grid-type-cdframe'/>
       </menu>
       <separator/>
       <menu action="TempoMenu">
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 63e48e17e7..762e8860c0 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -180,6 +180,10 @@ Editor::register_actions ()
 	ActionManager::register_action (editor_menu_actions, X_("Timecode"), _("Timecode fps"));
 	ActionManager::register_action (editor_menu_actions, X_("LayerDisplay"), _("Region Layers"));
 
+	ActionManager::register_action (editor_menu_actions, X_("GridChoiceTriplets"), _("Triplets"));
+	ActionManager::register_action (editor_menu_actions, X_("GridChoiceQuintuplets"), _("Quintuplets"));
+	ActionManager::register_action (editor_menu_actions, X_("GridChoiceSeptuplets"), _("Septuplets"));
+
 	act = ActionManager::register_action (editor_menu_actions, X_("TrackHeightMenu"), _("Height"));
 	ActionManager::stripable_selection_sensitive_actions.push_back (act);