2006-12-28 Don Allingham <don@gramps-project.org>

* src/docgen/PdfDoc.py: convert image name to str from unicode
	due to a ReportLab bug.

2006-12-27  Don Allingham  <don@gramps-project.org>
	* configure.in: change version number to 2.2.5



svn: r7855
This commit is contained in:
Don Allingham
2006-12-29 03:58:26 +00:00
parent 846e65514f
commit 1385c746fd
4 changed files with 20 additions and 8 deletions

View File

@@ -1769,6 +1769,10 @@ class MaskedEntry(gtk.Entry):
def set_pixbuf(self, pixbuf):
self._icon.set_pixbuf(pixbuf)
def set_stock(self, stock_name):
pixbuf = self.render_icon(stock_name, gtk.ICON_SIZE_MENU)
self._icon.set_pixbuf(pixbuf)
def update_background(self, color):
self._icon.update_background(color)
@@ -1794,8 +1798,9 @@ def main(args):
widget = MaskedEntry()
widget.set_mask('000.000.000.000')
pixbuf = gtk.gdk.pixbuf_new_from_file("images/stock_lock.png")
widget.set_pixbuf(pixbuf)
# pixbuf = gtk.gdk.pixbuf_new_from_file("images/stock_lock.png")
# widget.set_pixbuf(pixbuf)
widget.set_stock(gtk.STOCK_NO)
widget.set_tooltip("Tooltip example")
win.add(widget)

View File

@@ -354,7 +354,7 @@ class PdfDoc(BaseDoc.BaseDoc):
def add_media_object(self,name,pos,x_cm,y_cm):
try:
img = ImgManip.ImgManip(name)
img = ImgManip.ImgManip(nname)
except:
return
@@ -375,12 +375,12 @@ class PdfDoc(BaseDoc.BaseDoc):
act_height = y_cm
act_width = x_cm/ratio
im = Image(enc(name),act_width*cm,act_height*cm)
im = Image(str(name),act_width*cm,act_height*cm)
if pos in ['left','right','center']:
im.hAlign = pos.upper()
else:
im.hAlign = 'LEFT'
if self.in_table:
self.cur_cell.append(Spacer(1,0.5*cm))
self.cur_cell.append(im)