Author: dmeyer
Date: Mon Jan 29 21:18:28 2007
New Revision: 9089
Modified:
trunk/ui/bin/freevo
trunk/ui/src/application/handler.py
trunk/ui/src/audio/audiodiskitem.py
trunk/ui/src/audio/interface.py
trunk/ui/src/audio/player.py
trunk/ui/src/config.py
trunk/ui/src/directory.py
trunk/ui/src/games/emu.py
trunk/ui/src/games/gameitem.py
trunk/ui/src/games/interface.py
trunk/ui/src/games/machine.py
trunk/ui/src/gui/areas/area.py
trunk/ui/src/gui/areas/handler.py
trunk/ui/src/gui/areas/listing_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/display.py
trunk/ui/src/gui/displays/fb.py
trunk/ui/src/gui/displays/imlib2.py
trunk/ui/src/gui/displays/sdl.py
trunk/ui/src/gui/font.py
trunk/ui/src/gui/imagelib.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/dfbevents.py
trunk/ui/src/input/plugins/event_device.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/mainmenu.py
trunk/ui/src/menu/menu.py
trunk/ui/src/playlist.py
trunk/ui/src/plugins/file_ops.py
trunk/ui/src/plugins/idlebar/MultiMail.py
trunk/ui/src/plugins/idlebar/__init__.py
trunk/ui/src/plugins/idlebar/logo.py
trunk/ui/src/plugins/idlebar/mail.py
trunk/ui/src/plugins/idlebar/system.py
trunk/ui/src/plugins/idlebar/weather.py
trunk/ui/src/plugins/mediamenu.py
trunk/ui/src/plugins/mixer.py
trunk/ui/src/plugins/osd.py
trunk/ui/src/plugins/ossmixer.py
trunk/ui/src/plugins/shutdown.py
trunk/ui/src/setup.py
trunk/ui/src/tv/__init__.py
trunk/ui/src/tv/program.py
trunk/ui/src/tv/tvmenu.py
trunk/ui/src/video/database.py
trunk/ui/src/video/interface.py
trunk/ui/src/video/player.py
trunk/ui/src/video/videoitem.py
Log:
import config as module with full path
Modified: trunk/ui/bin/freevo
==============================================================================
--- trunk/ui/bin/freevo (original)
+++ trunk/ui/bin/freevo Mon Jan 29 21:18:28 2007
@@ -101,7 +101,7 @@
FREEVO_PATH = os.path.join(os.path.dirname(freevo.__file__), 'ui')
sys.path.insert(0, FREEVO_PATH)
- import config
+ from freevo.ui import config
if config.GUI_DISPLAY == 'SDL':
import pygame
Modified: trunk/ui/src/application/handler.py
==============================================================================
--- trunk/ui/src/application/handler.py (original)
+++ trunk/ui/src/application/handler.py Mon Jan 29 21:18:28 2007
@@ -46,7 +46,7 @@
import kaa.notifier
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui.input import set_mapping
from freevo.ui.event import *
Modified: trunk/ui/src/audio/audiodiskitem.py
==============================================================================
--- trunk/ui/src/audio/audiodiskitem.py (original)
+++ trunk/ui/src/audio/audiodiskitem.py Mon Jan 29 21:18:28 2007
@@ -37,7 +37,7 @@
import os
# Freevo imports
-import config
+from freevo.ui import config
from 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 Mon Jan 29 21:18:28 2007
@@ -44,7 +44,7 @@
import stat
# Freevo imports
-import config
+from freevo.ui import config
import util
from freevo.ui import plugin
import fxditem
Modified: trunk/ui/src/audio/player.py
==============================================================================
--- trunk/ui/src/audio/player.py (original)
+++ trunk/ui/src/audio/player.py Mon Jan 29 21:18:28 2007
@@ -40,7 +40,7 @@
import kaa.notifier
# Freevo imports
-import config
+from freevo.ui import config
from freevo.ui.event import *
from application import Application, STATUS_RUNNING, STATUS_STOPPING, \
Modified: trunk/ui/src/config.py
==============================================================================
--- trunk/ui/src/config.py (original)
+++ trunk/ui/src/config.py Mon Jan 29 21:18:28 2007
@@ -56,16 +56,9 @@
import freevo.conf
# freevo imports
-import version
+from freevo.ui import version, setup, input, plugin
-# config imports
-import setup
-
-# input inputs variables for the input system
-# and event.py (which has no more deps)
-from freevo.ui import input, plugin
-
-# import event names (no deps)
+# import event names
from freevo.ui.event import *
# get logging object
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Mon Jan 29 21:18:28 2007
@@ -44,7 +44,7 @@
from kaa.strutils import str_to_unicode
# freevo imports
-import config
+from freevo.ui import config
import util
import menu
Modified: trunk/ui/src/games/emu.py
==============================================================================
--- trunk/ui/src/games/emu.py (original)
+++ trunk/ui/src/games/emu.py Mon Jan 29 21:18:28 2007
@@ -31,7 +31,7 @@
# -----------------------------------------------------------------------------
from freevo.ui import plugin
import logging
-import config
+from freevo.ui import config
from application import ChildApp
from freevo.ui.event import *
Modified: trunk/ui/src/games/gameitem.py
==============================================================================
--- trunk/ui/src/games/gameitem.py (original)
+++ trunk/ui/src/games/gameitem.py Mon Jan 29 21:18:28 2007
@@ -32,7 +32,7 @@
# -----------------------------------------------------------------------------
from menu import MediaItem, Action
import machine
-import config
+from freevo.ui import config
import logging
log = logging.getLogger('games')
Modified: trunk/ui/src/games/interface.py
==============================================================================
--- trunk/ui/src/games/interface.py (original)
+++ trunk/ui/src/games/interface.py Mon Jan 29 21:18:28 2007
@@ -30,7 +30,7 @@
#
# -----------------------------------------------------------------------------
from freevo.ui import plugin
-import config
+from freevo.ui import config
import machine
from gameitem import GameItem
Modified: trunk/ui/src/games/machine.py
==============================================================================
--- trunk/ui/src/games/machine.py (original)
+++ trunk/ui/src/games/machine.py Mon Jan 29 21:18:28 2007
@@ -27,7 +27,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-import config
+from freevo.ui import config
from emu import UserEmu
Modified: trunk/ui/src/gui/areas/area.py
==============================================================================
--- trunk/ui/src/gui/areas/area.py (original)
+++ trunk/ui/src/gui/areas/area.py Mon Jan 29 21:18:28 2007
@@ -53,7 +53,7 @@
import os
# freevo imports
-import config
+from freevo.ui import config
import util
# gui imports
Modified: trunk/ui/src/gui/areas/handler.py
==============================================================================
--- trunk/ui/src/gui/areas/handler.py (original)
+++ trunk/ui/src/gui/areas/handler.py Mon Jan 29 21:18:28 2007
@@ -52,7 +52,7 @@
log = logging.getLogger('gui')
# freevo imports
-import config
+from freevo.ui import config
from kaa.weakref import weakref
# gui imports
Modified: trunk/ui/src/gui/areas/listing_area.py
==============================================================================
--- trunk/ui/src/gui/areas/listing_area.py (original)
+++ trunk/ui/src/gui/areas/listing_area.py Mon Jan 29 21:18:28 2007
@@ -45,7 +45,7 @@
from kaa.notifier import Timer
# freevo imports
-import config
+from freevo.ui import config
import util
# gui import
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 Mon Jan 29 21:18:28 2007
@@ -43,7 +43,7 @@
import gui.imagelib
import math
import time
-import config
+from freevo.ui import config
# kaa imports
import kaa.epg
Modified: trunk/ui/src/gui/compat.py
==============================================================================
--- trunk/ui/src/gui/compat.py (original)
+++ trunk/ui/src/gui/compat.py Mon Jan 29 21:18:28 2007
@@ -34,7 +34,7 @@
def __init__(self):
from areas import Handler
- import config
+ from freevo.ui import config
self.GUI_FADE_STEPS = config.GUI_FADE_STEPS
self.engine = Handler(self.name, self.areas)
Modified: trunk/ui/src/gui/displays/__init__.py
==============================================================================
--- trunk/ui/src/gui/displays/__init__.py (original)
+++ trunk/ui/src/gui/displays/__init__.py Mon Jan 29 21:18:28 2007
@@ -37,7 +37,7 @@
import kaa.notifier
# freevo imports
-import config
+from freevo.ui import config
# gui imports
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 Mon Jan 29 21:18:28 2007
@@ -41,7 +41,7 @@
from kaa.mevas.displays.directfbcanvas import DirectFBCanvas
# freevo imports
-import config
+from freevo.ui import config
# display imports
from display import Display as Base
Modified: trunk/ui/src/gui/displays/display.py
==============================================================================
--- trunk/ui/src/gui/displays/display.py (original)
+++ trunk/ui/src/gui/displays/display.py Mon Jan 29 21:18:28 2007
@@ -34,7 +34,7 @@
# -----------------------------------------------------------------------------
# Freevo imports
-import config
+from freevo.ui import config
class Display(object):
"""
Modified: trunk/ui/src/gui/displays/fb.py
==============================================================================
--- trunk/ui/src/gui/displays/fb.py (original)
+++ trunk/ui/src/gui/displays/fb.py Mon Jan 29 21:18:28 2007
@@ -41,7 +41,7 @@
from kaa.mevas.displays.fbcanvas import FramebufferCanvas
# Freevo imports
-import config
+from freevo.ui import config
# display imports
from display import Display as Base
Modified: trunk/ui/src/gui/displays/imlib2.py
==============================================================================
--- trunk/ui/src/gui/displays/imlib2.py (original)
+++ trunk/ui/src/gui/displays/imlib2.py Mon Jan 29 21:18:28 2007
@@ -33,7 +33,7 @@
# python imports
from freevo.ui import plugin
-import config
+from freevo.ui import config
# mevas imports
from kaa.mevas.displays.imlib2canvas import Imlib2Canvas
Modified: trunk/ui/src/gui/displays/sdl.py
==============================================================================
--- trunk/ui/src/gui/displays/sdl.py (original)
+++ trunk/ui/src/gui/displays/sdl.py Mon Jan 29 21:18:28 2007
@@ -41,7 +41,7 @@
from kaa.mevas.displays.pygamecanvas import PygameCanvas
# Freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
# display imports
Modified: trunk/ui/src/gui/font.py
==============================================================================
--- trunk/ui/src/gui/font.py (original)
+++ trunk/ui/src/gui/font.py Mon Jan 29 21:18:28 2007
@@ -36,7 +36,7 @@
import kaa.mevas
# freevo imports
-import config
+from freevo.ui import config
# get logging object
log = logging.getLogger('gui')
Modified: trunk/ui/src/gui/imagelib.py
==============================================================================
--- trunk/ui/src/gui/imagelib.py (original)
+++ trunk/ui/src/gui/imagelib.py Mon Jan 29 21:18:28 2007
@@ -40,7 +40,7 @@
# mevas imagelib
import kaa.mevas
-import config
+from freevo.ui import config
import util
import theme
Modified: trunk/ui/src/gui/theme.py
==============================================================================
--- trunk/ui/src/gui/theme.py (original)
+++ trunk/ui/src/gui/theme.py Mon Jan 29 21:18:28 2007
@@ -56,7 +56,7 @@
# freevo imports
import freevo.conf
-import config
+from freevo.ui import config
import util
from freevo.ui import plugin
Modified: trunk/ui/src/gui/windows/inputbox.py
==============================================================================
--- trunk/ui/src/gui/windows/inputbox.py (original)
+++ trunk/ui/src/gui/windows/inputbox.py Mon Jan 29 21:18:28 2007
@@ -35,7 +35,7 @@
import logging
# freevo imports
-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 Mon Jan 29 21:18:28 2007
@@ -39,7 +39,7 @@
import logging
# freevo imports
-import config
+from freevo.ui import config
# gui imports
import gui.displays as displays
Modified: trunk/ui/src/image/fxdhandler.py
==============================================================================
--- trunk/ui/src/image/fxdhandler.py (original)
+++ trunk/ui/src/image/fxdhandler.py Mon Jan 29 21:18:28 2007
@@ -58,7 +58,7 @@
from kaa.strutils import unicode_to_str
# Freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
from util import match_files
Modified: trunk/ui/src/image/imageitem.py
==============================================================================
--- trunk/ui/src/image/imageitem.py (original)
+++ trunk/ui/src/image/imageitem.py Mon Jan 29 21:18:28 2007
@@ -38,7 +38,7 @@
import time
# freevo imports
-import config
+from freevo.ui import config
from 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 Mon Jan 29 21:18:28 2007
@@ -39,7 +39,7 @@
__all__ = [ 'PluginInterface' ]
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
import fxditem
Modified: trunk/ui/src/image/viewer.py
==============================================================================
--- trunk/ui/src/image/viewer.py (original)
+++ trunk/ui/src/image/viewer.py Mon Jan 29 21:18:28 2007
@@ -40,7 +40,7 @@
from kaa.strutils import to_unicode
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
import gui
import gui.widgets
Modified: trunk/ui/src/input/plugins/dfbevents.py
==============================================================================
--- trunk/ui/src/input/plugins/dfbevents.py (original)
+++ trunk/ui/src/input/plugins/dfbevents.py Mon Jan 29 21:18:28 2007
@@ -41,7 +41,7 @@
import directfb
# Freevo imports
-import config
+from freevo.ui import config
import gui.displays
from freevo.ui.event import *
from interface import InputPlugin
Modified: trunk/ui/src/input/plugins/event_device.py
==============================================================================
--- trunk/ui/src/input/plugins/event_device.py (original)
+++ trunk/ui/src/input/plugins/event_device.py Mon Jan 29 21:18:28 2007
@@ -89,7 +89,7 @@
import logging
from time import sleep
-import config
+from freevo.ui import config
import freevo.ui.input.linux_input as li
import freevo.ui.input.evdev_keymaps as ek
Modified: trunk/ui/src/input/plugins/interface.py
==============================================================================
--- trunk/ui/src/input/plugins/interface.py (original)
+++ trunk/ui/src/input/plugins/interface.py Mon Jan 29 21:18:28 2007
@@ -36,7 +36,7 @@
import logging
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin, input
# 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 Mon Jan 29 21:18:28 2007
@@ -39,7 +39,7 @@
import struct
from time import sleep
-import config
+from freevo.ui import config
from interface import InputPlugin
import logging
Modified: trunk/ui/src/input/plugins/lirc.py
==============================================================================
--- trunk/ui/src/input/plugins/lirc.py (original)
+++ trunk/ui/src/input/plugins/lirc.py Mon Jan 29 21:18:28 2007
@@ -34,7 +34,7 @@
# -----------------------------------------------------------------------------
import kaa.input.lirc
-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 Mon Jan 29 21:18:28 2007
@@ -36,7 +36,7 @@
import logging
# Freevo imports
-import config
+from freevo.ui import config
import gui
from menu import Item
Modified: trunk/ui/src/input/plugins/x11.py
==============================================================================
--- trunk/ui/src/input/plugins/x11.py (original)
+++ trunk/ui/src/input/plugins/x11.py Mon Jan 29 21:18:28 2007
@@ -35,7 +35,7 @@
# freevo imports
import gui
-import config
+from freevo.ui import config
# input imports
from freevo.ui.input import linux_input
Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py (original)
+++ trunk/ui/src/mainmenu.py Mon Jan 29 21:18:28 2007
@@ -39,7 +39,7 @@
import os
# freevo imports
-import config
+from freevo.ui import config
import gui.theme
import util
from freevo.ui import plugin
Modified: trunk/ui/src/menu/menu.py
==============================================================================
--- trunk/ui/src/menu/menu.py (original)
+++ trunk/ui/src/menu/menu.py Mon Jan 29 21:18:28 2007
@@ -38,7 +38,7 @@
from kaa.weakref import weakref
# freevo imports
-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 Mon Jan 29 21:18:28 2007
@@ -42,7 +42,7 @@
from kaa.weakref import weakref
# freevo imports
-import config
+from freevo.ui import config
import util
from freevo.ui import plugin
import fxditem
Modified: trunk/ui/src/plugins/file_ops.py
==============================================================================
--- trunk/ui/src/plugins/file_ops.py (original)
+++ trunk/ui/src/plugins/file_ops.py Mon Jan 29 21:18:28 2007
@@ -35,7 +35,7 @@
from kaa.notifier import Callback
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
import util
Modified: trunk/ui/src/plugins/idlebar/MultiMail.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/MultiMail.py (original)
+++ trunk/ui/src/plugins/idlebar/MultiMail.py Mon Jan 29 21:18:28 2007
@@ -48,7 +48,7 @@
# ----------------------------------------------------------------------- */
import os
-import config
+from freevo.ui import config
import imaplib
import poplib
import mailbox
Modified: trunk/ui/src/plugins/idlebar/__init__.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/__init__.py (original)
+++ trunk/ui/src/plugins/idlebar/__init__.py Mon Jan 29 21:18:28 2007
@@ -38,7 +38,7 @@
import kaa.notifier
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
import gui
import gui.imagelib
Modified: trunk/ui/src/plugins/idlebar/logo.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/logo.py (original)
+++ trunk/ui/src/plugins/idlebar/logo.py Mon Jan 29 21:18:28 2007
@@ -34,7 +34,7 @@
import gui
import gui.widgets
import gui.theme
-import config
+from freevo.ui import config
from plugins.idlebar import IdleBarPlugin
class PluginInterface(IdleBarPlugin):
Modified: trunk/ui/src/plugins/idlebar/mail.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/mail.py (original)
+++ trunk/ui/src/plugins/idlebar/mail.py Mon Jan 29 21:18:28 2007
@@ -34,7 +34,7 @@
import gui.widgets
import gui.imagelib
-import config
+from freevo.ui import config
from plugins.idlebar import IdleBarPlugin
class PluginInterface(IdleBarPlugin):
Modified: trunk/ui/src/plugins/idlebar/system.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/system.py (original)
+++ trunk/ui/src/plugins/idlebar/system.py Mon Jan 29 21:18:28 2007
@@ -68,7 +68,7 @@
import gui.widgets
import gui.theme
-import config
+from freevo.ui import config
from plugins.idlebar import IdleBarPlugin
Modified: trunk/ui/src/plugins/idlebar/weather.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/weather.py (original)
+++ trunk/ui/src/plugins/idlebar/weather.py Mon Jan 29 21:18:28 2007
@@ -36,7 +36,7 @@
import gui
import gui.widgets
import gui.theme
-import config
+from freevo.ui import config
from freevo.ui import plugin
from plugins.idlebar import IdleBarPlugin
Modified: trunk/ui/src/plugins/mediamenu.py
==============================================================================
--- trunk/ui/src/plugins/mediamenu.py (original)
+++ trunk/ui/src/plugins/mediamenu.py Mon Jan 29 21:18:28 2007
@@ -41,7 +41,7 @@
from kaa.weakref import weakref
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
Modified: trunk/ui/src/plugins/mixer.py
==============================================================================
--- trunk/ui/src/plugins/mixer.py (original)
+++ trunk/ui/src/plugins/mixer.py Mon Jan 29 21:18:28 2007
@@ -70,7 +70,7 @@
import struct
import os
-import config
+from freevo.ui import config
from freevo.ui import plugin
from freevo.ui.event import *
from kaa.ioctl import *
Modified: trunk/ui/src/plugins/osd.py
==============================================================================
--- trunk/ui/src/plugins/osd.py (original)
+++ trunk/ui/src/plugins/osd.py Mon Jan 29 21:18:28 2007
@@ -39,7 +39,7 @@
from kaa.notifier import OneShotTimer, EventHandler
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
import gui
import gui.widgets
Modified: trunk/ui/src/plugins/ossmixer.py
==============================================================================
--- trunk/ui/src/plugins/ossmixer.py (original)
+++ trunk/ui/src/plugins/ossmixer.py Mon Jan 29 21:18:28 2007
@@ -80,7 +80,7 @@
import struct
import os
-import config
+from freevo.ui import config
from freevo.ui import plugin
from freevo.ui.event import *
Modified: trunk/ui/src/plugins/shutdown.py
==============================================================================
--- trunk/ui/src/plugins/shutdown.py (original)
+++ trunk/ui/src/plugins/shutdown.py Mon Jan 29 21:18:28 2007
@@ -38,7 +38,7 @@
import kaa.notifier
# freevo imports
-import config
+from freevo.ui import config
import gui
import gui.widgets
Modified: trunk/ui/src/setup.py
==============================================================================
--- trunk/ui/src/setup.py (original)
+++ trunk/ui/src/setup.py Mon Jan 29 21:18:28 2007
@@ -241,22 +241,6 @@
if o == '--chanlist':
conf.chanlist = a
- # this is called by the Makefile, don't call it directly
- if o == '--compile':
- # Compile python files:
- import distutils.util
- try:
- optimize=min(int(a[0]),2)
- prefix=a[2:]
- except:
- sys.exit(1)
-
- files = []
- os.path.walk('.', match_files_recursively_helper, files)
- distutils.util.byte_compile(files, prefix='.', base_dir=prefix,
- optimize=optimize)
- sys.exit(0)
-
for program, valname, needed in EXTERNAL_PROGRAMS:
check_program(conf, program, valname, needed)
Modified: trunk/ui/src/tv/__init__.py
==============================================================================
--- trunk/ui/src/tv/__init__.py (original)
+++ trunk/ui/src/tv/__init__.py Mon Jan 29 21:18:28 2007
@@ -50,7 +50,7 @@
# import here to avoid importing all this when some helpers only
# want to import something from iside the tv directory
- import config
+ from freevo.ui import config
# connect to tvserver using freevo.ipc
mbus = freevo.ipc.Instance('freevo')
Modified: trunk/ui/src/tv/program.py
==============================================================================
--- trunk/ui/src/tv/program.py (original)
+++ trunk/ui/src/tv/program.py Mon Jan 29 21:18:28 2007
@@ -42,7 +42,7 @@
import freevo.ipc
# freevo imports
-import config
+from freevo.ui import config
from freevo.ui import plugin
from menu import Item, Action, Menu, ActionItem
from application import MessageWindow
Modified: trunk/ui/src/tv/tvmenu.py
==============================================================================
--- trunk/ui/src/tv/tvmenu.py (original)
+++ trunk/ui/src/tv/tvmenu.py Mon Jan 29 21:18:28 2007
@@ -35,7 +35,7 @@
# freevo core imports
import freevo.ipc
-import config
+from freevo.ui import config
from freevo.ui import plugin
from mainmenu import MainMenuItem
Modified: trunk/ui/src/video/database.py
==============================================================================
--- trunk/ui/src/video/database.py (original)
+++ trunk/ui/src/video/database.py Mon Jan 29 21:18:28 2007
@@ -39,7 +39,7 @@
import copy
# freevo imports
-import config
+from freevo.ui import config
import util
import logging
Modified: trunk/ui/src/video/interface.py
==============================================================================
--- trunk/ui/src/video/interface.py (original)
+++ trunk/ui/src/video/interface.py Mon Jan 29 21:18:28 2007
@@ -41,7 +41,7 @@
import string
# freevo imports
-import config
+from freevo.ui import config
import util
from freevo.ui import plugin
import fxditem
Modified: trunk/ui/src/video/player.py
==============================================================================
--- trunk/ui/src/video/player.py (original)
+++ trunk/ui/src/video/player.py Mon Jan 29 21:18:28 2007
@@ -40,7 +40,7 @@
import kaa.notifier
# Freevo imports
-import config
+from freevo.ui import config
from freevo.ui.event import *
from application import Application, STATUS_RUNNING, STATUS_STOPPING, \
Modified: trunk/ui/src/video/videoitem.py
==============================================================================
--- trunk/ui/src/video/videoitem.py (original)
+++ trunk/ui/src/video/videoitem.py Mon Jan 29 21:18:28 2007
@@ -46,7 +46,7 @@
from kaa.strutils import unicode_to_str, str_to_unicode
# freevo imports
-import config
+from freevo.ui import config
import util
from application import MessageWindow, ConfirmWindow
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
