Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7509
Modified Files:
directory.py item.py main.py osd.py
Log Message:
do not call skin.get_singleton() anymore
Index: directory.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** directory.py 14 Feb 2004 12:06:29 -0000 1.115
--- directory.py 14 Feb 2004 13:04:46 -0000 1.116
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.116 2004/02/14 13:04:46 dischi
+ # do not call skin.get_singleton() anymore
+ #
# Revision 1.115 2004/02/14 12:06:29 dischi
# fix unicode crash
***************
*** 135,140 ****
from gui import PasswordInputBox, AlertBox, ProgressBox
- skin = skin.get_singleton()
-
all_variables = [('DIRECTORY_SORT_BY_DATE', _('Directory Sort By Date'),
_('Sort directory by date and not by name.'), False),
--- 138,141 ----
***************
*** 856,863 ****
# for DIRECTORY_FORCE_SKIN_LAYOUT max = number of styles in the menu
if arg == 'FORCE_SKIN_LAYOUT':
! if self.display_type and skin.settings.menu.has_key(self.display_type):
! area = skin.settings.menu[self.display_type]
else:
! area = skin.settings.menu['default']
max = len(area.style) - 1
--- 857,864 ----
# for DIRECTORY_FORCE_SKIN_LAYOUT max = number of styles in the menu
if arg == 'FORCE_SKIN_LAYOUT':
! if self.display_type and
skin.get_settings().menu.has_key(self.display_type):
! area = skin.get_settings().menu[self.display_type]
else:
! area = skin.get_settings().menu['default']
max = len(area.style) - 1
Index: item.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/item.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** item.py 12 Feb 2004 17:17:08 -0000 1.67
--- item.py 14 Feb 2004 13:04:46 -0000 1.68
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.68 2004/02/14 13:04:46 dischi
+ # do not call skin.get_singleton() anymore
+ #
# Revision 1.67 2004/02/12 17:17:08 dischi
# get image dir from skin
***************
*** 251,255 ****
if skin_type:
import skin
! settings = skin.get_singleton().settings
skin_info = settings.mainmenu.items
imagedir = settings.mainmenu.imagedir
--- 254,258 ----
if skin_type:
import skin
! settings = skin.get_settings()
skin_info = settings.mainmenu.items
imagedir = settings.mainmenu.imagedir
Index: main.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/main.py,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** main.py 12 Feb 2004 17:16:35 -0000 1.115
--- main.py 14 Feb 2004 13:05:03 -0000 1.116
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.116 2004/02/14 13:05:03 dischi
+ # do not call skin.get_singleton() anymore
+ #
# Revision 1.115 2004/02/12 17:16:35 dischi
# again, fix watermark problem
***************
*** 115,121 ****
osd = osd.get_singleton()
- # Create the skin object
- skin = skin.get_singleton()
-
class SkinSelectItem(Item):
--- 118,121 ----
Index: osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** osd.py 12 Feb 2004 12:37:14 -0000 1.139
--- osd.py 14 Feb 2004 13:05:03 -0000 1.140
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.140 2004/02/14 13:05:03 dischi
+ # do not call skin.get_singleton() anymore
+ #
# Revision 1.139 2004/02/12 12:37:14 dischi
# fix alternative font loading
***************
*** 394,398 ****
self.lock.acquire()
osd = get_singleton()
! icon = skin.get_singleton().get_icon('misc/osd_busy')
if icon:
image = osd.loadbitmap(icon)
--- 397,401 ----
self.lock.acquire()
osd = get_singleton()
! icon = skin.get_icon('misc/osd_busy')
if icon:
image = osd.loadbitmap(icon)
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
