Hello community,
here is the log from the commit of package python-goocanvas
checked in at Wed Jul 9 00:00:45 CEST 2008.
--------
--- GNOME/python-goocanvas/python-goocanvas.changes 2007-12-05 19:26:49.000000000 +0100
+++ python-goocanvas/python-goocanvas.changes 2008-07-01 00:20:03.129004000 +0200
@@ -1,0 +2,15 @@
+Mon Jun 30 23:58:26 CEST 2008 - maw@suse.de
+
+- Update to version 0.10.0:
+ + Install a .pc file
+ + Add goocanvas.ItemSimple.bounds getsets
+ + Prevent PYGTK from being imported into goocanvasmodule
+ (bln##150412)
+ o fix object registration TYPE_CAIRO_PATTERN (Gian Mario)
+ o New custom example for SVG images. (Gian Mario)
+ o update with new goocanvas 0.10 API (Gian Mario)
+ o fix a bug introduced by pycairo API change, see LP#222503
+ reported by David Boucher (Gian Mario)
+ o Update docs according to new API (Gian Mario)
+
+-------------------------------------------------------------------
Old:
----
pygoocanvas-0.9.0.tar.bz2
New:
----
pygoocanvas-0.10.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-goocanvas.spec ++++++
--- /var/tmp/diff_new_pack.j11826/_old 2008-07-09 00:00:17.000000000 +0200
+++ /var/tmp/diff_new_pack.j11826/_new 2008-07-09 00:00:17.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package python-goocanvas (Version 0.9.0)
+# spec file for package python-goocanvas (Version 0.10.0)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,12 +10,13 @@
# norootforbuild
+
Name: python-goocanvas
BuildRequires: goocanvas-devel gtk2-devel python-cairo-devel python-devel python-gobject2-devel python-gtk-devel
Summary: Python bindings for goocanvas
-Version: 0.9.0
+Version: 0.10.0
Release: 1
-License: LGPL v2.0 only
+License: LGPL v2.0 or later; LGPL v2.1 or later
Group: Development/Libraries/GNOME
Source0: pygoocanvas-%{version}.tar.bz2
Url: https://developer.berlios.de/projects/pygoocanvas/
@@ -46,15 +47,28 @@
%defattr(-, root, root)
%doc AUTHORS NEWS README
%{py_sitedir}/*.so
+%{_libdir}/pkgconfig/*.pc
%changelog
-* Wed Dec 05 2007 - maw@suse.de
+* Tue Jul 01 2008 maw@suse.de
+- Update to version 0.10.0:
+ + Install a .pc file
+ + Add goocanvas.ItemSimple.bounds getsets
+ + Prevent PYGTK from being imported into goocanvasmodule
+ (bln##150412)
+ o fix object registration TYPE_CAIRO_PATTERN (Gian Mario)
+ o New custom example for SVG images. (Gian Mario)
+ o update with new goocanvas 0.10 API (Gian Mario)
+ o fix a bug introduced by pycairo API change, see LP#222503
+ reported by David Boucher (Gian Mario)
+ o Update docs according to new API (Gian Mario)
+* Wed Dec 05 2007 maw@suse.de
- Import into autobuild.
-* Thu Nov 01 2007 - maw@suse.de
+* Thu Nov 01 2007 maw@suse.de
- Require python-gobject2
-* Thu Nov 01 2007 - maw@suse.de
+* Thu Nov 01 2007 maw@suse.de
- Require python-cairo.
-* Thu Nov 01 2007 - maw@suse.de
+* Thu Nov 01 2007 maw@suse.de
- Don't require the -lang subpackage, since it doesn't exist.
-* Thu Nov 01 2007 - maw@suse.de
+* Thu Nov 01 2007 maw@suse.de
- Initial package.
++++++ pygoocanvas-0.9.0.tar.bz2 -> pygoocanvas-0.10.0.tar.bz2 ++++++
++++ 7064 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/arg-types.py new/pygoocanvas-0.10.0/arg-types.py
--- old/pygoocanvas-0.9.0/arg-types.py 2007-05-14 16:18:49.000000000 +0200
+++ new/pygoocanvas-0.10.0/arg-types.py 2008-04-27 22:19:29.000000000 +0200
@@ -31,7 +31,7 @@
def convert_c2py(self):
self.wrapper.add_declaration("PyObject *py_%s;" % self.name)
self.wrapper.write_code(
- code=('py_%s = PycairoContext_FromContext(cairo_reference(%s), NULL, NULL);' %
+ code=('py_%s = PycairoContext_FromContext(cairo_reference(%s), &PyGdkCairoContext_Type, NULL);' %
(self.name, self.name)),
cleanup=("Py_DECREF(py_%s);" % self.name))
self.wrapper.add_pyargv_item("py_%s" % self.name)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/ChangeLog new/pygoocanvas-0.10.0/ChangeLog
--- old/pygoocanvas-0.9.0/ChangeLog 2007-08-18 23:05:41.000000000 +0200
+++ new/pygoocanvas-0.10.0/ChangeLog 2008-05-01 19:17:47.000000000 +0200
@@ -1,4 +1,69 @@
-=== 0.8.0 ===
+=== 0.10.0 ===
+
+ * NEWS: Updated
+
+2008-05-01 Gian Mario Tagliaretti
+
+ * docs/reference/pygoocanvas-item-model.xml
+ * docs/reference/pygoocanvas-item-simple.xml
+ * docs/reference/pygoocanvas-item.xml
+ * docs/reference/pygoocanvas-canvas.xml
+ * docs/reference/pygoocanvas-text.xml
+ * docs/reference/pygoocanvas-table.xml
+ docs updated.
+
+2008-04-29 Gian Mario Tagliaretti
+
+ * goocanvas.override:
+ (goo_canvas_text_get_natural_extents)
+ (goo_canvas_item_get_simple_transform)
+ (goo_canvas_item_model_get_simple_transform)
+ (goo_canvas_item_set_child_property)
+ (goo_canvas_item_get_child_property)
+ (goo_canvas_item_model_set_child_property)
+ (goo_canvas_item_model_get_child_property)
+ manually wrap the above methods.
+
+2008-04-27 Gian Mario Tagliaretti
+
+ * configure.ac bump version to 0.10.0 and require goocanvas 0.10.
+
+ * goocanvas.defs: update with new API.
+
+ * goocanvas.override:
+ * argtypes.py: fix a bug introduced by pycairo API change, see
+ LP bug #222503 reported by David Boucher.
+
+
+2007-11-19 Gian Mario Tagliaretti
+
+ * demo/customs/custom-svg.py: New custom example for SVG images.
+
+2007-11-15 Gian Mario Tagliaretti
+
+ * goocanvasmodule.c: fix object registration TYPE_CAIRO_PATTERN.
+
+2007-10-07 Gian Mario Tagliaretti
+
+ * goocanvasmodule.c: apply a patch to prevent PYGTK from being imported
+ into goocanvasmodule, patch from Randall Wood Fixes LP#150412.
+
+2007-10-07 Gustavo J. A. M. Carneiro
+
+ * Makefile.am:
+ * configure.ac:
+ * pygoocanvas.pc.in: Install a .pc file.
+
+ * goocanvas.override: include config.h so that with recent
+ pygtk-codegen we get a __version__ attribute on the module defined
+ for free.
+
+ * configure.ac bump version to 0.9.1.
+
+ * goocanvas.defs:
+ * goocanvas.override: Add goocanvas.ItemSimple.bounds getsets.
+
+=== 0.9.0 ===
2007-08-18 Gian Mario Tagliaretti
* NEWS: Update.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/configure.ac new/pygoocanvas-0.10.0/configure.ac
--- old/pygoocanvas-0.9.0/configure.ac 2007-08-18 23:04:21.000000000 +0200
+++ new/pygoocanvas-0.10.0/configure.ac 2008-04-27 23:34:16.000000000 +0200
@@ -2,15 +2,15 @@
dnl the pygoocanvas version number
m4_define(pygoocanvas_major_version, 0)
-m4_define(pygoocanvas_minor_version, 9)
+m4_define(pygoocanvas_minor_version, 10)
m4_define(pygoocanvas_micro_version, 0)
m4_define(pygoocanvas_version, pygoocanvas_major_version.pygoocanvas_minor_version.pygoocanvas_micro_version)
dnl versions of packages we require ...
m4_define(pygobject_required_version, 2.10.1)
m4_define(pygtk_required_version, 2.10.0)
-m4_define(goocanvas_required_version, 0.9)
-m4_define(pycairo_required_version, 1.2.0)
+m4_define(goocanvas_required_version, 0.10)
+m4_define(pycairo_required_version, 1.4.0)
AC_INIT(pygoocanvas, pygoocanvas_version, [http://developer.berlios.de/projects/pygoocanvas/])
@@ -137,6 +137,7 @@
demo/Makefile
docs/Makefile
docs/reference/entities.docbook
+ pygoocanvas.pc
)
GTK_DOC_CHECK(1.4)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/demo/misc/simple-demo.py new/pygoocanvas-0.10.0/demo/misc/simple-demo.py
--- old/pygoocanvas-0.9.0/demo/misc/simple-demo.py 2007-08-06 23:07:52.000000000 +0200
+++ new/pygoocanvas-0.10.0/demo/misc/simple-demo.py 2008-04-27 12:29:16.000000000 +0200
@@ -39,8 +39,6 @@
root.add_child(item, 1)
item.rotate(45, 300, 300)
- print type(root)
-
gtk.main()
## This handles button presses in item views. We simply output a message to
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-canvas.xml new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-canvas.xml
--- old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-canvas.xml 2007-08-04 20:36:52.000000000 +0200
+++ new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-canvas.xml 2008-05-01 16:07:15.000000000 +0200
@@ -233,6 +233,13 @@
</row>
<row valign="top">
+ <entry>"clear-background"</entry>
+ <entry>Read/Write</entry>
+ <entry>If the background is cleared before the canvas is painted.
+ Default value: <literal>True</literal></entry>
+ </row>
+
+ <row valign="top">
<entry>"integer-layout"</entry>
<entry>Read/Write</entry>
<entry>If all item layout is done to the nearest integer.</entry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-item-model.xml new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-item-model.xml
--- old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-item-model.xml 2007-05-14 16:18:47.000000000 +0200
+++ new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-item-model.xml 2008-05-01 19:02:54.000000000 +0200
@@ -69,7 +69,14 @@
<methodsynopsis language="python">
<methodname><link linkend="method-goocanvasitemmodel--get-child-properties">get_child_properties</link></methodname>
- <methodparam></methodparam>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">...</parameter></methodparam>
+ </methodsynopsis>
+
+ <methodsynopsis language="python">
+ <methodname><link linkend="method-goocanvasitemmodel--get-child-property">get_child_property</link></methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">property</parameter></methodparam>
</methodsynopsis>
<methodsynopsis language="python">
@@ -103,7 +110,7 @@
</methodsynopsis>
<methodsynopsis language="python">
- <methodname><link linkend="method-goocanvasitemmodel--get-transform">get_style</link></methodname>
+ <methodname><link linkend="method-goocanvasitemmodel--get-style">get_style</link></methodname>
<methodparam></methodparam>
</methodsynopsis>
@@ -111,6 +118,11 @@
<methodname><link linkend="method-goocanvasitemmodel--get-transform">get_transform</link></methodname>
<methodparam></methodparam>
</methodsynopsis>
+
+ <methodsynopsis language="python">
+ <methodname><link linkend="method-goocanvasitemmodel--get-simple-transform">get_simple_transform</link></methodname>
+ <methodparam></methodparam>
+ </methodsynopsis>
<methodsynopsis language="python">
<methodname><link linkend="method-goocanvasitemmodel--is-container">is_container</link></methodname>
@@ -180,8 +192,15 @@
<methodsynopsis language="python">
<methodname><link linkend="method-goocanvasitemmodel--set-child-properties">set_child_properties</link></methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
<methodparam><parameter role="keyword">properties</parameter></methodparam>
</methodsynopsis>
+
+ <methodsynopsis language="python">
+ <methodname><link linkend="method-goocanvasitemmodel--set-child-property">set_child_property</link></methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">property</parameter></methodparam>
+ </methodsynopsis>
<methodsynopsis language="python">
<methodname><link linkend="method-goocanvasitemmodel--set-model">set_model</link></methodname>
@@ -723,7 +742,7 @@
<programlisting><methodsynopsis language="python">
<methodname>get_child_properties</methodname>
<methodparam><parameter role="keyword">child</parameter></methodparam>
- <methodparam><parameter role="keyword">...</parameter></methodparam>
+ <methodparam><parameter role="keyword">properties</parameter></methodparam>
</methodsynopsis></programlisting>
<variablelist>
@@ -734,7 +753,7 @@
</simpara></listitem>
</varlistentry>
<varlistentry>
- <term><parameter role="keyword">...</parameter> :</term>
+ <term><parameter role="keyword">properties</parameter> :</term>
<listitem><simpara>property names as string</simpara></listitem>
</varlistentry>
<varlistentry>
@@ -747,6 +766,36 @@
Gets the values of one or more child properties of child.
</para>
</refsect2>
+
+ <refsect2 id="method-goocanvasitemmodel--get-child-property">
+ <title>goocanvas.ItemModel.get_child_property</title>
+ <programlisting><methodsynopsis language="python">
+ <methodname>get_child_property</methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">property</parameter></methodparam>
+ </methodsynopsis></programlisting>
+
+ <variablelist>
+ <varlistentry>
+ <term><parameter role="keyword">child</parameter> :</term>
+ <listitem><simpara>a child
+ <link linkend="class-canvas-item-model"><classname>goocanvas.ItemModel</classname></link>
+ </simpara></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter role="keyword">property</parameter> :</term>
+ <listitem><simpara>property name as string</simpara></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><emphasis>Returns</emphasis> :</term>
+ <listitem><simpara>The property value.</simpara></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ Gets the value of the property of child.
+ </para>
+ </refsect2>
<refsect2 id="method-goocanvasitemmodel--get-item-at">
<title>goocanvas.ItemModel.get_item_at</title>
@@ -898,6 +947,28 @@
Gets the item's style. If the item doesn't have its own style it will return its parent's style.
</para>
</refsect2>
+
+ <refsect2 id="method-goocanvasitemmodel--get-simple-transform">
+ <title>goocanvas.ItemModel.get_simple_transform</title>
+ <programlisting><methodsynopsis language="python">
+ <methodname>get_simple_transform</methodname>
+ </methodsynopsis></programlisting>
+
+ <variablelist>
+ <varlistentry>
+ <term><emphasis>Returns</emphasis> :</term>
+ <listitem><simpara>A 4 item tuple containing the item's x, y, scale and rotation.</simpara></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ This function can be used to get the position, scale and rotation of an item, providing that
+ the item has a simple transformation matrix (e.g. set with
+ <methodname><link linkend="method-goocanvasitemmodel--set-simple-transform">goocanvas.ItemModel.set_simple_transform</link></methodname>(),
+ or using a combination of simple translate, scale and rotate operations).
+ If the item has a complex transformation matrix the results will be incorrect.
+ </para>
+ </refsect2>
<refsect2 id="method-goocanvasitemmodel--get-transform">
<title>goocanvas.ItemModel.get_transform</title>
@@ -1204,6 +1275,30 @@
Sets the values of one or more child properties of child.
</para>
</refsect2>
+
+ <refsect2 id="method-goocanvasitemmodel--set-child-property">
+ <title>goocanvas.ItemModel.set_child_property</title>
+ <programlisting><methodsynopsis language="python">
+ <methodname>set_child_property</methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">property</parameter></methodparam>
+ </methodsynopsis></programlisting>
+
+ <variablelist>
+ <varlistentry>
+ <term><parameter role="keyword">child</parameter> :</term>
+ <listitem><simpara>A child <link linkend="class-canvas-item-model">goocanvas.ItemModel</link></simpara></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter role="keyword">property</parameter> :</term>
+ <listitem><simpara>The property to set as string</simpara></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ Sets a child property of child.
+ </para>
+ </refsect2>
<refsect2 id="method-goocanvasitemmodel--set-model">
<title>goocanvas.ItemModel.set_model</title>
@@ -1239,8 +1334,15 @@
</variablelist>
<para>
- Sets the parent of the item.
- </para>
+ This function is only intended to be used when implementing new canvas item models
+ (specifically container models such as
+ <link linkend="class-canvas-group-model">goocanvas.GroupModel</link>).
+ It sets the parent of the child model.
+ </para>
+ <note>
+ This function cannot be used to add a model to a group or to change the parent of a model.
+ To do that use the "parent" property.
+ </note>
</refsect2>
<refsect2 id="method-goocanvasitemmodel--set-simple-transform">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-item-simple.xml new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-item-simple.xml
--- old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-item-simple.xml 2007-08-04 20:36:52.000000000 +0200
+++ new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-item-simple.xml 2008-05-01 16:09:55.000000000 +0200
@@ -117,7 +117,7 @@
<row valign="top">
<entry>"fill-color-rgba"</entry>
- <entry>Write</entry>
+ <entry>Read/Write</entry>
<entry>The color to use to paint the interior of the item, specified as a 32-bit integer value. Default value: 0</entry>
</row>
@@ -196,7 +196,7 @@
<row valign="top">
<entry>"stroke-color-rgba"</entry>
- <entry>Write</entry>
+ <entry>Read/Write</entry>
<entry>The color to use for the item's perimeter, specified as a 32-bit integer value. Default value: 0</entry>
</row>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-item.xml new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-item.xml
--- old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-item.xml 2007-08-04 20:36:52.000000000 +0200
+++ new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-item.xml 2008-05-01 18:50:32.000000000 +0200
@@ -69,7 +69,14 @@
<methodsynopsis language="python">
<methodname><link linkend="method-goocanvasitem--get-child-properties">get_child_properties</link></methodname>
- <methodparam></methodparam>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">properties</parameter></methodparam>
+ </methodsynopsis>
+
+ <methodsynopsis language="python">
+ <methodname><link linkend="method-goocanvasitem--get-child-property">get_child_property</link></methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">property</parameter></methodparam>
</methodsynopsis>
<methodsynopsis language="python">
@@ -109,7 +116,12 @@
</methodsynopsis>
<methodsynopsis language="python">
- <methodname><link linkend="method-goocanvasitem--get-transform">get_style</link></methodname>
+ <methodname><link linkend="method-goocanvasitem--get-style">get_style</link></methodname>
+ <methodparam></methodparam>
+ </methodsynopsis>
+
+ <methodsynopsis language="python">
+ <methodname><link linkend="method-goocanvasitem--get-simple-transform">get_simple_tranform</link></methodname>
<methodparam></methodparam>
</methodsynopsis>
@@ -186,8 +198,15 @@
<methodsynopsis language="python">
<methodname><link linkend="method-goocanvasitem--set-child-properties">set_child_properties</link></methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
<methodparam><parameter role="keyword">properties</parameter></methodparam>
</methodsynopsis>
+
+ <methodsynopsis language="python">
+ <methodname><link linkend="method-goocanvasitem--set-child-property">set_child_property</link></methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">property</parameter></methodparam>
+ </methodsynopsis>
<methodsynopsis language="python">
<methodname><link linkend="method-goocanvasitem--set-model">set_model</link></methodname>
@@ -731,7 +750,7 @@
<programlisting><methodsynopsis language="python">
<methodname>get_child_properties</methodname>
<methodparam><parameter role="keyword">child</parameter></methodparam>
- <methodparam><parameter role="keyword">...</parameter></methodparam>
+ <methodparam><parameter role="keyword">properties</parameter></methodparam>
</methodsynopsis></programlisting>
<variablelist>
@@ -742,7 +761,7 @@
</simpara></listitem>
</varlistentry>
<varlistentry>
- <term><parameter role="keyword">...</parameter> :</term>
+ <term><parameter role="keyword">properties</parameter> :</term>
<listitem><simpara>property names as string</simpara></listitem>
</varlistentry>
<varlistentry>
@@ -755,6 +774,36 @@
Gets the values of one or more child properties of child.
</para>
</refsect2>
+
+ <refsect2 id="method-goocanvasitem--get-child-property">
+ <title>goocanvas.Item.get_child_property</title>
+ <programlisting><methodsynopsis language="python">
+ <methodname>get_child_property</methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">property</parameter></methodparam>
+ </methodsynopsis></programlisting>
+
+ <variablelist>
+ <varlistentry>
+ <term><parameter role="keyword">child</parameter> :</term>
+ <listitem><simpara>a child
+ <link linkend="class-canvas-item"><classname>goocanvas.Item</classname></link>
+ </simpara></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter role="keyword">property</parameter> :</term>
+ <listitem><simpara>property name as string</simpara></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><emphasis>Returns</emphasis> :</term>
+ <listitem><simpara>The property value.</simpara></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ Gets a child property of child.
+ </para>
+ </refsect2>
<refsect2 id="method-goocanvasitem--get-items-at">
<title>goocanvas.Item.get_items_at</title>
@@ -944,6 +993,28 @@
</para>
</refsect2>
+ <refsect2 id="method-goocanvasitem--get-simple-transform">
+ <title>goocanvas.Item.get_simple_transform</title>
+ <programlisting><methodsynopsis language="python">
+ <methodname>get_simple_transform</methodname>
+ </methodsynopsis></programlisting>
+
+ <variablelist>
+ <varlistentry>
+ <term><emphasis>Returns</emphasis> :</term>
+ <listitem><simpara>A 4 item tuple containing the item's x, y, scale and rotation.</simpara></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ This function can be used to get the position, scale and rotation of an item, providing that
+ the item has a simple transformation matrix (e.g. set with
+ <methodname><link linkend="method-goocanvasitem--set-simple-transform">goocanvas.Item.set_simple_transform</link></methodname>(),
+ or using a combination of simple translate, scale and rotate operations).
+ If the item has a complex transformation matrix the results will be incorrect.
+ </para>
+ </refsect2>
+
<refsect2 id="method-goocanvasitem--get-transform">
<title>goocanvas.Item.get_transform</title>
<programlisting><methodsynopsis language="python">
@@ -1236,7 +1307,7 @@
<variablelist>
<varlistentry>
- <term><parameter role="keyword">childs</parameter> :</term>
+ <term><parameter role="keyword">child</parameter> :</term>
<listitem><simpara>A child <link linkend="class-canvas-item">goocanvas.Item</link></simpara></listitem>
</varlistentry>
<varlistentry>
@@ -1249,6 +1320,30 @@
Sets the values of one or more child properties of child.
</para>
</refsect2>
+
+ <refsect2 id="method-goocanvasitem--set-child-property">
+ <title>goocanvas.Item.set_child_property</title>
+ <programlisting><methodsynopsis language="python">
+ <methodname>set_child_property</methodname>
+ <methodparam><parameter role="keyword">child</parameter></methodparam>
+ <methodparam><parameter role="keyword">property</parameter></methodparam>
+ </methodsynopsis></programlisting>
+
+ <variablelist>
+ <varlistentry>
+ <term><parameter role="keyword">child</parameter> :</term>
+ <listitem><simpara>A child <link linkend="class-canvas-item">goocanvas.Item</link></simpara></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter role="keyword">property</parameter> :</term>
+ <listitem><simpara>The property to set as string</simpara></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ Sets a child property of <parameter>child</parameter>.
+ </para>
+ </refsect2>
<refsect2 id="method-goocanvasitem--set-model">
<title>goocanvas.Item.set_model</title>
@@ -1284,8 +1379,15 @@
</variablelist>
<para>
- Sets the parent of the item.
- </para>
+ This method is only intended to be used when implementing new canvas items
+ (specifically container items such as
+ <link linkend="class-canvas-group">goocanvas.Group</link>).
+ It sets the parent of the child item.
+ </para>
+ <note>
+ This method cannot be used to add an item to a group or to change
+ the parent of an item. To do that use the "parent" property.
+ </note>
</refsect2>
<refsect2 id="method-goocanvasitem--set-simple-transform">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-table.xml new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-table.xml
--- old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-table.xml 2007-05-14 16:18:47.000000000 +0200
+++ new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-table.xml 2008-05-01 18:59:24.000000000 +0200
@@ -67,18 +67,44 @@
<entry>Read/Write</entry>
<entry>If all rows are the same height. Default value: False</entry>
</row>
+
+ <row valign="top">
+ <entry>"horiz-grid-line-width"</entry>
+ <entry>Read/Write</entry>
+ <entry>The width of the grid line to draw between rows. Allowed values: >= 0. Default value: 0.</entry>
+ </row>
<row valign="top">
<entry>"row-spacing"</entry>
<entry>Read/Write</entry>
<entry>The default space between rows. Allowed values: >= 0 Default value: 0</entry>
</row>
+
+ <row valign="top">
+ <entry>"vert-grid-line-width"</entry>
+ <entry>Read/Write</entry>
+ <entry>The width of the grid line to draw between columns. Allowed values: >= 0. Default value: 0.</entry>
+ </row>
<row valign="top">
<entry>"width"</entry>
<entry>Read/Write</entry>
<entry>The requested width of the table, or -1 to use the default width. Default value: -1</entry>
</row>
+
+ <row valign="top">
+ <entry>"x-border-spacing"</entry>
+ <entry>Read/Write</entry>
+ <entry>The amount of spacing between the lefmost and rightmost cells and the border grid line.
+ Allowed values: >= 0. Default value: 0.</entry>
+ </row>
+
+ <row valign="top">
+ <entry>"y-border-spacing"</entry>
+ <entry>Read/Write</entry>
+ <entry>The amount of spacing between the topmost and bottommost cells and the border grid line.
+ Allowed values: >= 0. Default value: 0.</entry>
+ </row>
</tbody>
</tgroup>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-text.xml new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-text.xml
--- old/pygoocanvas-0.9.0/docs/reference/pygoocanvas-text.xml 2007-05-14 16:18:47.000000000 +0200
+++ new/pygoocanvas-0.10.0/docs/reference/pygoocanvas-text.xml 2008-04-29 23:47:49.000000000 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<refentry id="class-canvas-text">
@@ -20,6 +20,12 @@
<methodname><link linkend="constructor-canvas-text">goocanvas.Text</link></methodname>
<methodparam><parameter role="keyword">properties</parameter><initializer>None</initializer></methodparam>
</constructorsynopsis>
+
+ <methodsynopsis language="python">
+ <methodname><link linkend="method-goocanvastext--get_natural_extents">convert_from_item_space</link></methodname>
+ <methodparam></methodparam>
+ </methodsynopsis>
+
</classsynopsis>
</refsect1>
@@ -157,5 +163,32 @@
fill_color="blue")
</programlisting>
</refsect1>
+
+ <refsect1>
+ <title>Methods</title>
+
+ <refsect2 id="method-goocanvastext--get-natural-extents">
+ <title>goocanvas.Text.get_natural_extents</title>
+ <programlisting><methodsynopsis language="python">
+ <methodname>get_natural_extents</methodname>
+ <methodparam></methodparam>
+ </methodsynopsis></programlisting>
+
+ <variablelist>
+ <varlistentry>
+ <term><emphasis>Returns</emphasis> :</term>
+ <listitem><simpara>a 2-tuple containing two 4-tuples representing the ink and
+ logical rectangles used to store the extents of glyph as drawn.</simpara></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ Gets the natural extents of the text, in the text item's coordinate space.
+ The final extents of the text may be different, if the text item is placed
+ in a layout container such as
+ <link linkend="class-canvas-table"><classname>goocanvas.Table</classname></link>.
+ </para>
+ </refsect2>
+ </refsect1>
</refentry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/goocanvas.defs new/pygoocanvas-0.10.0/goocanvas.defs
--- old/pygoocanvas-0.9.0/goocanvas.defs 2007-08-04 20:36:52.000000000 +0200
+++ new/pygoocanvas-0.10.0/goocanvas.defs 2008-04-27 22:51:28.000000000 +0200
@@ -56,7 +56,8 @@
("double" "bounds.x1")
("double" "bounds.x2")
("double" "bounds.y1")
- ("double" "bounds.y2"))
+ ("double" "bounds.y2")
+ ("GooCanvasBounds" "bounds"))
)
(define-object Image
@@ -771,6 +772,28 @@
)
)
+(define-method get_child_property
+ (of-object "GooCanvasItem")
+ (c-name "goo_canvas_item_get_child_property")
+ (return-type "none")
+ (parameters
+ '("GooCanvasItem*" "child")
+ '("const-gchar*" "property_name")
+ '("GValue*" "value")
+ )
+)
+
+(define-method set_child_property
+ (of-object "GooCanvasItem")
+ (c-name "goo_canvas_item_set_child_property")
+ (return-type "none")
+ (parameters
+ '("GooCanvasItem*" "child")
+ '("const-gchar*" "property_name")
+ '("const-GValue*" "value")
+ )
+)
+
(define-method get_child_properties
(of-object "GooCanvasItem")
(c-name "goo_canvas_item_get_child_properties")
@@ -899,6 +922,18 @@
)
)
+(define-method get_simple_transform
+ (of-object "GooCanvasItem")
+ (c-name "goo_canvas_item_get_simple_transform")
+ (return-type "gboolean")
+ (parameters
+ '("gdouble*" "x")
+ '("gdouble*" "y")
+ '("gdouble*" "scale")
+ '("gdouble*" "rotation")
+ )
+)
+
(define-method set_simple_transform
(of-object "GooCanvasItem")
(c-name "goo_canvas_item_set_simple_transform")
@@ -1481,6 +1516,28 @@
)
)
+(define-method get_child_property
+ (of-object "GooCanvasItemModel")
+ (c-name "goo_canvas_item_model_get_child_property")
+ (return-type "none")
+ (parameters
+ '("GooCanvasItemModel*" "child")
+ '("const-gchar*" "property_name")
+ '("GValue*" "value")
+ )
+)
+
+(define-method set_child_property
+ (of-object "GooCanvasItemModel")
+ (c-name "goo_canvas_item_model_set_child_property")
+ (return-type "none")
+ (parameters
+ '("GooCanvasItemModel*" "child")
+ '("const-gchar*" "property_name")
+ '("const-GValue*" "value")
+ )
+)
+
(define-method get_child_properties
(of-object "GooCanvasItemModel")
(c-name "goo_canvas_item_model_get_child_properties")
@@ -1584,6 +1641,18 @@
)
)
+(define-method get_simple_transform
+ (of-object "GooCanvasItemModel")
+ (c-name "goo_canvas_item_model_get_simple_transform")
+ (return-type "gboolean")
+ (parameters
+ '("gdouble*" "x")
+ '("gdouble*" "y")
+ '("gdouble*" "scale")
+ '("gdouble*" "rotation")
+ )
+)
+
(define-method set_simple_transform
(of-object "GooCanvasItemModel")
(c-name "goo_canvas_item_model_set_simple_transform")
@@ -2277,6 +2346,16 @@
(varargs #t)
)
+(define-method get_natural_extents
+ (of-object "GooCanvasText")
+ (c-name "goo_canvas_text_get_natural_extents")
+ (return-type "none")
+ (parameters
+ '("PangoRectangle*" "ink_rect")
+ '("PangoRectangle*" "logical_rect")
+ )
+)
+
(define-function goo_canvas_text_model_get_type
(c-name "goo_canvas_text_model_get_type")
(return-type "GType")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/goocanvasmodule.c new/pygoocanvas-0.10.0/goocanvasmodule.c
--- old/pygoocanvas-0.9.0/goocanvasmodule.c 2007-05-14 16:18:49.000000000 +0200
+++ new/pygoocanvas-0.10.0/goocanvasmodule.c 2008-04-27 12:29:17.000000000 +0200
@@ -3,6 +3,7 @@
#endif
#include
+#define NO_IMPORT_PYGTK
#include
#include
@@ -73,6 +74,7 @@
pyg_register_gtype_custom(GOO_TYPE_CAIRO_MATRIX,
_cairo_matrix_from_gvalue,
_cairo_matrix_to_gvalue);
+ PyModule_AddObject(m, "TYPE_CAIRO_PATTERN", pyg_type_wrapper_new(GOO_TYPE_CAIRO_PATTERN));
pyg_register_gtype_custom(GOO_TYPE_CAIRO_PATTERN,
_cairo_pattern_from_gvalue,
_cairo_pattern_to_gvalue);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/goocanvas.override new/pygoocanvas-0.10.0/goocanvas.override
--- old/pygoocanvas-0.9.0/goocanvas.override 2007-06-21 13:27:17.000000000 +0200
+++ new/pygoocanvas-0.10.0/goocanvas.override 2008-04-29 22:59:05.000000000 +0200
@@ -8,6 +8,8 @@
#include
+#include "config.h"
+
#if PY_VERSION_HEX < 0x02050000
typedef int Py_ssize_t;
#endif
@@ -208,6 +210,7 @@
import gobject.GObject as PyGObject_Type
import gtk.Container as PyGtkContainer_Type
import gtk.Adjustment as PyGtkAdjustment_Type
+import gtk.gdk.CairoContext as PyGdkCairoContext_Type
%%
ignore
@@ -646,7 +649,7 @@
py_bounds = PyObject_CallMethod(py_self, "do_update", "iN",
entire_tree,
- PycairoContext_FromContext(cairo_reference(cr), NULL, NULL));
+ PycairoContext_FromContext(cairo_reference(cr), &PyGdkCairoContext_Type, NULL));
if (py_bounds)
*bounds = ((PyGooCanvasBounds *) py_bounds)->bounds;
else
@@ -1578,3 +1581,296 @@
matrix = PycairoMatrix_FromMatrix(&transform);
return matrix;
}
+
+%%
+override-attr GooCanvasItemSimple.bounds
+
+static int
+_wrap_goo_canvas_item_simple__set_bounds(PyGObject *self, PyObject *py_value, void *closure)
+{
+ if (!PyObject_IsInstance(py_value, (PyObject*) &PyGooCanvasBounds_Type)) {
+ PyErr_SetString(PyExc_TypeError, "value must be goocanvas.Bounds");
+ return -1;
+ }
+ GOO_CANVAS_ITEM_SIMPLE(pygobject_get(self))->bounds = ((PyGooCanvasBounds*) py_value)->bounds;
+ return 0;
+}
+
+static PyObject*
+_wrap_goo_canvas_item_simple__get_bounds(PyGObject *self, void *closure)
+{
+ return pygoo_canvas_bounds_new(&GOO_CANVAS_ITEM_SIMPLE(pygobject_get(self))->bounds);
+}
+
+%%
+override goo_canvas_text_get_natural_extents noargs
+static PyObject *
+_wrap_goo_canvas_text_get_natural_extents(PyGObject *self)
+{
+ PangoRectangle ink_rect, logical_rect;
+
+ goo_canvas_text_get_natural_extents(GOO_CANVAS_TEXT(self->obj), &ink_rect,
+ &logical_rect);
+
+ return Py_BuildValue("((iiii)(iiii))",
+ ink_rect.x, ink_rect.y,
+ ink_rect.width, ink_rect.height,
+ logical_rect.x, logical_rect.y,
+ logical_rect.width, logical_rect.height);
+}
+
+%%
+override goo_canvas_item_get_simple_transform noargs
+static PyObject *
+_wrap_goo_canvas_item_get_simple_transform(PyGObject *self)
+{
+ gdouble x, y, scale, rotation;
+
+ goo_canvas_item_get_simple_transform(GOO_CANVAS_ITEM(self->obj), &x, &y,
+ &scale, &rotation);
+
+ return Py_BuildValue("dddd", x, y, scale, rotation);
+}
+
+%%
+override goo_canvas_item_model_get_simple_transform noargs
+static PyObject *
+_wrap_goo_canvas_item_model_get_simple_transform(PyGObject *self)
+{
+ gdouble x, y, scale, rotation;
+
+ goo_canvas_item_model_get_simple_transform(GOO_CANVAS_ITEM_MODEL(self->obj),
+ &x, &y, &scale, &rotation);
+
+ return Py_BuildValue("dddd", x, y, scale, rotation);
+}
+
+%%
+override goo_canvas_item_set_child_property kwargs
+static PyObject *
+_wrap_goo_canvas_item_set_child_property(PyGObject *self,
+ PyObject *args,
+ PyObject *kwargs)
+{
+ static char *kwlist[] = { "child", "property", "value", NULL };
+ gchar *property_name;
+ PyGObject *pychild;
+ GooCanvasItem *item, *child;
+ PyGObject *pyvalue;
+ GObjectClass *class;
+ GParamSpec *pspec;
+ GValue value = { 0, } ;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ "O!sO:GooCanvasItem.set_child_property",
+ kwlist,
+ &PyGooCanvasItem_Type, &pychild,
+ &property_name, &pyvalue)) {
+ return NULL;
+ }
+
+ item = GOO_CANVAS_ITEM(self->obj);
+ child = GOO_CANVAS_ITEM(pychild->obj);
+
+ if (goo_canvas_item_find_child(item, child) == -1) {
+ PyErr_SetString(PyExc_TypeError,
+ "first argument must be a child");
+ return NULL;
+ }
+
+ class = G_OBJECT_GET_CLASS(self->obj);
+ pspec = goo_canvas_item_class_find_child_property(class, property_name);
+ if (!pspec) {
+ gchar buf[512];
+ g_snprintf(buf, sizeof(buf),
+ "item does not support property `%s'",
+ property_name);
+ PyErr_SetString(PyExc_TypeError, buf);
+
+ return NULL;
+ }
+
+ g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
+
+ pyg_value_from_pyobject(&value, (PyObject*)pyvalue);
+
+ goo_canvas_item_set_child_property(item,
+ child,
+ property_name,
+ &value);
+ g_value_unset(&value);
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+%%
+override goo_canvas_item_get_child_property
+static PyObject *
+_wrap_goo_canvas_item_get_child_property(PyGObject *self,
+ PyObject *args,
+ PyObject *kwargs)
+{
+ static char *kwlist[] = { "child", "property", NULL };
+ PyGObject *pychild;
+ gchar *property_name;
+ GooCanvasItem *item, *child;
+ GObjectClass *class;
+ GParamSpec *pspec;
+ GValue value = { 0, } ;
+ PyObject *ret;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ "O!s:GooCanvasItem.get_child_property",
+ kwlist, &PyGooCanvasItem_Type, &pychild,
+ &property_name)) {
+ return NULL;
+ }
+
+ item = GOO_CANVAS_ITEM(self->obj);
+ child = GOO_CANVAS_ITEM(pychild->obj);
+
+ if (goo_canvas_item_find_child(item, child) == -1) {
+ PyErr_SetString(PyExc_TypeError,
+ "first argument must be a child");
+ return NULL;
+ }
+
+ class = G_OBJECT_GET_CLASS(item);
+ pspec = goo_canvas_item_class_find_child_property(class, property_name);
+ if (!pspec) {
+ gchar buf[512];
+ g_snprintf(buf, sizeof(buf),
+ "item does not support property `%s'",
+ property_name);
+
+ PyErr_SetString(PyExc_TypeError, buf);
+ return NULL;
+ }
+
+ g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
+
+ goo_canvas_item_get_child_property(item,
+ child,
+ property_name,
+ &value);
+
+ ret = pyg_value_as_pyobject(&value, TRUE);
+ g_value_unset(&value);
+
+ return ret;
+}
+
+%%
+override goo_canvas_item_model_set_child_property kwargs
+static PyObject *
+_wrap_goo_canvas_item_model_set_child_property(PyGObject *self,
+ PyObject *args,
+ PyObject *kwargs)
+{
+ static char *kwlist[] = { "child", "property", "value", NULL };
+ gchar *property_name;
+ PyGObject *pychild;
+ GooCanvasItemModel *item, *child;
+ PyGObject *pyvalue;
+ GObjectClass *class;
+ GParamSpec *pspec;
+ GValue value = { 0, } ;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ "O!sO:GooCanvasItemModel.set_child_property",
+ kwlist,
+ &PyGooCanvasItemModel_Type, &pychild,
+ &property_name, &pyvalue)) {
+ return NULL;
+ }
+
+ item = GOO_CANVAS_ITEM_MODEL(self->obj);
+ child = GOO_CANVAS_ITEM_MODEL(pychild->obj);
+
+ if (goo_canvas_item_model_find_child(item, child) == -1) {
+ PyErr_SetString(PyExc_TypeError,
+ "first argument must be a child");
+ return NULL;
+ }
+
+ class = G_OBJECT_GET_CLASS(self->obj);
+ pspec = goo_canvas_item_model_class_find_child_property(class, property_name);
+ if (!pspec) {
+ gchar buf[512];
+ g_snprintf(buf, sizeof(buf),
+ "item model does not support property `%s'",
+ property_name);
+ PyErr_SetString(PyExc_TypeError, buf);
+
+ return NULL;
+ }
+
+ g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
+
+ pyg_value_from_pyobject(&value, (PyObject*)pyvalue);
+
+ goo_canvas_item_model_set_child_property(item,
+ child,
+ property_name,
+ &value);
+ g_value_unset(&value);
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+%%
+override goo_canvas_item_model_get_child_property
+static PyObject *
+_wrap_goo_canvas_item_model_get_child_property(PyGObject *self,
+ PyObject *args,
+ PyObject *kwargs)
+{
+ static char *kwlist[] = { "child", "property", NULL };
+ PyGObject *pychild;
+ gchar *property_name;
+ GooCanvasItemModel *item, *child;
+ GObjectClass *class;
+ GParamSpec *pspec;
+ GValue value = { 0, } ;
+ PyObject *ret;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ "O!s:GooCanvasItemModel.get_child_property",
+ kwlist, &PyGooCanvasItemModel_Type, &pychild,
+ &property_name)) {
+ return NULL;
+ }
+
+ item = GOO_CANVAS_ITEM_MODEL(self->obj);
+ child = GOO_CANVAS_ITEM_MODEL(pychild->obj);
+
+ if (goo_canvas_item_model_find_child(item, child) == -1) {
+ PyErr_SetString(PyExc_TypeError,
+ "first argument must be a child");
+ return NULL;
+ }
+
+ class = G_OBJECT_GET_CLASS(item);
+ pspec = goo_canvas_item_model_class_find_child_property(class, property_name);
+ if (!pspec) {
+ gchar buf[512];
+ g_snprintf(buf, sizeof(buf),
+ "item model does not support property `%s'",
+ property_name);
+
+ PyErr_SetString(PyExc_TypeError, buf);
+ return NULL;
+ }
+
+ g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
+
+ goo_canvas_item_model_get_child_property(item,
+ child,
+ property_name,
+ &value);
+
+ ret = pyg_value_as_pyobject(&value, TRUE);
+ g_value_unset(&value);
+
+ return ret;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/Makefile.am new/pygoocanvas-0.10.0/Makefile.am
--- old/pygoocanvas-0.9.0/Makefile.am 2007-05-14 16:18:49.000000000 +0200
+++ new/pygoocanvas-0.10.0/Makefile.am 2008-04-27 12:29:17.000000000 +0200
@@ -32,3 +32,9 @@
--prefix py$* $*.defs) > gen-$*.c \
&& cp gen-$*.c $*.c \
&& rm -f gen-$*.c
+
+
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = pygoocanvas.pc
+EXTRA_DIST += pygoocanvas.pc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/NEWS new/pygoocanvas-0.10.0/NEWS
--- old/pygoocanvas-0.9.0/NEWS 2007-08-18 23:10:11.000000000 +0200
+++ new/pygoocanvas-0.10.0/NEWS 2008-05-01 19:24:04.000000000 +0200
@@ -1,3 +1,17 @@
+PyGooCanvas 0.10.0 (May 01 2008)
+==================
+
+ o Install a .pc file (Gustavo)
+ o Add goocanvas.ItemSimple.bounds getsets (Gustavo)
+ o prevent PYGTK from being imported into goocanvasmodule,
+ patch from Randall Wood. Fixes LP#150412
+ o fix object registration TYPE_CAIRO_PATTERN (Gian Mario)
+ o New custom example for SVG images. (Gian Mario)
+ o update with new goocanvas 0.10 API (Gian Mario)
+ o fix a bug introduced by pycairo API change, see LP#222503
+ reported by David Boucher (Gian Mario)
+ o Update docs according to new API (Gian Mario)
+
PyGooCanvas 0.9.0 (Aug 18 2007)
=================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/pygoocanvas.pc new/pygoocanvas-0.10.0/pygoocanvas.pc
--- old/pygoocanvas-0.9.0/pygoocanvas.pc 1970-01-01 01:00:00.000000000 +0100
+++ new/pygoocanvas-0.10.0/pygoocanvas.pc 2008-04-27 23:45:09.000000000 +0200
@@ -0,0 +1,11 @@
+prefix=/opt/gnome2
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+
+Name: PyGooCanvas
+Description: Python bindings for GooCanvas
+Version: 0.10.0
+Requires: pygtk-2.0
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pygoocanvas-0.9.0/pygoocanvas.pc.in new/pygoocanvas-0.10.0/pygoocanvas.pc.in
--- old/pygoocanvas-0.9.0/pygoocanvas.pc.in 1970-01-01 01:00:00.000000000 +0100
+++ new/pygoocanvas-0.10.0/pygoocanvas.pc.in 2008-04-27 12:29:17.000000000 +0200
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+
+Name: PyGooCanvas
+Description: Python bindings for GooCanvas
+Version: @VERSION@
+Requires: pygtk-2.0
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org