diff --git a/po/POTFILES.in b/po/POTFILES.in index df52d24..6bd6a19 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,7 +7,7 @@ src/ag-db.c src/ag-display-theme.c src/ag-window.c src/astrognome.c -[type: gettext/glade]src/resources/ui/astrognome.ui +[type: gettext/glade]src/resources/gtk/menus.ui [type: gettext/glade]src/resources/ui/ag-window.ui [type: gettext/glade]src/resources/ui/ag-preferences.ui [type: gettext/glade]src/resources/ui/ag-chart-edit.ui diff --git a/src/ag-app.c b/src/ag-app.c index 02b65e1..c465cb4 100644 --- a/src/ag-app.c +++ b/src/ag-app.c @@ -378,29 +378,6 @@ setup_accelerators(AgApp *app) } } -static void -setup_menu(AgApp *app) -{ - GtkBuilder *builder; - GMenuModel *model; - GError *err = NULL; - - builder = gtk_builder_new(); - - if (!gtk_builder_add_from_resource( - builder, - "/eu/polonkai/gergely/Astrognome/ui/astrognome.ui", - &err - )) { - g_error("%s", (err) ? err->message : "unknown error"); - } - - model = G_MENU_MODEL(gtk_builder_get_object(builder, "app-menu")); - gtk_application_set_app_menu(GTK_APPLICATION(app), model); - - g_object_unref(builder); -} - static void startup(GApplication *gapp) { @@ -409,7 +386,6 @@ startup(GApplication *gapp) G_APPLICATION_CLASS(ag_app_parent_class)->startup(gapp); setup_actions(app); - setup_menu(app); setup_accelerators(app); } diff --git a/src/ag.gresource.xml b/src/ag.gresource.xml index 2a795b4..76ae9b0 100644 --- a/src/ag.gresource.xml +++ b/src/ag.gresource.xml @@ -1,7 +1,8 @@ - ui/astrognome.ui + gtk/menus.ui + ui/ag-window.ui ui/ag-preferences.ui ui/ag-chart-edit.ui diff --git a/src/resources/ui/astrognome.ui b/src/resources/gtk/menus.ui similarity index 100% rename from src/resources/ui/astrognome.ui rename to src/resources/gtk/menus.ui