[Freevo-devel] Re: Problems creating a little plugin for freevo 1.5.3
Gorka Olaizola wrote: Hello, Hi I'm trying to code a little plugin for playing directories recursively Why? It's already in Freevo. Press ENTER on a dir to get the submenu. but i'm very confused about how the playlist do work. Yes, the code is scary. Needs some cleanup, I know. I simply iterate over the shuffled directories and call to Playlist.play() in each directory, but the loop doesn't stop while the playlist is playing and I get all the playlist playing at the same time. Freevo 1.5.3 or CVS? Dischi -- To alcohol! The cause of - and solution to - all of life's problems! -- Homer Simpson pgplE9MZREaMD.pgp Description: PGP signature
[Freevo-cvslog] freevo/share/skins/main basic.fxd,1.8,1.9 blurr.fxd,1.8,1.9 blurr.jpg,1.1,1.2 blue_round1.fxd,1.5,NONE blue_round1.jpg,1.1,NONE blurr2.fxd,1.55,NONE blurr2.jpg,1.1,NONE
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30634 Modified Files: basic.fxd blurr.fxd blurr.jpg Removed Files: blue_round1.fxd blue_round1.jpg blurr2.fxd blurr2.jpg Log Message: o removed old skins, renamed blurr2 to blurr o moved the tv info stuff from blurr to basic Index: basic.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/basic.fxd,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** basic.fxd 21 Feb 2004 19:36:28 - 1.8 --- basic.fxd 14 Mar 2004 10:51:36 - 1.9 *** *** 2,535 freevo ! !-- ! This is a basic skin definition. Each skin should inherit from this one ! (or from another inheriting from this) to make sure the basic menus, ! layout and fonts are defined. ! Each plugin can assume that all stuff here is defined for each skin ! -- [...1191 lines suppressed...] ! !-- ! *** ! ** Headlines ! *** -- ! ! headlines ! screen layout=screen x=0 y=0 width=800 height=600/ ! title visible=not idlebar layout=title x=10 y=10 ! width=780 height=80/ ! info layout=info x=10 y=110 width=780 height=480/ ! /headlines ! ! /skin /freevo + !-- Keep this comment at the end of the file + Local variables: + mode: xml + sgml-indent-step:4 + End: + -- Index: blurr.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr.fxd,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** blurr.fxd 17 Jan 2004 15:00:11 - 1.8 --- blurr.fxd 14 Mar 2004 10:51:37 - 1.9 *** *** 1,287 ?xml version=1.0 ? freevo - - skin include=basic geometry=800x600 - iconset theme=blurr/ - main - item label=tv name=Watch TV icon= - image=watermarks/tv.png/ - item label=video name=Watch a Movie icon= - image=watermarks/movie.png/ [...1123 lines suppressed...] ! /font ! font label=huge1 name=Arial_Bold size=28 color=default1 ! shadow visible=yes color=0x00 border=yes/ ! /font ! font label=huge2 name=Arial_Bold size=28 color=default2 ! shadow visible=yes color=0x00 border=yes/ ! /font ! ! color label=default0 value=0xff/ ! color label=default1 value=0xaa/ ! color label=default2 value=0xcc/ ! ! /skin /freevo + !-- Keep this comment at the end of the file + Local variables: + mode: xml + sgml-indent-step:4 + End: + -- Index: blurr.jpg === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsjGQyyi and /tmp/cvso2KD3S differ --- blue_round1.fxd DELETED --- --- blue_round1.jpg DELETED --- --- blurr2.fxd DELETED --- --- blurr2.jpg DELETED --- --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main tvlisting_area.py,1.19,1.20
Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1892
Modified Files:
tvlisting_area.py
Log Message:
remove old stuff
Index: tvlisting_area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/tvlisting_area.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tvlisting_area.py 21 Feb 2004 20:03:45 - 1.19
--- tvlisting_area.py 14 Mar 2004 11:17:38 - 1.20
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.20 2004/03/14 11:17:38 dischi
+ # remove old stuff
+ #
# Revision 1.19 2004/02/21 20:03:45 dischi
# unicode fix (again)
***
*** 199,203
content = self.calc_geometry(layout.content, copy_object=True)
- recordingshows = self.check_schedule()
to_listing = menu.table
--- 202,205
***
*** 374,390
font = val.font
- # Not at all elegant.
- # TODO:
- #* This is going to be SLOW for large schedules
- #* We should have a skin setting for recording
- # background color
- #* I dunno what else.
- # I will work on this soon, but think of this as a
- # proof of concept.
- if recordingshows:
- for recprogs in recordingshows:
- if (prg.channel_id, prg.start, prg.stop) == recprogs:
- val = selected_val
-
try:
if prg.title == _('This channel has no data loaded'):
--- 376,379
***
*** 446,477
self.drawimage(area.images['downarrow'].filename, v)
-
- def check_schedule (self):
-
- SCHEDULE = config.REC_SCHEDULE_FILE
- if not os.path.isfile(SCHEDULE):
- return None
- fd = open(SCHEDULE, 'r')
- schedule = fd.readlines()
- fd.close()
- recordingshows = []
-
- for s in schedule[1:]:
- if s[0] == '#':
- continue
-
- vals = s.strip().split(',')
-
- try:
- start_time = time.mktime(time.strptime(vals[0], '%Y-%m-%d %H:%M:%S'))
- except ValueError:
- continue
- stop_time = start_time+int(vals[1])
- if (time.localtime()[8]==1): # IF daylight savings time in effect
- start_time = start_time-3600
- stop_time = stop_time-3600
-
- channel_id = vals[3]
- recordingshows.append((channel_id,start_time,stop_time))
-
- return recordingshows
--- 435,436
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src skin.py,1.11,1.12
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5819/src Modified Files: skin.py Log Message: make idlebar have a background image Index: skin.py === RCS file: /cvsroot/freevo/freevo/src/skin.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** skin.py 24 Feb 2004 19:36:25 - 1.11 --- skin.py 14 Mar 2004 11:42:34 - 1.12 *** *** 23,26 --- 23,29 # --- # $Log$ + # Revision 1.12 2004/03/14 11:42:34 dischi + # make idlebar have a background image + # # Revision 1.11 2004/02/24 19:36:25 dischi # add function to change a skin area *** *** 64,68 'set_base_fxd', 'load', 'get_skins', 'get_settings', 'toggle_display_style', 'get_display_style', 'get_popupbox_style', ! 'get_font', 'get_icon', 'items_per_page', 'clear', 'redraw', 'prepare', 'draw' ) --- 67,71 'set_base_fxd', 'load', 'get_skins', 'get_settings', 'toggle_display_style', 'get_display_style', 'get_popupbox_style', ! 'get_font', 'get_image', 'get_icon', 'items_per_page', 'clear', 'redraw', 'prepare', 'draw' ) --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins/idlebar __init__.py,1.14,1.15
Update of /cvsroot/freevo/freevo/src/plugins/idlebar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5819/src/plugins/idlebar
Modified Files:
__init__.py
Log Message:
make idlebar have a background image
Index: __init__.py
===
RCS file: /cvsroot/freevo/freevo/src/plugins/idlebar/__init__.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** __init__.py 19 Feb 2004 04:57:57 - 1.14
--- __init__.py 14 Mar 2004 11:42:35 - 1.15
***
*** 19,22
--- 19,25
# ---
# $Log$
+ # Revision 1.15 2004/03/14 11:42:35 dischi
+ # make idlebar have a background image
+ #
# Revision 1.14 2004/02/19 04:57:57 gsbarbieri
# Support Web Interface i18n.
***
*** 74,78
# ---
# Freevo - A Home Theater PC framework
! # Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
--- 77,81
# ---
# Freevo - A Home Theater PC framework
! # Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
***
*** 110,113
--- 113,117
import util.pymetar as pymetar
+ from pygame import image,transform
class PluginInterface(plugin.DaemonPlugin):
***
*** 124,138
plugin.register(self, 'idlebar')
self.visible = True
! # Getting current LOCALE
try:
locale.resetlocale()
except:
pass
!
def draw(self, (type, object), osd):
draw a background and all idlebar plugins
! osd.drawroundbox(0, 0, osd.width + 2 * osd.x, osd.y + 60, (0x8000L, 0,
0, 0))
if not self.plugins:
self.plugins = plugin.get('idlebar')
--- 128,161
plugin.register(self, 'idlebar')
self.visible = True
! self.bar = None
! self.barfile = ''
!
! # Getting current LOCALE
try:
locale.resetlocale()
except:
pass
!
!
def draw(self, (type, object), osd):
draw a background and all idlebar plugins
! w = osd.width + 2 * osd.x
! h = osd.y + 60
!
! f = skin.get_image('idlebar')
!
! if self.barfile != f:
! self.barfile = f
! try:
! self.bar = transform.scale(image.load(f).convert_alpha(), (w,h))
! except:
! self.bar = None
!
! # draw the cached barimage
! if self.bar:
! osd.drawimage(self.bar, (0, 0, w, h) )
!
if not self.plugins:
self.plugins = plugin.get('idlebar')
***
*** 144,148
self.free_space = x
!
def eventhandler(self, event, menuw=None):
--- 167,171
self.free_space = x
!
def eventhandler(self, event, menuw=None):
***
*** 153,157
skin.get_singleton().redraw()
return False
!
def poll(self):
--- 176,180
skin.get_singleton().redraw()
return False
!
def poll(self):
***
*** 159,163
skin.get_singleton().redraw()
!
--- 182,186
skin.get_singleton().redraw()
!
***
*** 167,172
To activate the idle bar, put the following in your local_conf.py:
plugin.activate('idlebar')
! You can then add various plugins. Plugins inside the idlebar are
! sorted based on the level (except the clock, it's always on the
right side). Use freevo plugins -l to see all available plugins,
and freevo plugins -i idlebar.plugin for a specific plugin.
--- 190,195
To activate the idle bar, put the following in your local_conf.py:
plugin.activate('idlebar')
! You can then add various plugins. Plugins inside the idlebar are
! sorted based on the level (except the clock, it's always on the
right side). Use freevo plugins -l to see all available plugins,
and freevo plugins -i idlebar.plugin for a specific plugin.
***
*** 175,179
plugin.Plugin.__init__(self)
self._type = 'idlebar'
!
def draw(self, (type, object), x, osd):
return
--- 198,202
plugin.Plugin.__init__(self)
self._type = 'idlebar'
!
def draw(self, (type, object), x, osd):
return
***
*** 197,201
format ='%a %I:%M %P'
self.timeformat
[Freevo-cvslog] freevo/share/images idlebar.png,NONE,1.1
Update of /cvsroot/freevo/freevo/share/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5819/share/images Added Files: idlebar.png Log Message: make idlebar have a background image --- NEW FILE: idlebar.png --- (This appears to be a binary file; contents omitted.) --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/share/skins/main blurr.fxd,1.9,1.10
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28333/share/skins/main Modified Files: blurr.fxd Log Message: more dim/ellipse fixes Index: blurr.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr.fxd,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** blurr.fxd 14 Mar 2004 10:51:37 - 1.9 --- blurr.fxd 14 Mar 2004 13:10:40 - 1.10 *** *** 134,138 if expression=tagline text font=info tagline/text ! text font=info tagline width=max expression=tagline/ text font=info tagline/text newline/ --- 134,139 if expression=tagline text font=info tagline/text ! text font=info tagline width=max expression=tagline ! ellipses=.../ text font=info tagline/text newline/ --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main info_area.py,1.20,1.21 xml_skin.py,1.32,1.33
Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28333/src/skins/main
Modified Files:
info_area.py xml_skin.py
Log Message:
more dim/ellipse fixes
Index: info_area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/info_area.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** info_area.py27 Feb 2004 20:15:03 - 1.20
--- info_area.py14 Mar 2004 13:10:41 - 1.21
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.21 2004/03/14 13:10:41 dischi
+ # more dim/ellipse fixes
+ #
# Revision 1.20 2004/02/27 20:15:03 dischi
# more unicode fixes
***
*** 156,160
i.width , i.height,
align_v = i.valign, align_h = i.align,
! mode = i.mode )
elif isinstance( i, xml_skin.FormatImg ):
--- 159,164
i.width , i.height,
align_v = i.valign, align_h = i.align,
! mode = i.mode,
! ellipses = i.ellipses )
elif isinstance( i, xml_skin.FormatImg ):
Index: xml_skin.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/xml_skin.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** xml_skin.py 12 Feb 2004 17:18:48 - 1.32
--- xml_skin.py 14 Mar 2004 13:10:41 - 1.33
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.33 2004/03/14 13:10:41 dischi
+ # more dim/ellipse fixes
+ #
# Revision 1.32 2004/02/12 17:18:48 dischi
# Move watermark information to python ocde to avoid duplicate code here
***
*** 28,46
# better display type handling, added type main menu
#
- # Revision 1.27 2004/01/10 13:21:19 dischi
- # cleanup
- #
- # Revision 1.26 2004/01/05 18:03:43 dischi
- # support for extra fxd files for plugins
- #
- # Revision 1.25 2004/01/02 14:29:44 dischi
- # add border to font.h
- #
- # Revision 1.24 2004/01/01 17:41:05 dischi
- # add border support for Font
- #
- # Revision 1.23 2004/01/01 12:25:07 dischi
- # store version information and list of depending files
- #
# ---
# Freevo - A Home Theater PC framework
--- 31,34
***
*** 316,319
--- 304,308
'border' : ('visible', 0),
'icon' : ('str', 0),
+ 'ellipses' : ('str', 0),
}
***
*** 629,637
class FormatText(XML_data):
def __init__( self ):
! XML_data.__init__( self, ( 'align', 'valign', 'font', 'width', 'height' ) )
! self.mode = 'hard'
! self.align = 'left'
! self.height = -1
! self.text = ''
self.expression = None
self.expression_analized = 0
--- 618,628
class FormatText(XML_data):
def __init__( self ):
! XML_data.__init__( self, ( 'align', 'valign', 'font', 'width', 'height',
!'ellipses') )
! self.mode = 'hard'
! self.align= 'left'
! self.ellipses = 'dim'
! self.height = -1
! self.text = ''
self.expression = None
self.expression_analized = 0
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src osd.py,1.147,1.148
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28333/src
Modified Files:
osd.py
Log Message:
more dim/ellipse fixes
Index: osd.py
===
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** osd.py 14 Mar 2004 12:59:34 - 1.147
--- osd.py 14 Mar 2004 13:10:41 - 1.148
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.148 2004/03/14 13:10:41 dischi
+ # more dim/ellipse fixes
+ #
# Revision 1.147 2004/03/14 12:59:34 dischi
# fix crash
***
*** 26,33
# reworked rc.py to make several classes
#
- # Revision 1.142 2004/02/19 04:57:55 gsbarbieri
- # Support Web Interface i18n.
- # To use this, I need to get the gettext() translations in unicode, so some changes
are required to files that use print _('string'), need to make them print
String(_('string')).
- #
# Revision 1.141 2004/02/18 21:55:44 dischi
# Some osd updates for new gui code
--- 29,32
***
*** 45,159
# o If we're using the extra font path for osd.py, we need to use it in xml_skin
#
- # Revision 1.137 2004/02/11 21:21:56 dischi
- # deactivate arialbd fix, font is broken
- #
- # Revision 1.136 2004/02/11 14:23:33 dischi
- # search system for fonts
- #
- # Revision 1.135 2004/02/07 11:50:57 dischi
- # fix geometry calculation for border fonts
- #
- # Revision 1.134 2004/02/06 18:24:39 dischi
- # make to possible to override busy icon with skin
- #
- # Revision 1.133 2004/02/05 19:26:41 dischi
- # fix unicode handling
- #
- # Revision 1.132 2004/02/05 02:52:25 gsbarbieri
- # Handle filenames internally as unicode objects.
- #
- # This does *NOT* affect filenames that have only ASCII chars, since the
- # translation ASCII - Unicode is painless. However this *DOES* affect files
- # with accents
- #
- # I tested with Video, Images and Music modules, but *NOT* with Games, so if you
- # have the games modules, give it a try.
- #
- # It determines the encoding based on (in order) FREEVO_LOCALE, LANG and LC_ALL,
- # which may have the form: LANGUAGE_CODE.ENCODING, like pt_BR.UTF-8, and others.
- #
- # Revision 1.131 2004/02/04 17:32:35 dischi
- # fix crash for deactivated osd and fix busy icon redraw
- #
- # Revision 1.130 2004/02/01 17:11:31 dischi
- # cosmetic changes
- #
- # Revision 1.129 2004/01/30 20:42:38 dischi
- # add debug
- #
- # Revision 1.128 2004/01/25 13:09:04 dischi
- # unicode support for filenames
- #
- # Revision 1.127 2004/01/19 20:29:11 dischi
- # cleanup, reduce cache size
- #
- # Revision 1.126 2004/01/18 16:49:22 dischi
- # more verbose
- #
- # Revision 1.125 2004/01/16 12:19:09 dischi
- # fix crash when filename already is an image object
- #
- # Revision 1.124 2004/01/13 19:11:19 dischi
- # backup screen before osd shutdown
- #
- # Revision 1.123 2004/01/12 19:10:35 dischi
- # support spaces inside a string after a \n
- #
- # Revision 1.122 2004/01/11 20:23:31 dischi
- # move skin font handling to osd to avoid duplicate code
- #
- # Revision 1.121 2004/01/11 20:01:28 dischi
- # make bmovl work again
- #
- # Revision 1.120 2004/01/10 14:57:23 dischi
- # better debug messages
- #
- # Revision 1.119 2004/01/10 13:14:50 dischi
- # change print to _debug_
- #
- # Revision 1.118 2004/01/04 17:18:15 dischi
- # make it possible that image is already a .raw file
- #
- # Revision 1.117 2004/01/03 17:43:14 dischi
- # OVERLAY_DIR is always used
- #
- # Revision 1.116 2004/01/02 14:29:20 dischi
- # correct font outline drawing
- #
- # Revision 1.115 2004/01/01 17:40:24 dischi
- # added border support for drawstringframed
- #
- # Revision 1.114 2004/01/01 15:53:18 dischi
- # move the shadow code into osd.py
- #
- # Revision 1.111 2003/12/07 14:48:49 dischi
- # clean up the busy icon
- #
- # Revision 1.110 2003/12/07 14:45:57 dischi
- # make the busy icon thread save
- #
- # Revision 1.109 2003/12/07 12:26:55 dischi
- # add osd busy icon (work in progress)
- #
- # Revision 1.108 2003/12/01 19:19:37 dischi
- # first grep the keymap
- #
- # Revision 1.107 2003/11/29 11:27:40 dischi
- # move objectcache to util
- #
- # Revision 1.106 2003/11/23 19:48:59 krister
- # Added optional new blend settings (nr of steps and total time), must be
- # enabled explicitly in freevo_config
- #
- # Revision 1.105 2003/11/23 18:44:37 krister
- # Fixed blending bug where the final update contained a shadow of the previous image.
- #
- # Revision 1.104 2003/11/21 12:22:15 dischi
- # move blending effect to osd.py
- #
- # Revision 1.103 2003/11/21 11:42:06 dischi
- # bgcolor support for drawstringframed
- #
- #
# ---
# Freevo - A Home Theater PC framework
--- 44,47
[Freevo-cvslog] freevo/share/skins/plugins video_details.fxd,NONE,1.1
Update of /cvsroot/freevo/freevo/share/skins/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3506/share/skins/plugins Added Files: video_details.fxd Log Message: Plugin to replace the item menu for video --- NEW FILE: video_details.fxd --- ?xml version=1.0 ? freevo skin geometry=800x600 !-- skin informations for the plugin video.details -- !-- the main menu -- menu type=video details style text=video details/ /menu menuset label=video details screen layout=screen x=0 y=0 width=800 height=600/ view layout=view x=590 y=100 width=200 height=280/ listing layout=listing x=10 y=430 width=780 height=160/ info layout=detailed video info x=10 y=100 width=570 height=340/ /menuset layout label=detailed video info content x=0 y=0 type=text spacing=20 font=default item type=video if expression=tv_show_name text font=info tagline expression=tv_show_name/ newline/ if expression=tv_show_ep text font=info tagline expression=tv_show_ep/ newline/ /if /if if expression=not tv_show_name text font=info tagline width=max expression=name/ newline/ /if if expression=tagline text font=info tagline/text text font=info tagline width=max expression=tagline dim=no/ text font=info tagline/text newline/ /if goto_pos y=20 mode=relative/ if expression=year text width=140 align=right font=info valueYear:/text goto_pos x=10 mode=relative/ text font=info value expression=year/ newline/ /if if expression=genre text width=140 align=right font=info valueGenre:/text goto_pos x=10 mode=relative/ text font=info value expression=genre/ newline/ /if if expression=rating text width=140 align=right font=info valueRating:/text goto_pos x=10 mode=relative/ text font=info value expression=rating/ newline/ /if if expression=year or genre or rating goto_pos y=10 mode=relative/ /if if expression=runtime text width=140 align=right font=info valueRuntime:/text goto_pos x=10 mode=relative/ text font=info value expression=runtime/ newline/ /if text width=140 align=right font=info valueType:/text goto_pos x=10 mode=relative/ text font=info value expression=type/ newline/ if expression=geometry text width=140 align=right font=info valueResolution:/text goto_pos x=10 mode=relative/ text font=info value expression=geometry/ if expression=aspect text font=info value (/text text font=info value expression=aspect/ text font=info value)/text /if newline/ /if if expression=copyright text width=140 align=right font=info valueCopyright:/text goto_pos x=10 mode=relative/ text font=info value expression=copyright/ newline/ /if /item /content /layout /skin /freevo !-- Keep this comment at the end of the file Local variables: mode: xml sgml-indent-step:4 End: -- --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video/plugins details.py,NONE,1.1
Update of /cvsroot/freevo/freevo/src/video/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3506/src/video/plugins
Added Files:
details.py
Log Message:
Plugin to replace the item menu for video
--- NEW FILE: details.py ---
#if 0 /*
# ---
# details.py - Plugin for displaying movie details
# ---
# $Id: details.py,v 1.1 2004/03/14 19:46:22 dischi Exp $
#
# Notes:
#You can also bind it to a key (in this case key 2):
#EVENTS['menu']['2'] = Event(MENU_CALL_ITEM_ACTION, arg='show_details')
#
# Todo:
#
# ---
# $Log: details.py,v $
# Revision 1.1 2004/03/14 19:46:22 dischi
# Plugin to replace the item menu for video
#
#
# ---
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# --- */
#endif
import os
import menu
import config
import plugin
import skin
import item
class PluginInterface(plugin.ItemPlugin):
This plugin shows more details for a movie item.
It replaces the item menu with a menu showing informations about the file.
def __init__(self):
plugin.ItemPlugin.__init__(self)
skin.register('video_details', ('screen', 'title', 'view',
'listing', 'info', 'plugin'))
def actions(self, item):
self.item = item
if item.type == 'video':
return [ ( self.info_showdata, _('Show details for this item'),
'MENU_SUBMENU') ]
return []
def info_showdata(self, arg=None, menuw=None):
show info for this item
actions = self.item.actions()
plugins = plugin.get('item') + plugin.get('item_video')
plugins.sort(lambda l, o: cmp(l._level, o._level))
for p in plugins:
if p != self:
for a in p.actions(self.item):
if isinstance(a, menu.MenuItem):
actions.append(a)
else:
actions.append(a[:2])
items = []
for a in actions:
if not isinstance(a, item.Item):
a = menu.MenuItem(a[1], a[0])
a.subtitle = self.item.name
a.title= self.item.name
items.append(a)
m = menu.Menu(_('Details'), items)
m.infoitem = self.item
m.viewitem = self.item
m.item_types = 'video details'
menuw.pushmenu(m)
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/i18n freevo.pot,1.25,1.26
Update of /cvsroot/freevo/freevo/i18n In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4018 Modified Files: freevo.pot Log Message: update Index: freevo.pot === RCS file: /cvsroot/freevo/freevo/i18n/freevo.pot,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** freevo.pot 23 Feb 2004 08:34:36 - 1.25 --- freevo.pot 14 Mar 2004 19:48:33 - 1.26 *** *** 9,13 Project-Id-Version: PACKAGE VERSION\n Report-Msgid-Bugs-To: \n ! POT-Creation-Date: 2004-02-23 04:49-0300\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n Last-Translator: FULL NAME [EMAIL PROTECTED]\n --- 9,13 Project-Id-Version: PACKAGE VERSION\n Report-Msgid-Bugs-To: \n ! POT-Creation-Date: 2004-03-14 20:57+0100\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n [...4441 lines suppressed...] ! #: www/htdocs/record.rpy:189 ! msgid Episode msgstr ! #: www/htdocs/record.rpy:215 ! msgid UNKNOWN msgstr ! #: www/htdocs/search.rpy:135 ! msgid recording server is unavailable msgstr ! #: www/htdocs/search.rpy:165 ! msgid No matches msgstr ! #: www/htdocs/search.rpy:219 ! msgid New favorite msgstr # Manualy added from fxd skin files --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/games __init__.py,1.17,1.18
Update of /cvsroot/freevo/freevo/src/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7321/src/games Modified Files: __init__.py Log Message: fix doc Index: __init__.py === RCS file: /cvsroot/freevo/freevo/src/games/__init__.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** __init__.py 24 Feb 2004 18:05:19 - 1.17 --- __init__.py 13 Mar 2004 09:23:46 - 1.18 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.18 2004/03/13 09:23:46 dischi + # fix doc + # # Revision 1.17 2004/02/24 18:05:19 mikeruelle # make the info retreival a lot better *** *** 77,81 class PluginInterface(plugin.MimetypePlugin): ! Plugin to handle all kinds of audio items def __init__(self): --- 80,84 class PluginInterface(plugin.MimetypePlugin): ! Plugin to handle all kinds of games items def __init__(self): --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/image __init__.py,1.17,1.18
Update of /cvsroot/freevo/freevo/src/image In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7321/src/image Modified Files: __init__.py Log Message: fix doc Index: __init__.py === RCS file: /cvsroot/freevo/freevo/src/image/__init__.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** __init__.py 18 Jan 2004 16:51:48 - 1.17 --- __init__.py 13 Mar 2004 09:23:46 - 1.18 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.18 2004/03/13 09:23:46 dischi + # fix doc + # # Revision 1.17 2004/01/18 16:51:48 dischi # (re)move unneeded variables *** *** 82,86 class PluginInterface(plugin.MimetypePlugin): ! Plugin to handle all kinds of audio items def __init__(self): --- 85,89 class PluginInterface(plugin.MimetypePlugin): ! Plugin to handle all kinds of image items def __init__(self): --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/gui LetterBoxGroup.py,1.15,1.16
Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18665
Modified Files:
LetterBoxGroup.py
Log Message:
Improve input handling:
o support upper and lower case
o variable box width up to a length of 60 chars
o keyboard input
Index: LetterBoxGroup.py
===
RCS file: /cvsroot/freevo/freevo/src/gui/LetterBoxGroup.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** LetterBoxGroup.py 21 Feb 2004 19:33:24 - 1.15
--- LetterBoxGroup.py 13 Mar 2004 22:32:44 - 1.16
***
*** 11,14
--- 11,20
# ---
# $Log$
+ # Revision 1.16 2004/03/13 22:32:44 dischi
+ # Improve input handling:
+ # o support upper and lower case
+ # o variable box width up to a length of 60 chars
+ # o keyboard input
+ #
# Revision 1.15 2004/02/21 19:33:24 dischi
# enhance input box, merge password and normal input
***
*** 55,58
--- 61,65
import config
+ import copy
from GUIObject import Align
***
*** 60,63
--- 67,71
from LayoutManagers import LayoutManager
from Button import Button
+ from Border import Border
from event import *
***
*** 85,89
border, bd_color, bd_width)
! self.h_margin = 0
self.v_margin = 0
self.h_spacing = 0
--- 93,97
border, bd_color, bd_width)
! self.h_margin = 5
self.v_margin = 0
self.h_spacing = 0
***
*** 92,120
self.text = text
self.type = type
- self.numboxes = numboxes
self.boxes= []
self.set_layout(LetterBoxLayout(self))
l = 0
h = 0
! for i in range(self.numboxes):
! lb = LetterBox(border=None)
if self.type != 'password':
if self.text and len(self.text) i:
! lb.set_text(self.text[i])
- l = l + lb.width - self.bd_width
- if lb.height h: h = lb.height
- if i == 0:
- lb.toggle_selected()
self.add_child(lb)
self.boxes.append(lb)
! self.width = l + self.bd_width
self.height = h
self.set_h_align(Align.CENTER)
self.last_key = None
--- 100,143
self.text = text
self.type = type
self.boxes= []
self.set_layout(LetterBoxLayout(self))
+ bw = 0
+ for c in ('M', 'A', 'm'):
+ bw = max(bw, self.content_layout.types['button'].font.stringsize(c),
+ self.content_layout.types['button selected'].font.stringsize(c))
+
+ bw += 2
+
l = 0
h = 0
!
! for i in range(numboxes or 60):
! lb = LetterBox(width=bw)
!
if self.type != 'password':
if self.text and len(self.text) i:
! lb.set_text(self.text[i], fix_case=False)
! else:
! lb.set_text(' ')
! l = l + lb.width
! h = max(lb.height, h)
self.add_child(lb)
+ if self.boxes:
+ lb.upper_case = False
self.boxes.append(lb)
! self.width = min(self.width, l + self.bd_width + 2 * self.h_margin)
self.height = h
self.set_h_align(Align.CENTER)
self.last_key = None
+
+ if self.type != 'password' and self.text and len(self.text)
len(self.boxes):
+ self.boxes[len(self.text)].toggle_selected()
+ else:
+ self.boxes[0].toggle_selected()
***
*** 125,147
! def change_selected_box(self, dir=None):
! boxNow = self.boxes.index(self.get_selected_box())
!
! if not dir:
! dir = 'right'
if dir == 'right':
if boxNow len(self.boxes)-1:
boxNext = boxNow + 1
! else:
boxNext = 0
else:
if boxNow 0:
boxNext = boxNow - 1
! else:
! boxNext = len(self.boxes)-1
! self.boxes[boxNow].toggle_selected()
! self.boxes[boxNext].toggle_selected()
--- 148,176
! def change_selected_box(self, dir='right', allow_roundtrip=False):
! boxNow = self.boxes.index(self.get_selected_box())
! boxNext = boxNow
if dir == 'right':
if boxNow len(self.boxes)-1:
boxNext = boxNow + 1
! if self.boxes[boxNow].text == ' ':
! self.boxes[boxNext].upper_case = True
[Freevo-cvslog] freevo/src/gui Container.py,1.8,1.9 InputBox.py,1.16,1.17
Update of /cvsroot/freevo/freevo/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18810 Modified Files: Container.py InputBox.py Log Message: changes for the new input widget Index: Container.py === RCS file: /cvsroot/freevo/freevo/src/gui/Container.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Container.py18 Feb 2004 21:52:04 - 1.8 --- Container.py13 Mar 2004 22:33:15 - 1.9 *** *** 7,10 --- 7,13 #--- # $Log$ + # Revision 1.9 2004/03/13 22:33:15 dischi + # changes for the new input widget + # # Revision 1.8 2004/02/18 21:52:04 dischi # Major GUI update: *** *** 137,140 if not child == self.border: child.draw() ! if self.border: self.border.draw() --- 140,144 if not child == self.border: child.draw() ! ! if self.border and self.border != -1: self.border.draw() Index: InputBox.py === RCS file: /cvsroot/freevo/freevo/src/gui/InputBox.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** InputBox.py 24 Feb 2004 18:56:09 - 1.16 --- InputBox.py 13 Mar 2004 22:33:15 - 1.17 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.17 2004/03/13 22:33:15 dischi + # changes for the new input widget + # # Revision 1.16 2004/02/24 18:56:09 dischi # add hfill to text_prop *** *** 83,92 def __init__(self, text, handler=None, type='text', x=None, y=None, width=0, height=0, ! icon=None, vertical_expansion=1, text_prop=None, parent='osd'): PopupBox.__init__(self, text, handler, x, y, width, height, icon, vertical_expansion, text_prop, parent) ! self.lbg = LetterBoxGroup(type=type) self.add_child(self.lbg) --- 86,97 def __init__(self, text, handler=None, type='text', x=None, y=None, width=0, height=0, ! icon=None, vertical_expansion=1, text_prop=None, input_text='', ! numboxes=0, parent='osd'): PopupBox.__init__(self, text, handler, x, y, width, height, icon, vertical_expansion, text_prop, parent) ! self.lbg = LetterBoxGroup(type=type, numboxes=numboxes, text=input_text, ! width=self.content.width-self.content.h_margin*2) self.add_child(self.lbg) --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src directory.py,1.125,1.126
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19248
Modified Files:
directory.py
Log Message:
more debug, will be removed later
Index: directory.py
===
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** directory.py4 Mar 2004 05:10:06 - 1.125
--- directory.py13 Mar 2004 22:35:52 - 1.126
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.126 2004/03/13 22:35:52 dischi
+ # more debug, will be removed later
+ #
# Revision 1.125 2004/03/04 05:10:06 rshortt
# Bugfix. I think this is the desired behaviour.
***
*** 419,422
--- 422,426
if not num_timestamp or num_timestamp timestamp:
+ _debug_('create metainfo for %s', self.dir)
need_umount = False
if self.media:
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers cache.py,1.28,1.29
Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19367
Modified Files:
cache.py
Log Message:
do not remove num_ infos we already have
Index: cache.py
===
RCS file: /cvsroot/freevo/freevo/src/helpers/cache.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** cache.py27 Feb 2004 20:41:38 - 1.28
--- cache.py13 Mar 2004 22:36:16 - 1.29
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.29 2004/03/13 22:36:16 dischi
+ # do not remove num_ infos we already have
+ #
# Revision 1.28 2004/02/27 20:41:38 dischi
# better rebuild
***
*** 332,340
d = directory.DirItem(s, None)
- # remove all infos starting with 'num_' to force rebuild
- for k in copy.copy(d.info.metadata):
- if k.startswith('num_'):
- d.info.delete(k)
-
# rebuild metainfo
d.create_metainfo()
--- 335,338
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.35,1.36
Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19430
Modified Files:
recordserver.py
Log Message:
fix crashes on debug (unicode again)
Index: recordserver.py
===
RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** recordserver.py 13 Mar 2004 03:28:32 - 1.35
--- recordserver.py 13 Mar 2004 22:36:44 - 1.36
***
*** 7,10
--- 7,13
# ---
# $Log$
+ # Revision 1.36 2004/03/13 22:36:44 dischi
+ # fix crashes on debug (unicode again)
+ #
# Revision 1.35 2004/03/13 03:28:32 outlyer
# Someone must have fixed the str2XML part internal to the FxdIMDB code, since
***
*** 205,211
os.environ['LD_PRELOAD'] = ''
! DEBUG = config.DEBUG
! if DEBUG: print 'PLUGIN_RECORD: %s' % config.plugin_record
appname = os.path.splitext(os.path.basename(sys.argv[0]))[0]
--- 208,217
os.environ['LD_PRELOAD'] = ''
! def _debug_(text):
! if config.DEBUG:
! log.debug(String(text))
!
! _debug_('PLUGIN_RECORD: %s' % config.plugin_record)
appname = os.path.splitext(os.path.basename(sys.argv[0]))[0]
***
*** 224,229
if os.path.isfile(config.TV_RECORD_SCHEDULE):
! if DEBUG:
! log.debug('GET: reading cached file (%s)' %
config.TV_RECORD_SCHEDULE)
f = open(config.TV_RECORD_SCHEDULE, 'r')
scheduledRecordings = unjellyFromXML(f)
--- 230,234
if os.path.isfile(config.TV_RECORD_SCHEDULE):
! _debug_('GET: reading cached file (%s)' % config.TV_RECORD_SCHEDULE)
f = open(config.TV_RECORD_SCHEDULE, 'r')
scheduledRecordings = unjellyFromXML(f)
***
*** 233,254
file_ver = scheduledRecordings.TYPES_VERSION
except AttributeError:
! log.debug('The cache does not have a version and must be recreated.')
if file_ver != TYPES_VERSION:
! log.debug(('ScheduledRecordings version number %s is stale (new is
%s), must ' +
'be reloaded') % (file_ver, TYPES_VERSION))
scheduledRecordings = None
else:
! if DEBUG:
! log.debug('Got ScheduledRecordings (version %s).' % file_ver)
if not scheduledRecordings:
! if DEBUG: log.debug('GET: making a new ScheduledRecordings')
scheduledRecordings = ScheduledRecordings()
self.saveScheduledRecordings(scheduledRecordings)
! if DEBUG:
! log.debug('ScheduledRecordings has %s items.' % \
! len(scheduledRecordings.programList))
return scheduledRecordings
--- 238,257
file_ver = scheduledRecordings.TYPES_VERSION
except AttributeError:
! _debug_('The cache does not have a version and must be recreated.')
if file_ver != TYPES_VERSION:
! _debug_(('ScheduledRecordings version number %s is stale (new is
%s), must ' +
'be reloaded') % (file_ver, TYPES_VERSION))
scheduledRecordings = None
else:
! _debug_('Got ScheduledRecordings (version %s).' % file_ver)
if not scheduledRecordings:
! _debug_('GET: making a new ScheduledRecordings')
scheduledRecordings = ScheduledRecordings()
self.saveScheduledRecordings(scheduledRecordings)
! _debug_('ScheduledRecordings has %s items.' % \
! len(scheduledRecordings.programList))
return scheduledRecordings
***
*** 261,272
if not scheduledRecordings:
! if DEBUG: print 'SAVE: making a new ScheduledRecordings'
scheduledRecordings = ScheduledRecordings()
! if DEBUG:
! log.debug('SAVE: saving cached file (%s)' % config.TV_RECORD_SCHEDULE)
! if DEBUG:
! log.debug(SAVE: ScheduledRecordings has %s items. % \
! len(scheduledRecordings.programList))
f = open(config.TV_RECORD_SCHEDULE, 'w')
jellyToXML(scheduledRecordings, f)
--- 264,273
if not scheduledRecordings:
! _debug_('SAVE: making a new ScheduledRecordings')
scheduledRecordings = ScheduledRecordings()
! _debug_('SAVE: saving cached file (%s)' % config.TV_RECORD_SCHEDULE)
! _debug_(SAVE: ScheduledRecordings has %s items. % \
! len(scheduledRecordings.programList))
f = open(config.TV_RECORD_SCHEDULE, 'w
[Freevo-cvslog] freevo/src/util mediainfo.py,1.35,1.36
Update of /cvsroot/freevo/freevo/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30764/src/util Modified Files: mediainfo.py Log Message: audio stream selection fixes Index: mediainfo.py === RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** mediainfo.py28 Feb 2004 21:04:17 - 1.35 --- mediainfo.py13 Mar 2004 23:44:02 - 1.36 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.36 2004/03/13 23:44:02 dischi + # audio stream selection fixes + # # Revision 1.35 2004/02/28 21:04:17 dischi # unicode fixes *** *** 322,325 --- 325,332 ret['mime'] = object.mime + if hasattr(object, 'id'): + # mimetype may be good to have :-) + ret['id'] = object.id + # something with tracks (e.g. dvd on disc) if hasattr(object, 'tracks'): --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video configure.py,1.23,1.24
Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30764/src/video
Modified Files:
configure.py
Log Message:
audio stream selection fixes
Index: configure.py
===
RCS file: /cvsroot/freevo/freevo/src/video/configure.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** configure.py31 Jan 2004 16:39:03 - 1.23
--- configure.py13 Mar 2004 23:44:02 - 1.24
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.24 2004/03/13 23:44:02 dischi
+ # audio stream selection fixes
+ #
# Revision 1.23 2004/01/31 16:39:03 dischi
# fix function to check if we have to show configure
***
*** 96,103
items = []
for a in arg.info['audio']:
! if not a['id']:
a['id'] = arg.info['audio'].index(a) + 1
! if not a['language']:
! a['language'] = 'Unknown'
txt = '%s (channels=%s, codec=%s, id=%s)' % (a['language'], a['channels'],
a['codec'], a['id'])
--- 99,114
items = []
for a in arg.info['audio']:
! if not a.has_key('id') or a['id'] in ('', None):
a['id'] = arg.info['audio'].index(a) + 1
!
! if not a.has_key('language') or not not a['language']:
! a['language'] = _('Stream %s') % a['id']
!
! if not a.has_key('channels') or not not a['channels']:
! a['channels'] = 2 # wild guess :-)
!
! if not a.has_key('codec') or not not a['codec']:
! a['codec'] = _('Unknown')
!
txt = '%s (channels=%s, codec=%s, id=%s)' % (a['language'], a['channels'],
a['codec'], a['id'])
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins/idlebar volume.py,NONE,1.1
Update of /cvsroot/freevo/freevo/src/plugins/idlebar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19322
Added Files:
volume.py
Log Message:
Volume plugin from Viggo Frederiksen
--- NEW FILE: volume.py ---
#if 0 /*
# ---
# volume.py - IdleBarplugin for showing volume
# Author: Viggo Fredriksen [EMAIL PROTECTED]
# ---
# Freevo - A Home Theater PC framework
# Copyright (C) 2003 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# --- */
#endif
# python modules
import os, pygame
# freevo modules
from plugins.idlebar import IdleBarPlugin
import plugin, config
class PluginInterface(IdleBarPlugin):
This plugin shows the current volume level on the idlebar.
Activate with:
plugin.activate('idlebar.volume.Volume', level=0)
def __init__(self):
IdleBarPlugin.__init__(self)
self.plugin_name = 'idlebar.volume'
self.barimg = os.path.join(config.ICON_DIR, 'status/volume_bar.png')
self.outimg = os.path.join(config.ICON_DIR, 'status/volume_out.png')
self.muteimg = os.path.join(config.ICON_DIR, 'status/volume_mute.png')
self.cacheimg = {}
self.muted= False
self.volume = -1
def getimage(self, image, osd, cache=False):
if image.find(config.ICON_DIR) == 0 and image.find(osd.settings.icon_dir) ==
-1:
new_image = os.path.join(osd.settings.icon_dir,
image[len(config.ICON_DIR)+1:])
if os.path.isfile(new_image):
image = new_image
if cache:
if image not in self.cacheimg.keys():
self.cacheimg[image] = pygame.image.load(image)
return self.cacheimg[image]
return pygame.image.load(image)
def draw(self, (type, object), x, osd):
mixer = plugin.getbyname('MIXER')
w = 0
if mixer:
muted = mixer.getMuted()
vol = (float(mixer.getVolume())/float(config.MAX_VOLUME))
if muted != self.muted or vol != self.volume:
self.muted = muted
self.volume = vol
if muted:
self.muted = muted
volout = self.getimage(self.muteimg, osd, True)
self.cacheimg['cached'] = volout
else:
self.volume = vol
volbar = self.getimage(self.barimg, osd, True)
volout = self.getimage(self.outimg, osd)
w,h = volout.get_size()
volout.blit( volbar, (0,0), (0, 0, (w * vol), h) )
self.cacheimg['cached'] = volout
else:
volout = self.getimage('cached', osd, True)
w = osd.drawimage(volout, (x, osd.y + 10, -1, -1) )[0]
return w
def update(self):
bar = plugin.getbyname('idlebar')
if bar: bar.poll()
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src osd.py,1.143,1.144
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18423 Modified Files: osd.py Log Message: set keyboard repeat Index: osd.py === RCS file: /cvsroot/freevo/freevo/src/osd.py,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** osd.py 27 Feb 2004 20:12:16 - 1.143 --- osd.py 10 Mar 2004 20:13:52 - 1.144 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.144 2004/03/10 20:13:52 dischi + # set keyboard repeat + # # Revision 1.143 2004/02/27 20:12:16 dischi # reworked rc.py to make several classes *** *** 527,530 --- 530,534 pygame.mouse.set_visible(0) + pygame.key.set_repeat(500, 30) self.mousehidetime = time.time() --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util marmalade.py,NONE,1.1
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26017
Added Files:
marmalade.py
Log Message:
add our own version of marmalade from twisted
--- NEW FILE: marmalade.py ---
# -*- test-case-name: twisted.test.test_persisted -*-
# Twisted, the Framework of Your Internet
# Copyright (C) 2001 Matthew W. Lefkowitz
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of version 2.1 of the GNU Lesser General Public
# License as published by the Free Software Foundation.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Note: this file is from twisted but with small modification in the
# Unicode handling for freevo. These parts are marked with 'XXX Freevo changes:'
Marmalade: jelly, with just a hint of bitterness.
I can serialize a Python object to an XML DOM tree (twisted.web.microdom), and
therefore to XML data, similarly to twisted.spread.jelly. Because both Python
lists and DOM trees are tree data-structures, many of the idioms used here are
identical.
import new
from twisted.python.reflect import namedModule, namedClass, namedObject, fullFuncName,
qual
from twisted.persisted.crefutil import NotKnown, _Tuple, _InstanceMethod,
_DictKeyAndValue, _Dereference, _Defer
try:
from new import instancemethod
except:
from org.python.core import PyMethod
instancemethod = PyMethod
import types
import copy_reg
#for some reason, __builtins__ == __builtin__.__dict__ in the context where this is
used.
#Can someone tell me why?
import __builtin__
def instance(klass, d):
if isinstance(klass, types.ClassType):
return new.instance(klass, d)
elif isinstance(klass, type):
o = object.__new__(klass)
o.__dict__ = d
return o
else:
raise TypeError, %s is not a class % klass
def getValueElement(node):
Get the one child element of a given element.
If there is more than one child element, raises ValueError. Otherwise,
returns the value element.
valueNode = None
for subnode in node.childNodes:
if isinstance(subnode, Element):
if valueNode is None:
valueNode = subnode
else:
raise ValueError(Only one value node allowed per instance!)
return valueNode
class DOMJellyable:
jellyDOMVersion = 1
def jellyToDOM(self, jellier, element):
element.setAttribute(marmalade:version, str(self.jellyDOMVersion))
method = getattr(self, jellyToDOM_%s % self.jellyDOMVersion, None)
if method:
method(jellier, element)
else:
element.appendChild(jellier.jellyToNode(self.__dict__))
def unjellyFromDOM(self, unjellier, element):
pDOMVersion = element.getAttribute(marmalade:version) or 0
method = getattr(self, unjellyFromDOM_%s % pDOMVersion, None)
if method:
method(unjellier, element)
else:
# XXX: DOMJellyable.unjellyNode does not exist
# XXX: 'node' is undefined - did you mean 'self', 'element', or 'Node'?
state = self.unjellyNode(getValueElement(node))
if hasattr(self.__class__, __setstate__):
self.__setstate__(state)
else:
self.__dict__ = state
class DOMUnjellier:
def __init__(self):
self.references = {}
self._savedLater = []
def unjellyLater(self, node):
Unjelly a node, later.
d = _Defer()
self.unjellyInto(d, 0, node)
self._savedLater.append(d)
return d
def unjellyInto(self, obj, loc, node):
Utility method for unjellying one object into another.
This automates the handling of backreferences.
o = self.unjellyNode(node)
obj[loc] = o
if isinstance(o, NotKnown):
o.addDependant(obj, loc)
return o
def unjellyAttribute(self, instance, attrName, valueNode):
Utility method for unjellying into instances of attributes.
Use this rather than unjellyNode unless you like surprising bugs!
Alternatively, you can use unjellyInto on your instance's __dict__.
self.unjellyInto(instance.__dict__, attrName, valueNode)
def unjellyNode(self, node):
if node.tagName.lower() == none:
retval = None
elif node.tagName == string:
# XXX FIXME this is obviously insecure
# if you doubt:
# unjellyFromXML('''string
[Freevo-cvslog] freevo/src/tv tvguide.py,1.27,1.28
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26256
Modified Files:
tvguide.py
Log Message:
fix popup input focus
Index: tvguide.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** tvguide.py 25 Feb 2004 17:44:30 - 1.27
--- tvguide.py 8 Mar 2004 19:15:14 - 1.28
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.28 2004/03/08 19:15:14 dischi
+ # fix popup input focus
+ #
# Revision 1.27 2004/02/25 17:44:30 dischi
# add special event mapping for tvmenu
***
*** 275,281
def refresh(self):
- rc.set_context('tvmenu')
self.update_schedules(force=True)
! self.menuw.refresh()
--- 278,285
def refresh(self):
self.update_schedules(force=True)
! if not self.menuw.children:
! rc.set_context('tvmenu')
! self.menuw.refresh()
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/gui GUIObject.py,1.34,1.35
Update of /cvsroot/freevo/freevo/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4723/src/gui Modified Files: GUIObject.py Log Message: even more debug Index: GUIObject.py === RCS file: /cvsroot/freevo/freevo/src/gui/GUIObject.py,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** GUIObject.py7 Mar 2004 18:25:49 - 1.34 --- GUIObject.py7 Mar 2004 18:31:08 - 1.35 *** *** 8,11 --- 8,14 #--- # $Log$ + # Revision 1.35 2004/03/07 18:31:08 dischi + # even more debug + # # Revision 1.34 2004/03/07 18:25:49 dischi # more debug *** *** 374,377 --- 377,384 c = c.parent print + print 'Configuration: %sx%s %s %s' % \ + (self.osd.width, self.osd.height, config.OSD_OVERSCAN_X, +config.OSD_OVERSCAN_Y) + print raise Exception, e --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo_config.py,1.322,1.323
Update of /cvsroot/freevo/freevo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25098 Modified Files: freevo_config.py Log Message: doc update Index: freevo_config.py === RCS file: /cvsroot/freevo/freevo/freevo_config.py,v retrieving revision 1.322 retrieving revision 1.323 diff -C2 -d -r1.322 -r1.323 *** freevo_config.py27 Feb 2004 20:13:01 - 1.322 --- freevo_config.py2 Mar 2004 20:34:56 - 1.323 *** *** 534,539 # # The next varibales are a list of types in which the feature should be ! # enabled (video, audio, image, games). E.g. to enable audoplay for ! # audio and images set DIRECTORY_AUTOPLAY_ITEMS = [ 'audio', 'image' ] # # If you set this variable in a folder.fxd, the value is 1 (enabled) --- 534,540 # # The next varibales are a list of types in which the feature should be ! # enabled (video, audio, image, games). E.g. to enable autoplay for ! # audio and images set DIRECTORY_AUTOPLAY_ITEMS = [ 'audio', 'image' ], ! # to disable it set it to []. # # If you set this variable in a folder.fxd, the value is 1 (enabled) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video fxdhandler.py,1.18,1.19
Update of /cvsroot/freevo/freevo/src/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29963 Modified Files: fxdhandler.py Log Message: fxd files are always right about the name Index: fxdhandler.py === RCS file: /cvsroot/freevo/freevo/src/video/fxdhandler.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** fxdhandler.py 14 Feb 2004 12:59:26 - 1.18 --- fxdhandler.py 2 Mar 2004 20:56:59 - 1.19 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.19 2004/03/02 20:56:59 dischi + # fxd files are always right about the name + # # Revision 1.18 2004/02/14 12:59:26 dischi # make sure url is a string *** *** 229,232 --- 232,237 else: item.set_url(url, info=False) + if title: + item.name = title if player: item.force_player = player --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins usb.py,1.5,1.6
Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18939
Modified Files:
usb.py
Log Message:
add hotplugging
Index: usb.py
===
RCS file: /cvsroot/freevo/freevo/src/plugins/usb.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** usb.py 4 Oct 2003 18:37:29 - 1.5
--- usb.py 28 Feb 2004 11:28:56 - 1.6
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.6 2004/02/28 11:28:56 dischi
+ # add hotplugging
+ #
# Revision 1.5 2003/10/04 18:37:29 dischi
# i18n changes and True/False usage
***
*** 43,49
--- 46,56
#endif
+ import os
+
+ import config
import plugin
import util
import rc
+ from gui import PopupBox
class PluginInterface(plugin.DaemonPlugin):
***
*** 52,55
--- 59,73
plugin if you use mainmenu plugins for special usb devices
like camera.py.
+
+ You can also set USB_HOTPLUG in your local_config.py to call
+ an external program when a device is added. USB_HOTPLUG is a
+ list with actions. Each action is also a list of device, message
+ and program to call. Limitation: this works only when Freevo shows
+ the menu and is not running a video.
+
+ Example:
+ call pilot-xfer when a pda with the id 082d:0100 is pluged in:
+ USB_HOTPLUG = [ ('082d:0100', 'Synchronizing',
+ '/usr/bin/pilot-xfer -t -u /local/visor/current') ]
def __init__(self):
***
*** 58,66
self.poll_interval = 10
def poll(self, menuw=None, arg=None):
poll to check for devices
-
changes = False
--- 76,88
self.poll_interval = 10
+
+ def config(self):
+ return [( 'USB_HOTPLUG', [], 'action list when a devices comes up' )]
+
+
def poll(self, menuw=None, arg=None):
poll to check for devices
changes = False
***
*** 70,76
self.devices.remove(d)
except ValueError:
- changes = True
print 'usb.py: new device %s' %d
!
for d in self.devices:
changes = True
--- 92,106
self.devices.remove(d)
except ValueError:
print 'usb.py: new device %s' %d
! for device, message, action in config.USB_HOTPLUG:
! if d == device:
! pop = PopupBox(text=message)
! pop.show()
! os.system(action)
! pop.destroy()
! break
! else:
! changes = True
!
for d in self.devices:
changes = True
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src rc.py,1.29,1.30
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19664 Modified Files: rc.py Log Message: fix crash for helper Index: rc.py === RCS file: /cvsroot/freevo/freevo/src/rc.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** rc.py 27 Feb 2004 20:12:16 - 1.29 --- rc.py 28 Feb 2004 17:30:59 - 1.30 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.30 2004/02/28 17:30:59 dischi + # fix crash for helper + # # Revision 1.29 2004/02/27 20:12:16 dischi # reworked rc.py to make several classes *** *** 273,280 try: self.inputs.append(Lirc()) ! except Exception, e: pass ! self.inputs.append(Keyboard()) if use_netremote and config.ENABLE_NETWORK_REMOTE and \ --- 276,286 try: self.inputs.append(Lirc()) ! except: pass ! try: ! self.inputs.append(Keyboard()) ! except: ! pass if use_netremote and config.ENABLE_NETWORK_REMOTE and \ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util __init__.py,1.14,1.15 fxdparser.py,1.13,1.14 mediainfo.py,1.34,1.35 misc.py,1.33,1.34
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31857
Modified Files:
__init__.py fxdparser.py mediainfo.py misc.py
Log Message:
unicode fixes
Index: __init__.py
===
RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** __init__.py 27 Feb 2004 20:15:03 - 1.14
--- __init__.py 28 Feb 2004 21:04:17 - 1.15
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.15 2004/02/28 21:04:17 dischi
+ # unicode fixes
+ #
# Revision 1.14 2004/02/27 20:15:03 dischi
# more unicode fixes
***
*** 80,83
--- 83,89
print 'tried encoding %s and %s' % (encoding, config.LOCALE)
print e
+ elif string.__class__ != unicode:
+ return unicode(str(string), config.LOCALE)
+
return string
Index: fxdparser.py
===
RCS file: /cvsroot/freevo/freevo/src/util/fxdparser.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** fxdparser.py16 Jan 2004 16:23:07 - 1.13
--- fxdparser.py28 Feb 2004 21:04:17 - 1.14
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.14 2004/02/28 21:04:17 dischi
+ # unicode fixes
+ #
# Revision 1.13 2004/01/16 16:23:07 dischi
# made a ugly unicode fix...I will never understand python character encoding
***
*** 86,89
--- 89,93
+
class XMLnode:
***
*** 153,167
if vfs.isfile(filename):
vfs.unlink(filename)
! f = vfs.codecs_open(filename, 'w', encoding='utf-8')
! f.write('?xml version=1.0 ?\n')
! try:
! self._dump_recurse(f, self.tree)
! except UnicodeDecodeError:
! # sigh, some strange encoding errors again, make it slower
! # but it should work now
! f.close()
! f = vfs.codecs_open(filename, 'w', encoding='utf-8')
! f.write('?xml version=1.0 ?\n')
! self._dump_recurse(f, self.tree, encoding_problem=True)
f.write('\n')
--- 157,163
if vfs.isfile(filename):
vfs.unlink(filename)
! f = vfs.codecs_open(filename, 'wb', encoding='utf-8')
! f.write('?xml version=1.0 encoding=utf-8 ?\n')
! self._dump_recurse(f, self.tree)
f.write('\n')
***
*** 174,179
util.save_pickle(self.tree, vfs.getoverlay(filename + '.raw'))
!
! def _dump_recurse(self, f, elem, depth=0, encoding_problem=False):
Help function to dump all elements
--- 170,176
util.save_pickle(self.tree, vfs.getoverlay(filename + '.raw'))
!
!
! def _dump_recurse(self, f, elem, depth=0):
Help function to dump all elements
***
*** 183,187
f.write('' + elem.name)
for (ns, name), value in elem.attrs.items():
! f.write(' %s=%s' % (name, value))
if elem.children or elem.first_cdata:
if elem.first_cdata == None:
--- 180,184
f.write('' + elem.name)
for (ns, name), value in elem.attrs.items():
! f.write(u' ' + Unicode(name) + u'=' + Unicode(value) + '')
if elem.children or elem.first_cdata:
if elem.first_cdata == None:
***
*** 190,204
f.write(' ')
else:
! data = elem.first_cdata.replace('', 'amp;')
! if encoding_problem:
! unidata = unicode()
! for c in data:
! unidata += unichr(ord(c))
! data = unidata
! f.write('' + data)
for child in elem.children:
! self._dump_recurse(f, child, depth=depth+1,
!encoding_problem=encoding_problem)
if child.following_cdata == None:
if child == elem.children[-1]:
--- 187,195
f.write(' ')
else:
! data = Unicode(elem.first_cdata).replace(u'', u'amp;')
! f.write(u'' + data)
for child in elem.children:
! self._dump_recurse(f, child, depth=depth+1)
if child.following_cdata == None:
if child == elem.children[-1]:
***
*** 328,332
for child in node.children:
if child.name == name
[Freevo-cvslog] freevo/src/plugins rom_drives.py,1.57,1.58
Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32087/plugins
Modified Files:
rom_drives.py
Log Message:
add function to check if a media is mounted
Index: rom_drives.py
===
RCS file: /cvsroot/freevo/freevo/src/plugins/rom_drives.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** rom_drives.py 15 Feb 2004 15:29:47 - 1.57
--- rom_drives.py 27 Feb 2004 20:07:28 - 1.58
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.58 2004/02/27 20:07:28 dischi
+ # add function to check if a media is mounted
+ #
# Revision 1.57 2004/02/15 15:29:47 dischi
# remove old stuff
***
*** 381,385
Mount the media
! _debug_('Mounting disc in drive %s' % self.drivename,2)
util.mount(self.mountdir, force=True)
return
--- 384,388
Mount the media
! _debug_('Mounting disc in drive %s' % self.drivename, 2)
util.mount(self.mountdir, force=True)
return
***
*** 390,397
Mount the media
! _debug_('Unmounting disc in drive %s' % self.drivename,2)
util.umount(self.mountdir)
return
!
def shutdown(self):
shutdown()
--- 393,408
Mount the media
! _debug_('Unmounting disc in drive %s' % self.drivename, 2)
util.umount(self.mountdir)
return
!
!
! def is_mounted(self):
!
! Check if the media is mounted
!
! return util.is_mounted(self.mountdir)
!
!
def shutdown(self):
shutdown()
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src playlist.py,1.66,1.67
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453 Modified Files: playlist.py Log Message: more unicode fixes Index: playlist.py === RCS file: /cvsroot/freevo/freevo/src/playlist.py,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** playlist.py 23 Feb 2004 19:59:34 - 1.66 --- playlist.py 27 Feb 2004 20:15:02 - 1.67 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.67 2004/02/27 20:15:02 dischi + # more unicode fixes + # # Revision 1.66 2004/02/23 19:59:34 dischi # unicode fixes *** *** 153,157 self.name = Unicode(name) ! if (isinstance(playlist, str) or isinstance(playlist, unicode)) and not name: self.name = util.getname(playlist) --- 156,160 self.name = Unicode(name) ! if isstring(playlist) and not name: self.name = util.getname(playlist) *** *** 301,305 self.get_plugins.append(p) ! if isinstance(playlist, str) or isinstance(playlist, unicode): # it's a filename with a playlist try: --- 304,308 self.get_plugins.append(p) ! if isstring(playlist): # it's a filename with a playlist try: *** *** 318,322 # self.playlist is a list of Items or strings (filenames) ! if not isinstance(playlist, str): for i in playlist: if isinstance(i, Item): --- 321,325 # self.playlist is a list of Items or strings (filenames) ! if not isstring(playlist): for i in playlist: if isinstance(i, Item): --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util __init__.py,1.13,1.14 mediainfo.py,1.31,1.32
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/util
Modified Files:
__init__.py mediainfo.py
Log Message:
more unicode fixes
Index: __init__.py
===
RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** __init__.py 25 Feb 2004 19:50:51 - 1.13
--- __init__.py 27 Feb 2004 20:15:03 - 1.14
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.14 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.13 2004/02/25 19:50:51 dischi
# fix unicode problem for utf-8
***
*** 67,71
def Unicode(string, encoding=config.encoding):
! if type(string) == str:
try:
return unicode(string, encoding)
--- 70,74
def Unicode(string, encoding=config.encoding):
! if string.__class__ == str:
try:
return unicode(string, encoding)
***
*** 80,84
def String(string, encoding=config.encoding):
! if type(string) == unicode:
return string.encode(encoding, 'replace')
return string
--- 83,87
def String(string, encoding=config.encoding):
! if string.__class__ == unicode:
return string.encode(encoding, 'replace')
return string
Index: mediainfo.py
===
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mediainfo.py23 Feb 2004 19:27:07 - 1.31
--- mediainfo.py27 Feb 2004 20:15:03 - 1.32
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.32 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.31 2004/02/23 19:27:07 dischi
# fix mmpython init
***
*** 289,293
if not k in self.uncachable_keys and getattr(object,k) != None:
value = getattr(object,k)
! if isinstance(value, str) or isinstance(value, unicode):
value = Unicode(value.replace('\0', '').lstrip().rstrip())
if value:
--- 292,296
if not k in self.uncachable_keys and getattr(object,k) != None:
value = getattr(object,k)
! if isstring(value):
value = Unicode(value.replace('\0', '').lstrip().rstrip())
if value:
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins mediamenu.py,1.34,1.35
Update of /cvsroot/freevo/freevo/src/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/plugins Modified Files: mediamenu.py Log Message: more unicode fixes Index: mediamenu.py === RCS file: /cvsroot/freevo/freevo/src/plugins/mediamenu.py,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** mediamenu.py15 Feb 2004 11:33:19 - 1.34 --- mediamenu.py27 Feb 2004 20:15:02 - 1.35 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.35 2004/02/27 20:15:02 dischi + # more unicode fixes + # # Revision 1.34 2004/02/15 11:33:19 dischi # auto select item if there is only one *** *** 193,198 try: add_args = None ! if isinstance(item, str): ! title, filename = '', item else: (title, filename) = item[:2] --- 196,201 try: add_args = None ! if isstring(item): ! title, filename = u'', item else: (title, filename) = item[:2] --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main area.py,1.35,1.36 info_area.py,1.19,1.20 listing_area.py,1.25,1.26
Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/skins/main
Modified Files:
area.py info_area.py listing_area.py
Log Message:
more unicode fixes
Index: area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/area.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** area.py 23 Feb 2004 15:32:12 - 1.35
--- area.py 27 Feb 2004 20:15:03 - 1.36
***
*** 28,31
--- 28,34
# ---
# $Log$
+ # Revision 1.36 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.35 2004/02/23 15:32:12 dischi
# fix translation/unicode bug
***
*** 730,738
return 0,0
! if isinstance(image, str):
if isinstance(val, tuple):
! image = self.loadimage(image, val[2:])
else:
! image = self.loadimage(image, val)
if not image:
--- 733,741
return 0,0
! if isstring(image):
if isinstance(val, tuple):
! image = self.loadimage(String(image), val[2:])
else:
! image = self.loadimage(String(image), val)
if not image:
Index: info_area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/info_area.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** info_area.py23 Feb 2004 16:34:27 - 1.19
--- info_area.py27 Feb 2004 20:15:03 - 1.20
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.20 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.19 2004/02/23 16:34:27 dischi
# better skin i18n support
***
*** 297,301
if exp:
exp = eval(exp, {'attr': item.getattr}, function_calls)
! if type( exp ) != unicode and type( exp )!= str:
exp = str( exp )
if exp:
--- 300,304
if exp:
exp = eval(exp, {'attr': item.getattr}, function_calls)
! if not isstring(exp):
exp = str( exp )
if exp:
Index: listing_area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/listing_area.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** listing_area.py 24 Feb 2004 21:20:30 - 1.25
--- listing_area.py 27 Feb 2004 20:15:03 - 1.26
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.26 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.25 2004/02/24 21:20:30 dischi
# unicode fix
***
*** 406,411
x_mod, table_text[i] = text_or_icon(settings,
table_text[i],
table_x, table_w,
val.font)
! if not (isinstance(table_text[i], str) or
! isinstance(table_text[i], unicode)):
self.drawimage(table_text[i], (table_x + x_mod, y0 +
vskip))
table_text[i] = ''
--- 409,413
x_mod, table_text[i] = text_or_icon(settings,
table_text[i],
table_x, table_w,
val.font)
! if not isstring(table_text[i]):
self.drawimage(table_text[i], (table_x + x_mod, y0 +
vskip))
table_text[i] = ''
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util mediainfo.py,1.32,1.33
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4510
Modified Files:
mediainfo.py
Log Message:
add number of files to rom drives
Index: mediainfo.py
===
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** mediainfo.py27 Feb 2004 20:15:03 - 1.32
--- mediainfo.py27 Feb 2004 20:27:18 - 1.33
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.33 2004/02/27 20:27:18 dischi
+ # add number of files to rom drives
+ #
# Revision 1.32 2004/02/27 20:15:03 dischi
# more unicode fixes
***
*** 600,603
--- 603,615
else:
metainfo = {}
+
+ if mmdata.mime == 'unknown/unknown':
+ media.mount()
+ for type in ('video', 'audio', 'image'):
+ items = getattr(config, '%s_SUFFIX' % type.upper())
+ files = util.match_files_recursively(media.mountdir, items)
+ metainfo['disc_num_%s' % type] = len(files)
+ media.umount()
+
info = Info(cachefile, mmdata, metainfo)
info.disc = True
***
*** 687,693
mmchanged, freevo_changed, part_update, complete_update = info
# let's warn about some updates
! if freevo_changed 2:
print
! print 'Warning: Freevo cache helper updated.'
print 'Please rerun \'freevo cache\' to speed up Freevo'
print
--- 699,705
mmchanged, freevo_changed, part_update, complete_update = info
# let's warn about some updates
! if freevo_changed 3:
print
! print 'Warning: Freevo cache helper/informations updated.'
print 'Please rerun \'freevo cache\' to speed up Freevo'
print
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers cache.py,1.26,1.27
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4603/helpers Modified Files: cache.py Log Message: increase cache version Index: cache.py === RCS file: /cvsroot/freevo/freevo/src/helpers/cache.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** cache.py27 Feb 2004 20:15:02 - 1.26 --- cache.py27 Feb 2004 20:27:45 - 1.27 *** *** 12,15 --- 12,18 # --- # $Log$ + # Revision 1.27 2004/02/27 20:27:45 dischi + # increase cache version + # # Revision 1.26 2004/02/27 20:15:02 dischi # more unicode fixes *** *** 18,24 # also cache playlist dir # - # Revision 1.24 2004/02/13 17:34:18 dischi - # small fix - # # Revision 1.23 2004/02/12 12:22:03 dischi # update cache to new directory metainfo --- 21,24 *** *** 33,71 # cleanup # - # Revision 1.20 2004/02/07 20:46:21 dischi - # more old files to remove - # - # Revision 1.19 2004/02/07 13:08:41 dischi - # also remove covers in vfs if directory is gone - # - # Revision 1.18 2004/02/05 20:39:11 dischi - # check mmpython cache version - # - # Revision 1.17 2004/02/01 17:50:43 dischi - # fix, it deleted all infos on caching :-) - # - # Revision 1.16 2004/01/19 20:25:53 dischi - # sync metainfo before stopping - # - # Revision 1.15 2004/01/18 16:48:29 dischi - # expand caching (including extendedadd.py) - # - # Revision 1.14 2004/01/17 20:30:18 dischi - # use new metainfo - # - # Revision 1.13 2004/01/04 17:20:44 dischi - # support for generating video thumbnails - # - # Revision 1.12 2004/01/03 17:42:03 dischi - # o OVERLAY_DIR is now used everytime - # o added support to delete old cachefile in the overlay dir - # o remove unneeded subdirs in the overlay dir - # - # Revision 1.11 2003/12/31 16:43:28 dischi - # also cache thumbnails for config.OVERLAY_DIR_STORE_THUMBNAILS: - # - # Revision 1.10 2003/12/30 15:36:42 dischi - # support OVERLAY_DIR_STORE_MMPYTHON_DATA - # # --- # Freevo - A Home Theater PC framework --- 33,36 *** *** 108,112 # use this number to keep track of changes in # this helper. Check this against util/mediainfo ! VERSION = 2 def delete_old_files_1(): --- 73,77 # use this number to keep track of changes in # this helper. Check this against util/mediainfo ! VERSION = 3 def delete_old_files_1(): --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers cache.py,1.27,1.28
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7526/src/helpers Modified Files: cache.py Log Message: better rebuild Index: cache.py === RCS file: /cvsroot/freevo/freevo/src/helpers/cache.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** cache.py27 Feb 2004 20:27:45 - 1.27 --- cache.py27 Feb 2004 20:41:38 - 1.28 *** *** 12,15 --- 12,18 # --- # $Log$ + # Revision 1.28 2004/02/27 20:41:38 dischi + # better rebuild + # # Revision 1.27 2004/02/27 20:27:45 dischi # increase cache version *** *** 160,164 for f in util.match_files(config.OVERLAY_DIR + '/disc/metadata', ['mmpython']): os.unlink(f) - print f print 'done' --- 163,166 *** *** 398,401 --- 400,409 + print 'Freevo cache' + print + print 'Freevo will now generate a metadata cache for all your files and' + print 'create thumbnails from images for faster access.' + print + # check for current cache informations if (len(sys.argv)1 and sys.argv[1] == '--rebuild'): *** *** 413,420 print print 'Unable to detect last complete rebuild, forcing rebuild' ! rebuild = 2 complete_update = int(time.time()) else: ! complete_update = info[-1] except ImportError: print --- 421,439 print print 'Unable to detect last complete rebuild, forcing rebuild' ! rebuild = 2 complete_update = int(time.time()) else: ! if len(info) == 3: ! mmchanged, part_update, complete_update = info ! freevo_changed = 0 ! else: ! mmchanged, freevo_changed, part_update, complete_update = info ! ! # let's warn about some updates ! if freevo_changed VERSION: ! print 'Cache too old, forcing rebuild' ! rebuild = 2 ! complete_update = int(time.time()) ! except ImportError: print *** *** 427,435 print - print 'Freevo cache' - print - print 'Freevo will now generate a metadata cache for all your files and' - print 'create thumbnails from images for faster access.' - print start = time.clock() --- 446,449 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util mediainfo.py,1.33,1.34
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7670/src/util
Modified Files:
mediainfo.py
Log Message:
save disc file info
Index: mediainfo.py
===
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** mediainfo.py27 Feb 2004 20:27:18 - 1.33
--- mediainfo.py27 Feb 2004 20:42:05 - 1.34
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.34 2004/02/27 20:42:05 dischi
+ # save disc file info
+ #
# Revision 1.33 2004/02/27 20:27:18 dischi
# add number of files to rom drives
***
*** 604,614
metainfo = {}
! if mmdata.mime == 'unknown/unknown':
! media.mount()
! for type in ('video', 'audio', 'image'):
! items = getattr(config, '%s_SUFFIX' % type.upper())
! files = util.match_files_recursively(media.mountdir, items)
! metainfo['disc_num_%s' % type] = len(files)
! media.umount()
info = Info(cachefile, mmdata, metainfo)
--- 607,618
metainfo = {}
! if mmdata.mime == 'unknown/unknown' and not metainfo.has_key('disc_num_video'):
! media.mount()
! for type in ('video', 'audio', 'image'):
! items = getattr(config, '%s_SUFFIX' % type.upper())
! files = util.match_files_recursively(media.mountdir, items)
! metainfo['disc_num_%s' % type] = len(files)
! media.umount()
! util.save_pickle(metainfo, cachefile)
info = Info(cachefile, mmdata, metainfo)
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src directory.py,1.122,1.123
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19193 Modified Files: directory.py Log Message: remove debug Index: directory.py === RCS file: /cvsroot/freevo/freevo/src/directory.py,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** directory.py27 Feb 2004 20:11:19 - 1.122 --- directory.py27 Feb 2004 21:38:16 - 1.123 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.123 2004/02/27 21:38:16 dischi + # remove debug + # # Revision 1.122 2004/02/27 20:11:19 dischi # o fix umount while scanning the dir *** *** 642,646 # normal DirItems for filename in files: - print filename if os.path.isdir(filename): d = DirItem(filename, self, display_type = self.display_type) --- 645,648 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo_config.py,1.320,1.321
Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10242
Modified Files:
freevo_config.py
Log Message:
add special event mapping for tvmenu
Index: freevo_config.py
===
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.320
retrieving revision 1.321
diff -C2 -d -r1.320 -r1.321
*** freevo_config.py16 Feb 2004 14:41:31 - 1.320
--- freevo_config.py25 Feb 2004 17:44:12 - 1.321
***
*** 284,287
--- 284,288
EVENTS = {
'menu': MENU_EVENTS,
+ 'tvmenu' : TVMENU_EVENTS,
'input' : INPUT_EVENTS,
'tv' : TV_EVENTS,
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util __init__.py,1.12,1.13
Update of /cvsroot/freevo/freevo/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11078 Modified Files: __init__.py Log Message: fix unicode problem for utf-8 Index: __init__.py === RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** __init__.py 23 Feb 2004 19:39:59 - 1.12 --- __init__.py 25 Feb 2004 19:50:51 - 1.13 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.13 2004/02/25 19:50:51 dischi + # fix unicode problem for utf-8 + # # Revision 1.12 2004/02/23 19:39:59 dischi # fix vfs problem in mediainfo *** *** 68,73 return unicode(string, encoding) except Exception, e: ! _debug_( Could not convert %s to unicode using \%s\ encoding: %s % \ ! ( repr(string), encoding, e )) return string --- 71,80 return unicode(string, encoding) except Exception, e: ! try: ! return unicode(string, config.LOCALE) ! except Exception, e: ! print 'Error: Could not convert %s to unicode' % repr(string) ! print 'tried encoding %s and %s' % (encoding, config.LOCALE) ! print e return string --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/share/skins/main blurr2.fxd,1.50,1.51
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22598 Modified Files: blurr2.fxd Log Message: Sort tags so you can find something in this file. Also changed the tv program listing (when pressing record) Index: blurr2.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr2.fxd,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** blurr2.fxd 24 Feb 2004 05:08:49 - 1.50 --- blurr2.fxd 24 Feb 2004 18:49:51 - 1.51 *** *** 3,20 skin include=basic geometry=800x600 iconset theme=blurr/ - main imagedir=gant - item label=tv name=Watch TV/ - item label=video name=Watch a Movie image=gant/movie.png/ - item label=audio name=Listen to Music image=gant/music.png/ - item label=image name=Look at Pictures/ - item label=games name=Play a Game/ - item label=weather name=Weather Forecast/ [...1143 lines suppressed...] - font label=tv name=Arial_Bold size=14 color=0xff/ - font label=tv selected name=Arial_Bold size=14 color=0x164668 - shadow visible=no color=0x00 border=yes/ - /font - font label=tv time name=Arial_Bold size=14 color=0xff/ - font label=tv title name=Arial_Bold size=16 color=0xff/ font label=clock name=Arial_Bold size=16 color=0xff/ --- 845,848 *** *** 870,871 --- 895,902 /skin /freevo + !-- Keep this comment at the end of the file + Local variables: + mode: xml + sgml-indent-step:4 + End: + -- --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util extendedmeta.py,1.10,1.11
Update of /cvsroot/freevo/freevo/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23981 Modified Files: extendedmeta.py Log Message: unicode fix Index: extendedmeta.py === RCS file: /cvsroot/freevo/freevo/src/util/extendedmeta.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** extendedmeta.py 22 Feb 2004 20:20:06 - 1.10 --- extendedmeta.py 24 Feb 2004 18:55:38 - 1.11 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.11 2004/02/24 18:55:38 dischi + # unicode fix + # # Revision 1.10 2004/02/22 20:20:06 dischi # unicode fix again *** *** 158,162 # Audio Information ! various = '__various__' class AudioParser: --- 161,165 # Audio Information ! various = u'__various__' class AudioParser: --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main listing_area.py,1.24,1.25
Update of /cvsroot/freevo/freevo/src/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25076 Modified Files: listing_area.py Log Message: unicode fix Index: listing_area.py === RCS file: /cvsroot/freevo/freevo/src/skins/main/listing_area.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** listing_area.py 4 Feb 2004 19:05:36 - 1.24 --- listing_area.py 24 Feb 2004 21:20:30 - 1.25 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.25 2004/02/24 21:20:30 dischi + # unicode fix + # # Revision 1.24 2004/02/04 19:05:36 dischi # remove bad log message *** *** 403,407 x_mod, table_text[i] = text_or_icon(settings, table_text[i], table_x, table_w, val.font) ! if not isinstance(table_text[i], str): self.drawimage(table_text[i], (table_x + x_mod, y0 + vskip)) table_text[i] = '' --- 406,411 x_mod, table_text[i] = text_or_icon(settings, table_text[i], table_x, table_w, val.font) ! if not (isinstance(table_text[i], str) or ! isinstance(table_text[i], unicode)): self.drawimage(table_text[i], (table_x + x_mod, y0 + vskip)) table_text[i] = '' --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main area.py,1.34,1.35
Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7841
Modified Files:
area.py
Log Message:
fix translation/unicode bug
Index: area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/area.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** area.py 19 Feb 2004 04:57:57 - 1.34
--- area.py 23 Feb 2004 15:32:12 - 1.35
***
*** 28,34
# ---
# $Log$
# Revision 1.34 2004/02/19 04:57:57 gsbarbieri
! # Support Web Interface i18n.
! # To use this, I need to get the gettext() translations in unicode, so some changes
are required to files that use print _('string'), need to make them print
String(_('string')).
#
# Revision 1.33 2004/02/12 16:59:12 dischi
--- 28,36
# ---
# $Log$
+ # Revision 1.35 2004/02/23 15:32:12 dischi
+ # fix translation/unicode bug
+ #
# Revision 1.34 2004/02/19 04:57:57 gsbarbieri
! # Support i18n.
#
# Revision 1.33 2004/02/12 16:59:12 dischi
***
*** 683,687
height2 = font.h + 2
! self.tmp_objects.text.append((x, y, x+width, y+height2, Unicode(_(text)),
font, height,
align_h, align_v, mode, ellipses))
--- 685,689
height2 = font.h + 2
! self.tmp_objects.text.append((x, y, x+width, y+height2, text, font, height,
align_h, align_v, mode, ellipses))
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util __init__.py,1.11,1.12
Update of /cvsroot/freevo/freevo/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30798 Modified Files: __init__.py Log Message: fix vfs problem in mediainfo Index: __init__.py === RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** __init__.py 23 Feb 2004 19:27:07 - 1.11 --- __init__.py 23 Feb 2004 19:39:59 - 1.12 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.12 2004/02/23 19:39:59 dischi + # fix vfs problem in mediainfo + # # Revision 1.11 2004/02/23 19:27:07 dischi # fix mmpython init *** *** 81,87 import objectcache import popen3 - import mediainfo __builtin__.__dict__['vfs'] = vfs __builtin__.__dict__['Unicode'] = Unicode __builtin__.__dict__['String'] = String --- 84,91 import objectcache import popen3 __builtin__.__dict__['vfs'] = vfs __builtin__.__dict__['Unicode'] = Unicode __builtin__.__dict__['String'] = String + + import mediainfo --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src main.py,1.116,1.117
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27694/src Modified Files: main.py Log Message: fix mmpython init Index: main.py === RCS file: /cvsroot/freevo/freevo/src/main.py,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** main.py 14 Feb 2004 13:05:03 - 1.116 --- main.py 23 Feb 2004 19:27:07 - 1.117 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.117 2004/02/23 19:27:07 dischi + # fix mmpython init + # # Revision 1.116 2004/02/14 13:05:03 dischi # do not call skin.get_singleton() anymore *** *** 319,334 - # setup mmpython - - if config.DEBUG 2: - mmpython.mediainfo.DEBUG = config.DEBUG - mmpython.factory.DEBUG = config.DEBUG - else: - mmpython.mediainfo.DEBUG = 0 - mmpython.factory.DEBUG = 0 - - mmpython.USE_NETWORK = config.USE_NETWORK - mmpython.disc.discinfo.CREATE_MD5_ID = config.MMPYTHON_CREATE_MD5_ID - os.umask(config.UMASK) --- 322,325 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video/plugins mplayer.py,1.64,1.65
Update of /cvsroot/freevo/freevo/src/video/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25691 Modified Files: mplayer.py Log Message: bugfix Index: mplayer.py === RCS file: /cvsroot/freevo/freevo/src/video/plugins/mplayer.py,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** mplayer.py 19 Feb 2004 04:57:58 - 1.64 --- mplayer.py 23 Feb 2004 19:17:53 - 1.65 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.65 2004/02/23 19:17:53 dischi + # bugfix + # # Revision 1.64 2004/02/19 04:57:58 gsbarbieri # Support Web Interface i18n. *** *** 570,575 return USER_END else: - print String(_( 'ERROR' )) + ': ' + String(self.exit_type) + \ - String(_( 'unknow error while playing file' )) return PLAY_END --- 573,576 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/share/skins/main blurr2.fxd,1.48,1.49
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3288 Modified Files: blurr2.fxd Log Message: align time for tv on the right Index: blurr2.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr2.fxd,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** blurr2.fxd 23 Feb 2004 03:41:31 - 1.48 --- blurr2.fxd 23 Feb 2004 19:58:55 - 1.49 *** *** 58,64 listing layout=tv listing x=10 y=220 width=750 height=350 image x=765 y=220 width=32 height=32 label=uparrow ! filename=up.png/ image x=765 y=max-32 width=32 height=32 label=downarrow ! filename=down.png/ image width=16 height=16 label=leftarrow filename=left.png/ image width=16 height=16 label=rightarrow filename=right.png/ --- 58,64 listing layout=tv listing x=10 y=220 width=750 height=350 image x=765 y=220 width=32 height=32 label=uparrow ! filename=up.png/ image x=765 y=max-32 width=32 height=32 label=downarrow ! filename=down.png/ image width=16 height=16 label=leftarrow filename=left.png/ image width=16 height=16 label=rightarrow filename=right.png/ *** *** 580,591 /background content x=10 y=10 height=max-20 width=max-20 type=text ! spacing=10 font=tv item type=default if expression=title text font=tv title width=550 expression=title/ /if ! text font=tv time valign=right expression=start/ ! text font=tv time valign=right-/text ! text font=tv time valign=right expression=stop/ newline/ if expression=sub_title --- 580,589 /background content x=10 y=10 height=max-20 width=max-20 type=text ! spacing=10 font=tv item type=default if expression=title text font=tv title width=550 expression=title/ /if ! text font=tv time width=max align=right expression=time/ newline/ if expression=sub_title --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util misc.py,1.31,1.32
Update of /cvsroot/freevo/freevo/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3477/util Modified Files: misc.py Log Message: unicode fixes Index: misc.py === RCS file: /cvsroot/freevo/freevo/src/util/misc.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** misc.py 23 Feb 2004 16:34:48 - 1.31 --- misc.py 23 Feb 2004 19:59:35 - 1.32 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.32 2004/02/23 19:59:35 dischi + # unicode fixes + # # Revision 1.31 2004/02/23 16:34:48 dischi # bugfix *** *** 392,415 - def encode(str, code): - try: - return str.encode(code) - except UnicodeError: - result = '' - for ch in str: - try: - result += ch.encode(code) - except UnicodeError: - pass - return result - - - def ucmp(val1, val2): - - cmp function taking care of encoding - - return cmp(Unicode(val1), Unicode(val2)) - - def htmlenties2txt(string): --- 395,398 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv epg_types.py,1.13,1.14
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3477/tv
Modified Files:
epg_types.py
Log Message:
unicode fixes
Index: epg_types.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/epg_types.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** epg_types.py22 Feb 2004 06:18:20 - 1.13
--- epg_types.py23 Feb 2004 19:59:34 - 1.14
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.14 2004/02/23 19:59:34 dischi
+ # unicode fixes
+ #
# Revision 1.13 2004/02/22 06:18:20 gsbarbieri
# Better unicode support.
***
*** 125,128
--- 128,133
if attr == 'date':
return Unicode(time.strftime(config.TV_DATEFORMAT,
time.localtime(self.start)))
+ if attr == 'time':
+ return self.getattr('start') + u' - ' + self.getattr('stop')
if hasattr(self, attr):
return getattr(self,attr)
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv epg_types.py,1.14,1.15
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5018 Modified Files: epg_types.py Log Message: increase EPG_VERSION because of the unicode fixes Index: epg_types.py === RCS file: /cvsroot/freevo/freevo/src/tv/epg_types.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** epg_types.py23 Feb 2004 19:59:34 - 1.14 --- epg_types.py23 Feb 2004 20:05:36 - 1.15 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.15 2004/02/23 20:05:36 dischi + # increase EPG_VERSION because of the unicode fixes + # # Revision 1.14 2004/02/23 19:59:34 dischi # unicode fixes *** *** 69,73 # The file format version number. It must be updated when incompatible # changes are made to the file format. ! EPG_VERSION = 2 TRUE = 1 --- 72,76 # The file format version number. It must be updated when incompatible # changes are made to the file format. ! EPG_VERSION = 3 TRUE = 1 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main info_area.py,1.18,1.19
Update of /cvsroot/freevo/freevo/src/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22374/skins/main Modified Files: info_area.py Log Message: better skin i18n support Index: info_area.py === RCS file: /cvsroot/freevo/freevo/src/skins/main/info_area.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** info_area.py19 Feb 2004 04:57:57 - 1.18 --- info_area.py23 Feb 2004 16:34:27 - 1.19 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.19 2004/02/23 16:34:27 dischi + # better skin i18n support + # # Revision 1.18 2004/02/19 04:57:57 gsbarbieri # Support Web Interface i18n. *** *** 390,394 element.x = x element.y = y ! # Calculate the geometry r = Geometry( x, y, element.width, element.height) --- 393,398 element.x = x element.y = y ! element.text = _(element.text) ! # Calculate the geometry r = Geometry( x, y, element.width, element.height) *** *** 400,404 height = -1 ! size = osd.drawstringframed( _(element.text), 0, 0, r.width, r.height, element.font, None, None, --- 404,408 height = -1 ! size = osd.drawstringframed( element.text, 0, 0, r.width, r.height, element.font, None, None, --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src menu.py,1.88,1.89
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29330
Modified Files:
menu.py
Log Message:
refresh fix
Index: menu.py
===
RCS file: /cvsroot/freevo/freevo/src/menu.py,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** menu.py 22 Feb 2004 20:33:47 - 1.88
--- menu.py 23 Feb 2004 21:45:09 - 1.89
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.89 2004/02/23 21:45:09 dischi
+ # refresh fix
+ #
# Revision 1.88 2004/02/22 20:33:47 dischi
# some unicode fixes
***
*** 326,329
--- 329,336
if not isinstance(menu, Menu):
+ # Do not draw if there are any children
+ if self.children:
+ return False
+
return skin.draw(menu.type, menu)
***
*** 340,347
skin.draw('menu', self, self.menustack[-1])
- # Draw any child UI objects
- for child in self.children:
- child.draw()
-
def make_submenu(self, menu_name, actions, item):
--- 347,350
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.30,1.31
Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29632
Modified Files:
recordserver.py
Log Message:
start some unicode fixes, still not working every time
Index: recordserver.py
===
RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** recordserver.py 11 Feb 2004 04:20:46 - 1.30
--- recordserver.py 23 Feb 2004 21:46:22 - 1.31
***
*** 7,10
--- 7,13
# ---
# $Log$
+ # Revision 1.31 2004/02/23 21:46:22 dischi
+ # start some unicode fixes, still not working every time
+ #
# Revision 1.30 2004/02/11 04:20:46 outlyer
# Yet another place where we aren't following the user's time format... fixed now.
***
*** 204,210
if os.path.isfile(config.TV_RECORD_SCHEDULE):
! if DEBUG: log.debug('GET: reading cached file (%s)' %
config.TV_RECORD_SCHEDULE)
! scheduledRecordings =
marmalade.unjellyFromXML(open(config.TV_RECORD_SCHEDULE, 'r'))
!
try:
file_ver = scheduledRecordings.TYPES_VERSION
--- 207,216
if os.path.isfile(config.TV_RECORD_SCHEDULE):
! if DEBUG:
! log.debug('GET: reading cached file (%s)' %
config.TV_RECORD_SCHEDULE)
! f = open(config.TV_RECORD_SCHEDULE, 'r')
! scheduledRecordings = marmalade.unjellyFromXML(f)
! f.close()
!
try:
file_ver = scheduledRecordings.TYPES_VERSION
***
*** 239,245
scheduledRecordings = ScheduledRecordings()
! if DEBUG: log.debug('SAVE: saving cached file (%s)' %
config.TV_RECORD_SCHEDULE)
! if DEBUG: log.debug(SAVE: ScheduledRecordings has %s items. %
len(scheduledRecordings.programList))
! marmalade.jellyToXML(scheduledRecordings, open(config.TV_RECORD_SCHEDULE,
'w'))
return TRUE
--- 245,256
scheduledRecordings = ScheduledRecordings()
! if DEBUG:
! log.debug('SAVE: saving cached file (%s)' % config.TV_RECORD_SCHEDULE)
! if DEBUG:
! log.debug(SAVE: ScheduledRecordings has %s items. % \
! len(scheduledRecordings.programList))
! f = open(config.TV_RECORD_SCHEDULE, 'w')
! marmalade.jellyToXML(scheduledRecordings, f)
! f.close()
return TRUE
***
*** 319,323
if start == '%s' % prog.start:
if DEBUG: log.debug('PROGRAM MATCH')
! return (TRUE, prog)
return (FALSE, 'prog not found')
--- 330,334
if start == '%s' % prog.start:
if DEBUG: log.debug('PROGRAM MATCH')
! return (TRUE, prog.decode())
return (FALSE, 'prog not found')
***
*** 347,352
if regex.match(prog.title) or regex.match(prog.desc) \
or regex.match(prog.sub_title):
! if DEBUG: log.debug('PROGRAM MATCH: %s' % prog)
! matches.append(prog)
if matches:
--- 358,367
if regex.match(prog.title) or regex.match(prog.desc) \
or regex.match(prog.sub_title):
! if DEBUG:
! log.debug('PROGRAM MATCH: %s' % prog)
! matches.append(prog.decode())
!
! if DEBUG:
! log.debug('return: %s' % str(matches))
if matches:
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv tvguide.py,1.25,1.26
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30683 Modified Files: tvguide.py Log Message: fix unicode problem Index: tvguide.py === RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** tvguide.py 23 Feb 2004 03:54:25 - 1.25 --- tvguide.py 23 Feb 2004 21:51:15 - 1.26 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.26 2004/02/23 21:51:15 dischi + # fix unicode problem + # # Revision 1.25 2004/02/23 03:54:25 rshortt # Use ProgramItem and display_program rather than clunky popup-gui. Because *** *** 150,154 l = schedule.getProgramList() for k in l: ! self.scheduled_programs.append(l[k]) --- 153,157 l = schedule.getProgramList() for k in l: ! self.scheduled_programs.append(l[k].encode()) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util extendedmeta.py,1.9,1.10
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16397
Modified Files:
extendedmeta.py
Log Message:
unicode fix again
Index: extendedmeta.py
===
RCS file: /cvsroot/freevo/freevo/src/util/extendedmeta.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** extendedmeta.py 21 Feb 2004 19:44:05 - 1.9
--- extendedmeta.py 22 Feb 2004 20:20:06 - 1.10
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.10 2004/02/22 20:20:06 dischi
+ # unicode fix again
+ #
# Revision 1.9 2004/02/21 19:44:05 dischi
# unicode fix
***
*** 247,251
return various
! if s1.replace(' ', '').lower() == s2.replace(' ', '').lower():
return s1
return various
--- 250,254
return various
! if s1.replace(u' ', u'').lower() == s2.replace(u' ', u'').lower():
return s1
return various
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src menu.py,1.87,1.88
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19090/src Modified Files: menu.py Log Message: some unicode fixes Index: menu.py === RCS file: /cvsroot/freevo/freevo/src/menu.py,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** menu.py 14 Feb 2004 19:29:07 - 1.87 --- menu.py 22 Feb 2004 20:33:47 - 1.88 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.88 2004/02/22 20:33:47 dischi + # some unicode fixes + # # Revision 1.87 2004/02/14 19:29:07 dischi # send osd message when not using a submenu *** *** 94,98 Item.__init__(self, parent, skin_type = skin_type) if name: ! self.name = name if icon: self.icon = icon --- 97,101 Item.__init__(self, parent, skin_type = skin_type) if name: ! self.name = Unicode(name) if icon: self.icon = icon --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video videoitem.py,1.127,1.128
Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19090/src/video
Modified Files:
videoitem.py
Log Message:
some unicode fixes
Index: videoitem.py
===
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** videoitem.py20 Feb 2004 18:53:23 - 1.127
--- videoitem.py22 Feb 2004 20:33:48 - 1.128
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.128 2004/02/22 20:33:48 dischi
+ # some unicode fixes
+ #
# Revision 1.127 2004/02/20 18:53:23 dischi
# add parent in dvd menu
***
*** 153,158
show_name = config.VIDEO_SHOW_REGEXP_SPLIT(self.name)
if show_name[0] and show_name[1] and show_name[2] and show_name[3]:
! self.name = show_name[0] + + show_name[1] + x + show_name[2] +\
! - + show_name[3]
self.image = util.getimage((config.VIDEO_SHOW_DATA_DIR + \
show_name[0].lower()), self.image)
--- 156,161
show_name = config.VIDEO_SHOW_REGEXP_SPLIT(self.name)
if show_name[0] and show_name[1] and show_name[2] and show_name[3]:
! self.name = show_name[0] + u + show_name[1] + ux + show_name[2]
+\
! u - + show_name[3]
self.image = util.getimage((config.VIDEO_SHOW_DATA_DIR + \
show_name[0].lower()), self.image)
***
*** 272,276
return '%s%s' % (os.stat(self.filename).st_ctime, self.filename)
! if self.name.find(The ) == 0:
return self.name[4:]
return self.name
--- 275,279
return '%s%s' % (os.stat(self.filename).st_ctime, self.filename)
! if self.name.find(uThe ) == 0:
return self.name[4:]
return self.name
***
*** 575,579
i.possible_player = []
i.files = None
! i.name= _('Play Title %s') % (title+1)
items.append(i)
--- 578,582
i.possible_player = []
i.files = None
! i.name= Unicode(_('Play Title %s')) % (title+1)
items.append(i)
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video/plugins bookmarker.py,1.10,1.11
Update of /cvsroot/freevo/freevo/src/video/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19090/src/video/plugins
Modified Files:
bookmarker.py
Log Message:
some unicode fixes
Index: bookmarker.py
===
RCS file: /cvsroot/freevo/freevo/src/video/plugins/bookmarker.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** bookmarker.py 11 Feb 2004 20:12:29 - 1.10
--- bookmarker.py 22 Feb 2004 20:33:48 - 1.11
***
*** 21,24
--- 21,27
# ---
# $Log$
+ # Revision 1.11 2004/02/22 20:33:48 dischi
+ # some unicode fixes
+ #
# Revision 1.10 2004/02/11 20:12:29 dischi
# use new mmpython mpeg seek feature
***
*** 115,119
time = '%0.2d:%0.2d:%0.2d' % (hour,min,sec)
# set a new title
! file.name = _('Jump to %s') % (time)
if hasattr(file, 'tv_show'):
del file.tv_show
--- 118,122
time = '%0.2d:%0.2d:%0.2d' % (hour,min,sec)
# set a new title
! file.name = Unicode(_('Jump to %s') % (time))
if hasattr(file, 'tv_show'):
del file.tv_show
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main main.py,1.40,1.41
Update of /cvsroot/freevo/freevo/src/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21881 Modified Files: main.py Log Message: add Unicode error warning Index: main.py === RCS file: /cvsroot/freevo/freevo/src/skins/main/main.py,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** main.py 18 Feb 2004 21:54:03 - 1.40 --- main.py 22 Feb 2004 20:46:09 - 1.41 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.41 2004/02/22 20:46:09 dischi + # add Unicode error warning + # # Revision 1.40 2004/02/18 21:54:03 dischi # small update needed for the new gui code *** *** 78,81 --- 81,85 import os, copy import stat + import traceback import config *** *** 542,551 self.all_areas= getattr(self, '%s_areas' % type) - self.last_draw = type, object, menu ! self.screen.clear() ! for a in self.all_areas: ! a.draw(settings, object, menu, style, type, self.force_redraw) ! osd.update([self.screen.show(self.force_redraw)]) ! self.force_redraw = False --- 546,575 self.all_areas= getattr(self, '%s_areas' % type) ! self.last_draw = type, object, menu ! try: ! self.screen.clear() ! for a in self.all_areas: ! a.draw(settings, object, menu, style, type, self.force_redraw) ! if type == 'menu': ! x = 'ä' ! if x == u'ä': ! pass ! osd.update([self.screen.show(self.force_redraw)]) ! self.force_redraw = False ! except UnicodeError, e: ! print '**' ! print 'Unicode Error: %s' % e ! print 'Please report the following lines to the freevo mailing list' ! print 'or with the subject \'[Freevo-Bugreport\] Unicode\' to' ! print '[EMAIL PROTECTED]' ! print ! print traceback.print_exc() ! print ! print type, object ! if type == 'menu': ! for i in object.menustack[-1].choices: ! print i ! print ! raise UnicodeError, e --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main main.py,1.41,1.42
Update of /cvsroot/freevo/freevo/src/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21963 Modified Files: main.py Log Message: oops, remove test code Index: main.py === RCS file: /cvsroot/freevo/freevo/src/skins/main/main.py,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** main.py 22 Feb 2004 20:46:09 - 1.41 --- main.py 22 Feb 2004 20:46:46 - 1.42 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.42 2004/02/22 20:46:46 dischi + # oops, remove test code + # # Revision 1.41 2004/02/22 20:46:09 dischi # add Unicode error warning *** *** 553,560 for a in self.all_areas: a.draw(settings, object, menu, style, type, self.force_redraw) - if type == 'menu': - x = 'ä' - if x == u'ä': - pass osd.update([self.screen.show(self.force_redraw)]) self.force_redraw = False --- 556,559 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/gui ProgressBox.py,1.3,1.4
Update of /cvsroot/freevo/freevo/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25018 Modified Files: ProgressBox.py Log Message: bugfix when setting width Index: ProgressBox.py === RCS file: /cvsroot/freevo/freevo/src/gui/ProgressBox.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ProgressBox.py 18 Feb 2004 21:52:04 - 1.3 --- ProgressBox.py 21 Feb 2004 19:32:32 - 1.4 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.4 2004/02/21 19:32:32 dischi + # bugfix when setting width + # # Revision 1.3 2004/02/18 21:52:04 dischi # Major GUI update: *** *** 71,75 icon, vertical_expansion, text_prop, parent) ! self.progressbar = Progressbar(full=full, width=self.width-20) self.add_child(self.progressbar) --- 74,78 icon, vertical_expansion, text_prop, parent) ! self.progressbar = Progressbar(full=full, width=self.content.width-20) self.add_child(self.progressbar) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/gui InputBox.py,1.14,1.15 LetterBoxGroup.py,1.14,1.15 __init__.py,1.12,1.13 LetterBox.py,1.15,NONE PasswordInputBox.py,1.9,NONE PasswordLetterBox.py,1.6,NONE
Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25173
Modified Files:
InputBox.py LetterBoxGroup.py __init__.py
Removed Files:
LetterBox.py PasswordInputBox.py PasswordLetterBox.py
Log Message:
enhance input box, merge password and normal input
Index: InputBox.py
===
RCS file: /cvsroot/freevo/freevo/src/gui/InputBox.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** InputBox.py 18 Feb 2004 21:52:04 - 1.14
--- InputBox.py 21 Feb 2004 19:33:24 - 1.15
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.15 2004/02/21 19:33:24 dischi
+ # enhance input box, merge password and normal input
+ #
# Revision 1.14 2004/02/18 21:52:04 dischi
# Major GUI update:
***
*** 66,69
--- 69,73
heightInteger
text String to print.
+ type 'normal' or 'password'
icon icon
text_prop A dict of 3 elements composing text proprieties:
***
*** 74,78
! def __init__(self, text, handler=None, x=None, y=None, width=0, height=0,
icon=None, vertical_expansion=1, text_prop=None, parent='osd'):
--- 78,82
! def __init__(self, text, handler=None, type='text', x=None, y=None, width=0,
height=0,
icon=None, vertical_expansion=1, text_prop=None, parent='osd'):
***
*** 80,118
icon, vertical_expansion, text_prop, parent)
! self.lbg = LetterBoxGroup()
self.add_child(self.lbg)
!
def eventhandler(self, event):
! if event == INPUT_LEFT:
! self.lbg.change_selected_box('left')
! self.draw(update=True)
!
! elif event == INPUT_RIGHT:
! self.lbg.change_selected_box('right')
! self.draw(update=True)
!
! elif event == INPUT_ENTER:
self.destroy()
! if self.handler: self.handler(self.lbg.get_word())
! elif event == INPUT_EXIT:
self.destroy()
! elif event == INPUT_UP:
! self.lbg.get_selected_box().charUp()
! self.draw(update=True)
!
! elif event == INPUT_DOWN:
! self.lbg.get_selected_box().charDown()
! self.draw(update=True)
!
! elif event in (INPUT_0, INPUT_1, INPUT_2, INPUT_3,
!INPUT_4, INPUT_5, INPUT_6, INPUT_7,
!INPUT_8, INPUT_9, INPUT_0 ):
! self.lbg.get_selected_box().cycle_phone_char(event.arg)
! self.draw(update=True)
! else:
! return self.parent.eventhandler(event)
!
--- 84,105
icon, vertical_expansion, text_prop, parent)
! self.lbg = LetterBoxGroup(type=type)
self.add_child(self.lbg)
!
def eventhandler(self, event):
+ if self.lbg.eventhandler(event):
+ self.draw()
+ return True
! if event == INPUT_ENTER:
self.destroy()
! if self.handler:
! self.handler(self.lbg.get_word())
! return True
! if event == INPUT_EXIT:
self.destroy()
+ return True
! return self.parent.eventhandler(event)
Index: LetterBoxGroup.py
===
RCS file: /cvsroot/freevo/freevo/src/gui/LetterBoxGroup.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** LetterBoxGroup.py 18 Feb 2004 21:52:04 - 1.14
--- LetterBoxGroup.py 21 Feb 2004 19:33:24 - 1.15
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.15 2004/02/21 19:33:24 dischi
+ # enhance input box, merge password and normal input
+ #
# Revision 1.14 2004/02/18 21:52:04 dischi
# Major GUI update:
***
*** 53,66
import config
! from Container import Container
! from LayoutManagers import LayoutManager
! from LetterBox import *
! from PasswordLetterBox import *
!
class LetterBoxGroup(Container):
! left x coordinate. Integer
! top y coordinate. Integer
width Integer
heightInteger
--- 56,69
import config
! from GUIObject import Align
! from Container import Container
! from LayoutManagers import LayoutManager
! from Button import Button
! from event import *
class LetterBoxGroup(Container):
! x x coordinate. Integer
! y y coordinate. Integer
width Integer
heightInteger
***
*** 73,84
[Freevo-cvslog] freevo/src/tv program_search.py,1.12,1.13
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25231
Modified Files:
program_search.py
Log Message:
use eventhandler from letter box
Index: program_search.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/program_search.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** program_search.py 18 Feb 2004 21:55:11 - 1.12
--- program_search.py 21 Feb 2004 19:33:56 - 1.13
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.13 2004/02/21 19:33:56 dischi
+ # use eventhandler from letter box
+ #
# Revision 1.12 2004/02/18 21:55:11 dischi
# update to new gui code
***
*** 161,199
if self.get_selected_child() == self.lbg:
! if event == em.INPUT_LEFT:
! self.lbg.change_selected_box('left')
! self.draw()
! return
!
! elif event == em.INPUT_RIGHT:
! self.lbg.change_selected_box('right')
self.draw()
! return
! elif event == em.INPUT_ENTER:
self.searchProg(self.lbg.get_word())
self.draw()
! return
!
! elif event == em.INPUT_UP:
! self.lbg.get_selected_box().charUp()
! self.draw()
! return
!
! elif event == em.INPUT_DOWN:
! self.lbg.get_selected_box().charDown()
! self.draw()
! return
! elif event == em.MENU_PAGEDOWN:
self.lbg.get_selected_box().toggle_selected()
self.results.toggle_selected_index(0)
self.draw()
! return
!
! elif event in em.INPUT_ALL_NUMBERS:
! self.lbg.get_selected_box().cycle_phone_char(event)
! self.draw()
! return
elif self.get_selected_child() == self.results:
--- 164,181
if self.get_selected_child() == self.lbg:
! if self.lbg.eventhandler(event):
self.draw()
! return True
! if event == em.INPUT_ENTER:
self.searchProg(self.lbg.get_word())
self.draw()
! return True
! if event == em.MENU_PAGEDOWN:
self.lbg.get_selected_box().toggle_selected()
self.results.toggle_selected_index(0)
self.draw()
! return True
elif self.get_selected_child() == self.results:
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/gui VideoBox.py,1.3,NONE Image.py,1.5,NONE
Update of /cvsroot/freevo/freevo/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25370 Removed Files: VideoBox.py Image.py Log Message: moved to WIP/gui --- VideoBox.py DELETED --- --- Image.py DELETED --- --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/share/skins/main basic.fxd,1.7,1.8 blurr2.fxd,1.46,1.47
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25758/main Modified Files: basic.fxd blurr2.fxd Log Message: make larger border Index: basic.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/basic.fxd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** basic.fxd 18 Feb 2004 21:56:30 - 1.7 --- basic.fxd 21 Feb 2004 19:36:28 - 1.8 *** *** 276,289 layout label=popup background ! rectangle color=0x00 size=1 bgcolor=widget background/ /background content type=text spacing=10 color=widget text font=widget !-- basic widget information -- item type=widget font=widget ! rectangle color=0xff bgcolor=widget item background/ /item !-- selected widgets -- item type=selected font=selected widget ! rectangle color=0x00 bgcolor=widget selected background/ /item !-- special button settings -- --- 276,289 layout label=popup background ! rectangle color=0x00 size=2 bgcolor=widget background/ /background content type=text spacing=10 color=widget text font=widget !-- basic widget information -- item type=widget font=widget ! rectangle color=0xff bgcolor=widget item background size=2/ /item !-- selected widgets -- item type=selected font=selected widget ! rectangle color=0x00 bgcolor=widget selected background size=2/ /item !-- special button settings -- Index: blurr2.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr2.fxd,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** blurr2.fxd 18 Feb 2004 21:56:30 - 1.46 --- blurr2.fxd 21 Feb 2004 19:36:28 - 1.47 *** *** 656,663 background rectangle x=5 y=5 size=0 bgcolor=0xa000 radius=5/ ! rectangle width=max-5 height=max-5 color=0x00 size=1 bgcolor=0xff radius=5/ ! rectangle x=3 y=3 width=max-11 height=max-11 color=0x00 ! size=1 bgcolor=widget background radius=5/ /background content x=8 y=8 width=max-21 height=max-21 --- 656,663 background rectangle x=5 y=5 size=0 bgcolor=0xa000 radius=5/ ! rectangle width=max-5 height=max-5 color=0x00 size=2 bgcolor=0xff radius=5/ ! rectangle x=5 y=5 width=max-15 height=max-15 color=0x00 ! size=2 bgcolor=widget background radius=5/ /background content x=8 y=8 width=max-21 height=max-21 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/gui Button.py,1.18,1.19
Update of /cvsroot/freevo/freevo/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25819 Modified Files: Button.py Log Message: only draw border when needed Index: Button.py === RCS file: /cvsroot/freevo/freevo/src/gui/Button.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Button.py 18 Feb 2004 21:52:04 - 1.18 --- Button.py 21 Feb 2004 19:37:01 - 1.19 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.19 2004/02/21 19:37:01 dischi + # only draw border when needed + # # Revision 1.18 2004/02/18 21:52:04 dischi # Major GUI update: *** *** 149,155 self.surface = self.get_surface() ! self.osd.drawroundbox(0, 0, self.width, self.height, ! rect.bgcolor, rect.size, rect.color, ! rect.radius, self.surface) Container._draw(self) --- 152,163 self.surface = self.get_surface() ! if not self.border: ! self.osd.drawroundbox(0, 0, self.width, self.height, ! rect.bgcolor, rect.size, rect.color, ! rect.radius, self.surface) ! else: ! self.osd.drawroundbox(0, 0, self.width, self.height, ! rect.bgcolor, 0, rect.color, ! 0, self.surface) Container._draw(self) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src directory.py,1.118,1.119
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26176/src
Modified Files:
directory.py
Log Message:
use new gui box for password
Index: directory.py
===
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** directory.py16 Feb 2004 17:57:04 - 1.118
--- directory.py21 Feb 2004 19:39:04 - 1.119
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.119 2004/02/21 19:39:04 dischi
+ # use new gui box for password
+ #
# Revision 1.118 2004/02/16 17:57:04 dischi
# use ucmp to compare
***
*** 143,147
from playlist import Playlist
from event import *
! from gui import PasswordInputBox, AlertBox, ProgressBox
all_variables = [('DIRECTORY_SORT_BY_DATE', _('Directory Sort By Date'),
--- 146,150
from playlist import Playlist
from event import *
! from gui import InputBox, AlertBox, ProgressBox
all_variables = [('DIRECTORY_SORT_BY_DATE', _('Directory Sort By Date'),
***
*** 566,570
self.arg = arg
self.menuw = menuw
! pb = PasswordInputBox(text=_('Enter Password'), handler=self.pass_cmp_cb)
pb.show()
else:
--- 569,574
self.arg = arg
self.menuw = menuw
! pb = InputBox(text=_('Enter Password'), handler=self.pass_cmp_cb,
! type='password')
pb.show()
else:
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util extendedmeta.py,1.8,1.9
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27078
Modified Files:
extendedmeta.py
Log Message:
unicode fix
Index: extendedmeta.py
===
RCS file: /cvsroot/freevo/freevo/src/util/extendedmeta.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** extendedmeta.py 13 Feb 2004 17:33:42 - 1.8
--- extendedmeta.py 21 Feb 2004 19:44:05 - 1.9
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.9 2004/02/21 19:44:05 dischi
+ # unicode fix
+ #
# Revision 1.8 2004/02/13 17:33:42 dischi
# no defaults for addPathDB
***
*** 236,244
def strcmp(self, s1, s2):
if not s1 or not s2:
return s1 or s2
if s1 == various or s2 == various:
return various
! # print 'cmp: %s %s ' % ( s1, s2)
if s1.replace(' ', '').lower() == s2.replace(' ', '').lower():
return s1
--- 239,250
def strcmp(self, s1, s2):
+ s1 = Unicode(s1)
+ s2 = Unicode(s2)
+
if not s1 or not s2:
return s1 or s2
if s1 == various or s2 == various:
return various
!
if s1.replace(' ', '').lower() == s2.replace(' ', '').lower():
return s1
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main tvlisting_area.py,1.17,1.18
Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28397
Modified Files:
tvlisting_area.py
Log Message:
unicode fix
Index: tvlisting_area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/tvlisting_area.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tvlisting_area.py 4 Feb 2004 23:01:10 - 1.17
--- tvlisting_area.py 21 Feb 2004 19:50:39 - 1.18
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.18 2004/02/21 19:50:39 dischi
+ # unicode fix
+ #
# Revision 1.17 2004/02/04 23:01:10 outlyer
# Remove some debugging Dischi left in... but the good news is the @*!
***
*** 371,377
# TODO:
#* This is going to be SLOW for large schedules
! #* We should have a skin setting for recording background
color
#* I dunno what else.
! # I will work on this soon, but think of this as a proof of
concept.
if recordingshows:
for recprogs in recordingshows:
--- 374,382
# TODO:
#* This is going to be SLOW for large schedules
! #* We should have a skin setting for recording
! # background color
#* I dunno what else.
! # I will work on this soon, but think of this as a
! # proof of concept.
if recordingshows:
for recprogs in recordingshows:
***
*** 379,383
val = selected_val
! if prg.title == _('This channel has no data loaded'):
val = copy.copy(val)
val.align='center'
--- 384,388
val = selected_val
! if prg.title == Unicode(_('This channel has no data loaded')):
val = copy.copy(val)
val.align='center'
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main tvlisting_area.py,1.18,1.19
Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31215
Modified Files:
tvlisting_area.py
Log Message:
unicode fix (again)
Index: tvlisting_area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/tvlisting_area.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tvlisting_area.py 21 Feb 2004 19:50:39 - 1.18
--- tvlisting_area.py 21 Feb 2004 20:03:45 - 1.19
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.19 2004/02/21 20:03:45 dischi
+ # unicode fix (again)
+ #
# Revision 1.18 2004/02/21 19:50:39 dischi
# unicode fix
***
*** 384,391
val = selected_val
! if prg.title == Unicode(_('This channel has no data loaded')):
! val = copy.copy(val)
! val.align='center'
!
if x0 x1:
break
--- 387,397
val = selected_val
! try:
! if prg.title == _('This channel has no data loaded'):
! val = copy.copy(val)
! val.align='center'
! except UnicodeError:
! pass
!
if x0 x1:
break
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video videoitem.py,1.126,1.127
Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15251
Modified Files:
videoitem.py
Log Message:
add parent in dvd menu
Index: videoitem.py
===
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** videoitem.py19 Feb 2004 04:57:58 - 1.126
--- videoitem.py20 Feb 2004 18:53:23 - 1.127
***
*** 11,17
# ---
# $Log$
# Revision 1.126 2004/02/19 04:57:58 gsbarbieri
! # Support Web Interface i18n.
! # To use this, I need to get the gettext() translations in unicode, so some changes
are required to files that use print _('string'), need to make them print
String(_('string')).
#
# Revision 1.125 2004/02/15 15:22:42 dischi
--- 11,19
# ---
# $Log$
+ # Revision 1.127 2004/02/20 18:53:23 dischi
+ # add parent in dvd menu
+ #
# Revision 1.126 2004/02/19 04:57:58 gsbarbieri
! # Support i18n.
#
# Revision 1.125 2004/02/15 15:22:42 dischi
***
*** 555,558
--- 557,561
if len(self.info['tracks']) == 1:
i=copy.copy(self)
+ i.parent = self
i.possible_player = []
i.set_url(self.url + '1', False)
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main main.py,1.39,1.40
Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17906
Modified Files:
main.py
Log Message:
small update needed for the new gui code
Index: main.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/main.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** main.py 14 Feb 2004 13:00:39 - 1.39
--- main.py 18 Feb 2004 21:54:03 - 1.40
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.40 2004/02/18 21:54:03 dischi
+ # small update needed for the new gui code
+ #
# Revision 1.39 2004/02/14 13:00:39 dischi
# function to return the settings
***
*** 400,407
shadow attributes: visible, color, x, y
-
menu = self.__find_current_menu__(widget)
! if menu and menu.skin_settings:
settings = menu.skin_settings
else:
--- 403,409
shadow attributes: visible, color, x, y
menu = self.__find_current_menu__(widget)
! if menu and hasattr(menu, 'skin_settings') and menu.skin_settings:
settings = menu.skin_settings
else:
***
*** 410,437
layout = settings.popup
! background = None
!
for bg in layout.background:
if isinstance(bg, xml_skin.Image):
! background = ( 'image', bg)
elif isinstance(bg, xml_skin.Rectangle):
! background = ( 'rectangle', bg)
!
! button_default = None
! button_selected = None
!
! spacing = layout.content.spacing
! color = layout.content.color
!
! if layout.content.types.has_key('default'):
! button_default = layout.content.types['default']
!
! if layout.content.types.has_key('selected'):
! button_selected = layout.content.types['selected']
! return (background, spacing, color, layout.content.font,
! button_default, button_selected)
-
def get_font(self, name):
--- 412,424
layout = settings.popup
! background = []
for bg in layout.background:
if isinstance(bg, xml_skin.Image):
! background.append(( 'image', bg))
elif isinstance(bg, xml_skin.Rectangle):
! background.append(( 'rectangle', bg))
! return layout.content, background
def get_font(self, name):
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins file_ops.py,1.18,1.19
Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18079
Modified Files:
file_ops.py
Log Message:
use new gui ConfirmBox feature to show handler message
Index: file_ops.py
===
RCS file: /cvsroot/freevo/freevo/src/plugins/file_ops.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** file_ops.py 14 Feb 2004 13:03:32 - 1.18
--- file_ops.py 18 Feb 2004 21:54:34 - 1.19
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.19 2004/02/18 21:54:34 dischi
+ # use new gui ConfirmBox feature to show handler message
+ #
# Revision 1.18 2004/02/14 13:03:32 dischi
# o make it possible to turn off the menu item for delete image/info
***
*** 90,94
self.menuw = menuw
ConfirmBox(text=_('Do you wish to delete\n \'%s\'?') % self.item.name,
!handler=self.delete_file, default_choice=1).show()
def confirm_info_delete(self, arg=None, menuw=None):
--- 93,98
self.menuw = menuw
ConfirmBox(text=_('Do you wish to delete\n \'%s\'?') % self.item.name,
!handler=self.delete_file, default_choice=1,
!handler_message=_('Deleting...')).show()
def confirm_info_delete(self, arg=None, menuw=None):
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv edit_favorite.py,1.7,1.8 program_display.py,1.24,1.25 program_search.py,1.11,1.12 view_favorites.py,1.7,1.8
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215
Modified Files:
edit_favorite.py program_display.py program_search.py
view_favorites.py
Log Message:
update to new gui code
Index: edit_favorite.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/edit_favorite.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** edit_favorite.py9 Jan 2004 19:35:49 - 1.7
--- edit_favorite.py18 Feb 2004 21:55:11 - 1.8
***
*** 10,13
--- 10,16
#---
# $Log$
+ # Revision 1.8 2004/02/18 21:55:11 dischi
+ # update to new gui code
+ #
# Revision 1.7 2004/01/09 19:35:49 outlyer
# Inherit DEBUG parameter from config, move some prints into DEBUG
***
*** 117,121
! PopupBox.__init__(self, text=_('Edit Favorite'), left=left, top=top,
width=width,
height=height)
--- 120,124
! PopupBox.__init__(self, text=_('Edit Favorite'), x=left, y=top, width=width,
height=height)
***
*** 239,277
def eventhandler(self, event, menuw=None):
#print 'SELECTED CHILD: %s' % self.get_selected_child()
if self.get_selected_child() == self.name_input:
if event == em.INPUT_LEFT:
self.name_input.change_selected_box('left')
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_RIGHT:
self.name_input.change_selected_box('right')
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_ENTER:
self.name_input.get_selected_box().toggle_selected()
self.chan_box.toggle_selected()
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_UP:
self.name_input.get_selected_box().charUp()
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_DOWN:
self.name_input.get_selected_box().charDown()
self.draw()
! self.osd.update(self.get_rect())
! return
elif event in em.INPUT_ALL_NUMBERS:
self.name_input.get_selected_box().cycle_phone_char(event)
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_EXIT:
self.destroy()
! return
elif self.get_selected_child() == self.chan_box:
--- 242,275
def eventhandler(self, event, menuw=None):
#print 'SELECTED CHILD: %s' % self.get_selected_child()
+
if self.get_selected_child() == self.name_input:
if event == em.INPUT_LEFT:
self.name_input.change_selected_box('left')
self.draw()
! return True
elif event == em.INPUT_RIGHT:
self.name_input.change_selected_box('right')
self.draw()
! return True
elif event == em.INPUT_ENTER:
self.name_input.get_selected_box().toggle_selected()
self.chan_box.toggle_selected()
self.draw()
! return True
elif event == em.INPUT_UP:
self.name_input.get_selected_box().charUp()
self.draw()
! return True
elif event == em.INPUT_DOWN:
self.name_input.get_selected_box().charDown()
self.draw()
! return True
elif event in em.INPUT_ALL_NUMBERS:
self.name_input.get_selected_box().cycle_phone_char(event)
self.draw()
! return True
elif event == em.INPUT_EXIT:
self.destroy()
! return True
elif self.get_selected_child() == self.chan_box:
***
*** 294,300
elif event == em.INPUT_EXIT:
self.destroy()
! return
! self.osd.update(self.get_rect())
! return
elif self.get_selected_child() == self.dow_box:
--- 292,296
elif event == em.INPUT_EXIT:
self.destroy()
! return True
elif self.get_selected_child() == self.dow_box:
***
*** 316,322
elif event == em.INPUT_EXIT:
self.destroy()
! return
[Freevo-cvslog] freevo/WIP/gui - New directory
Update of /cvsroot/freevo/freevo/WIP/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18367/gui Log Message: Directory /cvsroot/freevo/freevo/WIP/gui added to the repository --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/WIP/gui ZIndexRenderer.py,NONE,1.1 debug.py,NONE,1.1 listboxdemo.py,NONE,1.1 optiondemo.py,NONE,1.1 scrolldemo.py,NONE,1.1
Update of /cvsroot/freevo/freevo/WIP/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18829/gui Added Files: ZIndexRenderer.py debug.py listboxdemo.py optiondemo.py scrolldemo.py Log Message: Moved unneeded gui stuff to this dir --- NEW FILE: ZIndexRenderer.py --- #!/usr/bin/env python #--- # ZIndexRenderer - A class for handling layers of stuff. #--- # $Id: ZIndexRenderer.py,v 1.1 2004/02/18 21:56:50 dischi Exp $ # #--- # $Log: ZIndexRenderer.py,v $ # Revision 1.1 2004/02/18 21:56:50 dischi # Moved unneeded gui stuff to this dir # # Revision 1.11 2003/10/14 17:46:54 dischi # fix crash on DEBUG1 # # Revision 1.10 2003/10/12 10:56:19 dischi # change debug to use _debug_ and set level to 2 # # Revision 1.9 2003/07/12 10:11:34 dischi # load osd only when needed # #--- # # Freevo - A Home Theater PC framework # # Copyright (C) 2002 Krister Lagerstrom, et al. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of MER- # CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General # Public License for more details. # # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -- import config import osd import pygame _singleton = None def get_singleton(): Singleton is a good way to keep an object consistant over several instances.. global _singleton if _singleton == None: _singleton = ZIndexRenderer() return _singleton class ZIndexRenderer: Keeps track of what is on top of under what. A simple render class updating the erasearea information of all GUI objects visible on screen. Handling screen updates on erase and draw. This should give you GUI objects you can freely move around under or over other objects on screen. We probably won't use very complicated screens so often, but this should handle it. Notes: I'd really like thoughts on this. I'm thinking about inheriting a render class from pygame.sprite, but I can't find a real good use for it yet. Todo: Need to optimize the update functions. Only update rectangles which have coordinates inside the changing rectangle, only save the needed part of the the background. Implement 'raise' and 'lower' when I need them. def __init__(self): Don't know what to do with constructor yet, but I'm sure I want it. self.zindex = [] def get_zindex(self): Return a reference to the zindex. return self.zindex def add_object(self, object): Appends a reference to object to the zindex list. All objects are put 'on top of each other' in the order they are instanticed. Arguments: object - the object to add Returns: index - the index no in the stack. Note: Should objects themselves be alowed to raise or lower themselves in the stack? self.zindex.append(object) return self.zindex.index(object) def del_object(self, object): Really delete object from stack. Arguments: object to delete. Notes: Maybe rename to kill. self.zindex.remove(object) def update_hide(self, object): Updates all affected objects when there is a hide. Notify objects above the calling object to do a redraw. Does anyone have a better idea for a name for this function? return # oi = self.zindex.index(object) # if not len(self.zindex) (oi+1): # return # ol = self.zindex[(oi+1):] # t_bg = object.bg_image.convert() # for o in ol: # if o.is_visible(): # if o.border: # # Erase a little bigger area when we have borders. # x,y,w,h = o.border.get_erase_rect() # else: # x,y,w,h = o.get_rect() # o.bg_image.blit(t_bg, (x,y), (x,y,w,h)) # o._erase() # for o in ol: # if o.is_visible
[Freevo-cvslog] freevo/src osd.py,1.140,1.141
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18396 Modified Files: osd.py Log Message: Some osd updates for new gui code Index: osd.py === RCS file: /cvsroot/freevo/freevo/src/osd.py,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** osd.py 14 Feb 2004 13:05:03 - 1.140 --- osd.py 18 Feb 2004 21:55:44 - 1.141 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.141 2004/02/18 21:55:44 dischi + # Some osd updates for new gui code + # # Revision 1.140 2004/02/14 13:05:03 dischi # do not call skin.get_singleton() anymore *** *** 539,543 self.active = True ! def focused_app(self): if len(self.app_list): --- 542,550 self.active = True ! ! # some functions from pygame ! self.Surface = pygame.Surface ! self.polygon = pygame.draw.polygon ! def focused_app(self): if len(self.app_list): *** *** 771,780 self.screen.blit(box, (x0, y0)) else: - r = (x0, y0, x1-x0, y1-y0) c = self._sdlcol(color) ! if layer: ! pygame.draw.rect(layer, c, r, width) ! else: ! pygame.draw.rect(self.screen, c, r, width) --- 778,787 self.screen.blit(box, (x0, y0)) else: c = self._sdlcol(color) ! if not layer: ! layer = self.screen ! for i in range(0, width): ! # looks strange, but sometimes thinkness doesn't work ! pygame.draw.rect(layer, c, (x0+i, y0+i, x1-x0-2*i, y1-y0-2*i), 1) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo_config.py,1.319,1.320
Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19143
Modified Files:
freevo_config.py
Log Message:
Index: freevo_config.py
===
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.319
retrieving revision 1.320
diff -C2 -d -r1.319 -r1.320
*** freevo_config.py15 Feb 2004 19:15:41 - 1.319
--- freevo_config.py16 Feb 2004 14:41:31 - 1.320
***
*** 430,433
--- 430,434
# make it possible to detach the player
plugin.activate('audio.detach', level=20)
+ plugin.activate('audio.detachbar')
# use mplayer for tv
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util misc.py,1.28,1.29
Update of /cvsroot/freevo/freevo/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26250 Modified Files: misc.py Log Message: helper function for cmp Index: misc.py === RCS file: /cvsroot/freevo/freevo/src/util/misc.py,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** misc.py 13 Feb 2004 17:18:39 - 1.28 --- misc.py 16 Feb 2004 17:56:22 - 1.29 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.29 2004/02/16 17:56:22 dischi + # helper function for cmp + # # Revision 1.28 2004/02/13 17:18:39 dischi # do not skip after . for directories *** *** 392,395 --- 395,406 return result + + def ucmp(val1, val2): + + cmp function taking care of encoding + + return cmp(Unicode(val1), Unicode(val2)) + + def htmlenties2txt(string): --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src directory.py,1.117,1.118
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26525
Modified Files:
directory.py
Log Message:
use ucmp to compare
Index: directory.py
===
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** directory.py14 Feb 2004 15:45:03 - 1.117
--- directory.py16 Feb 2004 17:57:04 - 1.118
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.118 2004/02/16 17:57:04 dischi
+ # use ucmp to compare
+ #
# Revision 1.117 2004/02/14 15:45:03 dischi
# add support folder.fxd to hold fxditem tags
***
*** 691,706
self.dir_items.sort(lambda l, o: util.smartsort(l.dir,o.dir))
else:
! self.dir_items.sort(lambda l, o: cmp(l.dir.upper(), o.dir.upper()))
# sort playlist
! self.pl_items.sort(lambda l, o: cmp(l.name.upper(), o.name.upper()))
# sort normal items
if self.DIRECTORY_SORT_BY_DATE:
! self.play_items.sort(lambda l, o: cmp(l.sort('date').upper(),
! o.sort('date').upper()))
else:
! self.play_items.sort(lambda l, o: cmp(l.sort().upper(),
! o.sort().upper()))
if self['num_dir_items'] != len(self.dir_items):
--- 694,709
self.dir_items.sort(lambda l, o: util.smartsort(l.dir,o.dir))
else:
! self.dir_items.sort(lambda l, o: util.ucmp(l.dir.upper(), o.dir.upper()))
# sort playlist
! self.pl_items.sort(lambda l, o: util.ucmp(l.name.upper(), o.name.upper()))
# sort normal items
if self.DIRECTORY_SORT_BY_DATE:
! self.play_items.sort(lambda l, o: util.ucmp(l.sort('date').upper(),
! o.sort('date').upper()))
else:
! self.play_items.sort(lambda l, o: util.ucmp(l.sort().upper(),
! o.sort().upper()))
if self['num_dir_items'] != len(self.dir_items):
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/audio/plugins detach.py,1.13,1.14 detachbar.py,1.5,1.6
Update of /cvsroot/freevo/freevo/src/audio/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2058/plugins
Modified Files:
detach.py detachbar.py
Log Message:
better detachbar plugin, does not need stuff in other files now
Index: detach.py
===
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/detach.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** detach.py 6 Feb 2004 18:33:06 - 1.13
--- detach.py 15 Feb 2004 11:18:47 - 1.14
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.14 2004/02/15 11:18:47 dischi
+ # better detachbar plugin, does not need stuff in other files now
+ #
# Revision 1.13 2004/02/06 18:33:06 dischi
# fix mimetype handling
***
*** 74,86
self.show_item.type = 'detached_player'
def detach(self):
- # start detachbar
- self.detachbar = plugin.getbyname('audio.detachbar')
- if self.detachbar == None:
- plugin.activate('audio.detachbar')
- self.detachbar = plugin.getbyname('audio.detachbar')
-
gui = audio.player.get()
- gui.detachbar = self.detachbar
# hide the player and show the menu
--- 77,83
self.show_item.type = 'detached_player'
+
def detach(self):
gui = audio.player.get()
# hide the player and show the menu
***
*** 94,97
--- 91,95
if gui.item.parent:
gui.item.parent.menuw = None
+ rc.post_event(plugin.event('DETACH'))
Index: detachbar.py
===
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/detachbar.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** detachbar.py14 Feb 2004 13:05:04 - 1.5
--- detachbar.py15 Feb 2004 11:18:47 - 1.6
***
*** 29,43
# freevo specific
! import skin,audio.player,plugin
from event import *
# barstates
! BAR_HIDE=0 # timedout, reset and change poll interval
! BAR_SHOW=1 # show the bar
! BAR_IDLE=2 # wait for new track
class PluginInterface(plugin.DaemonPlugin):
! detachbar plugin.
def __init__(self):
--- 29,51
# freevo specific
! import skin
! import audio.player
! import plugin
from event import *
+
# barstates
! BAR_HIDE=0# timedout, reset and change poll interval
! BAR_SHOW=1# show the bar
! BAR_IDLE=2# wait for new track
class PluginInterface(plugin.DaemonPlugin):
! This plugin enables a small bar showing information about audio being played
! when detached with the detach plugin.
!
! If the idlebar is loaded and there is enough space left there, this plugin
! will draw itself there, otherwise it will draw at the right bottom of the
! screen.
def __init__(self):
***
*** 46,78
# tunables
self.TimeOut = 3 # 3 seconds till we hide the bar
! self.reset()
!
! # register in list (is this necessery?)
! self.plugin_name = 'audio.detachbar'
! plugin.register(self, self.plugin_name)
! self.image = None
!
! def reset(self):
! self.status=BAR_HIDE
! self.render = []
! self.player = None
! self.Timer = None
! self.bar = None
! self.setPoll(99)
- def eventhandler(self, event, menuw=None):
-
- Needed to catch the PLAY_START event,
- since it now integrates with player.py,
- this should probably be removed in the future
- (don't have to many dependencies)
-
- print event
- if self.player and event == PLAY_START:
- if self.status == BAR_IDLE:
- self.refresh()
- else:
- self.show()
- return False
def timer(self):
--- 54,59
# tunables
self.TimeOut = 3 # 3 seconds till we hide the bar
! self.hide()
def timer(self):
***
*** 88,112
return BAR_IDLE
def hide(self):
used when hiding the bar
! self.reset()
def show(self):
used when showing for the first time
! self.player = audio.player.get().player
self.setPoll(10)
- self.refresh()
-
- def refresh(self):
-
- used when updating new songinfo
-
self.getInfo()
self.status = BAR_SHOW
def stop(self):
--- 69,105
return BAR_IDLE
+
+ def eventhandler(self
[Freevo-cvslog] freevo/src/audio player.py,1.17,1.18
Update of /cvsroot/freevo/freevo/src/audio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2058
Modified Files:
player.py
Log Message:
better detachbar plugin, does not need stuff in other files now
Index: player.py
===
RCS file: /cvsroot/freevo/freevo/src/audio/player.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** player.py 14 Feb 2004 13:05:03 - 1.17
--- player.py 15 Feb 2004 11:18:47 - 1.18
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.18 2004/02/15 11:18:47 dischi
+ # better detachbar plugin, does not need stuff in other files now
+ #
# Revision 1.17 2004/02/14 13:05:03 dischi
# do not call skin.get_singleton() anymore
***
*** 84,96
self.player = None
self.running = False
- self.detachbar = None
! def getDetachbar(self):
! if self.detachbar == None:
! self.detachbar = plugin.getbyname('audio.detachbar')
! if self.detachbar == None:
! return False
! return True
!
def play(self, player=None):
global _player_
--- 87,92
self.player = None
self.running = False
!
def play(self, player=None):
global _player_
***
*** 122,127
if self.menuw and self.menuw.visible:
self.menuw.hide(clear=False)
- if self.getDetachbar():
- self.detachbar.hide()
self.running = True
--- 118,121
***
*** 164,169
self.player.stop()
- if self.getDetachbar():
- self.detachbar.stop()
self.running = False
if self.visible:
--- 158,161
***
*** 174,179
if not self.visible:
self.visible = 1
- if self.getDetachbar():
- self.detachbar.hide()
self.refresh()
rc.app(self.player)
--- 166,169
***
*** 184,189
self.visible = 0
skin.clear()
- if self.getDetachbar():
- self.detachbar.show()
rc.app(None)
--- 174,177
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/share/skins/main blurr2.fxd,1.41,1.42
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2370 Modified Files: blurr2.fxd Log Message: do not show the name for playlists Index: blurr2.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr2.fxd,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** blurr2.fxd 14 Feb 2004 19:33:52 - 1.41 --- blurr2.fxd 15 Feb 2004 11:20:42 - 1.42 *** *** 199,203 newline/ /if ! if expression=not album and not artist text font=info tagline expression=name mode=soft / newline/ --- 199,203 newline/ /if ! if expression=not type == 'playlist' and not album and not artist text font=info tagline expression=name mode=soft / newline/ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins mediamenu.py,1.33,1.34
Update of /cvsroot/freevo/freevo/src/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4247 Modified Files: mediamenu.py Log Message: auto select item if there is only one Index: mediamenu.py === RCS file: /cvsroot/freevo/freevo/src/plugins/mediamenu.py,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** mediamenu.py5 Feb 2004 19:48:49 - 1.33 --- mediamenu.py15 Feb 2004 11:33:19 - 1.34 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.34 2004/02/15 11:33:19 dischi + # auto select item if there is only one + # # Revision 1.33 2004/02/05 19:48:49 dischi # handle directory stuff as strings *** *** 223,227 ! item_menu = menu.Menu(menutitle, self.main_menu_generate(), item_types = '%s main menu' % self.display_type, umount_all=1, reload_func = self.reload) --- 226,237 ! items = self.main_menu_generate() ! ! # autoselect one item ! if len(items) == 1: ! items[0](menuw=menuw) ! return ! ! item_menu = menu.Menu(menutitle, items, item_types = '%s main menu' % self.display_type, umount_all=1, reload_func = self.reload) *** *** 271,275 menuw.init_page() menuw.refresh() ! return True if event in (PLAY_END, USER_END, STOP) and event.context != 'menu': --- 281,286 menuw.init_page() menuw.refresh() ! # others may need this event, too ! return False if event in (PLAY_END, USER_END, STOP) and event.context != 'menu': --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins rom_drives.py,1.56,1.57
Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19926
Modified Files:
rom_drives.py
Log Message:
remove old stuff
Index: rom_drives.py
===
RCS file: /cvsroot/freevo/freevo/src/plugins/rom_drives.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** rom_drives.py 12 Feb 2004 12:20:55 - 1.56
--- rom_drives.py 15 Feb 2004 15:29:47 - 1.57
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.57 2004/02/15 15:29:47 dischi
+ # remove old stuff
+ #
# Revision 1.56 2004/02/12 12:20:55 dischi
# some media info fixes for directory
***
*** 540,552
media.item.info.mmdata = data
-
- # copy configure options from track[0] to main item
- # for playback
- for k in ('audio', 'subtitles', 'chapters' ):
- if data['tracks'][0].has_key(k):
- if not data.has_key(k):
- data[k] = data['tracks'][0][k]
-
- media.item.num_titles = len(data['tracks'])
return
--- 543,546
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util mediainfo.py,1.28,1.29
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20068
Modified Files:
mediainfo.py
Log Message:
improved item with track storage
Index: mediainfo.py
===
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** mediainfo.py14 Feb 2004 13:05:04 - 1.28
--- mediainfo.py15 Feb 2004 15:30:52 - 1.29
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.29 2004/02/15 15:30:52 dischi
+ # improved item with track storage
+ #
# Revision 1.28 2004/02/14 13:05:04 dischi
# do not call skin.get_singleton() anymore
***
*** 217,224
filename = filename[filename.rfind('/')+1:]
- # print dirname
- # print dirname.__class__
- # print self.current_cachedir
- # print self.current_cachedir.__class__
if dirname != self.current_cachedir:
self.load_cache(dirname)
--- 220,223
***
*** 281,288
ret = {}
- if hasattr(object, 'tracks'):
- # do not simplifiy dvds on disc/vcds cue/bin
- return object
-
for k in object.keys:
if not k in self.uncachable_keys and getattr(object,k) != None:
--- 280,283
***
*** 300,309
--- 295,311
for o in getattr(object, k):
ret[k].append(self.simplify(o))
+
if hasattr(object, 'subtitles') and object.subtitles:
# add subtitles for AVCORE
ret['subtitles'] = object.subtitles
+
if hasattr(object, 'mime'):
# mimetype may be good to have :-)
ret['mime'] = object.mime
+
+ # something with tracks (e.g. dvd on disc)
+ if hasattr(object, 'tracks'):
+ ret['tracks'] = object['tracks']
+
return ret
***
*** 316,320
if info:
info = self.simplify(info)
! info['title:filename'] = Unicode(util.getname(filename))
if info.has_key('video'):
for video in info['video']:
--- 318,327
if info:
info = self.simplify(info)
! name = util.getname(filename)
! if name == name.upper() and info.has_key('type') and \
!info['type'] in ('DVD', 'VCD'):
! name = util.getname(filename.lower())
! info['title:filename'] = name
!
if info.has_key('video'):
for video in info['video']:
***
*** 323,326
--- 330,343
(info.has_key(variable) and info[variable]):
info[variable] = video[variable]
+
+ if info.has_key('tracks') and info['tracks'] and not
info.has_key('length'):
+ info['length'] = 0
+ for track in info['tracks']:
+ if track.has_key('length'):
+ info['length'] += track['length']
+ if info['tracks'][0].has_key('length') and \
+info['tracks'][0]['length'] * len(info['tracks']) ==
info['length']:
+ # badly masted dvd
+ info['length'] = info['tracks'][0]['length']
return info
return {}
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src directory.py,1.114,1.115
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30121 Modified Files: directory.py Log Message: fix unicode crash Index: directory.py === RCS file: /cvsroot/freevo/freevo/src/directory.py,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** directory.py13 Feb 2004 17:18:38 - 1.114 --- directory.py14 Feb 2004 12:06:29 - 1.115 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.115 2004/02/14 12:06:29 dischi + # fix unicode crash + # # Revision 1.114 2004/02/13 17:18:38 dischi # do not skip after . for directories *** *** 750,754 if selected_pos != -1: for i in items: ! if i.id() == selected_id: self.menu.selected = i break --- 753,757 if selected_pos != -1: for i in items: ! if Unicode(i.id()) == Unicode(selected_id): self.menu.selected = i break --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video fxdhandler.py,1.17,1.18
Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6329
Modified Files:
fxdhandler.py
Log Message:
make sure url is a string
Index: fxdhandler.py
===
RCS file: /cvsroot/freevo/freevo/src/video/fxdhandler.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** fxdhandler.py 8 Feb 2004 05:33:30 - 1.17
--- fxdhandler.py 14 Feb 2004 12:59:26 - 1.18
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.18 2004/02/14 12:59:26 dischi
+ # make sure url is a string
+ #
# Revision 1.17 2004/02/08 05:33:30 outlyer
# Removed some debug print.
***
*** 84,88
parse a subitem from video
! filename = fxd.gettext(node)
media_id = fxd.getattr(node, 'media-id')
mode = node.name
--- 87,91
parse a subitem from video
! filename = String(fxd.gettext(node))
media_id = fxd.getattr(node, 'media-id')
mode = node.name
***
*** 102,106
if mode == 'url':
return id, filename, media_id, options, player, playlist
! return id, '%s://%s' % (mode, filename), media_id, options, player, playlist
--- 105,109
if mode == 'url':
return id, filename, media_id, options, player, playlist
! return id, String('%s://%s' % (mode, filename)), media_id, options, player,
playlist
***
*** 108,112
dirname = os.path.dirname(fxd.filename)
-
image = ''
title = fxd.getattr(node, 'title')
--- 111,114
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main main.py,1.38,1.39
Update of /cvsroot/freevo/freevo/src/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6585 Modified Files: main.py Log Message: function to return the settings Index: main.py === RCS file: /cvsroot/freevo/freevo/src/skins/main/main.py,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** main.py 6 Feb 2004 18:24:39 - 1.38 --- main.py 14 Feb 2004 13:00:39 - 1.39 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.39 2004/02/14 13:00:39 dischi + # function to return the settings + # # Revision 1.38 2004/02/06 18:24:39 dischi # make to possible to override busy icon with skin *** *** 86,90 osd = osd.get_singleton() - ### # Skin main functions --- 89,92 *** *** 101,105 Area = Skin_Area - def __init__(self): --- 103,106 *** *** 314,317 --- 315,325 ret += [ ( name, image, skin ) ] return ret + + + def get_settings(self): + + return the current loaded settings + + return self.settings --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src skin.py,1.9,1.10
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6723
Modified Files:
skin.py
Log Message:
copy all needed function from the skin implementation to this module
Index: skin.py
===
RCS file: /cvsroot/freevo/freevo/src/skin.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** skin.py 6 Dec 2003 16:49:09 - 1.9
--- skin.py 14 Feb 2004 13:01:08 - 1.10
***
*** 6,29
#
# Notes:
# Todo:
#
# ---
# $Log$
# Revision 1.9 2003/12/06 16:49:09 dischi
# do not create a skin object for helpers
#
- # Revision 1.8 2003/11/28 19:26:36 dischi
- # renamed some config variables
- #
- # Revision 1.7 2003/09/23 13:42:01 outlyer
- # Removed more chatter.
- #
- # Revision 1.6 2003/09/14 20:09:36 dischi
- # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
- #
- # Revision 1.5 2003/08/23 12:51:41 dischi
- # removed some old CVS log messages
- #
- #
# ---
# Freevo - A Home Theater PC framework
--- 6,32
#
# Notes:
+ #Works as a middle layer between the users preferred skin and rest of
+ #the system.
+ #
+ #Which skin you want to use is set in freevo_config.py. This small
+ #module gets your skin preferences from the configuration file and loads
+ #the correct skin implementation into the system.
+ #
+ #The path to the skin implementation is also added to the system path.
+ #
+ #get_singleton() returns an initialized skin object which is kept unique
+ #and consistent throughout.
+ #
+ #
# Todo:
#
# ---
# $Log$
+ # Revision 1.10 2004/02/14 13:01:08 dischi
+ # copy all needed function from the skin implementation to this module
+ #
# Revision 1.9 2003/12/06 16:49:09 dischi
# do not create a skin object for helpers
#
# ---
# Freevo - A Home Theater PC framework
***
*** 47,69
# --- */
#endif
-
- Works as a middle layer between the users preferred skin and rest of
- the system.
-
- Which skin you want to use is set in freevo_config.py. This small
- module gets your skin preferences from the configuration file and loads
- the correct skin implementation into the system.
-
- The path to the skin implementation is also added to the system path.
-
- get_singleton() returns an initialized skin object which is kept unique
- and consistent throughout.
-
- __version__ = $Revision$
- __date__= $Date$
- __author__ = Krister Lagerstrom [EMAIL PROTECTED],
- Thomas malt [EMAIL PROTECTED] # See, I snuck it in again ;)
! import config # Freevo configuration.
import sys
import os.path
--- 50,55
# --- */
#endif
! import config
import sys
import os.path
***
*** 71,74
--- 57,67
_singleton = None
+ # a list of all functions the skin needs to have
+ __all__ = ( 'Rectange', 'Image', 'Area', 'register', 'delete', 'set_base_fxd',
+ 'load', 'get_skins', 'get_settings', 'toggle_display_style',
+ 'get_display_style', 'get_popupbox_style', 'get_font', 'get_icon',
+ 'items_per_page', 'clear', 'redraw', 'prepare', 'draw' )
+
+
def get_singleton():
***
*** 92,93
--- 85,111
return _singleton
+
+ if __freevo_app__ == 'main':
+ # init the skin
+ get_singleton()
+
+ # the all function to this module
+ for i in __all__:
+ exec('%s = _singleton.%s' % (i,i))
+
+ else:
+ # set all skin functions to the dummy function so nothing
+ # bad happens when we call it from inside a helper
+ class dummy_class:
+ def __init__(*arg1, **arg2):
+ pass
+
+ def dummy_function(*arg1, **arg2):
+ pass
+
+ for i in __all__:
+ if i[0] == i[0].upper():
+ exec('%s = dummy_class' % i)
+ else:
+ exec('%s = dummy_function' % i)
+
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src menu.py,1.85,1.86
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6868
Modified Files:
menu.py
Log Message:
o remove unneeded functions
o add function to delete the submenu or do nothing (avoid duplicate code)
o use new skin functions and do not call get_singleton()
Index: menu.py
===
RCS file: /cvsroot/freevo/freevo/src/menu.py,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** menu.py 12 Feb 2004 16:27:06 - 1.85
--- menu.py 14 Feb 2004 13:02:34 - 1.86
***
*** 10,13
--- 10,18
# ---
# $Log$
+ # Revision 1.86 2004/02/14 13:02:34 dischi
+ # o remove unneeded functions
+ # o add function to delete the submenu or do nothing (avoid duplicate code)
+ # o use new skin functions and do not call get_singleton()
+ #
# Revision 1.85 2004/02/12 16:27:06 dischi
# fix watermark problem once and for all
***
*** 21,30
# Revision 1.82 2004/02/04 22:32:42 gsbarbieri
# Changed LEFT/RIGHT behaviour.
! # Now in single column mode it behaves like BACK_ONE_MENU/SELECT and in multi-column
mode (2d menus) it goes one item LEFT/RIGHT (as before).
! #
! # This was asked in freevo-devel because it improve usability and it really does,
since you just have to use arrows (UP/DOWN,LEFT/RIGHT) to navigate.
#
! # Revision 1.81 2004/02/01 17:07:13 dischi
! # cosmetic changes
#
# Revision 1.80 2004/01/19 20:26:41 dischi
--- 26,34
# Revision 1.82 2004/02/04 22:32:42 gsbarbieri
# Changed LEFT/RIGHT behaviour.
! # Now in single column mode it behaves like BACK_ONE_MENU/SELECT and in
! # multi-column mode (2d menus) it goes one item LEFT/RIGHT (as before).
#
! # This was asked in freevo-devel because it improve usability and it really
! # does, since you just have to use arrows (UP/DOWN,LEFT/RIGHT) to navigate.
#
# Revision 1.80 2004/01/19 20:26:41 dischi
***
*** 77,85
from gui import GUIObject, AlertBox
- skin = skin.get_singleton()
class MenuItem(Item):
! Default item for the main menu actions
def __init__( self, name, action=None, arg=None, type=None, image=None,
--- 81,88
from gui import GUIObject, AlertBox
class MenuItem(Item):
! Default item for the menu. It includes one action
def __init__( self, name, action=None, arg=None, type=None, image=None,
***
*** 99,106
--- 102,115
def actions(self):
+
+ return the default action
+
return [ ( self.select, self.name ) ]
def select(self, arg=None, menuw=None):
+
+ call the default acion
+
if self.function:
self.function(arg=self.arg, menuw=menuw)
***
*** 109,113
class Menu:
!
def __init__(self, heading, choices, fxd_file=None, umount_all = 0,
reload_func = None, item_types = None, force_skin_layout = -1):
--- 118,124
class Menu:
!
! a Menu with Items for the MenuWidget
!
def __init__(self, heading, choices, fxd_file=None, umount_all = 0,
reload_func = None, item_types = None, force_skin_layout = -1):
***
*** 143,184
- def delete_item(self, item):
- try:
- pos = self.choices.index(item)
- except ValueError:
- # item not in list
- return
-
- self.choices.remove(item)
-
- if self.selected == item:
- if self.choices:
- self.selected = self.choices[max(pos-1,0)]
- else:
- self.selected = None
-
- if len(self.choices) = self.page_start:
- if self.page_start != 0:
- self.page_start = self.previous_page_start.pop()
-
-
def items_per_page(self):
return skin.items_per_page(('menu', self))
- def add_item(self, item, pos):
- try:
- sel_pos = self.choices.index(self.selected)
- except:
- sel_pos = 0
-
- self.choices.insert(pos, item)
-
- rows, cols = self.items_per_page()
- items_per_page = rows*cols
- if sel_pos = self.page_start + items_per_page - 1:
- self.previous_page_start.append(self.page_start)
- self.page_start += items_per_page
-
--- 154,164
def items_per_page(self):
+
+ return the number of items per page for this skin
+
return skin.items_per_page(('menu', self))
***
*** 225,228
--- 205,223
self.init_page()
+
+ def delete_submenu(self, refresh=True, reload=False):
+
+ Delete the last menu
[Freevo-cvslog] freevo/src/plugins file_ops.py,1.17,1.18
Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7251
Modified Files:
file_ops.py
Log Message:
o make it possible to turn off the menu item for delete image/info
o use new menu delete_submenu function
Index: file_ops.py
===
RCS file: /cvsroot/freevo/freevo/src/plugins/file_ops.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** file_ops.py 31 Jan 2004 13:15:14 - 1.17
--- file_ops.py 14 Feb 2004 13:03:32 - 1.18
***
*** 10,13
--- 10,17
# ---
# $Log$
+ # Revision 1.18 2004/02/14 13:03:32 dischi
+ # o make it possible to turn off the menu item for delete image/info
+ # o use new menu delete_submenu function
+ #
# Revision 1.17 2004/01/31 13:15:14 dischi
# only add the plugin if the parent is a dir
***
*** 22,70
# make it possible to delete only the image
#
- # Revision 1.13 2003/12/29 22:28:13 dischi
- # move to new Item attributes
- #
- # Revision 1.12 2003/11/28 20:08:57 dischi
- # renamed some config variables
- #
- # Revision 1.11 2003/11/22 12:24:39 dischi
- # add delete to directories
- #
- # Revision 1.10 2003/10/23 23:05:24 outlyer
- # Remove some debug.
- #
- # Revision 1.9 2003/10/21 21:17:42 gsbarbieri
- # Some more i18n improvements.
- #
- # Revision 1.8 2003/10/07 19:46:07 outlyer
- # Make it possible to delete playlists. I can't see how this change could
- # ever break anything, but as with the plugin, it's optional if this change
- # should be in the next release.
- #
- # Not being able to delete a playlist seems like a bug to me.
- #
- # Revision 1.7 2003/10/04 18:37:29 dischi
- # i18n changes and True/False usage
- #
- # Revision 1.6 2003/09/20 15:46:48 dischi
- # fxd and imdb patches from Eirik Meland
- #
- # Revision 1.5 2003/09/20 15:08:26 dischi
- # some adjustments to the missing testfiles
- #
- # Revision 1.4 2003/09/14 20:09:36 dischi
- # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
- #
- # Revision 1.3 2003/09/03 18:03:06 dischi
- # fix crash in DEBUG
- #
- # Revision 1.2 2003/08/31 17:18:33 dischi
- # exception handling
- #
- # Revision 1.1 2003/08/31 17:14:21 dischi
- # Move delete file from VideoItem into a global plugin. Now it's also
- # possible to remove audio and image files.
- #
- #
# ---
# Freevo - A Home Theater PC framework
--- 26,29
***
*** 100,103
--- 59,67
small plugin to delete files
+ def config(self):
+ return [ ('FILE_OPS_ALLOW_DELETE_IMAGE', True,
+ 'Add delete image to the menu.'),
+('FILE_OPS_ALLOW_DELETE_INFO', True,
+ 'Add delete info to the menu.') ]
def actions(self, item):
***
*** 116,122
if item.files.delete_possible():
items.append((self.confirm_delete, _('Delete'), 'delete'))
! if item.files.fxd_file:
items.append((self.confirm_info_delete, _('Delete info'),
'delete_info'))
! if item.files.image:
items.append((self.confirm_image_delete, _('Delete image'),
'delete_image'))
return items
--- 80,86
if item.files.delete_possible():
items.append((self.confirm_delete, _('Delete'), 'delete'))
! if item.files.fxd_file and config.FILE_OPS_ALLOW_DELETE_INFO:
items.append((self.confirm_info_delete, _('Delete info'),
'delete_info'))
! if item.files.image and config.FILE_OPS_ALLOW_DELETE_IMAGE:
items.append((self.confirm_image_delete, _('Delete image'),
'delete_image'))
return items
***
*** 147,151
self.item.files.delete()
if self.menuw:
! self.menuw.back_one_menu(arg='reload')
def delete_info(self):
--- 111,115
self.item.files.delete()
if self.menuw:
! self.menuw.delete_submenu(True, True)
def delete_info(self):
***
*** 153,157
self.safe_unlink(self.item.files.fxd_file)
if self.menuw:
! self.menuw.back_one_menu(arg='reload')
def delete_image(self):
--- 117,121
self.safe_unlink(self.item.files.fxd_file)
if self.menuw:
! self.menuw.delete_submenu(True, True)
def delete_image(self):
***
*** 162,164
self.item.image = None
if self.menuw:
! self.menuw.back_one_menu(arg='reload')
--- 126,128
self.item.image = None
if self.menuw:
! self.menuw.delete_submenu(True, True
[Freevo-cvslog] freevo/src/util mediainfo.py,1.27,1.28
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7509/util
Modified Files:
mediainfo.py
Log Message:
do not call skin.get_singleton() anymore
Index: mediainfo.py
===
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mediainfo.py13 Feb 2004 20:26:39 - 1.27
--- mediainfo.py14 Feb 2004 13:05:04 - 1.28
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.28 2004/02/14 13:05:04 dischi
+ # do not call skin.get_singleton() anymore
+ #
# Revision 1.27 2004/02/13 20:26:39 dischi
# small bugfix
***
*** 214,217
--- 217,224
filename = filename[filename.rfind('/')+1:]
+ # print dirname
+ # print dirname.__class__
+ # print self.current_cachedir
+ # print self.current_cachedir.__class__
if dirname != self.current_cachedir:
self.load_cache(dirname)
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/audio/plugins detachbar.py,1.4,1.5
Update of /cvsroot/freevo/freevo/src/audio/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7509/audio/plugins Modified Files: detachbar.py Log Message: do not call skin.get_singleton() anymore Index: detachbar.py === RCS file: /cvsroot/freevo/freevo/src/audio/plugins/detachbar.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** detachbar.py31 Jan 2004 14:41:55 - 1.4 --- detachbar.py14 Feb 2004 13:05:04 - 1.5 *** *** 121,130 if self.status == BAR_SHOW: ! skin.get_singleton().redraw() elif self.status == BAR_IDLE: self.status = self.timer() if self.status == BAR_HIDE: self.reset() ! skin.get_singleton().redraw() def draw(self, (type, object), osd): --- 121,130 if self.status == BAR_SHOW: ! skin.redraw() elif self.status == BAR_IDLE: self.status = self.timer() if self.status == BAR_HIDE: self.reset() ! skin.redraw() def draw(self, (type, object), osd): --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins tiny_osd.py,1.9,1.10
Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7509/plugins
Modified Files:
tiny_osd.py
Log Message:
do not call skin.get_singleton() anymore
Index: tiny_osd.py
===
RCS file: /cvsroot/freevo/freevo/src/plugins/tiny_osd.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tiny_osd.py 1 Feb 2004 09:18:06 - 1.9
--- tiny_osd.py 14 Feb 2004 13:05:04 - 1.10
***
*** 16,19
--- 16,22
# ---
# $Log$
+ # Revision 1.10 2004/02/14 13:05:04 dischi
+ # do not call skin.get_singleton() anymore
+ #
# Revision 1.9 2004/02/01 09:18:06 dischi
# fix drawing for skin objects
***
*** 108,115
font = renderer.get_font('osd')
except AttributeError:
! try:
! font = skin.get_singleton().settings.font['osd']
! except:
! font = skin.get_singleton().settings.font['default']
w = font.stringsize(self.message)
--- 111,115
font = renderer.get_font('osd')
except AttributeError:
! font = skin.get_font('osd')
w = font.stringsize(self.message)
***
*** 144,148
self.message = event.arg
if not rc.app() or not skin.get_singleton().force_redraw:
! skin.get_singleton().redraw()
elif hasattr(rc.app(), 'im_self') and hasattr(rc.app().im_self,
'redraw'):
rc.app().im_self.redraw()
--- 144,148
self.message = event.arg
if not rc.app() or not skin.get_singleton().force_redraw:
! skin.redraw()
elif hasattr(rc.app(), 'im_self') and hasattr(rc.app().im_self,
'redraw'):
rc.app().im_self.redraw()
***
*** 157,161
self.message = ''
if not rc.app() or not skin.get_singleton().force_redraw:
! skin.get_singleton().redraw()
elif hasattr(rc.app(), 'im_self') and hasattr(rc.app().im_self,
'redraw'):
rc.app().im_self.redraw()
--- 157,161
self.message = ''
if not rc.app() or not skin.get_singleton().force_redraw:
! skin.redraw()
elif hasattr(rc.app(), 'im_self') and hasattr(rc.app().im_self,
'redraw'):
rc.app().im_self.redraw()
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/audio player.py,1.16,1.17
Update of /cvsroot/freevo/freevo/src/audio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7509/audio
Modified Files:
player.py
Log Message:
do not call skin.get_singleton() anymore
Index: player.py
===
RCS file: /cvsroot/freevo/freevo/src/audio/player.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** player.py 8 Feb 2004 17:40:53 - 1.16
--- player.py 14 Feb 2004 13:05:03 - 1.17
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.17 2004/02/14 13:05:03 dischi
+ # do not call skin.get_singleton() anymore
+ #
# Revision 1.16 2004/02/08 17:40:53 dischi
# only register to skin when we are main
***
*** 62,67
import event
- skin = skin.get_singleton()
-
_player_ = None
--- 65,68
***
*** 207,210
! if __freevo_app__ == 'main':
! skin.register('player', ('screen', 'title', 'view', 'info', 'plugin'))
--- 208,211
! # register player to the skin
! skin.register('player', ('screen', 'title', 'view', 'info', 'plugin'))
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
