Make GTK UI resources more consistent

The GTK UI resources have to be different resources between major versions.

When kept in one directory with slightly different filenames they were
  difficult to distinguish and resource definition was difficult to update.

The resources for both gtk versions were stored in both builds resulting in
  unneccessary increased binary size.

The new stratagy lists the UI files once in a single gresources file and only
  includes what is required. If a UI file is added it must be provided in both
  gtk2 and 3 or a build failure will occour rather than a runtime error.

30 files changed, 28 insertions, 33 deletions

diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index e4929e416..3bf3ea063 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -103,6 +103,7 @@ GLIB_COMPILE_RESOURCES := glib-compile-resources
 CFLAGS += -DWITH_GRESOURCE
 
 NETSURF_GRESOURCE_XML := $(NSGTK_RESOURCES_DIR)/netsurf.gresource.xml
+UI_GRESOURCE_XML := $(NSGTK_RESOURCES_DIR)/ui.gresource.xml
 MESSAGES_GRESOURCE_XML := $(NSGTK_RESOURCES_DIR)/messages.gresource.xml
 
 # generate the netsurf gresource source files
@@ -112,6 +113,13 @@ $(OBJROOT)/netsurf_gresource.c: $(NETSURF_GRESOURCE_XML) $(shell $(GLIB_COMPILE_
 
 S_RESOURCE += $(OBJROOT)/netsurf_gresource.c
 
+# generate the ui gresource source files
+$(OBJROOT)/ui_gresource.c: $(UI_GRESOURCE_XML) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir $(NSGTK_RESOURCES_DIR)/gtk$(NETSURF_GTK_MAJOR) --generate-dependencies $(UI_GRESOURCE_XML))
+	$(VQ)echo "GRESORCE: $<"
+	$(Q)$(GLIB_COMPILE_RESOURCES) --generate-source --sourcedir $(NSGTK_RESOURCES_DIR)/gtk$(NETSURF_GTK_MAJOR) --target=$@ $<
+
+S_RESOURCE += $(OBJROOT)/ui_gresource.c
+
 # generate the messages gresource source file
 $(OBJROOT)/messages_gresource.c: $(MESSAGES_GRESOURCE_XML) $(addsuffix /Messages,$(addprefix $(MESSAGES_TARGET)/,$(MESSAGES_LANGUAGES)))
 	$(VQ)echo "GRESORCE: $<"
@@ -182,7 +190,7 @@ GTK_RESOURCES_LIST := \
 
 GTK_RESOURCES_LIST := \
 	$(addprefix $(NSGTK_RESOURCES_DIR)/, $(GTK_RESOURCES_LIST)) \
-	$(wildcard $(NSGTK_RESOURCES_DIR)/*.gtk$(NETSURF_GTK_MAJOR).ui)
+	$(wildcard $(NSGTK_RESOURCES_DIR)/gtk$(NETSURF_GTK_MAJOR)/*.ui)
 
 # translations with more than just Messages files
 GTK_TRANSLATIONS_HTML := de en fr it ja nl zh_CN
diff --git a/frontends/gtk/res/cookies.gtk2.ui b/frontends/gtk/res/gtk2/cookies.ui
index 86f15c765..86f15c765 100644
--- a/frontends/gtk/res/cookies.gtk2.ui
+++ b/frontends/gtk/res/gtk2/cookies.ui
diff --git a/frontends/gtk/res/downloads.gtk2.ui b/frontends/gtk/res/gtk2/downloads.ui
index 1e71328a4..1e71328a4 100644
--- a/frontends/gtk/res/downloads.gtk2.ui
+++ b/frontends/gtk/res/gtk2/downloads.ui
diff --git a/frontends/gtk/res/globalhistory.gtk2.ui b/frontends/gtk/res/gtk2/globalhistory.ui
index 2b89ecb4b..2b89ecb4b 100644
--- a/frontends/gtk/res/globalhistory.gtk2.ui
+++ b/frontends/gtk/res/gtk2/globalhistory.ui
diff --git a/frontends/gtk/res/hotlist.gtk2.ui b/frontends/gtk/res/gtk2/hotlist.ui
index af0fd5696..af0fd5696 100644
--- a/frontends/gtk/res/hotlist.gtk2.ui
+++ b/frontends/gtk/res/gtk2/hotlist.ui
diff --git a/frontends/gtk/res/localhistory.gtk2.ui b/frontends/gtk/res/gtk2/localhistory.ui
index 2003ed69a..2003ed69a 100644
--- a/frontends/gtk/res/localhistory.gtk2.ui
+++ b/frontends/gtk/res/gtk2/localhistory.ui
diff --git a/frontends/gtk/res/netsurf.gtk2.ui b/frontends/gtk/res/gtk2/netsurf.ui
index adca54001..adca54001 100644
--- a/frontends/gtk/res/netsurf.gtk2.ui
+++ b/frontends/gtk/res/gtk2/netsurf.ui
diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/gtk2/options.ui
index 907d0b511..907d0b511 100644
--- a/frontends/gtk/res/options.gtk2.ui
+++ b/frontends/gtk/res/gtk2/options.ui
diff --git a/frontends/gtk/res/pageinfo.gtk2.ui b/frontends/gtk/res/gtk2/pageinfo.ui
index 3d541d653..3d541d653 100644
--- a/frontends/gtk/res/pageinfo.gtk2.ui
+++ b/frontends/gtk/res/gtk2/pageinfo.ui
diff --git a/frontends/gtk/res/password.gtk2.ui b/frontends/gtk/res/gtk2/password.ui
index eb51e4f8f..eb51e4f8f 100644
--- a/frontends/gtk/res/password.gtk2.ui
+++ b/frontends/gtk/res/gtk2/password.ui
diff --git a/frontends/gtk/res/tabcontents.gtk2.ui b/frontends/gtk/res/gtk2/tabcontents.ui
index c47e6a2ef..c47e6a2ef 100644
--- a/frontends/gtk/res/tabcontents.gtk2.ui
+++ b/frontends/gtk/res/gtk2/tabcontents.ui
diff --git a/frontends/gtk/res/toolbar.gtk2.ui b/frontends/gtk/res/gtk2/toolbar.ui
index 61723065b..61723065b 100644
--- a/frontends/gtk/res/toolbar.gtk2.ui
+++ b/frontends/gtk/res/gtk2/toolbar.ui
diff --git a/frontends/gtk/res/viewdata.gtk2.ui b/frontends/gtk/res/gtk2/viewdata.ui
index 7589022ca..7589022ca 100644
--- a/frontends/gtk/res/viewdata.gtk2.ui
+++ b/frontends/gtk/res/gtk2/viewdata.ui
diff --git a/frontends/gtk/res/warning.gtk2.ui b/frontends/gtk/res/gtk2/warning.ui
index e4fb4e662..e4fb4e662 100644
--- a/frontends/gtk/res/warning.gtk2.ui
+++ b/frontends/gtk/res/gtk2/warning.ui
diff --git a/frontends/gtk/res/cookies.gtk3.ui b/frontends/gtk/res/gtk3/cookies.ui
index 85f9aae76..85f9aae76 100644
--- a/frontends/gtk/res/cookies.gtk3.ui
+++ b/frontends/gtk/res/gtk3/cookies.ui
diff --git a/frontends/gtk/res/downloads.gtk3.ui b/frontends/gtk/res/gtk3/downloads.ui
index 1e71328a4..1e71328a4 100644
--- a/frontends/gtk/res/downloads.gtk3.ui
+++ b/frontends/gtk/res/gtk3/downloads.ui
diff --git a/frontends/gtk/res/globalhistory.gtk3.ui b/frontends/gtk/res/gtk3/globalhistory.ui
index c0496964f..c0496964f 100644
--- a/frontends/gtk/res/globalhistory.gtk3.ui
+++ b/frontends/gtk/res/gtk3/globalhistory.ui
diff --git a/frontends/gtk/res/hotlist.gtk3.ui b/frontends/gtk/res/gtk3/hotlist.ui
index ccd193637..ccd193637 100644
--- a/frontends/gtk/res/hotlist.gtk3.ui
+++ b/frontends/gtk/res/gtk3/hotlist.ui
diff --git a/frontends/gtk/res/localhistory.gtk3.ui b/frontends/gtk/res/gtk3/localhistory.ui
index 9a36a91a7..9a36a91a7 100644
--- a/frontends/gtk/res/localhistory.gtk3.ui
+++ b/frontends/gtk/res/gtk3/localhistory.ui
diff --git a/frontends/gtk/res/netsurf.gtk3.ui b/frontends/gtk/res/gtk3/netsurf.ui
index 6ea8f07a7..6ea8f07a7 100644
--- a/frontends/gtk/res/netsurf.gtk3.ui
+++ b/frontends/gtk/res/gtk3/netsurf.ui
diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/gtk3/options.ui
index 82a3e175a..82a3e175a 100644
--- a/frontends/gtk/res/options.gtk3.ui
+++ b/frontends/gtk/res/gtk3/options.ui
diff --git a/frontends/gtk/res/pageinfo.gtk3.ui b/frontends/gtk/res/gtk3/pageinfo.ui
index fdee5ac8d..fdee5ac8d 100644
--- a/frontends/gtk/res/pageinfo.gtk3.ui
+++ b/frontends/gtk/res/gtk3/pageinfo.ui
diff --git a/frontends/gtk/res/password.gtk3.ui b/frontends/gtk/res/gtk3/password.ui
index eb51e4f8f..eb51e4f8f 100644
--- a/frontends/gtk/res/password.gtk3.ui
+++ b/frontends/gtk/res/gtk3/password.ui
diff --git a/frontends/gtk/res/tabcontents.gtk3.ui b/frontends/gtk/res/gtk3/tabcontents.ui
index b07cf92e0..b07cf92e0 100644
--- a/frontends/gtk/res/tabcontents.gtk3.ui
+++ b/frontends/gtk/res/gtk3/tabcontents.ui
diff --git a/frontends/gtk/res/toolbar.gtk3.ui b/frontends/gtk/res/gtk3/toolbar.ui
index 60452f472..60452f472 100644
--- a/frontends/gtk/res/toolbar.gtk3.ui
+++ b/frontends/gtk/res/gtk3/toolbar.ui
diff --git a/frontends/gtk/res/viewdata.gtk3.ui b/frontends/gtk/res/gtk3/viewdata.ui
index b742d5f6b..b742d5f6b 100644
--- a/frontends/gtk/res/viewdata.gtk3.ui
+++ b/frontends/gtk/res/gtk3/viewdata.ui
diff --git a/frontends/gtk/res/warning.gtk3.ui b/frontends/gtk/res/gtk3/warning.ui
index e4fb4e662..e4fb4e662 100644
--- a/frontends/gtk/res/warning.gtk3.ui
+++ b/frontends/gtk/res/gtk3/warning.ui
diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml
index 272c1ade2..ada2d59fc 100644
--- a/frontends/gtk/res/netsurf.gresource.xml
+++ b/frontends/gtk/res/netsurf.gresource.xml
@@ -1,32 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/netsurf">
-    <file>cookies.gtk2.ui</file>
-    <file>cookies.gtk3.ui</file>
-    <file>downloads.gtk2.ui</file>
-    <file>downloads.gtk3.ui</file>
-    <file>globalhistory.gtk2.ui</file>
-    <file>globalhistory.gtk3.ui</file>
-    <file>hotlist.gtk2.ui</file>
-    <file>hotlist.gtk3.ui</file>
-    <file>localhistory.gtk2.ui</file>
-    <file>localhistory.gtk3.ui</file>
-    <file>netsurf.gtk2.ui</file>
-    <file>netsurf.gtk3.ui</file>
-    <file>options.gtk2.ui</file>
-    <file>options.gtk3.ui</file>
-    <file>pageinfo.gtk2.ui</file>
-    <file>pageinfo.gtk3.ui</file>
-    <file>password.gtk2.ui</file>
-    <file>password.gtk3.ui</file>
-    <file>tabcontents.gtk2.ui</file>
-    <file>tabcontents.gtk3.ui</file>
-    <file>toolbar.gtk2.ui</file>
-    <file>toolbar.gtk3.ui</file>
-    <file>viewdata.gtk2.ui</file>
-    <file>viewdata.gtk3.ui</file>
-    <file>warning.gtk3.ui</file>
-    <file>warning.gtk2.ui</file>
     <file preprocess="to-pixdata">favicon.png</file>
     <file preprocess="to-pixdata">netsurf.xpm</file>
     <file preprocess="to-pixdata">menu_cursor.png</file>
diff --git a/frontends/gtk/res/ui.gresource.xml b/frontends/gtk/res/ui.gresource.xml
new file mode 100644
index 000000000..dd43ddf59
--- /dev/null
+++ b/frontends/gtk/res/ui.gresource.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/netsurf">
+    <file>cookies.ui</file>
+    <file>downloads.ui</file>
+    <file>globalhistory.ui</file>
+    <file>hotlist.ui</file>
+    <file>localhistory.ui</file>
+    <file>netsurf.ui</file>
+    <file>options.ui</file>
+    <file>pageinfo.ui</file>
+    <file>password.ui</file>
+    <file>tabcontents.ui</file>
+    <file>toolbar.ui</file>
+    <file>viewdata.ui</file>
+    <file>warning.ui</file>
+  </gresource>
+</gresources>
diff --git a/frontends/gtk/resources.c b/frontends/gtk/resources.c
index 432ddb8b5..fc17f7418 100644
--- a/frontends/gtk/resources.c
+++ b/frontends/gtk/resources.c
@@ -345,11 +345,6 @@ init_pixbuf_resource(char **respath, struct nsgtk_resource_s *resource)
  */
 static nserror init_ui_resource(char **respath, struct nsgtk_resource_s *ui_res)
 {
-#if GTK_CHECK_VERSION(3,0,0)
-	int gtkv = 3;
-#else
-	int gtkv = 2;
-#endif
 	int resnamelen;
 	char *resname;
 	struct nsgtk_resource_s resource;
@@ -361,7 +356,7 @@ static nserror init_ui_resource(char **respath, struct nsgtk_resource_s *ui_res)
 	if (resname == NULL) {
 		return NSERROR_NOMEM;
 	}
-	snprintf(resname, resnamelen, "%s.gtk%d.ui", ui_res->name, gtkv);
+	snprintf(resname, resnamelen, "%s.ui", ui_res->name);
 	resource.name = resname;
 	resource.len = ui_res->len;
 	resource.path = NULL;