← Back to branch summary

~vorlon/ubuntu/saucy/gourmet/trunk

« back to all changes in this revision

Viewing changes to src/lib/recipeMerger.py

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2009-12-29 09:12:49 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20091229091249-n45z95fou0yr2t1t
Tags: 0.15.2-0ubuntu1
http://bugs.debian.org/530841
https://launchpad.net/bugs/431806
https://launchpad.net/bugs/315836
https://launchpad.net/bugs/295982
https://launchpad.net/bugs/316445
* New upstream release (LP: #431806, Closes: #530841). Also fixes the
  following bugs:
  - LP: #315836
  - LP: #295982
  - LP: #316445 (the GUI has been changed so this no longer applies)
* Drop forcing of python2.5
* debian/control: Recommends python-gnome2-extras for printing
* drop debian/patches/05-add_manpage.patch, which is now included upstream
* Fix some lintian warnings:
  - add debian/README.source
  - debian/control: bump Standards-Version to 3.8.3
  - debian/compat: bump to 5
* debian/control: Depends on python-poppler (needed for printing)
* debian/patches/01_fix_raise_str.patch: don't raise str exception
  in src/lib/plugin_gui.py
* debian/patches/02_fix_nutrition_index_out_of_range.patch: don't
  add entries beyond the width of the field in databaseGrabber.py
* debian/patches/03_dont_remove_nonexistent_plugin.patch: don't
  remove an inactive plugin in plugin_loader.py and don't deactivate
  a plugin from a non-existent database

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/recipeMerger.py
3
3
This module contains code for handling the 'merging' of duplicate
4
4
recipes.
5
5
"""
6
 
import gtk, os.path, time
 
6
import gtk, os.path, time,pango
7
7
import recipeIdentifier
8
8
from gtk_extras import ratingWidget, mnemonic_manager
9
9
import convert
409
409
                        l = gtk.Label(txt)
410
410
                        l.set_alignment(0.0,0.0)                    
411
411
                        l.set_use_markup(True)
412
 
                        l.set_line_wrap(True); l.set_line_wrap_mode(gtk.WRAP_WORD)
 
412
                        l.set_line_wrap(True); l.set_line_wrap_mode(pango.WRAP_WORD)
413
413
                        l.show()
414
414
                        self.setup_widget_size(l,in_col=True)
415
415
                        self.attach(l,col+1,col+2,self.row+1+n,self.row+2+n,
425
425
            l = gtk.Label(blocks[0])
426
426
            l.set_alignment(0.0,0.0)
427
427
            l.set_use_markup(True)
428
 
            l.set_line_wrap(True); l.set_line_wrap_mode(gtk.WRAP_WORD)
 
428
            l.set_line_wrap(True); l.set_line_wrap_mode(pango.WRAP_WORD)
429
429
            l.show()
430
430
            self.attach(l,1,5,self.row,self.row+1,xoptions=gtk.SHRINK|gtk.FILL,yoptions=gtk.SHRINK|gtk.FILL)
431
431
        lab.set_alignment(0.0,0.0); lab.show()