Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps2/ChangeLog
View File

@ -1,3 +1,10 @@
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
2006-12-26 Zsolt Foldvari <zsolt.foldvari@gmail.com> 2006-12-26 Zsolt Foldvari <zsolt.foldvari@gmail.com>
* src/GrampsWidgets.py: Add MaskedEntry, a widget to emulate the * src/GrampsWidgets.py: Add MaskedEntry, a widget to emulate the
KiwiEntry from the Kiwi project. KiwiEntry from the Kiwi project.

6
gramps2/configure.in
View File

@ -4,15 +4,15 @@ dnl Process this file with autoconf to produce a configure script.
dnl May need to run automake && aclocal first dnl May need to run automake && aclocal first
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT(gramps, 2.2.4, [gramps-bugs@lists.sourceforge.net]) AC_INIT(gramps, 2.2.5, [gramps-bugs@lists.sourceforge.net])
AC_CONFIG_SRCDIR(configure.in) AC_CONFIG_SRCDIR(configure.in)
AM_INIT_AUTOMAKE(1.6.3) AM_INIT_AUTOMAKE(1.6.3)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
GNOME_DOC_INIT GNOME_DOC_INIT
dnl RELEASE=0.SVN$(svnversion -n .) RELEASE=0.SVN$(svnversion -n .)
RELEASE=1 dnl RELEASE=1
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"

9
gramps2/src/GrampsWidgets.py
View File

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

4
gramps2/src/docgen/PdfDoc.py
View File

@ -354,7 +354,7 @@ class PdfDoc(BaseDoc.BaseDoc):
def add_media_object(self,name,pos,x_cm,y_cm): def add_media_object(self,name,pos,x_cm,y_cm):
try: try:
img = ImgManip.ImgManip(name) img = ImgManip.ImgManip(nname)
except: except:
return return
@ -375,7 +375,7 @@ class PdfDoc(BaseDoc.BaseDoc):
act_height = y_cm act_height = y_cm
act_width = x_cm/ratio 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']: if pos in ['left','right','center']:
im.hAlign = pos.upper() im.hAlign = pos.upper()
else: else: