[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.1-11-g498e7e1

[Luca Bruno]

The following commit has been merged in the master branch:
commit ccfabdcad747cc6bb5b09c44e9dc77fac6e285e2
Author: Luca Bruno <lethalman88 at gmail.com>
Date:   Thu Apr 16 09:58:00 2009 +0200

    wrap text in menus and disable the horizontal scrollbar. Fixes #521162/part

diff --git a/debian/changelog b/debian/changelog
index 01ecc0b..4daa974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ reportbug (4.2) UNRELEASED; urgency=low
     - display report message in a dialog at the end, in substitution of pager and stdout
     - forward page when the user hits ENTER either on an entry or a menu
     - respect given order in menus
+    - wrap text in menus and disable the horizontal scrollbar
     - ui focus and layout improvements
 
  -- Sandro Tosi <morph at debian.org>  Wed, 15 Apr 2009 20:06:48 +0200
diff --git a/reportbug/ui/gtk2_ui.py b/reportbug/ui/gtk2_ui.py
index e71acff..be4d59b 100644
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@ -25,6 +25,7 @@
 try:
     import gtk
     import gobject
+    import pango
 except ImportError:
     raise UINotImportable, 'Please install the python-gtk2 package to use this interface.'
 
@@ -749,6 +750,13 @@ class GetListPage (TreePage):
 
         self.view.append_column (gtk.TreeViewColumn ('Item', gtk.CellRendererText (), text=0))
 
+class WrapRendererText (gtk.CellRendererText):
+    def do_render (self, window, widget, background_area, cell_area, expose_area, flags):
+        self.set_property ('wrap-width', cell_area.width)
+        gtk.CellRendererText.do_render (self, window, widget, background_area, cell_area, expose_area, flags)
+
+gobject.type_register (WrapRendererText)
+
 class MenuPage (TreePage):
     value_column = 0
 
@@ -762,6 +770,7 @@ class MenuPage (TreePage):
         self.view = gtk.TreeView ()
         self.view.set_rules_hint (True)
         scrolled = create_scrollable (self.view)
+        scrolled.set_policy (gtk.POLICY_NEVER, gtk.POLICY_ALWAYS)
         vbox.pack_start (scrolled)
         vbox.show_all ()
         return vbox
@@ -781,7 +790,10 @@ class MenuPage (TreePage):
             self.selection.set_mode (gtk.SELECTION_MULTIPLE)
 
         self.view.append_column (gtk.TreeViewColumn ('Option', gtk.CellRendererText (), markup=0))
-        self.view.append_column (gtk.TreeViewColumn ('Description', gtk.CellRendererText (), text=1))
+        rend = WrapRendererText ()
+        rend.set_property ('wrap-mode', pango.WRAP_WORD)
+        rend.set_property ('wrap-width', 300)
+        self.view.append_column (gtk.TreeViewColumn ('Description', rend, text=1))
 
         default_iter = None
         if isinstance (options, dict):

-- 
Reportbug - reports bugs in the Debian distribution