Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8388/src/gui
Modified Files:
font.py popupbox.py theme_engine.py
Log Message:
renamed SKIN_* and OSD_* variables to GUI_*
Index: popupbox.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/popupbox.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** popupbox.py 18 Dec 2004 18:13:05 -0000 1.4
--- popupbox.py 31 Dec 2004 11:57:41 -0000 1.5
***************
*** 94,99 ****
w = max(min(int(math.sqrt(text_height * text_width * 4 / 3)),
displays.get_display().width - 60 - \
! 2 * config.OSD_OVERSCAN_X), width)
! h = displays.get_display().height - 100 - 2 * config.OSD_OVERSCAN_Y
# now create the label
--- 94,99 ----
w = max(min(int(math.sqrt(text_height * text_width * 4 / 3)),
displays.get_display().width - 60 - \
! 2 * config.GUI_OVERSCAN_X), width)
! h = displays.get_display().height - 100 - 2 * config.GUI_OVERSCAN_Y
# now create the label
Index: theme_engine.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/theme_engine.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** theme_engine.py 31 Dec 2004 10:16:57 -0000 1.13
--- theme_engine.py 31 Dec 2004 11:57:41 -0000 1.14
***************
*** 558,567 ****
if x != self.x:
try:
! self.x += config.OSD_OVERSCAN_X
except TypeError:
pass
if y != self.y:
try:
! self.y += config.OSD_OVERSCAN_Y
except TypeError:
pass
--- 558,567 ----
if x != self.x:
try:
! self.x += config.GUI_OVERSCAN_X
except TypeError:
pass
if y != self.y:
try:
! self.y += config.GUI_OVERSCAN_Y
except TypeError:
pass
***************
*** 576,585 ****
if x != self.images[label].x:
try:
! self.images[label].x += config.OSD_OVERSCAN_X
except TypeError:
pass
if y != self.images[label].y:
try:
! self.images[label].y += config.OSD_OVERSCAN_Y
except TypeError:
pass
--- 576,585 ----
if x != self.images[label].x:
try:
! self.images[label].x += config.GUI_OVERSCAN_X
except TypeError:
pass
if y != self.images[label].y:
try:
! self.images[label].y += config.GUI_OVERSCAN_Y
except TypeError:
pass
***************
*** 594,607 ****
def rect(self, type):
if type == 'screen':
! return (self.x - config.OSD_OVERSCAN_X,
! self.y - config.OSD_OVERSCAN_X,
! self.width + 2 * config.OSD_OVERSCAN_X,
! self.height + 2 * config.OSD_OVERSCAN_X)
return (self.x, self.y, self.width, self.height)
def pos(self, type):
if type == 'screen':
! return (self.x - config.OSD_OVERSCAN_X,
! self.y - config.OSD_OVERSCAN_X)
return (self.x, self.y)
--- 594,607 ----
def rect(self, type):
if type == 'screen':
! return (self.x - config.GUI_OVERSCAN_X,
! self.y - config.GUI_OVERSCAN_X,
! self.width + 2 * config.GUI_OVERSCAN_X,
! self.height + 2 * config.GUI_OVERSCAN_X)
return (self.x, self.y, self.width, self.height)
def pos(self, type):
if type == 'screen':
! return (self.x - config.GUI_OVERSCAN_X,
! self.y - config.GUI_OVERSCAN_X)
return (self.x, self.y)
***************
*** 1270,1275 ****
w, h = config.CONF.width, config.CONF.height
! scale = (float(config.CONF.width-2*config.OSD_OVERSCAN_X)/float(w),
! float(config.CONF.height-2*config.OSD_OVERSCAN_Y)/float(h))
include = attr_str(node, 'include', '')
--- 1270,1275 ----
w, h = config.CONF.width, config.CONF.height
! scale = (float(config.CONF.width-2*config.GUI_OVERSCAN_X)/float(w),
! float(config.CONF.height-2*config.GUI_OVERSCAN_Y)/float(h))
include = attr_str(node, 'include', '')
***************
*** 1351,1356 ****
Set the basic skin fxd file and store it
"""
! config.SKIN_XML_FILE = os.path.splitext(os.path.basename(name))[0]
! log.info('load basic skin settings: %s' % config.SKIN_XML_FILE)
try:
--- 1351,1356 ----
Set the basic skin fxd file and store it
"""
! config.GUI_XML_FILE = os.path.splitext(os.path.basename(name))[0]
! log.info('load basic skin settings: %s' % config.GUI_XML_FILE)
try:
***************
*** 1392,1404 ****
storage = util.read_pickle(cachefile)
if storage:
! if not config.SKIN_XML_FILE:
! config.SKIN_XML_FILE = storage['SKIN_XML_FILE']
else:
! log.debug('skin forced to %s' % config.SKIN_XML_FILE)
else:
! if not config.SKIN_XML_FILE:
! config.SKIN_XML_FILE = config.SKIN_DEFAULT_XML_FILE
storage = {}
# load the fxd file at set current_theme
! current_theme = set_base_fxd(config.SKIN_XML_FILE)
! current_theme.filename = config.SKIN_XML_FILE
--- 1392,1404 ----
storage = util.read_pickle(cachefile)
if storage:
! if not config.GUI_XML_FILE:
! config.GUI_XML_FILE = storage['GUI_XML_FILE']
else:
! log.debug('skin forced to %s' % config.GUI_XML_FILE)
else:
! if not config.GUI_XML_FILE:
! config.GUI_XML_FILE = config.GUI_DEFAULT_XML_FILE
storage = {}
# load the fxd file at set current_theme
! current_theme = set_base_fxd(config.GUI_XML_FILE)
! current_theme.filename = config.GUI_XML_FILE
Index: font.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/font.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** font.py 20 Nov 2004 18:23:00 -0000 1.3
--- font.py 31 Dec 2004 11:57:40 -0000 1.4
***************
*** 37,42 ****
# Ok, see if there is an alternate font to use
! if name in config.OSD_FONT_ALIASES:
! alt_fname = config.OSD_FONT_ALIASES[name]
log.debug('trying alternate: %s' % alt_fname)
try:
--- 37,42 ----
# Ok, see if there is an alternate font to use
! if name in config.GUI_FONT_ALIASES:
! alt_fname = config.GUI_FONT_ALIASES[name]
log.debug('trying alternate: %s' % alt_fname)
try:
***************
*** 49,53 ****
print 'Falling back to default font, this may look
very ugly'
font_warning.append(name)
! return
mevas.imagelib.load_font(config.OSD_DEFAULT_FONTNAME, ptsize)
--- 49,53 ----
print 'Falling back to default font, this may look
very ugly'
font_warning.append(name)
! return
mevas.imagelib.load_font(config.GUI_FONT_DEFAULT_NAME, ptsize)
-------------------------------------------------------
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
