Merge lp:~oif-team/libgrope/676473-fixup-examples into lp:libgrope

[Duncan McGreggor]

Okay, I've cleaned up the examples. Additionally, this branch includes the full dev history of the Python example.

[Cody Russell (bratsche)]

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2010-11-10 20:06:03 +0000
+++ Makefile.am	2010-11-17 18:29:14 +0000
@@ -4,7 +4,7 @@
 Q         = $(V:1=)
 QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
 
-SUBDIRS = build src example
+SUBDIRS = build src examples/rectangle-mover
 
 libgrope-0.1.pc: libgrope.pc
 	$(QUIET_GEN) cp -f libgrope.pc libgrope-0.1.pc

=== modified file 'configure.ac'
--- configure.ac	2010-11-10 20:49:49 +0000
+++ configure.ac	2010-11-17 18:29:14 +0000
@@ -119,7 +119,7 @@
   build/autotools/shave-libtool
   build/autotools/shave
   src/Makefile
-  example/Makefile
+  examples/rectangle-mover/Makefile
   libgrope.pc
 ])
 

=== removed directory 'example/python'
=== removed file 'example/python/example.py'
--- example/python/example.py	2010-11-15 16:05:37 +0000
+++ example/python/example.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-import pygtk
-from gi.repository import Gtk
-from gi.repository import Grope
-
-# XXX For now, we'll use Grope directly. Once we have a good sense of what's
-# going to be needed in general for general Python code using Grope, we might
-# want to put that stuff in a wrapper grope module, and import everything from
-# there instead.
-
-
-class GestureTester(object):
-
-    def __init__(self):
-        builder = Gtk.Builder()
-        builder.add_from_file("pygrope-gestures.xml")
-        builder.connect_signals(self)
-        self.window = builder.get_object("window1")
-        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, pygrope will only be
-        # for GTK2, since PyGTK3 will having the bindings.
-        gesture_manager = Grope.GestureManager()
-        # For the purpose of this example, we are registering all gestures; we
-        # could limit this by choosing a different pygrope.GROPE_GESTURE_*
-        # mask. Similarly, we're using one set of callbacks for all the
-        # gestures; we could have different callbacks for different registered
-        # gestures.
-        # XXX the comment above is for the new API; the example below has been
-        # reverted to the older API until the new one is merged to trunk.
-        finger_count = 2
-        gesture_manager.register_window(self.window,
-                                        Grope.GestureType.PINCH,
-                                        finger_count,
-                                        self.callback,
-                                        None, None)
-
-    def callback(self, window, time_type, gesture_type, gesture_event):
-        print "received gesture"
-
-    def quit(self, widget, data=None):
-        Gtk.main_quit()
-
-
-if __name__ == "__main__":
-    app = GestureTester()
-    Gtk.main()

=== removed file 'example/python/pygrope-gestures.xml'
--- example/python/pygrope-gestures.xml	2010-11-12 20:27:52 +0000
+++ example/python/pygrope-gestures.xml	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="window1">
-    <property name="width_request">0</property>
-    <property name="height_request">0</property>
-    <property name="default_width">1400</property>
-    <property name="default_height">800</property>
-    <signal name="map_event" handler="window_mapped"/>
-    <signal name="delete_event" handler="quit"/>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-</interface>

=== renamed directory 'example' => 'examples'
=== added directory 'examples/pygrope'
=== added file 'examples/pygrope/pygrope-gestures.xml'
--- examples/pygrope/pygrope-gestures.xml	1970-01-01 00:00:00 +0000
+++ examples/pygrope/pygrope-gestures.xml	2010-11-17 18:29:14 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="window1">
+    <property name="width_request">0</property>
+    <property name="height_request">0</property>
+    <property name="default_width">1400</property>
+    <property name="default_height">800</property>
+    <signal name="map_event" handler="window_mapped"/>
+    <signal name="delete_event" handler="quit"/>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>

=== added file 'examples/pygrope/pygrope.py'
--- examples/pygrope/pygrope.py	1970-01-01 00:00:00 +0000
+++ examples/pygrope/pygrope.py	2010-11-17 18:29:14 +0000
@@ -0,0 +1,47 @@
+import pygtk
+from gi.repository import Gtk
+from gi.repository import Grope
+
+
+# XXX For now, we'll use Grope directly. Once we have a good sense of what's
+# going to be needed in general for general Python code using Grope, we might
+# want to put that stuff in a wrapper grope module, and import everything from
+# there instead.
+
+
+class GestureTester(object):
+
+    def __init__(self):
+        builder = Gtk.Builder()
+        builder.add_from_file("pygrope-gestures.xml")
+        builder.connect_signals(self)
+        self.window = builder.get_object("window1")
+        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, pygrope will only be
+        # for GTK2, since PyGTK3 will having the bindings.
+        gesture_manager = Grope.GestureManager()
+        # For the purpose of this example, we are registering all gestures; we
+        # could limit this by choosing a different pygrope.GROPE_GESTURE_*
+        # mask. Similarly, we're using one set of callbacks for all the
+        # gestures; we could have different callbacks for different registered
+        # gestures.
+        # XXX the comment above is for the new API; the example below has been
+        # reverted to the older API until the new one is merged to trunk.
+        finger_count = 2
+        gesture_manager.register_window(
+            self.window, Grope.GestureType.PINCH, finger_count,self.callback,
+            None, None)
+
+    def callback(self, window, time_type, gesture_type, gesture_event):
+        print "received gesture"
+
+    def quit(self, widget, data=None):
+        Gtk.main_quit()
+
+
+if __name__ == "__main__":
+    app = GestureTester()
+    Gtk.main()

=== added directory 'examples/rectangle-mover'
=== renamed file 'example/Makefile.am' => 'examples/rectangle-mover/Makefile.am'
=== renamed file 'example/gesture.c' => 'examples/rectangle-mover/gesture.c'