Move resource files to resources/ directory
This is to make them more managable
This commit is contained in:
		| @@ -1,10 +1,11 @@ | ||||
| resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/ag.gresource.xml) | ||||
| RESOURCE_DIR = $(srcdir)/resources | ||||
| resource_files = $(shell glib-compile-resources --sourcedir=$(RESOURCE_DIR) --generate-dependencies $(srcdir)/ag.gresource.xml) | ||||
|  | ||||
| ag-resources.c: ag.gresource.xml $(resource_files) | ||||
| 	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name ag $(srcdir)/ag.gresource.xml | ||||
| 	glib-compile-resources --target=$@ --sourcedir=$(RESOURCE_DIR) --generate-source --c-name ag $(srcdir)/ag.gresource.xml | ||||
|  | ||||
| ag-resources.h: ag.gresource.xml $(resource_files) | ||||
| 	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name ag $(srcdir)/ag.gresource.xml | ||||
| 	glib-compile-resources --target=$@ --sourcedir=$(RESOURCE_DIR) --generate-header --c-name ag $(srcdir)/ag.gresource.xml | ||||
|  | ||||
| BUILT_SOURCES = \ | ||||
| 				ag-resources.h \ | ||||
| @@ -33,7 +34,3 @@ astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $ | ||||
| astrognome_LDFLAGS = -rdynamic | ||||
| astrognome_CFLAGS = $(SWE_GLIB_CFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(WEBKIT_CFLAGS) -Wall | ||||
|  | ||||
| guidir = $(pkgdatadir) | ||||
| gui_DATA = astrognome.ui | ||||
|  | ||||
| EXTRA_DIST += $(gui_DATA) | ||||
|   | ||||
| @@ -257,7 +257,7 @@ setup_menu(AgApp *app) | ||||
|  | ||||
|     builder = gtk_builder_new(); | ||||
|  | ||||
|     if (!gtk_builder_add_from_resource(builder, "/eu/polonkai/gergely/astrognome/astrognome.ui", &err)) { | ||||
|     if (!gtk_builder_add_from_resource(builder, "/eu/polonkai/gergely/Astrognome/ui/astrognome.ui", &err)) { | ||||
|         g_error("%s", (err) ? err->message : "unknown error"); | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -40,7 +40,7 @@ ag_preferences_class_init(AgPreferencesClass *klass) | ||||
|     object_class->finalize = ag_preferences_finalize; | ||||
|     dialog_class->response = ag_preferences_response; | ||||
|  | ||||
|     gtk_widget_class_set_template_from_resource(widget_class, "/eu/polonkai/gergely/astrognome/ag-preferences.ui"); | ||||
|     gtk_widget_class_set_template_from_resource(widget_class, "/eu/polonkai/gergely/Astrognome/ui/ag-preferences.ui"); | ||||
|     gtk_widget_class_bind_template_child_private(widget_class, AgPreferences, maximized); | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -540,7 +540,7 @@ ag_window_class_init(AgWindowClass *klass) | ||||
|  | ||||
|     gobject_class->dispose = ag_window_dispose; | ||||
|  | ||||
|     gtk_widget_class_set_template_from_resource(widget_class, "/eu/polonkai/gergely/astrognome/ag-window.ui"); | ||||
|     gtk_widget_class_set_template_from_resource(widget_class, "/eu/polonkai/gergely/Astrognome/ui/ag-window.ui"); | ||||
|     gtk_widget_class_bind_template_child_private(widget_class, AgWindow, header_bar); | ||||
|     gtk_widget_class_bind_template_child_private(widget_class, AgWindow, name); | ||||
|     gtk_widget_class_bind_template_child_private(widget_class, AgWindow, year); | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <gresources> | ||||
|   <gresource prefix="/eu/polonkai/gergely/astrognome"> | ||||
|     <file>astrognome.ui</file> | ||||
|     <file>ag-window.ui</file> | ||||
|     <file>ag-preferences.ui</file> | ||||
|   <gresource prefix="/eu/polonkai/gergely/Astrognome"> | ||||
|     <file>ui/astrognome.ui</file> | ||||
|     <file>ui/ag-window.ui</file> | ||||
|     <file>ui/ag-preferences.ui</file> | ||||
|   </gresource> | ||||
| </gresources> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user