Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8388/src
Modified Files:
controlpanel.py directory.py main.py menu.py
Log Message:
renamed SKIN_* and OSD_* variables to GUI_*
Index: directory.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** directory.py 30 Dec 2004 11:31:51 -0000 1.146
--- directory.py 31 Dec 2004 11:57:22 -0000 1.147
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.147 2004/12/31 11:57:22 dischi
+ # renamed SKIN_* and OSD_* variables to GUI_*
+ #
# Revision 1.146 2004/12/30 11:31:51 dischi
# rename id to __id__
***************
*** 603,608 ****
return
! # if config.OSD_BUSYICON_TIMER:
! # osd.get_singleton().busyicon.wait(config.OSD_BUSYICON_TIMER[0])
files = vfs.listdir(self.dir, include_overlay=True)
--- 606,611 ----
return
! # if config.GUI_BUSYICON_TIMER:
! # osd.get_singleton().busyicon.wait(config.GUI_BUSYICON_TIMER[0])
files = vfs.listdir(self.dir, include_overlay=True)
***************
*** 621,625 ****
! # elif config.OSD_BUSYICON_TIMER and len(files) >
config.OSD_BUSYICON_TIMER[1]:
# # many files, just show the busy icon now
# osd.get_singleton().busyicon.wait(0)
--- 624,628 ----
! # elif config.GUI_BUSYICON_TIMER and len(files) >
config.GUI_BUSYICON_TIMER[1]:
# # many files, just show the busy icon now
# osd.get_singleton().busyicon.wait(0)
***************
*** 730,734 ****
self.media.mount()
! # if config.OSD_BUSYICON_TIMER:
# # stop the timer. If the icons is drawn, it will stay there
# # until the osd is redrawn, if not, we don't need it to pop
--- 733,737 ----
self.media.mount()
! # if config.GUI_BUSYICON_TIMER:
# # stop the timer. If the icons is drawn, it will stay there
# # until the osd is redrawn, if not, we don't need it to pop
Index: controlpanel.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/controlpanel.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** controlpanel.py 15 Sep 2004 19:35:57 -0000 1.1
--- controlpanel.py 31 Dec 2004 11:57:22 -0000 1.2
***************
*** 114,119 ****
# TODO: support different placements
! tw = display.width - 2*config.OSD_OVERSCAN_X
! th = display.height - 2*config.OSD_OVERSCAN_Y
x = int(tw/2) - int(w/2)
--- 114,119 ----
# TODO: support different placements
! tw = display.width - 2*config.GUI_OVERSCAN_X
! th = display.height - 2*config.GUI_OVERSCAN_Y
x = int(tw/2) - int(w/2)
***************
*** 122,126 ****
self.container.set_pos((x,y))
! fade = config.OSD_FADE_STEPS
if fade:
gui.animation.FadeAnimation([self.container],fade, 0, 255).start()
--- 122,126 ----
self.container.set_pos((x,y))
! fade = config.GUI_FADE_STEPS
if fade:
gui.animation.FadeAnimation([self.container],fade, 0, 255).start()
Index: main.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/main.py,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** main.py 30 Dec 2004 11:28:06 -0000 1.158
--- main.py 31 Dec 2004 11:57:23 -0000 1.159
***************
*** 89,93 ****
import config
! if config.OSD_DISPLAY == 'SDL':
import pygame
--- 89,93 ----
import config
! if config.GUI_DISPLAY == 'SDL':
import pygame
***************
*** 312,316 ****
fade out
"""
! self.engine.hide(config.OSD_FADE_STEPS)
--- 312,316 ----
fade out
"""
! self.engine.hide(config.GUI_FADE_STEPS)
Index: menu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/menu.py,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** menu.py 28 Dec 2004 18:09:58 -0000 1.112
--- menu.py 31 Dec 2004 11:57:39 -0000 1.113
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.113 2004/12/31 11:57:39 dischi
+ # renamed SKIN_* and OSD_* variables to GUI_*
+ #
# Revision 1.112 2004/12/28 18:09:58 dischi
# add extra Action class for item actions
***************
*** 216,220 ****
self.inside_menu = False
else:
! self.engine.show(config.OSD_FADE_STEPS)
--- 219,223 ----
self.inside_menu = False
else:
! self.engine.show(config.GUI_FADE_STEPS)
***************
*** 228,232 ****
self.inside_menu = False
else:
! self.engine.hide(config.OSD_FADE_STEPS)
--- 231,235 ----
self.inside_menu = False
else:
! self.engine.hide(config.GUI_FADE_STEPS)
-------------------------------------------------------
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
