Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5103/src/gui
Modified Files:
__init__.py theme_engine.py
Log Message:
remove TRUE, FALSE, DEBUG and HELPER
Index: theme_engine.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/theme_engine.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** theme_engine.py 8 Jan 2005 15:09:26 -0000 1.17
--- theme_engine.py 8 Jan 2005 15:40:52 -0000 1.18
***************
*** 46,50 ****
import copy
import re
- import traceback
# freevo imports
--- 46,49 ----
***************
*** 104,109 ****
theme.prepare()
except:
! log.error('XML file corrupt:')
! traceback.print_exc()
theme = copy.copy(current_theme)
theme.filename = new
--- 103,107 ----
theme.prepare()
except:
! log.exception('XML file corrupt:')
theme = copy.copy(current_theme)
theme.filename = new
***************
*** 189,193 ****
new_val += val[:pos].lower()
else:
! print 'WARNING: unsupported value %s' % val[:pos]
val = val[pos:]
--- 187,191 ----
new_val += val[:pos].lower()
else:
! log.error('unsupported value %s' % val[:pos])
val = val[pos:]
***************
*** 262,271 ****
return vfs.abspath("%s.jpg" % dfile)
! print 'skin error: can\'t find image %s' % file
! if config.DEBUG:
! print 'image search path is:'
! for s in search_dirs:
! print s
! print
return ''
--- 260,267 ----
return vfs.abspath("%s.jpg" % dfile)
! log.error('skin error: can\'t find image %s' % file)
! log.info('image search path is:')
! for s in search_dirs:
! log.info(s)
return ''
***************
*** 786,790 ****
self.font = font[self.font]
else:
! print 'skin error: can\'t find font %s' % self.font
self.font = font['default']
else:
--- 782,786 ----
self.font = font[self.font]
else:
! log.error('skin error: can\'t find font %s' % self.font)
self.font = font['default']
else:
***************
*** 895,900 ****
self.filename = image_names[self.image]
else:
! print 'skin error: can\'t find image definition %s' % \
! self.image
if self.filename:
--- 891,896 ----
self.filename = image_names[self.image]
else:
! log.error('skin error: can\'t find image definition %s' % \
! self.image)
if self.filename:
***************
*** 1365,1370 ****
# default skin (basic.fxd). This skin works
# (if not, Freevo is broken)
! traceback.print_exc()
! log.error('XML file %s corrupt, using default skin' % name)
settings = FXDSettings('basic.fxd')
--- 1361,1365 ----
# default skin (basic.fxd). This skin works
# (if not, Freevo is broken)
! log.exception('XML file %s corrupt, using default skin' % name)
settings = FXDSettings('basic.fxd')
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/__init__.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** __init__.py 19 Dec 2004 10:36:30 -0000 1.31
--- __init__.py 8 Jan 2005 15:40:52 -0000 1.32
***************
*** 97,103 ****
return display
- import config as _config
! if not _config.HELPER:
# create default display and set gui width and height
# in case some part of Freevo needs this
--- 97,102 ----
return display
! if __freevo_app__ == 'main':
# create default display and set gui width and height
# in case some part of Freevo needs this
-------------------------------------------------------
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
