Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13847/src/plugins
Modified Files:
lcd.py
Log Message:
Improve unicode support using String() everywhere.
Index: lcd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/lcd.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** lcd.py 11 Jul 2004 11:14:53 -0000 1.19
--- lcd.py 11 Aug 2004 17:56:09 -0000 1.20
***************
*** 14,17 ****
--- 14,20 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.20 2004/08/11 17:56:09 gsbarbieri
+ # Improve unicode support using String() everywhere.
+ #
# Revision 1.19 2004/07/11 11:14:53 dischi
# lcd detach fixes from Magnus Schmidt
***************
*** 152,156 ****
None ),
"calendar" : ( "scroller",
! "1 2 %d 2 m 3 \"" + _( "Today is %s." ) + "%s\"",
"( self.width, time.strftime('%A, %d-%B'),
self.get_sepstrmscroll(time.strftime('%A, %d-%B')) )" ),
"clock" : ( "string",
--- 155,159 ----
None ),
"calendar" : ( "scroller",
! "1 2 %d 2 m 3 \"" + String(_( "Today is %s." )) +
"%s\"",
"( self.width, time.strftime('%A, %d-%B'),
self.get_sepstrmscroll(time.strftime('%A, %d-%B')) )" ),
"clock" : ( "string",
***************
*** 162,175 ****
"menu" :
{ "title_l" : ( "string",
! "1 1 '" + rjust(_( "Menu" ),4) + ": '",
None ),
"item_l" : ( "string",
! "1 2 '" + rjust(_( "Item" ),4) + ": '",
None ),
"type_l" : ( "string",
! "1 3 '" + rjust(_( "Type" ),4) + ": '",
None ),
"info_l" : ( "string",
! "1 4 '" + rjust(_( "Information" ),4) + ": '",
None ),
"title_v" : ( "scroller",
--- 165,178 ----
"menu" :
{ "title_l" : ( "string",
! "1 1 '" + rjust( String(_( "Menu" )), 4 ) + ": '",
None ),
"item_l" : ( "string",
! "1 2 '" + rjust( String(_( "Item" )), 4 ) + ": '",
None ),
"type_l" : ( "string",
! "1 3 '" + rjust( String(_( "Type" )), 4 ) + ": '",
None ),
"info_l" : ( "string",
! "1 4 '" + rjust( String(_( "Information" )), 4 ) +
": '",
None ),
"title_v" : ( "scroller",
***************
*** 189,199 ****
"audio_player" :
{ "music_l" : ( "string",
! "1 1 '" + rjust(_( "Music" ),5) + ": '",
None ),
"album_l" : ( "string",
! "1 2 '" + rjust(_( "Album" ),5) + ": '",
None ),
"artist_l" : ( "string",
! "1 3 '" + rjust(_( "Artist" ),5) + ": '",
None ),
"music_v" : ( "scroller",
--- 192,202 ----
"audio_player" :
{ "music_l" : ( "string",
! "1 1 '" + rjust( String(_( "Music" )), 5 ) + ": '",
None ),
"album_l" : ( "string",
! "1 2 '" + rjust( String(_( "Album" )), 5 ) + ": '",
None ),
"artist_l" : ( "string",
! "1 3 '" + rjust( String(_( "Artist" )), 5 ) + ":
'",
None ),
"music_v" : ( "scroller",
***************
*** 227,237 ****
"video_player" :
{ "video_l" : ( "string",
! "2 1 '" + rjust(_( "Video" ),5) + ": '",
None ),
"tag_l" : ( "string",
! "2 2 '" + rjust(_( "Tagline" ),5) + ": '",
None ),
"genre_l" : ( "string",
! "1 3 '" + rjust(_( "Genre" ),5) + ": '",
None ),
"video_v" : ( "scroller",
--- 230,240 ----
"video_player" :
{ "video_l" : ( "string",
! "2 1 '" + rjust( String(_( "Video" )), 5 ) + ": '",
None ),
"tag_l" : ( "string",
! "2 2 '" + rjust( String(_( "Tagline" )), 5 ) + ":
'",
None ),
"genre_l" : ( "string",
! "1 3 '" + rjust( String(_( "Genre" )), 5 ) + ": '",
None ),
"video_v" : ( "scroller",
***************
*** 266,279 ****
"tv" :
{ "chan_l" : ( "string",
! "1 1 '" + rjust(_( "Channel" ),4) + ": '",
None ),
"prog_l" : ( "string",
! "1 2 '" + rjust(_( "Program" ),4) + ": '",
None ),
"time_l" : ( "string",
! "1 3 '" + rjust(_( "Time" ),4) + ": '",
None ),
"desc_l" : ( "string",
! "1 4 '" + rjust(_( "Description" ),4) + ": '",
None ),
"chan_v" : ( "scroller",
--- 269,282 ----
"tv" :
{ "chan_l" : ( "string",
! "1 1 '" + rjust( String(_( "Channel" )), 4 ) + ":
'",
None ),
"prog_l" : ( "string",
! "1 2 '" + rjust( String(_( "Program" )), 4 ) + ":
'",
None ),
"time_l" : ( "string",
! "1 3 '" + rjust( String(_( "Time" )), 4 ) + ": '",
None ),
"desc_l" : ( "string",
! "1 4 '" + rjust( String(_( "Description" )), 4 ) +
": '",
None ),
"chan_v" : ( "scroller",
***************
*** 300,304 ****
None ),
"calendar" : ( "scroller",
! "1 2 %d 2 m 3 \"" + _( "Today is %s." ) + "%s\"",
"( self.width, time.strftime('%A, %d-%B'),
self.get_sepstrmscroll(time.strftime('%A, %d-%B')) )" ),
"clock" : ( "string",
--- 303,307 ----
None ),
"calendar" : ( "scroller",
! "1 2 %d 2 m 3 \"" + String(_( "Today is %s." )) +
"%s\"",
"( self.width, time.strftime('%A, %d-%B'),
self.get_sepstrmscroll(time.strftime('%A, %d-%B')) )" ),
"clock" : ( "string",
***************
*** 521,528 ****
"menu":
{ "title_l" : ( "string",
! "1 1 '" + rjust(_( "Menu" ),4) + ": '",
None ),
"item_l" : ( "string",
! "1 2 '" + rjust(_( "Item" ),4) + ": '",
None ),
"title_v" : ( "scroller",
--- 524,531 ----
"menu":
{ "title_l" : ( "string",
! "1 1 '" + rjust( String(_( "Menu" )), 4 ) + ": '",
None ),
"item_l" : ( "string",
! "1 2 '" + rjust( String(_( "Item" )), 4 ) + ": '",
None ),
"title_v" : ( "scroller",
***************
*** 536,540 ****
"audio_player":
{ "music_l" : ( "string",
! "1 1 '" + rjust(_( "Music" ),5) + ": '",
None ),
"music_v" : ( "scroller",
--- 539,543 ----
"audio_player":
{ "music_l" : ( "string",
! "1 1 '" + rjust( String(_( "Music" )), 5 ) + ": '",
None ),
"music_v" : ( "scroller",
***************
*** 563,567 ****
"video_player" :
{ "video_l" : ( "string",
! "2 1 '" + rjust(_( "Video" ),5) + ": '",
None ),
"video_v" : ( "scroller",
--- 566,570 ----
"video_player" :
{ "video_l" : ( "string",
! "2 1 '" + rjust( String(_( "Video" )), 5 ) + ": '",
None ),
"video_v" : ( "scroller",
***************
*** 591,598 ****
"tv":
{ "chan_l" : ( "string",
! "1 1 '" + rjust(_( "Channel" ),4) + ": '",
None ),
"prog_l" : ( "string",
! "1 2 '" + rjust(_( "Program" ),4) + ": '",
None ),
"chan_v" : ( "scroller",
--- 594,601 ----
"tv":
{ "chan_l" : ( "string",
! "1 1 '" + rjust( String(_( "Channel" )), 4 ) + ":
'",
None ),
"prog_l" : ( "string",
! "1 2 '" + rjust( String(_( "Program" )), 4 ) + ":
'",
None ),
"chan_v" : ( "scroller",
***************
*** 708,716 ****
if val: param = param % eval( val )
! try:
! self.lcd.widget_set( "welcome", w, param.encode( 'latin1' ) )
! except UnicodeError:
! self.lcd.widget_set( "welcome", w, param )
!
self.lcd.screen_set( "welcome", "-priority 192 -duration 2 -heartbeat off" )
self.last_screen = "welcome"
--- 711,716 ----
if val: param = param % eval( val )
! self.lcd.widget_set( "welcome", String( w ), String( param ) )
!
self.lcd.screen_set( "welcome", "-priority 192 -duration 2 -heartbeat off" )
self.last_screen = "welcome"
***************
*** 733,741 ****
# Check if audio is detached
# When in detached mode, do not draw the player screen
! if plugin.getbyname('audio.detachbar'):
! if type == 'player' and plugin.getbyname('audio.detachbar').status != 0:
return
! if type == 'player':
sname = "%s_%s" % ( object.type, type )
else:
--- 733,742 ----
# Check if audio is detached
# When in detached mode, do not draw the player screen
! if plugin.getbyname( "audio.detachbar" ):
! if type == "player" and \
! plugin.getbyname( "audio.detachbar" ).status != 0:
return
! if type == "player":
sname = "%s_%s" % ( object.type, type )
else:
***************
*** 743,747 ****
if not self.screens.has_key( sname ):
! sname = 'menu'
if sname != self.last_screen:
--- 744,748 ----
if not self.screens.has_key( sname ):
! sname = "menu"
if sname != self.last_screen:
***************
*** 754,772 ****
self.lsv = { } # reset last changed values
! if type == 'menu':
menu = object.menustack[ -1 ]
! title = menu.selected.name
if isinstance( menu.selected, MenuItem ):
! title = _( title )
typeinfo = menu.selected.type
info = ""
! if menu.selected.getattr( 'type' ):
! typeinfo = menu.selected.getattr( 'type' )
# get info:
if menu.selected.type and menu_info.has_key( menu.selected.type ):
info = get_info( menu.selected, menu_info[ menu.selected.type ] )
! if menu_strinfo.has_key( menu.selected.type ) and menu_strinfo[
menu.selected.type ]:
if info:
info += sep_str
--- 755,774 ----
self.lsv = { } # reset last changed values
! if type == "menu":
menu = object.menustack[ -1 ]
! title = String( menu.selected.name )
if isinstance( menu.selected, MenuItem ):
! title = String( _( title ) )
typeinfo = menu.selected.type
info = ""
! if menu.selected.getattr( "type" ):
! typeinfo = menu.selected.getattr( "type" )
# get info:
if menu.selected.type and menu_info.has_key( menu.selected.type ):
info = get_info( menu.selected, menu_info[ menu.selected.type ] )
! if menu_strinfo.has_key( menu.selected.type ) and \
! menu_strinfo[ menu.selected.type ]:
if info:
info += sep_str
***************
*** 774,802 ****
# specific things related with item type
! if menu.selected.type == 'audio':
! title = menu.selected.getattr( 'title' )
if not title:
! title = menu.selected.getattr( 'name' )
! if menu.selected.getattr( 'trackno' ):
! title = "%s - %s" % ( menu.selected.getattr( 'trackno' ), title )
! elif type == 'player':
player = object
! title = player.getattr( 'title' )
if not title:
! title = player.getattr( 'name' )
! if player.type == 'audio':
! if player.getattr( 'trackno' ):
! title = "%s - %s" % ( player.getattr( 'trackno' ), title )
! elif player.type == 'video':
! length = player.getattr( 'length' )
elapsed = player.elapsed
if elapsed / 3600:
! elapsed ='%d:%02d:%02d' % ( elapsed / 3600, ( elapsed % 3600 ) /
60,
! elapsed % 60)
else:
! elapsed = '%d:%02d' % ( elapsed / 60, elapsed % 60)
try:
percentage = float( player.elapsed / player.info.video[0].length
)
--- 776,807 ----
# specific things related with item type
! if menu.selected.type == "audio":
! title = menu.selected.getattr( "title" )
if not title:
! title = String( menu.selected.getattr( "name" ) )
! if menu.selected.getattr( "trackno" ):
! title = "%s - %s" % ( menu.selected.getattr( "trackno" ),
! String( title ) )
! elif type == "player":
player = object
! title = String( player.getattr( "title" ) )
if not title:
! title = String( player.getattr( "name" ) )
! if player.type == "audio":
! if player.getattr( "trackno" ):
! title = "%s - %s" % ( player.getattr( "trackno" ),
! String( title ) )
! elif player.type == "video":
! length = player.getattr( "length" )
elapsed = player.elapsed
if elapsed / 3600:
! elapsed = "%d:%02d:%02d" % ( elapsed / 3600,
! ( elapsed % 3600 ) / 60,
! elapsed % 60 )
else:
! elapsed = "%d:%02d" % ( elapsed / 60, elapsed % 60)
try:
percentage = float( player.elapsed / player.info.video[0].length
)
***************
*** 805,809 ****
! elif type == 'tv':
tv = copy.copy( object.selected )
--- 810,814 ----
! elif type == "tv":
tv = copy.copy( object.selected )
***************
*** 827,831 ****
param = None
! k = '%s %s' % ( sname, w )
try:
if self.lsv[ k ] == param:
--- 832,836 ----
param = None
! k = "%s %s" % ( sname, String( w ) )
try:
if self.lsv[ k ] == param:
***************
*** 836,844 ****
self.lsv[ k ] = param
if param:
! try:
! self.lcd.widget_set( sname, w, param.encode( 'latin1' ) )
! except UnicodeError:
! self.lcd.widget_set( sname, w, param )
!
if self.last_screen != sname:
--- 841,846 ----
self.lsv[ k ] = param
if param:
! self.lcd.widget_set( sname, String( w ),
! String( param ) )
if self.last_screen != sname:
***************
*** 866,873 ****
if val: param = param % eval( val )
! try:
! self.lcd.widget_set( s, w, param.encode( 'latin1' ) )
! except UnicodeError:
! self.lcd.widget_set( s, w, param )
--- 868,873 ----
if val: param = param % eval( val )
!
! self.lcd.widget_set( s, String( w ), String( param ) )
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
