Author: dmeyer
Date: Sat Apr 14 20:30:08 2007
New Revision: 9444
Modified:
trunk/ui/src/__init__.py
trunk/ui/src/games/emulator.py
trunk/ui/src/gui/__init__.py
trunk/ui/src/gui/areas/handler.py
trunk/ui/src/gui/font.py
trunk/ui/src/gui/imagelib.py
trunk/ui/src/gui/theme.py
trunk/ui/src/input/plugins/lirc.py
trunk/ui/src/plugins/idlebar/logo.py
trunk/ui/src/plugins/mediamenu.py
trunk/ui/src/video/plugins/resume.py
Log:
no need to import freevo.conf from within freevo except __init__
Modified: trunk/ui/src/__init__.py
==============================================================================
--- trunk/ui/src/__init__.py (original)
+++ trunk/ui/src/__init__.py Sat Apr 14 20:30:08 2007
@@ -39,9 +39,12 @@
# freevo.ui imports
import event
+# expose SHAREDIR to other modules
+SHAREDIR = freevo.conf.SHAREDIR
+
# generate config
pycfgfile = freevo.conf.datafile('freevo_config.py')
-cfgdir = os.path.join(freevo.conf.SHAREDIR, 'config')
+cfgdir = os.path.join(SHAREDIR, 'config')
cfgsource = [ os.path.join(cfgdir, f) for f in os.listdir(cfgdir) ]
freevo.xmlconfig.xmlconfig(pycfgfile, cfgsource)
Modified: trunk/ui/src/games/emulator.py
==============================================================================
--- trunk/ui/src/games/emulator.py (original)
+++ trunk/ui/src/games/emulator.py Sat Apr 14 20:30:08 2007
@@ -46,8 +46,8 @@
import kaa.beacon
# freevo imports
-import freevo.conf
from freevo.resources import ResourceHandler
+from freevo.ui import SHAREDIR
from freevo.ui.mainmenu import MainMenuItem, MainMenuPlugin
from freevo.ui.directory import DirItem
from freevo.ui.event import EJECT
@@ -280,7 +280,7 @@
filename = filename[len(os.getcwd()):]
if filename[0] == '/':
filename = filename[1:]
- filename = os.path.join(freevo.conf.SHAREDIR, filename)
+ filename = os.path.join(SHAREDIR, filename)
query = kaa.beacon.query(filename=filename)
listing = query.get()
Modified: trunk/ui/src/gui/__init__.py
==============================================================================
--- trunk/ui/src/gui/__init__.py (original)
+++ trunk/ui/src/gui/__init__.py Sat Apr 14 20:30:08 2007
@@ -49,7 +49,7 @@
# the display on runtime and get some basic display informations.
#
# Submodule: import gui.windows
-# Dependencies: freevo config, gui.widgets
+# Dependencies: gui.widgets
# Content: The different windows and popup boxes
# Description: This module includes different popup boxes and a basic window
#
Modified: trunk/ui/src/gui/areas/handler.py
==============================================================================
--- trunk/ui/src/gui/areas/handler.py (original)
+++ trunk/ui/src/gui/areas/handler.py Sat Apr 14 20:30:08 2007
@@ -46,8 +46,6 @@
import traceback
import time
-import freevo.conf
-
import logging
log = logging.getLogger('gui')
Modified: trunk/ui/src/gui/font.py
==============================================================================
--- trunk/ui/src/gui/font.py (original)
+++ trunk/ui/src/gui/font.py Sat Apr 14 20:30:08 2007
@@ -38,8 +38,7 @@
import kaa.mevas
# freevo imports
-import freevo.conf
-from freevo.ui import config
+from freevo.ui import config, SHAREDIR
# get logging object
log = logging.getLogger('gui')
@@ -109,7 +108,7 @@
# init mevas font (imlib2)
-FONT_DIR = os.path.join(freevo.conf.SHAREDIR, 'fonts')
+FONT_DIR = os.path.join(SHAREDIR, 'fonts')
kaa.mevas.imagelib.add_font_path(FONT_DIR)
DEFAULT_FONT = os.path.join(FONT_DIR, fontcfg.default)
Modified: trunk/ui/src/gui/imagelib.py
==============================================================================
--- trunk/ui/src/gui/imagelib.py (original)
+++ trunk/ui/src/gui/imagelib.py Sat Apr 14 20:30:08 2007
@@ -40,7 +40,8 @@
# mevas imagelib
import kaa.mevas
-import freevo.conf
+from freevo.ui import SHAREDIR
+
import theme
# get logging object
@@ -103,7 +104,7 @@
filename = os.path.abspath(url)
if not os.path.isfile(filename):
- filename = os.path.join(freevo.conf.SHAREDIR, 'images', url[8:])
+ filename = os.path.join(SHAREDIR, 'images', url[8:])
if not os.path.isfile(filename):
log.error('Image file "%s" doesn\'t exist!' % filename)
Modified: trunk/ui/src/gui/theme.py
==============================================================================
--- trunk/ui/src/gui/theme.py (original)
+++ trunk/ui/src/gui/theme.py Sat Apr 14 20:30:08 2007
@@ -55,9 +55,8 @@
import kaa.strutils
# freevo imports
-import freevo.conf
from freevo import plugin
-from freevo.ui import config
+from freevo.ui import config, SHAREDIR
from freevo.ui import util
# gui imports
@@ -71,8 +70,8 @@
FXD_FORMAT_VERSION = 2
# internal variables
-ICON_DIR = os.path.join(freevo.conf.SHAREDIR, 'icons')
-IMAGE_DIR = os.path.join(freevo.conf.SHAREDIR, 'images')
+ICON_DIR = os.path.join(SHAREDIR, 'icons')
+IMAGE_DIR = os.path.join(SHAREDIR, 'images')
# signals
signals = { 'theme change': kaa.notifier.Signal() }
@@ -1140,7 +1139,7 @@
self.box_under_icon = 0
# load plugin skin files:
- pdir = os.path.join(freevo.conf.SHAREDIR, 'skins/plugins')
+ pdir = os.path.join(SHAREDIR, 'skins/plugins')
if os.path.isdir(pdir):
for p in util.match_files(pdir, [ 'fxd' ]):
self.load(p)
@@ -1403,7 +1402,7 @@
"""
self.prepared = False
- skin_dir = os.path.join(freevo.conf.SHAREDIR, 'skins')
+ skin_dir = os.path.join(SHAREDIR, 'skins')
if not os.path.isfile(file):
if os.path.isfile(file+".fxd"):
file += ".fxd"
@@ -1444,15 +1443,6 @@
log.exception('XML file %s corrupt, using default skin' % name)
settings = FXDSettings('basic.fxd')
- # search for personal skin settings additions
- # (this feature needs more doc outside this file)
- for dir in freevo.conf.cfgfilepath:
- local_skin = '%s/local_skin.fxd' % dir
- if os.path.isfile(local_skin):
- log.debug('add local config %s to skin' % local_skin)
- settings.load(local_skin)
- break
-
# prepare the skin for usage
settings.prepare()
return settings
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 20:30:08 2007
@@ -5,8 +5,6 @@
# $Id$
#
# This file handles the lirc input device and maps it to freevo events.
-# If /dev/lirc is present, this plugin will be actiavted by
-# freevo_config.py.
#
# -----------------------------------------------------------------------------
# Freevo - A Home Theater PC framework
Modified: trunk/ui/src/plugins/idlebar/logo.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/logo.py (original)
+++ trunk/ui/src/plugins/idlebar/logo.py Sat Apr 14 20:30:08 2007
@@ -31,8 +31,7 @@
import os
-import freevo.conf
-from freevo.ui import gui
+from freevo.ui import gui, SHAREDIR
from freevo.ui.gui import theme, widgets
from plugin import IdleBarPlugin
@@ -50,7 +49,7 @@
if not self.image:
image = theme.image('logo')
else:
- image = os.path.join(freevo.conf.SHAREDIR, 'images', self.image)
+ image = os.path.join(SHAREDIR, 'images', self.image)
if self.objects and self.file == image:
return self.NO_CHANGE
Modified: trunk/ui/src/plugins/mediamenu.py
==============================================================================
--- trunk/ui/src/plugins/mediamenu.py (original)
+++ trunk/ui/src/plugins/mediamenu.py Sat Apr 14 20:30:08 2007
@@ -40,9 +40,6 @@
import kaa.beacon
from kaa.weakref import weakref
-# freevo imports
-import freevo.conf
-
from freevo.ui.event import EJECT
from freevo.ui.directory import DirItem
from freevo.ui.mainmenu import MainMenuItem, MainMenuPlugin
@@ -154,14 +151,6 @@
continue
# normal file
- if not os.path.isfile(filename) and \
- filename.startswith(os.getcwd()):
- # file is in share dir
- filename = filename[len(os.getcwd()):]
- if filename[0] == '/':
- filename = filename[1:]
- filename = os.path.join(freevo.conf.SHAREDIR, filename)
-
query = kaa.beacon.query(filename=filename)
listing = query.get(filter='extmap')
for p in MediaPlugin.plugins(self.display_type):
Modified: trunk/ui/src/video/plugins/resume.py
==============================================================================
--- trunk/ui/src/video/plugins/resume.py (original)
+++ trunk/ui/src/video/plugins/resume.py Sat Apr 14 20:30:08 2007
@@ -34,8 +34,6 @@
import kaa.beacon
# freevo imports
-import freevo.conf
-
from freevo.ui.menu import Action, Menu, ItemPlugin
from freevo.ui.event import PLAY_START, PLAY_END, STOP
-------------------------------------------------------------------------
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
