[gedit] Make the gear menu a popover and redesign menu

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 8b20fe04c26dbf795519ebac1c4347eb2d7a6cb4
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Fri Mar 28 22:55:36 2014 +0100

    Make the gear menu a popover and redesign menu

 gedit/gedit-menu.ui   |  148 +++++++++++++++++++++++++++----------------------
 gedit/gedit-window.ui |    1 +
 2 files changed, 83 insertions(+), 66 deletions(-)
---
diff --git a/gedit/gedit-menu.ui b/gedit/gedit-menu.ui
index 702a197..830cc42 100644
--- a/gedit/gedit-menu.ui
+++ b/gedit/gedit-menu.ui
@@ -34,15 +34,30 @@
   </menu>
   <menu id="gear_menu_withappmenu">
     <section>
-      <attribute name="id">file-section</attribute>
-    </section>
-    <section>
-      <attribute name="id">file-section-1</attribute>
+      <attribute name="id">juntion-section</attribute>
+      <attribute name="display-hint">horizontal-buttons</attribute>
       <item>
         <attribute name="label" translatable="yes">_Reload</attribute>
         <attribute name="action">win.revert</attribute>
+        <attribute name="verb-icon">view-refresh-symbolic</attribute>
       </item>
       <item>
+        <attribute name="label" translatable="yes">_Print…</attribute>
+        <attribute name="action">win.print</attribute>
+        <attribute name="verb-icon">printer-symbolic</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Fullscreen</attribute>
+        <attribute name="action">win.fullscreen</attribute>
+        <attribute name="verb-icon">view-fullscreen-symbolic</attribute>
+      </item>
+    </section>
+    <section>
+      <attribute name="id">file-section</attribute>
+    </section>
+    <section>
+      <attribute name="id">file-section-1</attribute>
+      <item>
         <attribute name="label" translatable="yes">_Save As…</attribute>
         <attribute name="action">win.save-as</attribute>
       </item>
@@ -52,11 +67,10 @@
       </item>
     </section>
     <section>
-      <attribute name="id">print-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_Print…</attribute>
-        <attribute name="action">win.print</attribute>
-      </item>
+      <attribute name="id">edit-section</attribute>
+    </section>
+    <section>
+      <attribute name="id">edit-section-1</attribute>
     </section>
     <section>
       <attribute name="id">search-section</attribute>
@@ -78,69 +92,82 @@
       </item>
     </section>
     <section>
-      <attribute name="id">edit-section</attribute>
+      <submenu>
+        <attribute name="label">View</attribute>
+        <section>
+          <attribute name="id">view-section</attribute>
+          <item>
+            <attribute name="label" translatable="yes">Side _Panel</attribute>
+            <attribute name="action">win.side-panel</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">_Bottom Panel</attribute>
+            <attribute name="action">win.bottom-panel</attribute>
+            <attribute name="hidden-when">action-disabled</attribute>
+          </item>
+        </section>
+        <section>
+          <attribute name="id">view-section-1</attribute>
+        </section>
+        <section>
+          <attribute name="id">view-section-2</attribute>
+          <item>
+            <attribute name="label" translatable="yes">_Highlight Mode…</attribute>
+            <attribute name="action">win.highlight-mode</attribute>
+          </item>
+        </section>
+      </submenu>
+      <submenu>
+        <attribute name="label">Tools</attribute>
+        <section>
+          <attribute name="id">spell-section</attribute>
+        </section>
+        <section>
+          <attribute name="id">tools-section</attribute>
+        </section>
+        <section>
+          <attribute name="id">tools-section-1</attribute>
+        </section>
+      </submenu>
     </section>
     <section>
-      <attribute name="id">edit-section-1</attribute>
-    </section>
-    <section>
-      <attribute name="id">view-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Side _Panel</attribute>
-        <attribute name="action">win.side-panel</attribute>
-      </item>
+      <attribute name="id">close-section</attribute>
       <item>
-        <attribute name="label" translatable="yes">_Bottom Panel</attribute>
-        <attribute name="action">win.bottom-panel</attribute>
-        <attribute name="hidden-when">action-disabled</attribute>
+        <attribute name="label" translatable="yes">_Close All</attribute>
+        <attribute name="action">win.close-all</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">_Fullscreen</attribute>
-        <attribute name="action">win.fullscreen</attribute>
+        <attribute name="label" translatable="yes">_Close</attribute>
+        <attribute name="action">win.close</attribute>
       </item>
     </section>
+  </menu>
+  <menu id="gear_menu_noappmenu">
     <section>
-      <attribute name="id">view-section-1</attribute>
-    </section>
-    <section>
-      <attribute name="id">view-section-2</attribute>
+      <attribute name="id">juntion-section</attribute>
+      <attribute name="display-hint">horizontal-buttons</attribute>
       <item>
-        <attribute name="label" translatable="yes">_Highlight Mode…</attribute>
-        <attribute name="action">win.highlight-mode</attribute>
+        <attribute name="label" translatable="yes">_Reload</attribute>
+        <attribute name="action">win.revert</attribute>
+        <attribute name="verb-icon">view-refresh-symbolic</attribute>
       </item>
-    </section>
-    <section>
-      <attribute name="id">spell-section</attribute>
-    </section>
-    <section>
-      <attribute name="id">tools-section</attribute>
-    </section>
-    <section>
-      <attribute name="id">tools-section-1</attribute>
-    </section>
-    <section>
-      <attribute name="id">close-section</attribute>
       <item>
-        <attribute name="label" translatable="yes">_Close All</attribute>
-        <attribute name="action">win.close-all</attribute>
+        <attribute name="label" translatable="yes">_Print…</attribute>
+        <attribute name="action">win.print</attribute>
+        <attribute name="verb-icon">printer-symbolic</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">_Close</attribute>
-        <attribute name="action">win.close</attribute>
+        <attribute name="label" translatable="yes">_Fullscreen</attribute>
+        <attribute name="action">win.fullscreen</attribute>
+        <attribute name="verb-icon">view-fullscreen-symbolic</attribute>
       </item>
     </section>
-  </menu>
-  <menu id="gear_menu_noappmenu">
     <section>
       <attribute name="id">file-section</attribute>
     </section>
     <section>
       <attribute name="id">file-section-1</attribute>
       <item>
-        <attribute name="label" translatable="yes">_Reload</attribute>
-        <attribute name="action">win.revert</attribute>
-      </item>
-      <item>
         <attribute name="label" translatable="yes">_Save As…</attribute>
         <attribute name="action">win.save-as</attribute>
       </item>
@@ -150,11 +177,10 @@
       </item>
     </section>
     <section>
-      <attribute name="id">print-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_Print…</attribute>
-        <attribute name="action">win.print</attribute>
-      </item>
+      <attribute name="id">edit-section</attribute>
+    </section>
+    <section>
+      <attribute name="id">edit-section-1</attribute>
     </section>
     <section>
       <attribute name="id">search-section</attribute>
@@ -176,12 +202,6 @@
       </item>
     </section>
     <section>
-      <attribute name="id">edit-section</attribute>
-    </section>
-    <section>
-      <attribute name="id">edit-section-1</attribute>
-    </section>
-    <section>
       <attribute name="id">view-section</attribute>
       <item>
         <attribute name="label" translatable="yes">Side _Panel</attribute>
@@ -192,10 +212,6 @@
         <attribute name="action">win.bottom-panel</attribute>
         <attribute name="hidden-when">action-disabled</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">_Fullscreen</attribute>
-        <attribute name="action">win.fullscreen</attribute>
-      </item>
     </section>
     <section>
       <attribute name="id">view-section-1</attribute>
diff --git a/gedit/gedit-window.ui b/gedit/gedit-window.ui
index 63c20fb..388960c 100644
--- a/gedit/gedit-window.ui
+++ b/gedit/gedit-window.ui
@@ -104,6 +104,7 @@
               <object class="GtkMenuButton" id="gear_button">
                 <property name="visible">True</property>
                 <property name="valign">center</property>
+                <property name="use_popover">True</property>
                 <style>
                   <class name="image-button"/>
                 </style>