From 2fb04d1e1ae80522e62ebb2dfd48a08cfb1b11e2 Mon Sep 17 00:00:00 2001
From: Sven Neumann <sven@gimp.org>
Date: Sun, 2 May 2004 10:41:28 +0000
Subject: [PATCH] menus/Makefile.am new file that holds menuitems that appear
 in several

2004-05-02  Sven Neumann  <sven@gimp.org>

	* menus/Makefile.am
	* menus/dialogs-menuitems.xml: new file that holds menuitems that
	appear in several places.

	* menus/dockable-menu.xml.in: new file used to generate
	dockable-menu.xml.

	* menus/toolbox-menu.xml.in: new file used to generate
	toolbox-menu.xml.

	* menus/image-menu.xml.in: include dialogs-menuitems.xml.

	* menus/menus.xsl: allow inclusion of menuitems using XInclude.
---
 ChangeLog                                     | 16 ++++++++++
 menus/.cvsignore                              |  2 ++
 menus/Makefile.am                             | 13 ++++----
 menus/dialogs-menuitems.xml                   | 29 ++++++++++++++++++
 ...dockable-menu.xml => dockable-menu.xml.in} | 30 ++-----------------
 menus/image-menu.xml.in                       | 28 ++---------------
 menus/menus.xsl                               | 11 +++++++
 .../{toolbox-menu.xml => toolbox-menu.xml.in} | 30 ++-----------------
 8 files changed, 74 insertions(+), 85 deletions(-)
 create mode 100644 menus/dialogs-menuitems.xml
 rename menus/{dockable-menu.xml => dockable-menu.xml.in} (55%)
 rename menus/{toolbox-menu.xml => toolbox-menu.xml.in} (56%)

diff --git a/ChangeLog b/ChangeLog
index c4bdd9a1c4..330c0ba0f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2004-05-02  Sven Neumann  <sven@gimp.org>
+
+	* menus/Makefile.am
+	* menus/dialogs-menuitems.xml: new file that holds menuitems that
+	appear in several places.
+
+	* menus/dockable-menu.xml.in: new file used to generate
+	dockable-menu.xml.
+
+	* menus/toolbox-menu.xml.in: new file used to generate
+	toolbox-menu.xml.
+
+	* menus/image-menu.xml.in: include dialogs-menuitems.xml.
+
+	* menus/menus.xsl: allow inclusion of menuitems using XInclude.
+
 2004-05-02  Michael Natterer  <mitch@convergence.de>
 
 	* app/actions/Makefile.am
diff --git a/menus/.cvsignore b/menus/.cvsignore
index aba098c658..62d6fbb8fc 100644
--- a/menus/.cvsignore
+++ b/menus/.cvsignore
@@ -1,3 +1,5 @@
 Makefile
 Makefile.in
+dockable-menu.xml
 image-menu.xml
+toolbox-menu.xml
diff --git a/menus/Makefile.am b/menus/Makefile.am
index c889d8d25a..352d32b228 100644
--- a/menus/Makefile.am
+++ b/menus/Makefile.am
@@ -2,7 +2,10 @@
 
 menudatadir = $(gimpdatadir)/menus
 
-menudata_in_files = image-menu.xml.in
+menudata_in_files = \
+	dockable-menu.xml.in	\
+	image-menu.xml.in	\
+	toolbox-menu.xml.in
 
 menudata_built_files = $(menudata_in_files:.xml.in=.xml)
 
@@ -12,7 +15,6 @@ menudata_DATA = \
 	buffers-menu.xml		\
 	channels-menu.xml		\
 	colormap-editor-menu.xml	\
-	dockable-menu.xml		\
 	documents-menu.xml		\
 	error-console-menu.xml		\
 	file-open-menu.xml		\
@@ -28,20 +30,21 @@ menudata_DATA = \
 	qmask-menu.xml			\
 	templates-menu.xml		\
 	tool-options-menu.xml		\
-	toolbox-menu.xml		\
 	vectors-menu.xml
 
 EXTRA_DIST = \
 	$(menudata_DATA)		\
+	$(menudata_in_files)		\
+	dialogs-menuitems.xml		\
 	gtkuimanager.dtd		\
 	menus.xsl
 
 MAINTAINERCLEAN_FILES = $(menudata_built_files)
 
 
-%.xml: %.xml.in menus.xsl
+%.xml: %.xml.in menus.xsl dialogs-menuitems.xml
 if HAVE_XSLTPROC
-	$(XSLTPROC) menus.xsl $< > $(@) || rm -f $(@)
+	$(XSLTPROC) --xinclude menus.xsl $< > $(@) || rm -f $(@)
 else
 	@echo "xsltproc is needed to build the menus XML files"; exit 1;
 endif
diff --git a/menus/dialogs-menuitems.xml b/menus/dialogs-menuitems.xml
new file mode 100644
index 0000000000..3eb9a85902
--- /dev/null
+++ b/menus/dialogs-menuitems.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menuitems>
+  <menuitem action="dialogs-tool-options" />
+  <menuitem action="dialogs-device-status" />
+  <separator />
+  <menuitem action="dialogs-layers" />
+  <menuitem action="dialogs-channels" />
+  <menuitem action="dialogs-vectors" />
+  <menuitem action="dialogs-indexed-palette" />
+  <menuitem action="dialogs-histogram" />
+  <menuitem action="dialogs-selection-editor" />
+  <menuitem action="dialogs-navigation" />
+  <menuitem action="dialogs-undo-history" />
+  <separator />
+  <menuitem action="dialogs-colors" />
+  <menuitem action="dialogs-brushes" />
+  <menuitem action="dialogs-patterns" />
+  <menuitem action="dialogs-gradients" />
+  <menuitem action="dialogs-palettes" />
+  <menuitem action="dialogs-fonts" />
+  <menuitem action="dialogs-buffers" />
+  <separator />
+  <menuitem action="dialogs-images" />
+  <menuitem action="dialogs-document-history" />
+  <menuitem action="dialogs-templates" />
+  <menuitem action="dialogs-tools" />
+  <menuitem action="dialogs-error-console" />
+</menuitems>
diff --git a/menus/dockable-menu.xml b/menus/dockable-menu.xml.in
similarity index 55%
rename from menus/dockable-menu.xml
rename to menus/dockable-menu.xml.in
index ef76ecfde2..0ab10138c0 100644
--- a/menus/dockable-menu.xml
+++ b/menus/dockable-menu.xml.in
@@ -1,35 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
-<ui>
+<ui xmlns:xi="http://www.w3.org/2001/XInclude">
+
   <popup action="dockable-popup">
     <menuitem action="dockable-menu" />
     <menu action="dockable-add-tab-menu">
-      <menuitem action="dialogs-tool-options" />
-      <menuitem action="dialogs-device-status" />
-      <separator />
-      <menuitem action="dialogs-layers" />
-      <menuitem action="dialogs-channels" />
-      <menuitem action="dialogs-vectors" />
-      <menuitem action="dialogs-indexed-palette" />
-      <menuitem action="dialogs-histogram" />
-      <menuitem action="dialogs-selection-editor" />
-      <menuitem action="dialogs-navigation" />
-      <menuitem action="dialogs-undo-history" />
-      <separator />
-      <menuitem action="dialogs-colors" />
-      <menuitem action="dialogs-brushes" />
-      <menuitem action="dialogs-patterns" />
-      <menuitem action="dialogs-gradients" />
-      <menuitem action="dialogs-palettes" />
-      <menuitem action="dialogs-fonts" />
-      <menuitem action="dialogs-buffers" />
-      <separator />
-      <menuitem action="dialogs-images" />
-      <menuitem action="dialogs-document-history" />
-      <menuitem action="dialogs-templates" />
-      <menuitem action="dialogs-tools" />
-      <menuitem action="dialogs-error-console" />
+      <xi:include href="dialogs-menuitems.xml" />
     </menu>
     <menuitem action="dockable-close-tab" />
     <menuitem action="dockable-detach-tab" />
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 506f023a53..334c9cefb1 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ui>
+<ui xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <menubar-and-popup action-name="image">
 
@@ -277,31 +277,7 @@
 	<menuitem action="dialogs-new-dock-data" />
 	<menuitem action="dialogs-new-dock-stuff" />
       </menu>
-      <menuitem action="dialogs-tool-options" />
-      <menuitem action="dialogs-device-status" />
-      <separator />
-      <menuitem action="dialogs-layers" />
-      <menuitem action="dialogs-channels" />
-      <menuitem action="dialogs-vectors" />
-      <menuitem action="dialogs-indexed-palette" />
-      <menuitem action="dialogs-histogram" />
-      <menuitem action="dialogs-selection-editor" />
-      <menuitem action="dialogs-navigation" />
-      <menuitem action="dialogs-undo-history" />
-      <separator />
-      <menuitem action="dialogs-colors" />
-      <menuitem action="dialogs-brushes" />
-      <menuitem action="dialogs-patterns" />
-      <menuitem action="dialogs-gradients" />
-      <menuitem action="dialogs-palettes" />
-      <menuitem action="dialogs-fonts" />
-      <menuitem action="dialogs-buffers" />
-      <separator />
-      <menuitem action="dialogs-images" />
-      <menuitem action="dialogs-document-history" />
-      <menuitem action="dialogs-templates" />
-      <menuitem action="dialogs-tools" />
-      <menuitem action="dialogs-error-console" />
+      <xi:include href="dialogs-menuitems.xml" />
     </menu>
 
     <menu action="plug-in-menu" name="Filters">
diff --git a/menus/menus.xsl b/menus/menus.xsl
index 3dd9a0c40f..ef1ae6d8b5 100644
--- a/menus/menus.xsl
+++ b/menus/menus.xsl
@@ -31,6 +31,17 @@
     </popup>
   </xsl:template>
 
+  <xsl:template match="menuitems">
+    <xsl:apply-templates />
+  </xsl:template>
+
+  <!-- need to strip the XInclude namespace declaration from the ui element -->
+  <xsl:template match="ui">
+    <ui>
+      <xsl:apply-templates />
+    </ui>
+  </xsl:template>
+
   <xsl:template match="@*|node()" name="identity">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()" />
diff --git a/menus/toolbox-menu.xml b/menus/toolbox-menu.xml.in
similarity index 56%
rename from menus/toolbox-menu.xml
rename to menus/toolbox-menu.xml.in
index f12a74d9bf..6be602f292 100644
--- a/menus/toolbox-menu.xml
+++ b/menus/toolbox-menu.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
-<ui>
+<ui xmlns:xi="http://www.w3.org/2001/XInclude">
+
   <menubar action="toolbox-menubar">
 
     <menu action="file-menu" name="File">
@@ -22,31 +22,7 @@
           <menuitem action="dialogs-new-dock-data" />
           <menuitem action="dialogs-new-dock-stuff" />
         </menu>
-        <menuitem action="dialogs-tool-options" />
-	<menuitem action="dialogs-device-status" />
-	<separator />
-        <menuitem action="dialogs-layers" />
-        <menuitem action="dialogs-channels" />
-        <menuitem action="dialogs-vectors" />
-        <menuitem action="dialogs-indexed-palette" />
-        <menuitem action="dialogs-histogram" />
-        <menuitem action="dialogs-selection-editor" />
-        <menuitem action="dialogs-navigation" />
-        <menuitem action="dialogs-undo-history" />
-        <separator />
-        <menuitem action="dialogs-colors" />
-        <menuitem action="dialogs-brushes" />
-        <menuitem action="dialogs-patterns" />
-        <menuitem action="dialogs-gradients" />
-        <menuitem action="dialogs-palettes" />
-        <menuitem action="dialogs-fonts" />
-        <menuitem action="dialogs-buffers" />
-        <separator />
-        <menuitem action="dialogs-images" />
-        <menuitem action="dialogs-document-history" />
-        <menuitem action="dialogs-templates" />
-        <menuitem action="dialogs-tools" />
-        <menuitem action="dialogs-error-console" />
+        <xi:include href="dialogs-menuitems.xml" />
       </menu>
       <menu action="debug-menu" name="Debug">
         <menuitem action="debug-mem-profile" />