Merge lp:~ken-vandine/libgrip/python_gi_override into lp:~bratsche/libgrip/python-fixage-wip

[Ken VanDine]

* Added python overrides for gi
* Fixed pygrip example

[Cody Russell (bratsche)]

Awesome, thanks for the fix!

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2010-11-22 14:49:44 +0000
+++ Makefile.am	2011-01-24 19:13:59 +0000
@@ -4,7 +4,7 @@
 Q         = $(V:1=)
 QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
 
-SUBDIRS = build src examples/rectangle-mover
+SUBDIRS = build src bindings examples/rectangle-mover
 
 libgrip-0.1.pc: libgrip.pc
 	$(QUIET_GEN) cp -f libgrip.pc libgrip-0.1.pc
 
=== added directory 'bindings'
=== added file 'bindings/Makefile.am'
--- bindings/Makefile.am	1970-01-01 00:00:00 +0000
+++ bindings/Makefile.am	2011-01-24 19:13:59 +0000
@@ -0,0 +1,1 @@
+SUBDIRS = python
 
=== added directory 'bindings/python'
=== added file 'bindings/python/Grip.py'
--- bindings/python/Grip.py	1970-01-01 00:00:00 +0000
+++ bindings/python/Grip.py	2011-01-24 19:13:59 +0000
@@ -0,0 +1,52 @@
+#
+# Copyright 2010 Canonical, Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of either or both of the following licenses:
+#
+# 1) the GNU Lesser General Public License version 3, as published by the
+# Free Software Foundation; and/or
+# 2) the GNU Lesser General Public License version 2.1, as published by
+# the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the applicable version of the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of both the GNU Lesser General Public
+# License version 3 and version 2.1 along with this program.  If not, see
+# <http://www.gnu.org/licenses/>
+#
+# Authors:
+#    Cody Russell <[e-mail]>
+#
+
+from ..overrides import override
+from ..importer import modules
+
+Grip = modules['Grip'].introspection_module
+
+__all__ = []
+
+class GestureEvent(Grip.GestureEvent):
+    _UNION_MEMBERS = {
+        Grip.GestureType.DRAG: 'drag',
+        Grip.GestureType.PINCH: 'pinch',
+        Grip.GestureType.ROTATE: 'rotate',
+        Grip.GestureType.TAP: 'tap'
+    }
+
+    def __new__(cls, *args, **kwargs):
+        return Grip.GestureEvent.__new__(cls)
+
+    def __getattr__(self, name):
+        real_event = getattr(self, '_UNION_MEMBERS').get(self.type)
+        if real_event:
+            return getattr(getattr(self, real_event), name)
+        else:
+            return getattr(self, name)
+
+GestureEvent = override(GestureEvent)
+__all__.append('GestureEvent')
 
=== added file 'bindings/python/Makefile.am'
--- bindings/python/Makefile.am	1970-01-01 00:00:00 +0000
+++ bindings/python/Makefile.am	2011-01-24 19:13:59 +0000
@@ -0,0 +1,9 @@
+PLATFORM_VERSION = 2.0
+
+pkgpyexecdir = $(pyexecdir)/gi
+
+pygioverridesdir = $(pkgpyexecdir)/overrides
+pygioverrides_PYTHON = \
+        Grip.py
+
+EXTRA_DIST = Grip.py
 
=== modified file 'configure.ac'
--- configure.ac	2011-01-03 19:12:52 +0000
+++ configure.ac	2011-01-24 19:13:59 +0000
@@ -27,6 +27,8 @@
 AM_INIT_AUTOMAKE([1.9])
 AM_MAINTAINER_MODE
 
+AM_PATH_PYTHON
+
 GRIP_MAJOR_VERSION=grip_major_version
 GRIP_MINOR_VERSION=grip_minor_version
 GRIP_MICRO_VERSION=grip_micro_version
@@ -119,6 +121,8 @@
   build/autotools/shave-libtool
   build/autotools/shave
   src/Makefile
+  bindings/python/Makefile
+  bindings/Makefile
   examples/rectangle-mover/Makefile
   libgrip.pc
 ])
 
=== modified file 'examples/pygrip/pygrip.py' (properties changed: -x to +x)
--- examples/pygrip/pygrip.py	2011-01-21 17:19:26 +0000
+++ examples/pygrip/pygrip.py	2011-01-24 19:13:59 +0000
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 from gi.repository import Gtk
 Gtk.require_version('2.0')
 from gi.repository import Grip
@@ -16,20 +17,18 @@
         builder.add_from_file("pygrip-gestures.xml")
         builder.connect_signals(self)
         self.window = builder.get_object("window1")
+        self.gesture_manager = Grip.GestureManager()
         self.window.show()
 
     def window_mapped(self, widget, data=None):
         # The gesture manager is only going to be needed for GTK2, since GTK3
         # will have the gesture API natively. Conversely, pygrip will only be
         # for GTK2, since PyGTK3 will having the bindings.
-        gesture_manager = Grip.GestureManager()
  
         finger_count = 2
-#        import epdb; epdb.st();
-        gesture_manager.register_window(self.window, Grip.GestureType.PINCH, finger_count, self.callback, None)
+        self.gesture_manager.register_window(widget, Grip.GestureType.PINCH, finger_count, self.callback, None)
 
     def callback(self, window, time_type, gesture_event, data):
-#        import epdb; epdb.st();
         print "received gesture"
 
     def quit(self, widget, data=None):
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-11-22 14:49:44 +0000
+++ src/Makefile.am	2011-01-24 19:13:59 +0000
@@ -38,6 +38,7 @@
 	$(INTROSPECTION_SCANNER)						\
 		-v --namespace Grip						\
 		--nsversion=0.1							\
+		--warn-all							\
 		--add-include-path=$(srcdir) $(GTK_CFLAGS)			\
 		--include=GObject-2.0						\
 		--include=GLib-2.0						\
@@ -104,4 +105,5 @@
 DISTCLEANFILES =			\
 	stamp-griptypebuiltins.h	\
 	griptypebuiltins.h		\
-	griptypebuiltins.c
 \ No newline at end of file
+	griptypebuiltins.c
+