callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use libgimp header, added "Since: GIMP 2.4" to the gtk-doc comments.

Browse Source 
2005-01-29  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpenumwidgets.[ch]: use libgimp header,
	added "Since: GIMP 2.4" to the gtk-doc comments.

2005-01-29  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/libgimpwidgets-docs.sgml
	* libgimpwidgets/libgimpwidgets-sections.txt
	* libgimpwidgets/tmpl/gimpenumwidgets.sgml: updated.
This commit is contained in:
Sven Neumann
2005-01-29 12:26:14 +00:00
committed by Sven Neumann
parent 6d74b06daf
commit be6f9d259e
8 changed files with 180 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-01-29 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpenumwidgets.[ch]: use libgimp header,
added "Since: GIMP 2.4" to the gtk-doc comments.
2005-01-28 Bill Skaggs <weskaggs@primate.ucdavis.edu> 2005-01-28 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/widgets/gimpenumwidgets.c * app/widgets/gimpenumwidgets.c

6
devel-docs/ChangeLog
View File

@ -1,3 +1,9 @@
2005-01-29 Sven Neumann <sven@gimp.org>
* libgimpwidgets/libgimpwidgets-docs.sgml
* libgimpwidgets/libgimpwidgets-sections.txt
* libgimpwidgets/tmpl/gimpenumwidgets.sgml: updated.
2005-01-28 Sven Neumann <sven@gimp.org> 2005-01-28 Sven Neumann <sven@gimp.org>
* libgimpconfig/libgimpconfig-docs.sgml * libgimpconfig/libgimpconfig-docs.sgml

1
devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
View File

@ -78,6 +78,7 @@
<xi:include href="xml/gimpquerybox.xml" /> <xi:include href="xml/gimpquerybox.xml" />
<xi:include href="xml/gimpsizeentry.xml" /> <xi:include href="xml/gimpsizeentry.xml" />
<xi:include href="xml/gimpstock.xml" /> <xi:include href="xml/gimpstock.xml" />
<xi:include href="xml/gimpenumwidgets.xml" />
<xi:include href="xml/gimpwidgets.xml" /> <xi:include href="xml/gimpwidgets.xml" />
</part> </part>

12
devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
View File

@ -651,6 +651,18 @@ GIMP_STOCK_PATTERN
GIMP_STOCK_ZOOM_FOLLOW_WINDOW GIMP_STOCK_ZOOM_FOLLOW_WINDOW
</SECTION> </SECTION>
<SECTION>
<FILE>gimpenumwidgets</FILE>
<TITLE>GimpEnumWidgets</TITLE>
gimp_enum_radio_box_new
gimp_enum_radio_box_new_with_range
gimp_enum_radio_frame_new
gimp_enum_radio_frame_new_with_range
gimp_enum_stock_box_new
gimp_enum_stock_box_new_with_range
gimp_enum_stock_box_set_child_padding
</SECTION>
<SECTION> <SECTION>
<FILE>gimpwidgets</FILE> <FILE>gimpwidgets</FILE>
<TITLE>GimpWidgets</TITLE> <TITLE>GimpWidgets</TITLE>

110
devel-docs/libgimpwidgets/tmpl/gimpenumwidgets.sgml Normal file
View File

@ -0,0 +1,110 @@
<!-- ##### SECTION Title ##### -->
GimpEnumWidgets
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### FUNCTION gimp_enum_radio_box_new ##### -->
<para>
</para>
@enum_type:
@callback:
@callback_data:
@first_button:
@Returns:
<!-- ##### FUNCTION gimp_enum_radio_box_new_with_range ##### -->
<para>
</para>
@enum_type:
@minimum:
@maximum:
@callback:
@callback_data:
@first_button:
@Returns:
<!-- ##### FUNCTION gimp_enum_radio_frame_new ##### -->
<para>
</para>
@enum_type:
@label_widget:
@callback:
@callback_data:
@first_button:
@Returns:
<!-- ##### FUNCTION gimp_enum_radio_frame_new_with_range ##### -->
<para>
</para>
@enum_type:
@minimum:
@maximum:
@label_widget:
@callback:
@callback_data:
@first_button:
@Returns:
<!-- ##### FUNCTION gimp_enum_stock_box_new ##### -->
<para>
</para>
@enum_type:
@stock_prefix:
@icon_size:
@callback:
@callback_data:
@first_button:
@Returns:
<!-- ##### FUNCTION gimp_enum_stock_box_new_with_range ##### -->
<para>
</para>
@enum_type:
@minimum:
@maximum:
@stock_prefix:
@icon_size:
@callback:
@callback_data:
@first_button:
@Returns:
<!-- ##### FUNCTION gimp_enum_stock_box_set_child_padding ##### -->
<para>
</para>
@stock_box:
@xpad:
@ypad:

51
libgimpwidgets/gimpenumwidgets.c
View File

@ -1,5 +1,5 @@
/* The GIMP -- an image manipulation program /* LIBGIMP - The GIMP Library
* Copyright (C) 1995 Spencer Kimball and Peter Mattis * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* gimpenumwidgets.c * gimpenumwidgets.c
* Copyright (C) 2002-2004 Sven Neumann <sven@gimp.org> * Copyright (C) 2002-2004 Sven Neumann <sven@gimp.org>
@ -27,9 +27,10 @@
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "gimpwidgetstypes.h" #include "gimpwidgetstypes.h"
#include "gimpenumwidgets.h"
#include "gimpframe.h" #include "gimpframe.h"
#include "gimphelpui.h" #include "gimphelpui.h"
#include "gimpenumwidgets.h"
/** /**
@ -46,6 +47,8 @@
* #GimpEnumComboBox instead. * #GimpEnumComboBox instead.
* *
* Return value: a new #GtkVBox holding a group of #GtkRadioButtons. * Return value: a new #GtkVBox holding a group of #GtkRadioButtons.
*
* Since: GIMP 2.4
**/ **/
GtkWidget * GtkWidget *
gimp_enum_radio_box_new (GType enum_type, gimp_enum_radio_box_new (GType enum_type,
@ -86,6 +89,8 @@ gimp_enum_radio_box_new (GType enum_type,
* enum values. * enum values.
* *
* Return value: a new #GtkVBox holding a group of #GtkRadioButtons. * Return value: a new #GtkVBox holding a group of #GtkRadioButtons.
*
* Since: GIMP 2.4
**/ **/
GtkWidget * GtkWidget *
gimp_enum_radio_box_new_with_range (GType enum_type, gimp_enum_radio_box_new_with_range (GType enum_type,
@ -142,11 +147,11 @@ gimp_enum_radio_box_new_with_range (GType enum_type,
return vbox; return vbox;
} }
/** /**
* gimp_enum_radio_frame_new: * gimp_enum_radio_frame_new:
* @enum_type: the #GType of an enum. * @enum_type: the #GType of an enum.
* @label_widget: a widget to put into the frame that will hold the radio box. * @label_widget: a widget to use as label for the frame that will
* hold the radio box.
* @callback: a callback to connect to the "toggled" signal of each * @callback: a callback to connect to the "toggled" signal of each
* #GtkRadioButton that is created. * #GtkRadioButton that is created.
* @callback_data: data to pass to the @callback. * @callback_data: data to pass to the @callback.
@ -156,13 +161,15 @@ gimp_enum_radio_box_new_with_range (GType enum_type,
* #GtkFrame. * #GtkFrame.
* *
* Return value: a new #GtkFrame holding a group of #GtkRadioButtons. * Return value: a new #GtkFrame holding a group of #GtkRadioButtons.
*
* Since: GIMP 2.4
**/ **/
GtkWidget * GtkWidget *
gimp_enum_radio_frame_new (GType enum_type, gimp_enum_radio_frame_new (GType enum_type,
GtkWidget *label_widget, GtkWidget *label_widget,
GCallback callback, GCallback callback,
gpointer callback_data, gpointer callback_data,
GtkWidget **first_button) GtkWidget **first_button)
{ {
GtkWidget *frame; GtkWidget *frame;
GtkWidget *radio_box; GtkWidget *radio_box;
@ -203,15 +210,17 @@ gimp_enum_radio_frame_new (GType enum_type,
* vbox into a #GtkFrame. * vbox into a #GtkFrame.
* *
* Return value: a new #GtkFrame holding a group of #GtkRadioButtons. * Return value: a new #GtkFrame holding a group of #GtkRadioButtons.
*
* Since: GIMP 2.4
**/ **/
GtkWidget * GtkWidget *
gimp_enum_radio_frame_new_with_range (GType enum_type, gimp_enum_radio_frame_new_with_range (GType enum_type,
gint minimum, gint minimum,
gint maximum, gint maximum,
GtkWidget *label_widget, GtkWidget *label_widget,
GCallback callback, GCallback callback,
gpointer callback_data, gpointer callback_data,
GtkWidget **first_button) GtkWidget **first_button)
{ {
GtkWidget *frame; GtkWidget *frame;
GtkWidget *radio_box; GtkWidget *radio_box;
@ -255,6 +264,8 @@ gimp_enum_radio_frame_new_with_range (GType enum_type,
* nick to the given @stock_prefix. * nick to the given @stock_prefix.
* *
* Return value: a new #GtkHbox holding a group of #GtkRadioButtons. * Return value: a new #GtkHbox holding a group of #GtkRadioButtons.
*
* Since: GIMP 2.4
**/ **/
GtkWidget * GtkWidget *
gimp_enum_stock_box_new (GType enum_type, gimp_enum_stock_box_new (GType enum_type,
@ -300,6 +311,8 @@ gimp_enum_stock_box_new (GType enum_type,
* enum values. * enum values.
* *
* Return value: a new #GtkHbox holding a group of #GtkRadioButtons. * Return value: a new #GtkHbox holding a group of #GtkRadioButtons.
*
* Since: GIMP 2.4
**/ **/
GtkWidget * GtkWidget *
gimp_enum_stock_box_new_with_range (GType enum_type, gimp_enum_stock_box_new_with_range (GType enum_type,
@ -383,6 +396,8 @@ gimp_enum_stock_box_new_with_range (GType enum_type,
* *
* Sets the padding of all buttons in a box created by * Sets the padding of all buttons in a box created by
* gimp_enum_stock_box_new(). * gimp_enum_stock_box_new().
*
* Since: GIMP 2.4
**/ **/
void void
gimp_enum_stock_box_set_child_padding (GtkWidget *stock_box, gimp_enum_stock_box_set_child_padding (GtkWidget *stock_box,
@ -397,7 +412,7 @@ gimp_enum_stock_box_set_child_padding (GtkWidget *stock_box,
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
GtkBin *bin = list->data; GtkBin *bin = list->data;
if (GTK_IS_MISC (bin->child)) if (GTK_IS_MISC (bin->child))
{ {

4
libgimpwidgets/gimpenumwidgets.h
View File

@ -1,5 +1,5 @@
/* The GIMP -- an image manipulation program /* LIBGIMP - The GIMP Library
* Copyright (C) 1995 Spencer Kimball and Peter Mattis * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* gimpenumwidgets.h * gimpenumwidgets.h
* Copyright (C) 2002-2004 Sven Neumann <sven@gimp.org> * Copyright (C) 2002-2004 Sven Neumann <sven@gimp.org>

22
po/Makefile.in.in
View File

@ -46,8 +46,8 @@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
DEFS = @DEFS@ DEFS = @DEFS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -60,7 +60,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
SOURCES = SOURCES =
POFILES = @POFILES@ POFILES = @POFILES@
GMOFILES = @GMOFILES@ GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
$(POFILES) $(GMOFILES) $(SOURCES) $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \ POTFILES = \
@ -77,13 +77,13 @@ INSTOBJEXT = @INSTOBJEXT@
.po.pox: .po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*pox $(MSGMERGE) $< $(top_builddir)/po/$(GETTEXT_PACKAGE).pot -o $*pox
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
.po.gmo: .po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $< && rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat: .po.cat:
@ -96,7 +96,7 @@ all: all-@USE_NLS@
all-yes: $(CATALOGS) all-yes: $(CATALOGS)
all-no: all-no:
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) $(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT) $(GENPOT)
install: install-exec install-data install: install-exec install-data
@ -179,7 +179,7 @@ check: all
dvi info tags TAGS ID: dvi info tags TAGS ID:
mostlyclean: mostlyclean:
rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
rm -fr *.o rm -fr *.o
rm -f .intltool-merge-cache rm -f .intltool-merge-cache
@ -194,7 +194,7 @@ maintainer-clean: distclean
rm -f $(GMOFILES) rm -f $(GMOFILES)
distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
dist distdir: update-po $(DISTFILES) dist distdir: $(DISTFILES) $(GETTEXT_PACKAGE).pot
dists="$(DISTFILES)"; \ dists="$(DISTFILES)"; \
for file in $$dists; do \ for file in $$dists; do \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
@ -204,14 +204,14 @@ dist distdir: update-po $(DISTFILES)
update-po: Makefile update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \ tmpdir=`pwd`; \
cd $(srcdir); \
catalogs='$(CATALOGS)'; \ catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
echo "$$lang:"; \ echo "$$lang:"; \
if $$tmpdir/$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -o $$tmpdir/$$lang.new.po $$lang; then \ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ if $$result; then \
if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
rm -f $$tmpdir/$$lang.new.po; \ rm -f $$tmpdir/$$lang.new.po; \
else \ else \
if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \