Commit a597d16d authored by Michael Catanzaro's avatar Michael Catanzaro

Merge branch 'update-gnome-menus' into 'master'

menus: Update for GNOME 3.32 recommendations

See merge request GNOME/gnome-nibbles!2
parents 38159bed ae97bae6
......@@ -16,7 +16,6 @@ gsettings_SCHEMAS = org.gnome.nibbles.gschema.xml
dist_man_MANS = gnome-nibbles.6
dist_noinst_DATA = \
nibbles-menus.ui \
nibbles.ui \
nibbles.css \
scoreboard.ui \
......
......@@ -8,8 +8,5 @@
<file>controls-grid.ui</file>
<file>preferences-dialog.ui</file>
</gresource>
<gresource prefix="/org/gnome/Nibbles/gtk">
<file alias="menus.ui">nibbles-menus.ui</file>
</gresource>
</gresources>
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<menu id="app-menu">
<section>
<item>
<attribute name="label" translatable="yes">_Scores</attribute>
<attribute name="action">app.scores</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">_Preferences</attribute>
<attribute name="action">app.preferences</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Help</attribute>
<attribute name="action">app.help</attribute>
<attribute name="accel">F1</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_About Nibbles</attribute>
<attribute name="action">app.about</attribute>
</item>
</section>
</menu>
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="title" translatable="yes">Nibbles</property>
......@@ -26,6 +49,24 @@
<property name="pack-type">end</property>
</packing>
</child>
<child>
<object class="GtkMenuButton" id="menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="menu-model">app-menu</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">open-menu-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<object class="GtkApplicationWindow" id="nibbles-window">
<property name="title" translatable="yes">Nibbles</property>
......
......@@ -2,7 +2,6 @@
# Please keep this file in alphabetical order.
[encoding: UTF-8]
[type: gettext/glade]data/controls-grid.ui
[type: gettext/glade]data/nibbles-menus.ui
[type: gettext/glade]data/nibbles.ui
data/org.gnome.Nibbles.appdata.xml.in
data/org.gnome.Nibbles.desktop.in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment