[latexila/wip/app-menu: 4/4] Automatic resource

[Sébastien Wilmet <swilmet src gnome org>]

commit a64d47aa9819ceca82c5766541af063bac276c65
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Nov 6 12:24:19 2015 +0100

    Automatic resource

 po/POTFILES.in                   |    2 +-
 src/latexila.gresource.xml       |    5 ++++-
 src/latexila_app.vala            |   11 -----------
 src/ui/Makefile.am               |    4 ++--
 src/ui/{app_menu.ui => menus.ui} |    6 +++---
 5 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5cd39e6..b07d176 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,6 +62,6 @@ src/structure.vala
 src/symbols.vala
 src/symbols_view.vala
 src/tab_info_bar.vala
-[type: gettext/glade]src/ui/app_menu.ui
+[type: gettext/glade]src/ui/menus.ui
 [type: gettext/glade]src/ui/preferences_dialog.ui
 src/utils.vala
diff --git a/src/latexila.gresource.xml b/src/latexila.gresource.xml
index 1a7dc1e..e08861f 100644
--- a/src/latexila.gresource.xml
+++ b/src/latexila.gresource.xml
@@ -2,10 +2,13 @@
 
 <gresources>
   <gresource prefix="/org/gnome/latexila">
-    <file>ui/app_menu.ui</file>
     <file>ui/latexila.adwaita.css</file>
   </gresource>
 
+  <gresource prefix="/org/gnome/latexila/gtk">
+    <file alias="menus.ui" preprocess="xml-stripblanks">ui/menus.ui</file>
+  </gresource>
+
   <gresource prefix="/org/gnome/latexila/icons/16x16/actions">
     <file alias="compile_dvi.png" preprocess="to-pixdata">../data/icons/16x16/actions/compile_dvi.png</file>
     <file alias="compile_pdf.png" preprocess="to-pixdata">../data/icons/16x16/actions/compile_pdf.png</file>
diff --git a/src/latexila_app.vala b/src/latexila_app.vala
index 5275597..273c670 100644
--- a/src/latexila_app.vala
+++ b/src/latexila_app.vala
@@ -124,7 +124,6 @@ public class LatexilaApp : Gtk.Application
         Latexila.utils_register_icons ();
         StockIcons.register_stock_icons ();
         setup_theme_extensions ();
-        setup_app_menu ();
 
         AppSettings.get_default ();
         create_window ();
@@ -196,16 +195,6 @@ public class LatexilaApp : Gtk.Application
         }
     }
 
-    private void setup_app_menu ()
-    {
-        Gtk.Builder builder =
-            new Gtk.Builder.from_resource ("/org/gnome/latexila/ui/app_menu.ui");
-        builder.set_translation_domain (Config.GETTEXT_PACKAGE);
-        unowned GLib.MenuModel app_menu = builder.get_object ("app_menu")
-            as GLib.MenuModel;
-        set_app_menu (app_menu);
-    }
-
     private void reopen_files ()
     {
         GLib.Settings editor_settings =
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 5bfddc1..90753da 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -5,7 +5,7 @@ dist_ui_DATA =                  \
        ui.xml
 
 EXTRA_DIST =                   \
-       app_menu.ui             \
-       latexila.adwaita.css
+       latexila.adwaita.css    \
+       menus.ui
 
 -include $(top_srcdir)/git.mk
diff --git a/src/ui/app_menu.ui b/src/ui/menus.ui
similarity index 88%
rename from src/ui/app_menu.ui
rename to src/ui/menus.ui
index 295c1a8..e0616c1 100644
--- a/src/ui/app_menu.ui
+++ b/src/ui/menus.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <interface>
-  <menu id="app_menu">
+  <menu id="app-menu">
     <section>
       <item>
         <attribute name="label" translatable="yes">_New Window</attribute>
-        <attribute name="action">app.new_window</attribute>
+        <attribute name="action">app.new-window</attribute>
       </item>
     </section>
     <section>
@@ -14,7 +14,7 @@
       </item>
       <item>
         <attribute name="label" translatable="yes">_Manage Build Tools</attribute>
-        <attribute name="action">app.manage_build_tools</attribute>
+        <attribute name="action">app.manage-build-tools</attribute>
       </item>
     </section>
     <section>