dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

take over cosmetic fix from upstream. 

2007-08-30  Michael Natterer  <mitch@gimp.org>

	* app/gui/sync-menu.c: take over cosmetic fix from upstream.

	* configure.in: add HAVE_CARBON as AM_CONDITIONAL

	* menus/image-menu.xml.in: add the Help menu to the image menu.

	* menus/Makefile.am
	* menus/menus.xsl: filter it away if we are not on carbon.

	* app/menus/menus.c: added the "help" action group to the image UI
	manager.


svn path=/trunk/; revision=23412
This commit is contained in:
Michael Natterer 2007-08-30 15:00:50 +00:00 committed by Michael Natterer
parent a333d6c660
commit 399b6639de
7 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2007-08-30 Michael Natterer <mitch@gimp.org>
* app/gui/sync-menu.c: take over cosmetic fix from upstream.
* configure.in: add HAVE_CARBON as AM_CONDITIONAL
* menus/image-menu.xml.in: add the Help menu to the image menu.
* menus/Makefile.am
* menus/menus.xsl: filter it away if we are not on carbon.
* app/menus/menus.c: added the "help" action group to the image UI
manager.
2007-08-30 Simon Budig <simon@gimp.org>
* plug-ins/script-fu/scheme-wrapper.c

3
app/gui/sync-menu.c
View File

@ -624,7 +624,8 @@ sync_menu_shell (GtkMenuShell *menu_shell,
if (GTK_IS_TEAROFF_MENU_ITEM (menu_item))
continue;
if (toplevel && g_object_get_data (G_OBJECT (menu_item), "gtk-empty-menu-item"))
if (toplevel && g_object_get_data (G_OBJECT (menu_item),
"gtk-empty-menu-item"))
continue;
carbon_item = carbon_menu_item_get (menu_item);

1
app/menus/menus.c
View File

@ -96,6 +96,7 @@ menus_init (Gimp *gimp,
gimp_menu_factory_manager_register (global_menu_factory, "<Image>",
"file",
"context",
"help",
"edit",
"select",
"view",

1
configure.in
View File

@ -1660,6 +1660,7 @@ if test "x$carbon_ok" = "xyes"; then
CARBON_LDFLAGS="-framework Carbon"
AC_SUBST(CARBON_LDFLAGS)
fi
AM_CONDITIONAL(HAVE_CARBON, test "x$carbon_ok" = "xyes")
##########################################################

8
menus/Makefile.am
View File

@ -49,12 +49,16 @@ MAINTAINERCLEANFILES = $(menudata_built_files)
if GIMP_UNSTABLE
XSLTPARAMS = --stringparam debug-menu yes
DEBUG_MENU_PARAMS = --stringparam debug-menu yes
endif
if HAVE_CARBON
HELP_MENU_PARAMS = --stringparam help-menu yes
endif
%.xml: %.xml.in $(srcdir)/menus.xsl dialogs-menuitems.xml
if HAVE_XSLTPROC
$(XSLTPROC) --xinclude $(XSLTPARAMS) $(srcdir)/menus.xsl $< > $(@) || rm -f $(@)
$(XSLTPROC) --xinclude $(DEBUG_MENU_PARAMS) $(HELP_MENU_PARAMS) $(srcdir)/menus.xsl $< > $(@) || rm -f $(@)
else
@echo "*** xsltproc is required to build the menus XML files ***"; exit 1;
endif

8
menus/image-menu.xml.in
View File

@ -589,6 +589,14 @@
<separator />
</menu>
<menu action="help-menu" name="Help">
<menuitem action="help-help" />
<menuitem action="help-context-help" />
<menuitem action="dialogs-tips" />
<menuitem action="dialogs-about" />
<separator />
</menu>
</menubar-and-popup>
</ui>

8
menus/menus.xsl
View File

@ -9,6 +9,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="debug-menu" />
<xsl:param name="help-menu" />
<xsl:output method="xml"
version="1.0"
@ -22,7 +23,6 @@
</xsl:template>
<xsl:template match="menubar-and-popup">
<menubar>
<xsl:attribute name="action"><xsl:value-of select="@action-name"/>-menubar</xsl:attribute>
<xsl:apply-templates />
@ -45,6 +45,12 @@
</xsl:if>
</xsl:template>
<xsl:template match="menubar-and-popup/menu[@action='help-menu']">
<xsl:if test="$help-menu='yes'">
<xsl:call-template name="identity" />
</xsl:if>
</xsl:template>
<!-- need to strip the XInclude namespace declaration from the ui element -->
<xsl:template match="ui">
<ui>