[pitivi: 5/41] Enforce showing icons in the timeline "Zoom" button

[Thibault Saunier <tsaunier src gnome org>]

commit 64cf9cecf90a717e4adcde0604d8fdbad99fd936
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Fri Jul 15 01:18:55 2011 -0400

    Enforce showing icons in the timeline "Zoom" button

 pitivi/ui/timeline.py |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 4da4f33..2d938c6 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -242,12 +242,17 @@ class Timeline(gtk.Table, Loggable, Zoomable):
 
         # zooming slider's "zoom fit" button
         zoom_controls_hbox = gtk.HBox()
-        zoom_best_fit_button = gtk.Button(_("Zoom"))
-        zoom_best_fit_button.set_relief(gtk.RELIEF_NONE)
-        zoom_best_fit_button.set_tooltip_text(ZOOM_FIT)
-        zoom_best_fit_button.set_image(gtk.image_new_from_stock(gtk.STOCK_ZOOM_FIT, gtk.ICON_SIZE_BUTTON))
-        zoom_best_fit_button.connect("clicked", self._zoomFitCb)
-        zoom_controls_hbox.pack_start(zoom_best_fit_button)
+        zoom_fit_btn = gtk.Button()
+        zoom_fit_btn.set_relief(gtk.RELIEF_NONE)
+        zoom_fit_btn.set_tooltip_text(ZOOM_FIT)
+        zoom_fit_icon = gtk.Image()
+        zoom_fit_icon.set_from_stock(gtk.STOCK_ZOOM_FIT, gtk.ICON_SIZE_BUTTON)
+        zoom_fit_btn_hbox = gtk.HBox()
+        zoom_fit_btn_hbox.pack_start(zoom_fit_icon)
+        zoom_fit_btn_hbox.pack_start(gtk.Label(_("Zoom")))
+        zoom_fit_btn.add(zoom_fit_btn_hbox)
+        zoom_fit_btn.connect("clicked", self._zoomFitCb)
+        zoom_controls_hbox.pack_start(zoom_fit_btn)
         # zooming slider
         self._zoomAdjustment = gtk.Adjustment()
         self._zoomAdjustment.set_value(Zoomable.getCurrentZoomLevel())