Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23627/src/gui
Modified Files:
theme_engine.py
Log Message:
small cleanup, renaming
Index: theme_engine.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/theme_engine.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** theme_engine.py 30 Dec 2004 11:30:48 -0000 1.12
--- theme_engine.py 31 Dec 2004 10:16:57 -0000 1.13
***************
*** 289,293 ****
# lenght of something
exp += ' attr("%s") %s' % ( b[ : ( b.find(')') + 1 ) ],
! b[ ( b.find(')') + 1 ) : ])
else:
# an attribute
--- 289,293 ----
# lenght of something
exp += ' attr("%s") %s' % ( b[ : ( b.find(')') + 1 ) ],
! b[ ( b.find(')') + 1 ) : ])
else:
# an attribute
***************
*** 1051,1067 ****
"""
def __init__(self, filename):
! self._layout = {}
! self._font = {}
! self._color = {}
! self._images = {}
! self._menuset = {}
! self._menu = {}
! self._popup = ''
! self._sets = {}
! self._mainmenu = MainMenu()
self.skindirs = []
self.icon_dir = ""
! self.fxd_files = []
# variables set by set_var
--- 1051,1068 ----
"""
def __init__(self, filename):
! self.__layout = {}
! self.__font = {}
! self.__color = {}
! self.__images = {}
! self.__menuset = {}
! self.__menu = {}
! self.__popup = ''
! self.__sets = {}
! self.__mainmenu = MainMenu()
!
self.skindirs = []
self.icon_dir = ""
! self.fxd_files = []
# variables set by set_var
***************
*** 1084,1088 ****
for node in children:
if node.name == u'main':
! self._mainmenu.parse(node, scale, c_dir)
elif node.name == u'menu':
--- 1085,1089 ----
for node in children:
if node.name == u'main':
! self.__mainmenu.parse(node, scale, c_dir)
elif node.name == u'menu':
***************
*** 1092,1100 ****
# if type is all, all types except default are deleted and
# the settings will be loaded for default
! self._menu = {}
type = 'default'
! self._menu[type] = Menu()
! self._menu[type].parse(node, scale, c_dir)
--- 1093,1101 ----
# if type is all, all types except default are deleted and
# the settings will be loaded for default
! self.__menu = {}
type = 'default'
! self.__menu[type] = Menu()
! self.__menu[type].parse(node, scale, c_dir)
***************
*** 1103,1110 ****
inherit = attr_str(node, 'inherits', '')
if inherit:
! self._menuset[label]
=copy.deepcopy(self._menuset[inherit])
! elif not self._menuset.has_key(label):
! self._menuset[label] = MenuSet()
! self._menuset[label].parse(node, scale, c_dir)
--- 1104,1112 ----
inherit = attr_str(node, 'inherits', '')
if inherit:
! m = copy.deepcopy(self.__menuset[inherit])
! self.__menuset[label] = m
! elif not self.__menuset.has_key(label):
! self.__menuset[label] = MenuSet()
! self.__menuset[label].parse(node, scale, c_dir)
***************
*** 1112,1145 ****
label = attr_str(node, 'label', '')
if label:
! if not self._layout.has_key(label):
! self._layout[label] = Layout(label)
! self._layout[label].parse(node, scale, c_dir)
elif node.name == u'font':
label = attr_str(node, 'label', '')
if label:
! if not self._font.has_key(label):
! self._font[label] = Font(label)
! self._font[label].parse(node, scale, c_dir)
elif node.name == u'color':
try:
value = attr_col(node, 'value', '')
! self._color[node.attrs[('', 'label')]] = int2col(value)
except KeyError:
pass
elif node.name == u'image':
try:
value = attr_col(node, 'filename', '')
! self._images[node.attrs[('', 'label')]] = value
except KeyError:
pass
elif node.name == u'iconset':
self.icon_dir = attr_str(node, 'theme', self.icon_dir)
elif node.name == u'popup':
! self._popup = attr_str(node, 'layout', self._popup)
elif node.name == u'setvar':
--- 1114,1153 ----
label = attr_str(node, 'label', '')
if label:
! if not self.__layout.has_key(label):
! self.__layout[label] = Layout(label)
! self.__layout[label].parse(node, scale, c_dir)
!
elif node.name == u'font':
label = attr_str(node, 'label', '')
if label:
! if not self.__font.has_key(label):
! self.__font[label] = Font(label)
! self.__font[label].parse(node, scale, c_dir)
!
elif node.name == u'color':
try:
value = attr_col(node, 'value', '')
! self.__color[node.attrs[('', 'label')]] = int2col(value)
except KeyError:
pass
+
elif node.name == u'image':
try:
value = attr_col(node, 'filename', '')
! self.__images[node.attrs[('', 'label')]] = value
except KeyError:
pass
+
elif node.name == u'iconset':
self.icon_dir = attr_str(node, 'theme', self.icon_dir)
+
elif node.name == u'popup':
! self.__popup = attr_str(node, 'layout', self.__popup)
!
elif node.name == u'setvar':
***************
*** 1153,1160 ****
else:
if node.children and node.children[0].name == 'style':
! self._sets[node.name] = Menu()
! elif not self._sets.has_key(node.name):
! self._sets[node.name] = AreaSet()
! self._sets[node.name].parse(node, scale, c_dir)
--- 1161,1168 ----
else:
if node.children and node.children[0].name == 'style':
! self.__sets[node.name] = Menu()
! elif not self.__sets.has_key(node.name):
! self.__sets[node.name] = AreaSet()
! self.__sets[node.name].parse(node, scale, c_dir)
***************
*** 1163,1170 ****
self.prepared = True
- self.sets = copy.deepcopy(self._sets)
! self.font = copy.deepcopy(self._font)
! layout = copy.deepcopy(self._layout)
if not os.path.isdir(self.icon_dir):
--- 1171,1180 ----
self.prepared = True
! # copy internal structures to prepare the copy
! self.sets = copy.deepcopy(self.__sets)
! all_menus = copy.deepcopy(self.__menu)
! self.font = copy.deepcopy(self.__font)
! layout = copy.deepcopy(self.__layout)
if not os.path.isdir(self.icon_dir):
***************
*** 1174,1186 ****
for f in self.font:
! self.font[f].prepare(self._color, scale=self.font_scale)
for l in layout:
! 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
--- 1184,1195 ----
for f in self.font:
! self.font[f].prepare(self.__color, scale=self.font_scale)
for l in layout:
! layout[l].prepare(self.font, self.__color, search_dirs,
! self.__images)
for menu in all_menus:
! all_menus[menu].prepare(self.__menuset, layout)
# prepare listing area images
***************
*** 1191,1199 ****
s[i].listing.images[image].prepare(None,
search_dirs,
! self._images)
!
self.default_menu = {}
self.special_menu = {}
for k in all_menus:
if k.startswith('default'):
--- 1200,1209 ----
s[i].listing.images[image].prepare(None,
search_dirs,
! self.__images)
+ # menu structures
self.default_menu = {}
self.special_menu = {}
+
for k in all_menus:
if k.startswith('default'):
***************
*** 1225,1229 ****
else:
# prepare a menu
! self.sets[s].prepare(self._menuset, layout)
for s in self.sets[s].style:
for i in range(2):
--- 1235,1239 ----
else:
# prepare a menu
! self.sets[s].prepare(self.__menuset, layout)
for s in self.sets[s].style:
for i in range(2):
***************
*** 1232,1245 ****
for image in sli:
sli[image].prepare(None, search_dirs,
! self._images)
! self.popup = layout[self._popup]
! self.mainmenu = copy.deepcopy(self._mainmenu)
! self.mainmenu.prepare(search_dirs, self._images)
self.images = {}
! for name in self._images:
! self.images[name] = search_file(self._images[name], search_dirs)
--- 1242,1255 ----
for image in sli:
sli[image].prepare(None, search_dirs,
! self.__images)
! self.popup = layout[self.__popup]
! self.mainmenu = copy.deepcopy(self.__mainmenu)
! self.mainmenu.prepare(search_dirs, self.__images)
self.images = {}
! for name in self.__images:
! self.images[name] = search_file(self.__images[name], search_dirs)
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
