[gnome-sudoku] Remove AppMenu



commit b7d588b88682be711b993bc2199122df621ca636
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Oct 10 11:37:03 2018 +1300

    Remove AppMenu
    
    https://gitlab.gnome.org/GNOME/Initiatives/wikis/App-Menu-Retirement

 data/gnome-sudoku-menu.ui       | 45 ----------------------------------
 data/gnome-sudoku.gresource.xml |  3 ---
 data/gnome-sudoku.ui            | 53 +++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                  |  1 -
 4 files changed, 53 insertions(+), 49 deletions(-)
---
diff --git a/data/gnome-sudoku.gresource.xml b/data/gnome-sudoku.gresource.xml
index fb2f2fd..de0ca68 100644
--- a/data/gnome-sudoku.gresource.xml
+++ b/data/gnome-sudoku.gresource.xml
@@ -4,7 +4,4 @@
     <file preprocess="xml-stripblanks" alias="gnome-sudoku.ui">gnome-sudoku.ui</file>
     <file preprocess="xml-stripblanks" alias="print-dialog.ui">print-dialog.ui</file>
   </gresource>
-  <gresource prefix="/org/gnome/sudoku/gtk">
-    <file preprocess="xml-stripblanks" alias="menus.ui">gnome-sudoku-menu.ui</file>
-  </gresource>
 </gresources>
diff --git a/data/gnome-sudoku.ui b/data/gnome-sudoku.ui
index bdf0e2e..8da91bd 100644
--- a/data/gnome-sudoku.ui
+++ b/data/gnome-sudoku.ui
@@ -58,6 +58,22 @@
                 </child>
             </object>
         </child>
+        <child>
+            <object class="GtkMenuButton">
+                <property name="visible">True</property>
+                <property name="menu_model">primary_menu</property>
+                <child>
+                    <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="halign">center</property>
+                        <property name="icon_name">open-menu-symbolic</property>
+                    </object>
+                </child>
+            </object>
+            <packing>
+                <property name="pack-type">end</property>
+            </packing>
+        </child>
         <child>
             <object class="GtkBox" id="timer_box">
                 <property name="visible">True</property>
@@ -104,6 +120,43 @@
             </object>
         </child>
     </object>
+    <menu id="primary_menu">
+        <section>
+            <submenu>
+                <attribute name="label" translatable="yes">_Print</attribute>
+                <section>
+                    <item>
+                        <attribute name="label" translatable="yes">Print _Current Puzzle…</attribute>
+                        <attribute name="action">app.print</attribute>
+                    </item>
+                    <item>
+                        <attribute name="label" translatable="yes">Print _Multiple Puzzles…</attribute>
+                        <attribute name="action">app.print-multiple</attribute>
+                    </item>
+                </section>
+            </submenu>
+        </section>
+        <section>
+            <item>
+                <attribute name="label" translatable="yes">High_lighter</attribute>
+                <attribute name="action">app.highlighter</attribute>
+            </item>
+            <item>
+                <attribute name="label" translatable="yes">_Warnings</attribute>
+                <attribute name="action">app.show-warnings</attribute>
+            </item>
+        </section>
+        <section>
+            <item>
+                <attribute name="label" translatable="yes">_Help</attribute>
+                <attribute name="action">app.help</attribute>
+            </item>
+            <item>
+                <attribute name="label" translatable="yes">_About Sudoku</attribute>
+                <attribute name="action">app.about</attribute>
+            </item>
+        </section>
+    </menu>
     <object class="GtkApplicationWindow" id="sudoku_app">
         <property name="title" translatable="yes">Sudoku</property>
         <child>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b58778c..6c601eb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
-data/gnome-sudoku-menu.ui
 data/gnome-sudoku.appdata.xml.in
 data/gnome-sudoku.desktop.in
 data/gnome-sudoku.ui


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]