Merge lp:~roadmr/checkbox/621880 into lp:checkbox

[Daniel Manrique]

I removed the static "hardware database" string from the header graphic and it's now rendered from within the gtk+ code for the interface. Other than internationalization of the string, this could enable us to do interesting things with the header and the text it contains, might be useful in order to more easily customize an updated header, and/or in preparation for Ubuntu Friendly where checkbox's visual presentation might change.

All this was done using Cairo and Pango, gi.repository and the new "draw" signal to be as GTK3-compliant as possible.

Tested to run under both Natty and Oneiric.

[Marc Tardif (cr3)]

Looks good, I just moved your changelog comment from 0.12.2 to 0.12.1 since the latter hasn't been released in Ubuntu yet. Thanks man!

review: Approve

=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2011-05-17 13:47:10 +0000
+++ checkbox_gtk/gtk_interface.py	2011-06-10 15:51:29 +0000
@@ -22,7 +22,8 @@
 from gettext import gettext as _
 from string import Template
 
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk, Gdk, Pango, PangoCairo
+import cairo
 
 from checkbox.job import UNINITIATED
 from checkbox.user_interface import (UserInterface,
@@ -32,7 +33,6 @@
 # Import to register HyperTextView type with gtk
 from checkbox_gtk.hyper_text_view import HyperTextView
 
-
 ANSWER_TO_BUTTON = {
     YES_ANSWER: "radio_button_yes",
     NO_ANSWER: "radio_button_no",
@@ -85,6 +85,19 @@
         self._dialog = self._get_widget("dialog_main")
         self._dialog.set_title(title)
 
+        #Setup and handler to render pixmap and translatable description text.
+        self.IMAGE_HEAD_BACKGROUND = posixpath.join(data_path,
+            "checkbox-gtk-head.png")
+        self.FONT = "Ubuntu"
+        self.TEXT =_("hardware database")
+
+        image_head=self._get_widget("image_head")
+        try:
+            image_head.connect("draw",self.draw_image_head)
+        except TypeError:
+            #Looks like GTK+ 2.x
+            image_head.connect("expose-event",self.draw_image_head)
+
         # Set wait transient for dialog
         self._wait = self._get_widget("window_wait")
         self._wait.set_transient_for(self._dialog)
@@ -501,7 +514,7 @@
         message_dialog.set_title(_("Info"))
 
         for index, option in enumerate(options):
-            button = getattr(gtk, "STOCK_%s" % option.upper())
+            button = getattr(Gtk, "STOCK_%s" % option.upper())
             message_dialog.add_buttons(button, index)
 
         self._run_dialog(message_dialog)
@@ -522,3 +535,28 @@
         message_dialog.add_buttons(Gtk.STOCK_CLOSE, NEXT)
         self._run_dialog(message_dialog)
         message_dialog.hide()
+
+    def draw_image_head(self, widget, data):
+        #Render the background we read from an image
+        background_image = cairo.ImageSurface.create_from_png(
+                self.IMAGE_HEAD_BACKGROUND)
+        cairo_drawing_context = Gdk.cairo_create(widget.get_window())
+        cairo_drawing_context.set_source_surface(background_image,0,0)
+        cairo_drawing_context.paint()
+        #Text rendering with Pango is more involved but potentially
+        #better for l10n and i18n purposes
+        font_description = Pango.FontDescription()
+        font_description.set_family(self.FONT)
+        font_description.set_weight(Pango.Weight.NORMAL)
+        font_description.set_absolute_size(12 * Pango.SCALE)
+
+        pango_drawing_context = widget.get_pango_context()       
+        pango_text_layout = Pango.Layout(context=pango_drawing_context)
+        pango_text_layout.set_font_description(font_description)
+        pango_text_layout.set_text(self.TEXT, -1) 
+
+        #Color to render text
+        cairo_drawing_context.set_source_rgb(0,0,0)
+        #Position to render text
+        cairo_drawing_context.move_to(100,45)
+        PangoCairo.show_layout(cairo_drawing_context,pango_text_layout)

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-06 20:38:04 +0000
+++ debian/changelog	2011-06-10 15:51:29 +0000
@@ -1,3 +1,10 @@
+checkbox (0.12.2) oneiric; urgency=low
+
+  *  Render header text dynamically over the image background, and updated pot
+     file with the new string. (LP: #621880)
+
+ -- Daniel Manrique <[e-mail]>  Thu, 09 Jun 2011 15:57:58 -0400
+
 checkbox (0.12.1) oneiric; urgency=low
 
   [Brendan Donegan]

=== modified file 'gtk/checkbox-gtk-head.png'
Binary files gtk/checkbox-gtk-head.png	2009-02-09 21:34:00 +0000 and gtk/checkbox-gtk-head.png	2011-06-10 15:51:29 +0000 differ
=== modified file 'gtk/checkbox-gtk.ui'
--- gtk/checkbox-gtk.ui	2011-05-20 21:22:31 +0000
+++ gtk/checkbox-gtk.ui	2011-06-10 15:51:29 +0000
@@ -23,7 +23,8 @@
               <object class="GtkImage" id="image_head">
                 <property name="visible">True</property>
                 <property name="yalign">0</property>
-                <property name="pixbuf">checkbox-gtk-head.png</property>
+                <property name="width_request">-1</property>
+                <property name="height_request">69</property>
               </object>
             </child>
           </object>

=== modified file 'po/checkbox.pot'
--- po/checkbox.pot	2011-04-05 16:11:50 +0000
+++ po/checkbox.pot	2011-06-10 15:51:29 +0000
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 12:01-0400\n"
+"POT-Creation-Date: 2011-06-09 16:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,6 +53,7 @@
 msgstr ""
 
 #: ../gtk/checkbox-gtk.ui.h:9 ../checkbox_gtk/gtk_interface.py:488
+#: checkbox_gtk/gtk_interface.py:503
 msgid "_Test"
 msgstr ""
 
@@ -1278,15 +1280,15 @@
 msgid "Test Again"
 msgstr ""
 
-#: ../checkbox_gtk/gtk_interface.py:457
+#: ../checkbox_gtk/gtk_interface.py:457 checkbox_gtk/gtk_interface.py:472
 msgid "_Test Again"
 msgstr ""
 
-#: ../checkbox_gtk/gtk_interface.py:499
+#: ../checkbox_gtk/gtk_interface.py:499 checkbox_gtk/gtk_interface.py:514
 msgid "Info"
 msgstr ""
 
-#: ../checkbox_gtk/gtk_interface.py:518
+#: ../checkbox_gtk/gtk_interface.py:518 checkbox_gtk/gtk_interface.py:533
 msgid "Error"
 msgstr ""
 
@@ -1433,3 +1435,7 @@
 #: ../scripts/internet_test:140
 msgid "Internet connection fully established"
 msgstr ""
+
+#: checkbox_gtk/gtk_interface.py:92
+msgid "hardware database"
+msgstr ""