Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29627
Modified Files:
mediamenu.py
Log Message:
Added FORCE_SKIN_LAYOUT and changed to layout of folder.fxd (see
freevo_config.py for details)
Index: mediamenu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/mediamenu.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** mediamenu.py 29 Mar 2003 21:45:26 -0000 1.42
--- mediamenu.py 30 Mar 2003 14:18:16 -0000 1.43
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.43 2003/03/30 14:18:16 dischi
+ # Added FORCE_SKIN_LAYOUT and changed to layout of folder.fxd (see
+ # freevo_config.py for details)
+ #
# Revision 1.42 2003/03/29 21:45:26 dischi
# added display_type tv for the new skin
***************
*** 317,321 ****
all_variables = ('MOVIE_PLAYLISTS', 'DIRECTORY_SORT_BY_DATE',
'DIRECTORY_AUTOPLAY_SINGLE_ITEM', 'COVER_DIR',
! 'AUDIO_RANDOM_PLAYLIST')
for v in all_variables:
setattr(self, v, eval('config.%s' % v))
--- 321,325 ----
all_variables = ('MOVIE_PLAYLISTS', 'DIRECTORY_SORT_BY_DATE',
'DIRECTORY_AUTOPLAY_SINGLE_ITEM', 'COVER_DIR',
! 'AUDIO_RANDOM_PLAYLIST', 'FORCE_SKIN_LAYOUT')
for v in all_variables:
setattr(self, v, eval('config.%s' % v))
***************
*** 389,392 ****
--- 393,412 ----
parser = qp_xml.Parser()
var_def = parser.parse(open(self.xml_file).read())
+
+ for top in var_def.children:
+ if top.name == 'variables' and not config.NEW_SKIN:
+ for var_names in top.children:
+ for v in all_variables:
+ if var_names.name.upper() == v.upper():
+ setattr(self, v, int(var_names.textof()))
+
+ if top.name == 'folder':
+ for node in top.children:
+ if node.name == 'setvar':
+ for v in all_variables:
+ if node.attrs[('', 'name')].upper() == v.upper():
+ setattr(self, v, int(node.attrs[('',
'val')]))
+
+
except:
print "Skin XML file %s corrupt" % self.xml_file
***************
*** 394,405 ****
return
- for top in var_def.children:
- if top.name == 'variables':
- for var_names in top.children:
- for v in all_variables:
- if var_names.name.upper() == v.upper():
- setattr(self, v, int(var_names.textof()))
-
-
if self.DIRECTORY_SORT_BY_DATE == 2 and self.display_type != 'tv':
self.DIRECTORY_SORT_BY_DATE = 0
--- 414,417 ----
***************
*** 540,544 ****
else:
item_menu = menu_module.Menu(title, items, reload_func=self.reload,
! item_types = self.display_type)
if self.xml_file:
item_menu.skin_settings = skin.LoadSettings(self.xml_file)
--- 552,558 ----
else:
item_menu = menu_module.Menu(title, items, reload_func=self.reload,
! item_types = self.display_type,
! force_skin_layout = self.FORCE_SKIN_LAYOUT)
!
if self.xml_file:
item_menu.skin_settings = skin.LoadSettings(self.xml_file)
-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
