Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1:/tmp/cvs-serv31015
Modified Files:
area.py xml_skin.py
Log Message:
better display type handling, added type main menu
Index: area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/area.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** area.py 3 Jan 2004 17:43:15 -0000 1.25
--- area.py 11 Jan 2004 15:43:16 -0000 1.26
***************
*** 28,31 ****
--- 28,34 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.26 2004/01/11 15:43:16 dischi
+ # better display type handling, added type main menu
+ #
# Revision 1.25 2004/01/03 17:43:15 dischi
# OVERLAY_DIR is always used
***************
*** 506,526 ****
if widget_type == 'menu':
# get the correct <menu>
! try:
! area = settings.menu[display_type]
! except:
if not self.use_images:
! if self.use_description and \
! settings.menu.has_key('default description no image'):
! area = settings.menu['default description no image']
! else:
! try:
! area = settings.menu['default no image']
! except:
! area = settings.menu['default']
! elif self.use_description and \
! settings.menu.has_key('default description'):
! area = settings.menu['default description']
! else:
! area = settings.menu['default']
# get the correct style based on display_style
--- 509,521 ----
if widget_type == 'menu':
# get the correct <menu>
! if display_type and settings.special_menu.has_key(display_type):
! area = settings.special_menu[display_type]
! else:
! name = 'default'
! if self.use_description:
! name += ' description'
if not self.use_images:
! name += ' no image'
! area = settings.default_menu[name]
# get the correct style based on display_style
Index: xml_skin.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/xml_skin.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** xml_skin.py 10 Jan 2004 13:21:19 -0000 1.27
--- xml_skin.py 11 Jan 2004 15:43:16 -0000 1.28
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.28 2004/01/11 15:43:16 dischi
+ # better display type handling, added type main menu
+ #
# Revision 1.27 2004/01/10 13:21:19 dischi
# cleanup
***************
*** 68,72 ****
! FXD_FORMAT_VERSION = 1
#
--- 71,75 ----
! FXD_FORMAT_VERSION = 2
#
***************
*** 936,940 ****
def prepare(self):
self.prepared = True
- self.menu = copy.deepcopy(self._menu)
self.sets = copy.deepcopy(self._sets)
--- 939,942 ----
***************
*** 952,960 ****
layout[l].prepare(self.font, self._color, search_dirs, self._images)
! for menu in self.menu:
! self.menu[menu].prepare(self._menuset, layout)
# prepare listing area images
! for s in self.menu[menu].style:
for i in range(2):
if s[i] and hasattr(s[i], 'listing'):
--- 954,963 ----
layout[l].prepare(self.font, self._color, search_dirs, self._images)
! all_menus = copy.deepcopy(self._menu)
! for menu in all_menus:
! all_menus[menu].prepare(self._menuset, layout)
# prepare listing area images
! for s in all_menus[menu].style:
for i in range(2):
if s[i] and hasattr(s[i], 'listing'):
***************
*** 963,966 ****
--- 966,994 ----
self._images)
+
+ self.default_menu = {}
+ self.special_menu = {}
+ for k in all_menus:
+ if k.startswith('default'):
+ self.default_menu[k] = all_menus[k]
+ else:
+ self.special_menu[k] = all_menus[k]
+
+ types = []
+ for k in self.special_menu:
+ if k.find('main menu') == -1:
+ types.append(k)
+
+ for t in types:
+ if not self.special_menu.has_key(t + ' main menu'):
+ self.special_menu[t + ' main menu'] = self.special_menu[t]
+
+ for t in ('default no image', 'default description'):
+ if not self.default_menu.has_key(t):
+ self.default_menu[t] = self.default_menu['default']
+
+ t = 'default description'
+ if not self.default_menu.has_key(t + ' no image'):
+ self.default_menu[t + ' no image'] = self.default_menu[t]
for s in self.sets:
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
