[latexila/wip/app-menu] Automatic resource
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [latexila/wip/app-menu] Automatic resource
- Date: Fri, 6 Nov 2015 13:28:46 +0000 (UTC)
commit 42a54a467190db45b4076440909e74046b6c4a90
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri Nov 6 13:59:10 2015 +0100
Automatic resource
po/POTFILES.in | 2 +-
src/latexila.gresource.xml | 2 +-
src/latexila_app.vala | 21 ---------------------
src/ui/Makefile.am | 4 ++--
src/ui/{app_menu.ui => menus.ui} | 0
5 files changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index addb6a1..60c4367 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 7f4ad21..c132351 100644
--- a/src/latexila.gresource.xml
+++ b/src/latexila.gresource.xml
@@ -2,7 +2,7 @@
<gresources>
<gresource prefix="/org/gnome/latexila">
- <file preprocess="xml-stripblanks">ui/app_menu.ui</file>
+ <file alias="gtk/menus.ui" preprocess="xml-stripblanks">ui/menus.ui</file>
<file>ui/latexila.adwaita.css</file>
</gresource>
diff --git a/src/latexila_app.vala b/src/latexila_app.vala
index daf3bff..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,26 +195,6 @@ public class LatexilaApp : Gtk.Application
}
}
- private void setup_app_menu ()
- {
- message ("setup_app_menu()");
-
- if (! prefers_app_menu ())
- {
- message ("do not prefer app menu");
- return;
- }
-
- Gtk.Builder builder =
- new Gtk.Builder.from_resource ("/org/gnome/latexila/ui/app_menu.ui");
- builder.set_translation_domain (Config.GETTEXT_PACKAGE);
- GLib.MenuModel menu_model = builder.get_object ("app-menu") as GLib.MenuModel;
-
- return_if_fail (menu_model != null);
- message ("n_items=%d", menu_model.get_n_items ());
- set_app_menu (menu_model);
- }
-
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 100%
rename from src/ui/app_menu.ui
rename to src/ui/menus.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]