Update of /cvsroot/freevo/freevo/src/image
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2759/src/image
Modified Files:
viewer.py
Log Message:
put image viewer osd into config
Index: viewer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/image/viewer.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** viewer.py 31 May 2004 10:45:27 -0000 1.49
--- viewer.py 3 Jun 2004 18:23:31 -0000 1.50
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.50 2004/06/03 18:23:31 dischi
+ # put image viewer osd into config
+ #
# Revision 1.49 2004/05/31 10:45:27 dischi
# update to new callback handling in rc
***************
*** 384,388 ****
# print image information
elif event == TOGGLE_OSD:
! self.osd_mode = {0:1, 1:2, 2:0}[self.osd_mode] # Toggle on/off
# Redraw
self.view(self.fileitem, zoom=self.zoom, rotation = self.rotation)
--- 387,391 ----
# print image information
elif event == TOGGLE_OSD:
! self.osd_mode = (self.osd_mode + 1) % (len(config.IMAGEVIEWER_OSD) + 1)
# Redraw
self.view(self.fileitem, zoom=self.zoom, rotation = self.rotation)
***************
*** 430,473 ****
def drawosd(self, layer=None):
! if not self.osd_mode: return
!
! elif self.osd_mode == 1:
! # This is where we add a caption. Only if playlist is empty
! # May need to check the caption too?
! osdstring = []
!
! # Here we set up the tags that we want to put in the display
! # Using the following fields
! tags_check = [[_('Title')+': ', 'name'],
! [_('Description')+': ','description'],
! [_('Author')+': ', 'author']
! ]
!
!
!
! elif self.osd_mode == 2:
! # This is where we add a caption. Only if playlist is empty
! # create an array with Exif tags as above
! osdstring = []
! tags_check = [ [_('Title')+': ', 'name'],
! [_('Date')+': ' , 'date'],
! ['W:', 'width'],
! ['H:', 'height'],
! [_('Model')+': ', 'hardware'],
! [_('Software')+': ', 'software']
! ]
! # FIXME: add this informations to mmpython:
!
! # ['Exp:','EXIF ExposureTime','ExposureTime','EXIF'],
! # ['F/','EXIF FNumber','FNumber','EXIF'],
! # ['FL:','EXIF FocalLength','FocalLength','EXIF'],
! # ['ISO:','EXIF ISOSpeedRatings','ISOSpeedRatings','EXIF'],
! # ['Meter:','EXIF MeteringMode','MeteringMode','EXIF'],
! # ['Light:','EXIF LightSource','LightSource','EXIF'],
! # ['Flash:','EXIF Flash','Flash','EXIF'],
! # ['Make:','Image Make','Make','EXIF'],
! for strtag in tags_check:
i = self.fileitem.getattr(strtag[1])
if i:
--- 433,442 ----
def drawosd(self, layer=None):
! if not self.osd_mode:
! return
! osdstring = []
! for strtag in config.IMAGEVIEWER_OSD[self.osd_mode-1]:
i = self.fileitem.getattr(strtag[1])
if i:
-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
>From Windows to Linux, servers to mobile, InstallShield X is the one
installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
