* src/docgen/HtmlDoc.py (add_photo): Enforce given image size.

Add optional alt argument.


svn: r2997
This commit is contained in:
Alex Roitman 2004-03-10 04:56:20 +00:00
parent 1833c28063
commit 4a53c021e2
2 changed files with 15 additions and 5 deletions

View File

@ -11,6 +11,9 @@
* src/ImageSelect.py (LocalMediaProperties.__init__, * src/ImageSelect.py (LocalMediaProperties.__init__,
GlobalMediaProperties.update_info): Mark translatable string. GlobalMediaProperties.update_info): Mark translatable string.
* src/docgen/HtmlDoc.py (add_photo): Enforce given image size.
Add optional alt argument.
2004-03-08 Don Allingham <dallingham@users.sourceforge.net> 2004-03-08 Don Allingham <dallingham@users.sourceforge.net>
* src/EditPerson.py: TreeView enhancements * src/EditPerson.py: TreeView enhancements
* src/PeopleModel.py: TreeView enhancements * src/PeopleModel.py: TreeView enhancements

View File

@ -356,7 +356,7 @@ class HtmlDoc(BaseDoc.BaseDoc):
except: except:
raise Errors.ReportError(_("Could not create %s") % fname) raise Errors.ReportError(_("Could not create %s") % fname)
def add_media_object(self,name,pos,x,y): def add_media_object(self,name,pos,x,y,alt=''):
self.empty = 0 self.empty = 0
size = int(max(x,y) * float(150.0/2.54)) size = int(max(x,y) * float(150.0/2.54))
refname = "is%s" % os.path.basename(name) refname = "is%s" % os.path.basename(name)
@ -385,11 +385,18 @@ class HtmlDoc(BaseDoc.BaseDoc):
else: else:
xtra = '' xtra = ''
if self.image_dir: imgsize = img.size()
self.f.write('<img src="%s/%s" border="0"%s>\n' % \ if imgsize[0] > imgsize[1]:
(self.image_dir,refname,xtra)) size_str = "width"
else: else:
self.f.write('<img src="%s" border="0"%s>\n' % (refname,xtra)) size_str = "height"
if self.image_dir:
self.f.write('<img src="%s/%s" border="0" %s="%d" alt="%s"%s>\n' % \
(self.image_dir,refname,size_str,size,alt,xtra))
else:
self.f.write('<img src="%s" border="0" %s="%d" alt="%s"%s>\n'
% (refname,size_str,size,alt,xtra))
def start_table(self,name,style): def start_table(self,name,style):
self.tbl = self.table_styles[style] self.tbl = self.table_styles[style]