Author: dmeyer
Date: Sat Apr 14 17:40:01 2007
New Revision: 9432
Added:
trunk/ui/src/configfile.py
- copied unchanged from r9430, /trunk/ui/src/config.py
Removed:
trunk/ui/src/config.py
Modified:
trunk/ui/bin/freevo
trunk/ui/src/__init__.py
trunk/ui/src/audio/audiodiskitem.py
trunk/ui/src/audio/interface.py
trunk/ui/src/directory.py
trunk/ui/src/games/plugins/pcgames.py
trunk/ui/src/games/plugins/scummvm.py
trunk/ui/src/games/plugins/zsnes.py
trunk/ui/src/gui/areas/area.py
trunk/ui/src/gui/areas/tvlisting_area.py
trunk/ui/src/gui/compat.py
trunk/ui/src/gui/displays/__init__.py
trunk/ui/src/gui/displays/dfb.py
trunk/ui/src/gui/displays/fb.py
trunk/ui/src/gui/font.py
trunk/ui/src/gui/theme.py
trunk/ui/src/gui/windows/inputbox.py
trunk/ui/src/gui/windows/waitbox.py
trunk/ui/src/image/fxdhandler.py
trunk/ui/src/image/imageitem.py
trunk/ui/src/image/interface.py
trunk/ui/src/image/viewer.py
trunk/ui/src/input/plugins/interface.py
trunk/ui/src/input/plugins/joystick.py
trunk/ui/src/input/plugins/lirc.py
trunk/ui/src/input/plugins/sdl.py
trunk/ui/src/input/plugins/x11.py
trunk/ui/src/menu/menu.py
trunk/ui/src/playlist.py
trunk/ui/src/plugins/dpms.py
trunk/ui/src/plugins/idlebar/__init__.py
trunk/ui/src/plugins/osd.py
trunk/ui/src/plugins/shutdown.py
trunk/ui/src/tv/favorite.py
trunk/ui/src/tv/plugins/directory.py
trunk/ui/src/tv/plugins/scheduled.py
trunk/ui/src/tv/program.py
trunk/ui/src/video/interface.py
trunk/ui/src/video/videoitem.py
Log:
import config object in freevo.ui
Modified: trunk/ui/bin/freevo
==============================================================================
--- trunk/ui/bin/freevo (original)
+++ trunk/ui/bin/freevo Sat Apr 14 17:40:01 2007
@@ -94,7 +94,7 @@
# import ui path (ugly)
import freevo
- from freevo.ui.config import config
+ from freevo.ui import config
if config.gui.display.engine.lower() == 'sdl':
import pygame
Modified: trunk/ui/src/__init__.py
==============================================================================
--- trunk/ui/src/__init__.py (original)
+++ trunk/ui/src/__init__.py Sat Apr 14 17:40:01 2007
@@ -0,0 +1 @@
+from configfile import config
Modified: trunk/ui/src/audio/audiodiskitem.py
==============================================================================
--- trunk/ui/src/audio/audiodiskitem.py (original)
+++ trunk/ui/src/audio/audiodiskitem.py Sat Apr 14 17:40:01 2007
@@ -37,7 +37,7 @@
import os
# Freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.menu import Action, Menu
from audioitem import AudioItem
Modified: trunk/ui/src/audio/interface.py
==============================================================================
--- trunk/ui/src/audio/interface.py (original)
+++ trunk/ui/src/audio/interface.py Sat Apr 14 17:40:01 2007
@@ -47,7 +47,7 @@
# Freevo imports
from freevo import plugin
from freevo.ui import util, fxditem
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.menu import MediaPlugin
# AudioItem
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Sat Apr 14 17:40:01 2007
@@ -44,7 +44,7 @@
from kaa.strutils import str_to_unicode
# freevo imports
-from config import config
+from freevo.ui import config
import util
import menu
Modified: trunk/ui/src/games/plugins/pcgames.py
==============================================================================
--- trunk/ui/src/games/plugins/pcgames.py (original)
+++ trunk/ui/src/games/plugins/pcgames.py Sat Apr 14 17:40:01 2007
@@ -43,7 +43,7 @@
# Freevo imports
from freevo.ui.menu import ActionItem, Menu, Action
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.event import Event, STOP
# games imports
Modified: trunk/ui/src/games/plugins/scummvm.py
==============================================================================
--- trunk/ui/src/games/plugins/scummvm.py (original)
+++ trunk/ui/src/games/plugins/scummvm.py Sat Apr 14 17:40:01 2007
@@ -42,7 +42,7 @@
# Freevo imports
from freevo.ui.menu import ActionItem, Menu, Action
-from freevo.ui.config import config
+from freevo.ui import config
# games imports
from freevo.ui.games.emulator import EmulatorPlugin
Modified: trunk/ui/src/games/plugins/zsnes.py
==============================================================================
--- trunk/ui/src/games/plugins/zsnes.py (original)
+++ trunk/ui/src/games/plugins/zsnes.py Sat Apr 14 17:40:01 2007
@@ -32,7 +32,7 @@
# -----------------------------------------------------------------------------
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
# games imports
from freevo.ui.games.emulator import *
Modified: trunk/ui/src/gui/areas/area.py
==============================================================================
--- trunk/ui/src/gui/areas/area.py (original)
+++ trunk/ui/src/gui/areas/area.py Sat Apr 14 17:40:01 2007
@@ -54,7 +54,7 @@
# freevo imports
from freevo.ui import util
-from freevo.ui.config import config
+from freevo.ui import config
# gui imports
from freevo.ui.gui.widgets import Rectangle, Text, Textbox, Image
Modified: trunk/ui/src/gui/areas/tvlisting_area.py
==============================================================================
--- trunk/ui/src/gui/areas/tvlisting_area.py (original)
+++ trunk/ui/src/gui/areas/tvlisting_area.py Sat Apr 14 17:40:01 2007
@@ -42,7 +42,7 @@
import os
import math
import time
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.gui import imagelib
# kaa imports
Modified: trunk/ui/src/gui/compat.py
==============================================================================
--- trunk/ui/src/gui/compat.py (original)
+++ trunk/ui/src/gui/compat.py Sat Apr 14 17:40:01 2007
@@ -34,7 +34,7 @@
def __init__(self):
from freevo.ui.gui.areas import Handler
- from freevo.ui.config import config
+ from freevo.ui import config
self._fade_steps = config.gui.theme.fadestep
self.engine = Handler(self.name, self.areas)
@@ -115,7 +115,7 @@
areas = ()
def __init__(self):
- from freevo.ui.config import config
+ from freevo.ui import config
BaseApplication.__init__(self)
self.engine.set_background(int(config.player.video.colorkey))
Modified: trunk/ui/src/gui/displays/__init__.py
==============================================================================
--- trunk/ui/src/gui/displays/__init__.py (original)
+++ trunk/ui/src/gui/displays/__init__.py Sat Apr 14 17:40:01 2007
@@ -37,7 +37,7 @@
import kaa.notifier
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
# gui imports
from freevo.ui import gui
Modified: trunk/ui/src/gui/displays/dfb.py
==============================================================================
--- trunk/ui/src/gui/displays/dfb.py (original)
+++ trunk/ui/src/gui/displays/dfb.py Sat Apr 14 17:40:01 2007
@@ -41,7 +41,7 @@
from kaa.mevas.displays.directfbcanvas import DirectFBCanvas
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
# display imports
from display import Display as Base
Modified: trunk/ui/src/gui/displays/fb.py
==============================================================================
--- trunk/ui/src/gui/displays/fb.py (original)
+++ trunk/ui/src/gui/displays/fb.py Sat Apr 14 17:40:01 2007
@@ -41,7 +41,7 @@
from kaa.mevas.displays.fbcanvas import FramebufferCanvas
# Freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
# display imports
from display import Display as Base
Modified: trunk/ui/src/gui/font.py
==============================================================================
--- trunk/ui/src/gui/font.py (original)
+++ trunk/ui/src/gui/font.py Sat Apr 14 17:40:01 2007
@@ -39,7 +39,7 @@
# freevo imports
import freevo.conf
-from freevo.ui.config import config
+from freevo.ui import config
# get logging object
log = logging.getLogger('gui')
Modified: trunk/ui/src/gui/theme.py
==============================================================================
--- trunk/ui/src/gui/theme.py (original)
+++ trunk/ui/src/gui/theme.py Sat Apr 14 17:40:01 2007
@@ -57,7 +57,7 @@
# freevo imports
import freevo.conf
from freevo import plugin
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui import util
# gui imports
Modified: trunk/ui/src/gui/windows/inputbox.py
==============================================================================
--- trunk/ui/src/gui/windows/inputbox.py (original)
+++ trunk/ui/src/gui/windows/inputbox.py Sat Apr 14 17:40:01 2007
@@ -35,7 +35,7 @@
import logging
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.event import *
# gui imports
Modified: trunk/ui/src/gui/windows/waitbox.py
==============================================================================
--- trunk/ui/src/gui/windows/waitbox.py (original)
+++ trunk/ui/src/gui/windows/waitbox.py Sat Apr 14 17:40:01 2007
@@ -39,7 +39,7 @@
import logging
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
# gui imports
from freevo.ui.gui import displays
Modified: trunk/ui/src/image/fxdhandler.py
==============================================================================
--- trunk/ui/src/image/fxdhandler.py (original)
+++ trunk/ui/src/image/fxdhandler.py Sat Apr 14 17:40:01 2007
@@ -58,7 +58,7 @@
from kaa.strutils import unicode_to_str
# Freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui import menu
from freevo.ui.util import match_files
Modified: trunk/ui/src/image/imageitem.py
==============================================================================
--- trunk/ui/src/image/imageitem.py (original)
+++ trunk/ui/src/image/imageitem.py Sat Apr 14 17:40:01 2007
@@ -38,7 +38,7 @@
import time
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.menu import MediaItem, Action
from viewer import viewer
Modified: trunk/ui/src/image/interface.py
==============================================================================
--- trunk/ui/src/image/interface.py (original)
+++ trunk/ui/src/image/interface.py Sat Apr 14 17:40:01 2007
@@ -43,7 +43,7 @@
from freevo import plugin
from freevo.ui import fxditem
from freevo.ui.menu import MediaPlugin
-from freevo.ui.config import config
+from freevo.ui import config
# ImageItem
from imageitem import ImageItem
Modified: trunk/ui/src/image/viewer.py
==============================================================================
--- trunk/ui/src/image/viewer.py (original)
+++ trunk/ui/src/image/viewer.py Sat Apr 14 17:40:01 2007
@@ -43,7 +43,7 @@
from freevo import plugin
from freevo.ui import gui
from freevo.ui.gui import theme, imagelib, widgets
-from freevo.ui.config import config
+from freevo.ui import config
# cache for loading images
from freevo.ui.util import ObjectCache
Modified: trunk/ui/src/input/plugins/interface.py
==============================================================================
--- trunk/ui/src/input/plugins/interface.py (original)
+++ trunk/ui/src/input/plugins/interface.py Sat Apr 14 17:40:01 2007
@@ -39,7 +39,7 @@
# freevo imports
from freevo import plugin
from freevo.ui import input
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.event import Event
# get logging object
Modified: trunk/ui/src/input/plugins/joystick.py
==============================================================================
--- trunk/ui/src/input/plugins/joystick.py (original)
+++ trunk/ui/src/input/plugins/joystick.py Sat Apr 14 17:40:01 2007
@@ -45,7 +45,7 @@
from freevo.resources import ResourceHandler
from freevo.ui import application
from interface import InputPlugin
-from freevo.ui.config import config
+from freevo.ui import config
import logging
log = logging.getLogger('input')
Modified: trunk/ui/src/input/plugins/lirc.py
==============================================================================
--- trunk/ui/src/input/plugins/lirc.py (original)
+++ trunk/ui/src/input/plugins/lirc.py Sat Apr 14 17:40:01 2007
@@ -34,7 +34,7 @@
# -----------------------------------------------------------------------------
import kaa.input.lirc
-from freevo.ui.config import config
+from freevo.ui import config
from interface import InputPlugin
class PluginInterface(InputPlugin):
Modified: trunk/ui/src/input/plugins/sdl.py
==============================================================================
--- trunk/ui/src/input/plugins/sdl.py (original)
+++ trunk/ui/src/input/plugins/sdl.py Sat Apr 14 17:40:01 2007
@@ -38,7 +38,7 @@
# Freevo imports
from freevo.ui import gui
from freevo.ui.input import KEYBOARD_MAP
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.menu import Item
from freevo.ui.event import *
from interface import InputPlugin
Modified: trunk/ui/src/input/plugins/x11.py
==============================================================================
--- trunk/ui/src/input/plugins/x11.py (original)
+++ trunk/ui/src/input/plugins/x11.py Sat Apr 14 17:40:01 2007
@@ -36,7 +36,7 @@
# freevo imports
from freevo.ui import gui
-from freevo.ui.config import config
+from freevo.ui import config
# input imports
from freevo.ui.input import KEYBOARD_MAP
Modified: trunk/ui/src/menu/menu.py
==============================================================================
--- trunk/ui/src/menu/menu.py (original)
+++ trunk/ui/src/menu/menu.py Sat Apr 14 17:40:01 2007
@@ -38,7 +38,7 @@
from kaa.weakref import weakref
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.event import *
# menu imports
Modified: trunk/ui/src/playlist.py
==============================================================================
--- trunk/ui/src/playlist.py (original)
+++ trunk/ui/src/playlist.py Sat Apr 14 17:40:01 2007
@@ -43,7 +43,7 @@
# freevo imports
from freevo import plugin
-from config import config
+from freevo.ui import config
import util
import fxditem
Modified: trunk/ui/src/plugins/dpms.py
==============================================================================
--- trunk/ui/src/plugins/dpms.py (original)
+++ trunk/ui/src/plugins/dpms.py Sat Apr 14 17:40:01 2007
@@ -40,7 +40,7 @@
from freevo.plugin import Plugin
# freevo.ui imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.event import Event, DPMS_BLANK_SCREEN
from freevo.ui.application import signals as app_signals
Modified: trunk/ui/src/plugins/idlebar/__init__.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/__init__.py (original)
+++ trunk/ui/src/plugins/idlebar/__init__.py Sat Apr 14 17:40:01 2007
@@ -40,7 +40,7 @@
# freevo imports
from freevo.plugin import Plugin
from freevo.ui import gui, application
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.gui import theme, imagelib, widgets, animation
from freevo.ui.event import *
Modified: trunk/ui/src/plugins/osd.py
==============================================================================
--- trunk/ui/src/plugins/osd.py (original)
+++ trunk/ui/src/plugins/osd.py Sat Apr 14 17:40:01 2007
@@ -42,7 +42,7 @@
from freevo import plugin
from freevo.ui import gui
from freevo.ui.gui import theme, widgets
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.event import OSD_MESSAGE
Modified: trunk/ui/src/plugins/shutdown.py
==============================================================================
--- trunk/ui/src/plugins/shutdown.py (original)
+++ trunk/ui/src/plugins/shutdown.py Sat Apr 14 17:40:01 2007
@@ -43,7 +43,7 @@
from freevo.ui.application import ConfirmWindow
from freevo.ui.mainmenu import MainMenuItem, MainMenuPlugin
from freevo.ui.gui import theme, widgets
-from freevo.ui.config import config
+from freevo.ui import config
# get shutdown config
config = config.plugin.shutdown
Modified: trunk/ui/src/tv/favorite.py
==============================================================================
--- trunk/ui/src/tv/favorite.py (original)
+++ trunk/ui/src/tv/favorite.py Sat Apr 14 17:40:01 2007
@@ -39,7 +39,7 @@
from kaa.strutils import unicode_to_str
# freevo ui imports
-from freevo.ui.config import config
+from freevo.ui import config
# freevo core imports
import freevo.ipc
Modified: trunk/ui/src/tv/plugins/directory.py
==============================================================================
--- trunk/ui/src/tv/plugins/directory.py (original)
+++ trunk/ui/src/tv/plugins/directory.py Sat Apr 14 17:40:01 2007
@@ -33,7 +33,7 @@
import kaa.beacon
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.mainmenu import MainMenuPlugin
from freevo.ui.menu import ActionItem
from freevo.ui.directory import DirItem
Modified: trunk/ui/src/tv/plugins/scheduled.py
==============================================================================
--- trunk/ui/src/tv/plugins/scheduled.py (original)
+++ trunk/ui/src/tv/plugins/scheduled.py Sat Apr 14 17:40:01 2007
@@ -40,7 +40,7 @@
import freevo.ipc
# freevo ui imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.menu import Menu, ActionItem, Action, Item
from freevo.ui.mainmenu import MainMenuPlugin
from freevo.ui.application import MessageWindow
Modified: trunk/ui/src/tv/program.py
==============================================================================
--- trunk/ui/src/tv/program.py (original)
+++ trunk/ui/src/tv/program.py Sat Apr 14 17:40:01 2007
@@ -43,7 +43,7 @@
import freevo.ipc
# freevo imports
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.menu import Item, Action, Menu, ActionItem
from freevo.ui.application import MessageWindow
Modified: trunk/ui/src/video/interface.py
==============================================================================
--- trunk/ui/src/video/interface.py (original)
+++ trunk/ui/src/video/interface.py Sat Apr 14 17:40:01 2007
@@ -44,7 +44,7 @@
from freevo import plugin
from freevo.ui import util, fxditem
from freevo.ui.menu import Files, MediaPlugin
-from freevo.ui.config import config
+from freevo.ui import config
# video imports
from videoitem import VideoItem
Modified: trunk/ui/src/video/videoitem.py
==============================================================================
--- trunk/ui/src/video/videoitem.py (original)
+++ trunk/ui/src/video/videoitem.py Sat Apr 14 17:40:01 2007
@@ -48,7 +48,7 @@
# freevo imports
from freevo.ui import util
-from freevo.ui.config import config
+from freevo.ui import config
from freevo.ui.application import MessageWindow, ConfirmWindow
from freevo.ui.menu import Menu, MediaItem, Files, Action
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
