From 228e51b31975445c4b157b561807517c85cd07b8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 26 Oct 2014 09:08:37 -0400
Subject: [PATCH] Adapt the testpopover example

Add the required boxes for each submenu. We now need to specify the
submenu name only once per submenu.
---
 tests/popover2.ui | 921 ++++++++++++++++++++++------------------------
 1 file changed, 443 insertions(+), 478 deletions(-)

diff --git a/tests/popover2.ui b/tests/popover2.ui
index 4b85bc35b5..10a2241aba 100644
--- a/tests/popover2.ui
+++ b/tests/popover2.ui
@@ -5,398 +5,446 @@
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">3</property>
+        <property name="margin">10</property>
         <child>
-          <object class="GtkLabel">
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="label">Edit</property>
-            <style>
-              <class name="separator"/>
-            </style>
+            <property name="orientation">vertical</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">3</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="label">Edit</property>
+                <style>
+                  <class name="separator"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.cut</property>
+            <property name="text">Cut</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.copy</property>
+            <property name="text">Copy</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.paste</property>
+            <property name="text">Paste</property>
           </object>
         </child>
         <child>
           <object class="GtkSeparator">
             <property name="visible">True</property>
             <property name="orientation">horizontal</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">3</property>
+            <property name="margin-bottom">3</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">action1</property>
+            <property name="text">No action</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action2</property>
+            <property name="text">Toggle</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action2a</property>
+            <property name="text">Another Toggle</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">3</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="label">Middle Section</property>
+                <style>
+                  <class name="separator"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action3</property>
+            <property name="action-target">'three'</property>
+            <property name="text">Radio 1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action3</property>
+            <property name="action-target">'four'</property>
+            <property name="text">Radio 2</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="text">Submenu 1</property>
+            <property name="menu-name">submenu1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="text">Submenu 2</property>
+            <property name="menu-name">submenu2</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">3</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="label">End Section</property>
+                <style>
+                  <class name="separator"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action9</property>
+            <property name="text">Another Item 9</property>
+            <property name="icon">icon9</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action10</property>
+            <property name="text">Another Item 10</property>
           </object>
         </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.cut</property>
-        <property name="text">Cut</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.copy</property>
-        <property name="text">Copy</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.paste</property>
-        <property name="text">Paste</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparator">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">3</property>
-        <property name="margin-bottom">3</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">action1</property>
-        <property name="text">No action</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action2</property>
-        <property name="text">Toggle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action2a</property>
-        <property name="text">Another Toggle</property>
       </object>
     </child>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">3</property>
+        <property name="margin">10</property>
         <child>
-          <object class="GtkLabel">
+          <object class="GtkModelButton">
             <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="label">Middle Section</property>
-            <style>
-              <class name="separator"/>
-            </style>
+            <property name="text">Submenu 1</property>
+            <property name="inverted">True</property>
+            <property name="centered">True</property>
+            <property name="menu-name">main</property>
           </object>
         </child>
         <child>
-          <object class="GtkSeparator">
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">3</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="label">5555</property>
+                <style>
+                  <class name="separator"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action5</property>
+            <property name="text">Item 5</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action5</property>
+            <property name="text">Item 5a</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action5</property>
+            <property name="text">Item 5b</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="orientation">horizontal</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action3</property>
-        <property name="action-target">'three'</property>
-        <property name="text">Radio 1</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action3</property>
-        <property name="action-target">'four'</property>
-        <property name="text">Radio 2</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="text">Submenu 1</property>
-        <property name="menu-name">submenu1</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="text">Submenu 2</property>
-        <property name="menu-name">submenu2</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">3</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="label">End Section</property>
+            <property name="halign">fill</property>
+            <property name="margin-top">10</property>
             <style>
-              <class name="separator"/>
+              <class name="linked"/>
             </style>
+            <child>
+              <object class="GtkModelButton">
+                <property name="visible">True</property>
+                <property name="text">List</property>
+                <property name="action-name">top.set-view</property>
+                <property name="action-target">'list'</property>
+                <property name="iconic">True</property>
+                <property name="centered">True</property>
+                <property name="icon">icon-list</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="visible">True</property>
+                <property name="text">Grid</property>
+                <property name="action-name">top.set-view</property>
+                <property name="action-target">'grid'</property>
+                <property name="iconic">True</property>
+                <property name="centered">True</property>
+                <property name="icon">icon-grid</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkSeparator">
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action5</property>
+            <property name="text">Item 5c</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action5</property>
+            <property name="text">Item 5d</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">3</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="label">Format</property>
+                <style>
+                  <class name="separator"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="orientation">horizontal</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action9</property>
-        <property name="text">Another Item 9</property>
-        <property name="icon">icon9</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action10</property>
-        <property name="text">Another Item 10</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="text">Submenu 1</property>
-        <property name="inverted">True</property>
-        <property name="centered">True</property>
-        <property name="menu-name">main</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">3</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="label">5555</property>
+            <property name="halign">fill</property>
+            <property name="margin-top">10</property>
             <style>
-              <class name="separator"/>
+              <class name="linked"/>
             </style>
+            <child>
+              <object class="GtkModelButton">
+                <property name="visible">True</property>
+                <property name="text">Bold</property>
+                <property name="action-name">top.bold</property>
+                <property name="iconic">True</property>
+                <property name="centered">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="visible">True</property>
+                <property name="text">Italic</property>
+                <property name="action-name">top.italic</property>
+                <property name="iconic">True</property>
+                <property name="centered">True</property>
+                <property name="icon">icon-italic</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="visible">True</property>
+                <property name="text">Strikethrough</property>
+                <property name="action-name">top.strikethrough</property>
+                <property name="iconic">True</property>
+                <property name="centered">True</property>
+                <property name="icon">icon-strikethrough</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="visible">True</property>
+                <property name="text">Underline</property>
+                <property name="action-name">top.underline</property>
+                <property name="iconic">True</property>
+                <property name="centered">True</property>
+                <property name="icon">icon-underline</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkSeparator">
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
+            <property name="orientation">vertical</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">3</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="label">6666</property>
+                <style>
+                  <class name="separator"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
+              </object>
+            </child>
           </object>
         </child>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action5</property>
-        <property name="text">Item 5</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action5</property>
-        <property name="text">Item 5a</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action5</property>
-        <property name="text">Item 5b</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
-        <property name="halign">fill</property>
-        <property name="margin-top">10</property>
-        <style>
-          <class name="linked"/>
-        </style>
-        <child>
-          <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="text">List</property>
-            <property name="action-name">top.set-view</property>
-            <property name="action-target">'list'</property>
-            <property name="iconic">True</property>
-            <property name="centered">True</property>
-            <property name="icon">icon-list</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkModelButton">
             <property name="visible">True</property>
-            <property name="text">Grid</property>
-            <property name="action-name">top.set-view</property>
-            <property name="action-target">'grid'</property>
-            <property name="iconic">True</property>
-            <property name="centered">True</property>
-            <property name="icon">icon-grid</property>
+            <property name="action-name">top.action6</property>
+            <property name="text">Item 6</property>
           </object>
-          <packing>
-            <property name="expand">True</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action5</property>
-        <property name="text">Item 5c</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action5</property>
-        <property name="text">Item 5d</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">3</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="label">Format</property>
-            <style>
-              <class name="separator"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
-        <property name="halign">fill</property>
-        <property name="margin-top">10</property>
-        <style>
-          <class name="linked"/>
-        </style>
-        <child>
-          <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="text">Bold</property>
-            <property name="action-name">top.bold</property>
-            <property name="iconic">True</property>
-            <property name="centered">True</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-          </packing>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="visible">True</property>
-            <property name="text">Italic</property>
-            <property name="action-name">top.italic</property>
-            <property name="iconic">True</property>
-            <property name="centered">True</property>
-            <property name="icon">icon-italic</property>
+            <property name="action-name">top.action6</property>
+            <property name="text">Item 6a</property>
           </object>
-          <packing>
-            <property name="expand">True</property>
-          </packing>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="visible">True</property>
-            <property name="text">Strikethrough</property>
-            <property name="action-name">top.strikethrough</property>
-            <property name="iconic">True</property>
-            <property name="centered">True</property>
-            <property name="icon">icon-strikethrough</property>
+            <property name="action-name">top.action6</property>
+            <property name="text">Item 6b</property>
           </object>
-          <packing>
-            <property name="expand">True</property>
-          </packing>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="visible">True</property>
-            <property name="text">Underline</property>
-            <property name="action-name">top.underline</property>
-            <property name="iconic">True</property>
-            <property name="centered">True</property>
-            <property name="icon">icon-underline</property>
+            <property name="action-name">top.action6</property>
+            <property name="text">Item 6c</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action6</property>
+            <property name="text">Item 6d</property>
           </object>
-          <packing>
-            <property name="expand">True</property>
-          </packing>
         </child>
       </object>
       <packing>
@@ -407,164 +455,81 @@
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">3</property>
+        <property name="margin">10</property>
         <child>
-          <object class="GtkLabel">
+          <object class="GtkModelButton">
             <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="label">6666</property>
-            <style>
-              <class name="separator"/>
-            </style>
+            <property name="text">Submenu 2</property>
+            <property name="inverted">True</property>
+            <property name="centered">True</property>
+            <property name="menu-name">main</property>
           </object>
         </child>
         <child>
-          <object class="GtkSeparator">
+          <object class="GtkModelButton">
             <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
+            <property name="action-name">top.action7</property>
+            <property name="text">Item 7</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="text">Subsubmenu</property>
+            <property name="icon">icon9</property>
+            <property name="menu-name">subsubmenu</property>
           </object>
         </child>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action6</property>
-        <property name="text">Item 6</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action6</property>
-        <property name="text">Item 6a</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action6</property>
-        <property name="text">Item 6b</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action6</property>
-        <property name="text">Item 6c</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action6</property>
-        <property name="text">Item 6d</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="text">Submenu 2</property>
-        <property name="inverted">True</property>
-        <property name="centered">True</property>
-        <property name="menu-name">main</property>
       </object>
       <packing>
         <property name="submenu">submenu2</property>
       </packing>
     </child>
     <child>
-      <object class="GtkModelButton">
+      <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="action-name">top.action7</property>
-        <property name="text">Item 7</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="text">Subsubmenu</property>
-        <property name="icon">icon9</property>
-        <property name="menu-name">subsubmenu</property>
-      </object>
-      <packing>
-        <property name="submenu">submenu2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="text">Subsubmenu</property>
-        <property name="inverted">True</property>
-        <property name="centered">True</property>
-        <property name="menu-name">submenu2</property>
-      </object>
-      <packing>
-        <property name="submenu">subsubmenu</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">action8</property>
-        <property name="text">Item 8</property>
-      </object>
-      <packing>
-        <property name="submenu">subsubmenu</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSeparator">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">3</property>
-        <property name="margin-bottom">3</property>
-      </object>
-      <packing>
-        <property name="submenu">subsubmenu</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action9</property>
-        <property name="text">Item 9</property>
-      </object>
-      <packing>
-        <property name="submenu">subsubmenu</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkModelButton">
-        <property name="visible">True</property>
-        <property name="action-name">top.action10</property>
-        <property name="text">Item 10</property>
+        <property name="orientation">vertical</property>
+        <property name="margin">10</property>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="text">Subsubmenu</property>
+            <property name="inverted">True</property>
+            <property name="centered">True</property>
+            <property name="menu-name">submenu2</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">action8</property>
+            <property name="text">Item 8</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">3</property>
+            <property name="margin-bottom">3</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action9</property>
+            <property name="text">Item 9</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="visible">True</property>
+            <property name="action-name">top.action10</property>
+            <property name="text">Item 10</property>
+          </object>
+        </child>
       </object>
       <packing>
         <property name="submenu">subsubmenu</property>