Update of /cvsroot/freevo/freevo/src/image
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24366/src/image
Modified Files:
imageitem.py viewer.py
Log Message:
image viwer auto slideshow
Index: viewer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/image/viewer.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** viewer.py 27 Aug 2004 14:22:01 -0000 1.67
--- viewer.py 7 Sep 2004 18:57:43 -0000 1.68
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.68 2004/09/07 18:57:43 dischi
+ # image viwer auto slideshow
+ #
# Revision 1.67 2004/08/27 14:22:01 dischi
# The complete image code is working again and should not crash. The zoom
***************
*** 92,96 ****
str(IMAGE_ZOOM_GRID8):8, str(IMAGE_ZOOM_GRID9):9 }
self.bitmapcache = util.objectcache.ObjectCache(3, desc='viewer')
! self.slideshow = False
self.last_image = None
self.last_item = None
--- 95,99 ----
str(IMAGE_ZOOM_GRID8):8, str(IMAGE_ZOOM_GRID9):9 }
self.bitmapcache = util.objectcache.ObjectCache(3, desc='viewer')
! self.slideshow = True
self.last_image = None
self.last_item = None
***************
*** 100,103 ****
--- 103,107 ----
self.rotation = None
self.zomm = None
+ self.signal_registered = False
***************
*** 124,129 ****
self.osd_mode = 0
self.filename = None
- self.slideshow = False
# we don't need the signalhandler anymore
rc.unregister(self.signalhandler)
# reset bitmap cache
--- 128,133 ----
self.osd_mode = 0
self.filename = None
# we don't need the signalhandler anymore
+ self.signal_registered = False
rc.unregister(self.signalhandler)
# reset bitmap cache
***************
*** 273,279 ****
# start timer
! if self.fileitem.duration:
! rc.register(self.signalhandler, False, self.fileitem.duration)
! self.slideshow = True
self.last_image = image
--- 277,283 ----
# start timer
! if self.fileitem.duration and self.slideshow and not self.signal_registered:
! rc.register(self.signalhandler, False, self.fileitem.duration*100)
! self.signal_registered = True
self.last_image = image
***************
*** 309,314 ****
"""
self.hide()
self.eventhandler(PLAY_END)
- self.slideshow = False
--- 313,318 ----
"""
self.hide()
+ self.signal_registered = False
self.eventhandler(PLAY_END)
***************
*** 322,329 ****
--- 326,335 ----
self.slideshow = False
rc.unregister(self.signalhandler)
+ self.signal_registered = False
else:
self.post_event(Event(OSD_MESSAGE, arg=_('play')))
self.slideshow = True
rc.register(self.signalhandler, False, 100)
+ self.signal_registered = True
return True
***************
*** 335,339 ****
# up and down will stop the slideshow and pass the
# event to the playlist
! self.slideshow = False
rc.unregister(self.signalhandler)
self.fileitem.eventhandler(event)
--- 341,345 ----
# up and down will stop the slideshow and pass the
# event to the playlist
! self.signal_registered = False
rc.unregister(self.signalhandler)
self.fileitem.eventhandler(event)
Index: imageitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/image/imageitem.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** imageitem.py 27 Aug 2004 14:22:01 -0000 1.28
--- imageitem.py 7 Sep 2004 18:57:43 -0000 1.29
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.29 2004/09/07 18:57:43 dischi
+ # image viwer auto slideshow
+ #
# Revision 1.28 2004/08/27 14:22:01 dischi
# The complete image code is working again and should not crash. The zoom
***************
*** 56,60 ****
An item for image files
"""
! def __init__(self, url, parent, name = None, duration = 0):
# set autovars to 'rotation' so that this value is
# stored between Freevo sessions
--- 59,63 ----
An item for image files
"""
! def __init__(self, url, parent, name = None, duration =
config.IMAGEVIEWER_DURATION):
# set autovars to 'rotation' so that this value is
# stored between Freevo sessions
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
