Author: dmeyer
Date: Wed Jan 31 09:24:06 2007
New Revision: 9110
Modified:
trunk/ui/bin/freevo
trunk/ui/src/image/plugins/apod.py
trunk/ui/src/plugin.py
trunk/ui/src/plugins/idlebar/MultiMail.py
trunk/ui/src/plugins/idlebar/clock.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
Log:
remove freevo.ui from path, freevo is now a correct python module
Modified: trunk/ui/bin/freevo
==============================================================================
--- trunk/ui/bin/freevo (original)
+++ trunk/ui/bin/freevo Wed Jan 31 09:24:06 2007
@@ -98,9 +98,6 @@
# import ui path (ugly)
import freevo
- FREEVO_PATH = os.path.join(os.path.dirname(freevo.__file__), 'ui')
- sys.path.insert(0, FREEVO_PATH)
-
from freevo.ui import config
if config.GUI_DISPLAY == 'SDL':
import pygame
@@ -264,7 +261,7 @@
splash = Splashscreen(_('Starting Freevo, please wait ...'), num)
# load plugins
- plugin.init(FREEVO_PATH, splash.progress)
+ plugin.init(splash.progress)
# fade out the splash screen
splash.hide()
Modified: trunk/ui/src/image/plugins/apod.py
==============================================================================
--- trunk/ui/src/image/plugins/apod.py (original)
+++ trunk/ui/src/image/plugins/apod.py Wed Jan 31 09:24:06 2007
@@ -43,7 +43,7 @@
from freevo.ui import menu
from freevo.ui.menu import Item, Action, ActionItem, Menu
-from image import ImageItem
+from freevo.ui.image import ImageItem
from freevo.ui.application import TextWindow, MessageWindow
class ApodMainMenuItem(Item):
Modified: trunk/ui/src/plugin.py
==============================================================================
--- trunk/ui/src/plugin.py (original)
+++ trunk/ui/src/plugin.py Wed Jan 31 09:24:06 2007
@@ -247,7 +247,7 @@
return False
- def init(self, plugin_path, callback = None):
+ def init(self, callback = None):
"""
Load and init all the plugins. The function takes the path were the
plugins are searched in. Optional is a callback, called after a
@@ -255,7 +255,7 @@
prefix are loaded.
"""
self.__initialized = True
- self.path = plugin_path
+ self.path = os.path.dirname(__file__)
for name, type, level, args, number in self.plugins:
kaa.notifier.step(False, True)
Modified: trunk/ui/src/plugins/idlebar/MultiMail.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/MultiMail.py (original)
+++ trunk/ui/src/plugins/idlebar/MultiMail.py Wed Jan 31 09:24:06 2007
@@ -56,7 +56,7 @@
import time
from freevo.ui.gui import theme, imagelib, widgets
-from plugins.idlebar import IdleBarPlugin
+from freevo.ui.plugins.idlebar import IdleBarPlugin
import logging
log = logging.getLogger()
Modified: trunk/ui/src/plugins/idlebar/clock.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/clock.py (original)
+++ trunk/ui/src/plugins/idlebar/clock.py Wed Jan 31 09:24:06 2007
@@ -33,7 +33,7 @@
from freevo.ui import gui
from freevo.ui.gui import theme, widgets
-from plugins.idlebar import IdleBarPlugin
+from freevo.ui.plugins.idlebar import IdleBarPlugin
class PluginInterface(IdleBarPlugin):
"""
Modified: trunk/ui/src/plugins/idlebar/logo.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/logo.py (original)
+++ trunk/ui/src/plugins/idlebar/logo.py Wed Jan 31 09:24:06 2007
@@ -33,7 +33,7 @@
from freevo.ui import config, gui
from freevo.ui.gui import theme, widgets
-from plugins.idlebar import IdleBarPlugin
+from freevo.ui.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 Wed Jan 31 09:24:06 2007
@@ -34,7 +34,7 @@
from freevo.ui.gui import imagelib, widgets
from freevo.ui import config
-from plugins.idlebar import IdleBarPlugin
+from freevo.ui.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 Wed Jan 31 09:24:06 2007
@@ -66,7 +66,7 @@
from freevo.ui import config, gui
from freevo.ui.gui import theme, imagelib, widgets
-from plugins.idlebar import IdleBarPlugin
+from freevo.ui.plugins.idlebar import IdleBarPlugin
import logging
log = logging.getLogger()
Modified: trunk/ui/src/plugins/idlebar/weather.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/weather.py (original)
+++ trunk/ui/src/plugins/idlebar/weather.py Wed Jan 31 09:24:06 2007
@@ -35,7 +35,7 @@
# freevo modules
from freevo.ui.gui import theme, widgets
from freevo.ui import config, plugin, gui
-from plugins.idlebar import IdleBarPlugin
+from freevo.ui.plugins.idlebar import IdleBarPlugin
# grabber module
from pywebinfo.weather import WeatherGrabber
-------------------------------------------------------------------------
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
