Merge lp:~roadmr/checkbox/checkbox-fix-pygi-misbehaviors into lp:checkbox

[Daniel Manrique]

This branch fixes 3 bugs due to API-related changes on PyGi. They're not strictly GTK3-related, but have to do with the way PyGi exposes the GTK API. The buggy behavior was also present when running Checkbox trunk under Natty, but now works correctly there too. The GUI should now behave as expected in Natty and Oneiric.

[lp:~roadmr/checkbox/checkbox-fix-pygi-misbehaviors]

928. By Daniel Manrique on 2011-06-15

GTK GUI: Fix handling of mouse events in gtk_hypertext_view.py which prevented displaying the final report.

[Daniel Manrique (roadmr)]

I snuck in one more PyGI-related bugfix, this is for a problem with launching/displaying the report at the end of the run that I believe hadn't been reported by anyone. Well, with these changes, it will not need to be reported ;)

I chose to add them to this branch as it is where they logically belong.

[Marc Tardif (cr3)]

This fix seems like it was painful, thanks for solving all these bugs!

review: Approve

=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2011-06-09 20:23:11 +0000
+++ checkbox_gtk/gtk_interface.py	2011-06-15 21:41:46 +0000
@@ -128,7 +128,7 @@
     def _get_text_view(self, name):
         widget = self._get_widget(name)
         buffer = widget.get_buffer()
-        text = buffer.get_text(buffer.get_start_iter(), buffer.get_end_iter())
+        text = buffer.get_text(buffer.get_start_iter(), buffer.get_end_iter(), True)
         return text
 
     def _set_label(self, name, label=""):
@@ -367,7 +367,8 @@
 
         # Set options
         treestore = Gtk.TreeStore(str, bool)
-        treeview = Gtk.TreeView(treestore)
+        treeview = Gtk.TreeView()
+        treeview.set_model(treestore)
         treeview.set_headers_visible(False)
         treeview.show()
 
 
=== modified file 'checkbox_gtk/hyper_text_view.py'
--- checkbox_gtk/hyper_text_view.py	2011-06-13 09:42:59 +0000
+++ checkbox_gtk/hyper_text_view.py	2011-06-15 21:41:46 +0000
@@ -21,7 +21,7 @@
 
 class HyperTextView(Gtk.TextView):
     __gtype_name__ = "HyperTextView"
-    __gsignals__ = {"anchor-clicked": (GObject.SignalFlags.RUN_LAST, None, (str, str, int))}
+    __gsignals__ = {"anchor-clicked": (GObject.SignalFlags.RUN_LAST, GObject.TYPE_NONE, (str, str, int))}
     __gproperties__ = {
         "link":  (GObject.TYPE_PYOBJECT, "link color", "link color of TextView", GObject.PARAM_READWRITE),
         "active":(GObject.TYPE_PYOBJECT, "active color", "active color of TextView", GObject.PARAM_READWRITE),
@@ -82,7 +82,7 @@
             if tag.get_data("is_anchor"):
                 for t in set(self.__tags) - set([tag]):
                     self.__tag_reset(t, window)
-                self.__set_anchor(window, tag, Gdk.Cursor.new(Gdk.HAND2), self.get_property("hover"))
+                self.__set_anchor(window, tag, Gdk.Cursor.new(Gdk.CursorType.HAND2), self.get_property("hover"))
                 break
         else:
             tag_table = self.get_buffer().get_tag_table()
@@ -90,13 +90,13 @@
 
     def _tag_event(self, tag, view, ev, _iter, text, anchor):
         _type = ev.type
-        if _type == Gdk.MOTION_NOTIFY:
+        if _type == Gdk.EventType.MOTION_NOTIFY:
             return
-        elif _type in [Gdk.EventType.BUTTON_PRESS, Gdk.BUTTON_RELEASE]:
+        elif _type in [Gdk.EventType.BUTTON_PRESS, Gdk.EventType.BUTTON_RELEASE]:
             button = ev.button
-            cursor = Gdk.Cursor.new(Gdk.HAND2)
-            if _type == Gdk.BUTTON_RELEASE:
-                self.emit("anchor-clicked", text, anchor, button)
+            cursor = Gdk.Cursor.new(Gdk.CursorType.HAND2)
+            if _type == Gdk.EventType.BUTTON_RELEASE:
+                self.emit("anchor-clicked", text, anchor, button.button)
                 self.__set_anchor(ev.window, tag, cursor, self.get_property("hover"))
             elif button in [1, 2]:
                 self.__set_anchor(ev.window, tag, cursor, self.get_property("active"))
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-06-13 14:21:56 +0000
+++ debian/changelog	2011-06-15 21:41:46 +0000
@@ -1,8 +1,19 @@
 checkbox (0.12.2) oneiric; urgency=low
 
+  [ Marc Tardif ]
   * Incremented version.
 
- -- Marc Tardif <[e-mail]>  Mon, 13 Jun 2011 10:21:23 -0400
+  [ Daniel Manrique ]
+  * GTK GUI: Change assignment of TreeStore model to TreeView to account for
+    pygi-related API changes. Also seems to fix lingering select/deselect all
+    buttons. (LP: #796666) (LP: #796622)
+  * GTK GUI: Fix call to Gtk buffer get_text to add now-mandatory fourth
+    parameter, keeps the GUI from misbehaving in connection to fixed bug. 
+    (LP: #796827)
+  * GTK GUI: Fix handling of mouse events in gtk_hypertext_view.py which
+    prevented displaying the final report.
+
+ -- Daniel Manrique <[e-mail]>  Wed, 15 Jun 2011 17:37:23 -0400
 
 checkbox (0.12.1) oneiric; urgency=low