Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19978
Modified Files:
__init__.py
Removed Files:
bmovl_renderer.py pygame_renderer.py
Log Message:
move renderer into backend subdir
--- bmovl_renderer.py DELETED ---
--- pygame_renderer.py DELETED ---
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/__init__.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** __init__.py 23 Jul 2004 19:43:30 -0000 1.17
--- __init__.py 24 Jul 2004 12:21:05 -0000 1.18
***************
*** 7,10 ****
--- 7,13 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.18 2004/07/24 12:21:05 dischi
+ # move renderer into backend subdir
+ #
# Revision 1.17 2004/07/23 19:43:30 dischi
# move most of the settings code out of the skin engine
***************
*** 13,17 ****
# add first draft of new gui code
#
- #
# -----------------------------------------------------------------------
#
--- 16,19 ----
***************
*** 36,59 ****
# ----------------------------------------------------------------------
! # include all the widgets
! # FIXME: needs cleanup!
!
! from widgets.Border import *
! from widgets.Color import *
! from widgets.GUIObject import *
! from widgets.Container import *
! from widgets.PopupBox import *
! from widgets.AlertBox import *
! from widgets.ConfirmBox import *
! from widgets.Label import *
! from widgets.Button import *
! from widgets.LetterBoxGroup import *
! from widgets.RegionScroller import *
! from widgets.Scrollbar import *
! from widgets.InputBox import *
! from widgets.LayoutManagers import *
! from widgets.exceptions import *
! from widgets.ProgressBox import *
! from widgets.ListBox import *
# the objects that can be drawn
--- 38,42 ----
# ----------------------------------------------------------------------
! import config
# the objects that can be drawn
***************
*** 62,68 ****
_screen = None
_skin = None
- import fxdparser
- settings = fxdparser.Settings()
def get_screen():
--- 45,79 ----
_screen = None
_skin = None
+ _renderer = None
+ _keyboard = None
+
+ if hasattr(config, 'BMOVL_OSD_VIDEO'):
+ import backends.bmovl
+ backend = backends.bmovl
+ else:
+ import backends.sdl
+ backend = backends.sdl
+
+
+ def get_keyboard():
+ """
+ return the screen object
+ """
+ global _keyboard
+ if not _keyboard:
+ _keyboard = backend.Keyboard()
+ print _keyboard
+ return _keyboard
+
+
+ def get_renderer():
+ """
+ return the screen object
+ """
+ global _renderer
+ if not _renderer:
+ _renderer = backend.Renderer()
+ return _renderer
def get_screen():
***************
*** 72,82 ****
global _screen
if not _screen:
! # some test code here
! if hasattr(config, 'BMOVL_OSD_VIDEO'):
! import bmovl_renderer
! _screen = bmovl_renderer.Screen()
! else:
! import pygame_renderer
! _screen = pygame_renderer.Screen()
return _screen
--- 83,87 ----
global _screen
if not _screen:
! _screen = backend.Screen(get_renderer())
return _screen
***************
*** 89,93 ****
if not _skin:
import areas
! _skin = areas.Skin(get_settings())
_skin.set_screen(get_screen())
return _skin
--- 94,98 ----
if not _skin:
import areas
! _skin = areas.AreaHandler(get_settings())
_skin.set_screen(get_screen())
return _skin
***************
*** 126,127 ****
--- 131,158 ----
return settings.settings.get_icon(name)
+
+ import fxdparser
+ settings = fxdparser.Settings()
+
+
+ # include all the widgets
+ # FIXME: needs cleanup!
+
+ from widgets.Border import *
+ from widgets.Color import *
+ from widgets.GUIObject import *
+ from widgets.Container import *
+ from widgets.PopupBox import *
+ from widgets.AlertBox import *
+ from widgets.ConfirmBox import *
+ from widgets.Label import *
+ from widgets.Button import *
+ from widgets.LetterBoxGroup import *
+ from widgets.RegionScroller import *
+ from widgets.Scrollbar import *
+ from widgets.InputBox import *
+ from widgets.LayoutManagers import *
+ from widgets.exceptions import *
+ from widgets.ProgressBox import *
+ from widgets.ListBox import *
+
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
