Author: dmeyer
Date: Sat Feb 10 20:00:54 2007
New Revision: 9195
Modified:
trunk/ui/src/config.py
trunk/ui/src/gui/imagelib.py
trunk/ui/src/gui/theme.py
trunk/ui/src/plugins/idlebar/__init__.py
trunk/ui/src/plugins/idlebar/logo.py
Log:
more config cleanup
Modified: trunk/ui/src/config.py
==============================================================================
--- trunk/ui/src/config.py (original)
+++ trunk/ui/src/config.py Sat Feb 10 20:00:54 2007
@@ -85,6 +85,3 @@
plugin.activate(p)
else:
plugin.activate(p, level=c.activate)
-
-ICON_DIR = os.path.join(freevo.conf.SHAREDIR, 'icons')
-IMAGE_DIR = os.path.join(freevo.conf.SHAREDIR, 'images')
Modified: trunk/ui/src/gui/imagelib.py
==============================================================================
--- trunk/ui/src/gui/imagelib.py (original)
+++ trunk/ui/src/gui/imagelib.py Sat Feb 10 20:00:54 2007
@@ -40,7 +40,7 @@
# mevas imagelib
import kaa.mevas
-from freevo.ui import config
+import freevo.conf
from freevo.ui import util
import theme
@@ -104,7 +104,7 @@
filename = os.path.abspath(url)
if not os.path.isfile(filename):
- filename = os.path.join(config.IMAGE_DIR, url[8:])
+ filename = os.path.join(freevo.conf.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 Feb 10 20:00:54 2007
@@ -56,7 +56,7 @@
# freevo imports
import freevo.conf
-from freevo.ui import config
+from freevo.ui.config import config
from freevo.ui import util
from freevo.ui import plugin
@@ -70,6 +70,10 @@
# Internal fxd file version
FXD_FORMAT_VERSION = 2
+# internal variables
+ICON_DIR = os.path.join(freevo.conf.SHAREDIR, 'icons')
+IMAGE_DIR = os.path.join(freevo.conf.SHAREDIR, 'images')
+
# signals
signals = { 'theme change': kaa.notifier.Signal() }
@@ -77,8 +81,8 @@
current_theme = None
-guicfg = config.config.gui
-overscan = config.config.gui.display.overscan
+guicfg = config.gui
+overscan = config.gui.display.overscan
def get():
"""
@@ -358,7 +362,7 @@
def prepare_copy(self, search_dirs, image_names):
ret = MainMenu()
- ret.imagedir = os.path.join(config.IMAGE_DIR, self.imagedir)
+ ret.imagedir = os.path.join(IMAGE_DIR, self.imagedir)
for key, template in self.items.items():
ret.items[key] = template.prepare_copy(search_dirs, image_names)
return ret
@@ -1230,10 +1234,10 @@
self.prepared = True
if not os.path.isdir(self.icon_dir):
- self.icon_dir = os.path.join(config.ICON_DIR, 'themes',
+ self.icon_dir = os.path.join(ICON_DIR, 'themes',
self.icon_dir)
- search_dirs = self.skindirs + [ config.IMAGE_DIR, self.icon_dir, '.' ]
+ search_dirs = self.skindirs + [ IMAGE_DIR, self.icon_dir, '.' ]
# prepare font objects
self.font = {}
@@ -1381,7 +1385,7 @@
icon = util.getimage(os.path.join(self.icon_dir, name))
if icon:
return icon
- return util.getimage(os.path.join(config.ICON_DIR, name), '')
+ return util.getimage(os.path.join(ICON_DIR, name), '')
def load(self, file):
Modified: trunk/ui/src/plugins/idlebar/__init__.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/__init__.py (original)
+++ trunk/ui/src/plugins/idlebar/__init__.py Sat Feb 10 20:00:54 2007
@@ -38,7 +38,8 @@
import kaa.notifier
# freevo imports
-from freevo.ui import config, plugin, gui, application
+from freevo.ui import plugin, gui, application
+from freevo.ui.config import config
from freevo.ui.gui import theme, imagelib, widgets, animation
from freevo.ui.event import *
@@ -46,7 +47,7 @@
log = logging.getLogger()
# get gui config object
-guicfg = config.config.gui
+guicfg = config.gui
class PluginInterface(plugin.Plugin):
"""
Modified: trunk/ui/src/plugins/idlebar/logo.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/logo.py (original)
+++ trunk/ui/src/plugins/idlebar/logo.py Sat Feb 10 20:00:54 2007
@@ -31,7 +31,8 @@
import os
-from freevo.ui import config, gui
+import freevo.conf
+from freevo.ui import gui
from freevo.ui.gui import theme, widgets
from freevo.ui.plugins.idlebar import IdleBarPlugin
@@ -49,7 +50,7 @@
if not self.image:
image = theme.image('logo')
else:
- image = os.path.join(config.IMAGE_DIR, self.image)
+ image = os.path.join(freevo.conf.SHAREDIR, 'images', self.image)
if self.objects and self.file == image:
return self.NO_CHANGE
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
