dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

menus/Makefile.am new file that holds menuitems that appear in several

Browse source 
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.
This commit is contained in:
Sven Neumann 2004-05-02 10:41:28 +00:00 committed by Sven Neumann
parent bdec5cc5da
commit 2fb04d1e1a
8 changed files with 74 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -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

2
menus/.cvsignore
View file

@ -1,3 +1,5 @@
Makefile
Makefile.in
dockable-menu.xml
image-menu.xml
toolbox-menu.xml

13
menus/Makefile.am
View file

@ -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

29
menus/dialogs-menuitems.xml Normal file
View file

@ -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>

30
menus/dockable-menu.xml → menus/dockable-menu.xml.in
View file

@ -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" />

28
menus/image-menu.xml.in
View file

@ -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">

11
menus/menus.xsl
View file

@ -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()" />

30
menus/toolbox-menu.xml → menus/toolbox-menu.xml.in
View file

@ -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" />