Author: dmeyer
Date: Mon Jan 29 20:52:31 2007
New Revision: 9083
Modified:
trunk/ui/bin/freevo
trunk/ui/src/audio/interface.py
trunk/ui/src/audio/plugins/artist.py
trunk/ui/src/config.py
trunk/ui/src/directory.py
trunk/ui/src/fxditem.py
trunk/ui/src/games/emu.py
trunk/ui/src/games/factory.py
trunk/ui/src/games/interface.py
trunk/ui/src/games/player.py
trunk/ui/src/games/plugins/advmame.py
trunk/ui/src/games/plugins/fakenes.py
trunk/ui/src/games/plugins/zsnes.py
trunk/ui/src/gui/displays/imlib2.py
trunk/ui/src/gui/displays/sdl.py
trunk/ui/src/gui/theme.py
trunk/ui/src/image/fxdhandler.py
trunk/ui/src/image/interface.py
trunk/ui/src/image/plugins/apod.py
trunk/ui/src/image/viewer.py
trunk/ui/src/input/__init__.py
trunk/ui/src/input/interface.py
trunk/ui/src/mainmenu.py
trunk/ui/src/menu/item.py
trunk/ui/src/playlist.py
trunk/ui/src/plugins/file_ops.py
trunk/ui/src/plugins/idlebar/__init__.py
trunk/ui/src/plugins/idlebar/weather.py
trunk/ui/src/plugins/lcd.py
trunk/ui/src/plugins/mbus.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/shoppingcart.py
trunk/ui/src/plugins/shutdown.py
trunk/ui/src/plugins/unpack.py
trunk/ui/src/tv/__init__.py
trunk/ui/src/tv/program.py
trunk/ui/src/tv/tvmenu.py
trunk/ui/src/video/interface.py
trunk/ui/src/video/plugins/bookmarker.py
trunk/ui/src/video/plugins/mover.py
Log:
import plugin as module with full path
Modified: trunk/ui/bin/freevo
==============================================================================
--- trunk/ui/bin/freevo (original)
+++ trunk/ui/bin/freevo Mon Jan 29 20:52:31 2007
@@ -171,11 +171,13 @@
import gui.widgets
import gui.theme
import util
-import plugin
import beacon
from mainmenu import MainMenu
+# new style imports
+from freevo.ui import plugin
+
# load the fxditem to make sure it's the first in the
# mimetypes list
import fxditem
Modified: trunk/ui/src/audio/interface.py
==============================================================================
--- trunk/ui/src/audio/interface.py (original)
+++ trunk/ui/src/audio/interface.py Mon Jan 29 20:52:31 2007
@@ -46,7 +46,7 @@
# Freevo imports
import config
import util
-import plugin
+from freevo.ui import plugin
import fxditem
# AudioItem
Modified: trunk/ui/src/audio/plugins/artist.py
==============================================================================
--- trunk/ui/src/audio/plugins/artist.py (original)
+++ trunk/ui/src/audio/plugins/artist.py Mon Jan 29 20:52:31 2007
@@ -40,7 +40,7 @@
from kaa.strutils import str_to_unicode
# Freevo imports
-from plugin import MainMenuPlugin
+from freevo.ui.plugin import MainMenuPlugin
from menu import Item, ActionItem, Menu, Action
from playlist import Playlist
Modified: trunk/ui/src/config.py
==============================================================================
--- trunk/ui/src/config.py (original)
+++ trunk/ui/src/config.py Mon Jan 29 20:52:31 2007
@@ -65,7 +65,7 @@
# and event.py (which has no more deps)
import input
-import plugin
+from freevo.ui import plugin
# import event names (no deps)
from event import *
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Mon Jan 29 20:52:31 2007
@@ -48,7 +48,7 @@
import util
import menu
-import plugin
+from freevo.ui import plugin
import fxditem
from menu import Item, Files, Action, ActionItem
Modified: trunk/ui/src/fxditem.py
==============================================================================
--- trunk/ui/src/fxditem.py (original)
+++ trunk/ui/src/fxditem.py Mon Jan 29 20:52:31 2007
@@ -50,7 +50,7 @@
import logging
import util
-import plugin
+from freevo.ui import plugin
import os
import freevo.fxdparser
Modified: trunk/ui/src/games/emu.py
==============================================================================
--- trunk/ui/src/games/emu.py (original)
+++ trunk/ui/src/games/emu.py Mon Jan 29 20:52:31 2007
@@ -29,7 +29,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------------
-import plugin
+from freevo.ui import plugin
import logging
import config
Modified: trunk/ui/src/games/factory.py
==============================================================================
--- trunk/ui/src/games/factory.py (original)
+++ trunk/ui/src/games/factory.py Mon Jan 29 20:52:31 2007
@@ -30,7 +30,7 @@
#
# -----------------------------------------------------------------------------
from singleton import Singleton
-import plugin
+from freevo.ui import plugin
class Factory(Singleton):
def init(self):
Modified: trunk/ui/src/games/interface.py
==============================================================================
--- trunk/ui/src/games/interface.py (original)
+++ trunk/ui/src/games/interface.py Mon Jan 29 20:52:31 2007
@@ -29,7 +29,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------------
-import plugin
+from freevo.ui import plugin
import config
import machine
from gameitem import GameItem
Modified: trunk/ui/src/games/player.py
==============================================================================
--- trunk/ui/src/games/player.py (original)
+++ trunk/ui/src/games/player.py Mon Jan 29 20:52:31 2007
@@ -4,7 +4,7 @@
STATUS_STOPPED, STATUS_IDLE, CAPABILITY_TOGGLE, CAPABILITY_PAUSE, \
CAPABILITY_FULLSCREEN
from event import *
-import plugin
+from freevo.ui import plugin
_singleton = None
Modified: trunk/ui/src/games/plugins/advmame.py
==============================================================================
--- trunk/ui/src/games/plugins/advmame.py (original)
+++ trunk/ui/src/games/plugins/advmame.py Mon Jan 29 20:52:31 2007
@@ -29,7 +29,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------------
-import plugin
+from freevo.ui import plugin
from emulator import Emulator
class PluginInterface(plugin.Plugin):
Modified: trunk/ui/src/games/plugins/fakenes.py
==============================================================================
--- trunk/ui/src/games/plugins/fakenes.py (original)
+++ trunk/ui/src/games/plugins/fakenes.py Mon Jan 29 20:52:31 2007
@@ -29,7 +29,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------------
-import plugin
+from freevo.ui import plugin
from emulator import Emulator
class PluginInterface(plugin.Plugin):
Modified: trunk/ui/src/games/plugins/zsnes.py
==============================================================================
--- trunk/ui/src/games/plugins/zsnes.py (original)
+++ trunk/ui/src/games/plugins/zsnes.py Mon Jan 29 20:52:31 2007
@@ -29,7 +29,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------------
-import plugin
+from freevo.ui import plugin
from emulator import Emulator
class PluginInterface(plugin.Plugin):
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 20:52:31 2007
@@ -32,7 +32,7 @@
__all__ = [ 'Display' ]
# python imports
-import plugin
+from freevo.ui import plugin
import config
# mevas imports
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 20:52:31 2007
@@ -42,7 +42,7 @@
# Freevo imports
import config
-import plugin
+from freevo.ui import plugin
# display imports
from display import Display as Base
Modified: trunk/ui/src/gui/theme.py
==============================================================================
--- trunk/ui/src/gui/theme.py (original)
+++ trunk/ui/src/gui/theme.py Mon Jan 29 20:52:31 2007
@@ -58,7 +58,7 @@
import freevo.conf
import config
import util
-import plugin
+from freevo.ui import plugin
# gui imports
from font import get as get_font_object
Modified: trunk/ui/src/image/fxdhandler.py
==============================================================================
--- trunk/ui/src/image/fxdhandler.py (original)
+++ trunk/ui/src/image/fxdhandler.py Mon Jan 29 20:52:31 2007
@@ -59,7 +59,7 @@
# Freevo imports
import config
-import plugin
+from freevo.ui import plugin
from util import match_files
from playlist import Playlist
Modified: trunk/ui/src/image/interface.py
==============================================================================
--- trunk/ui/src/image/interface.py (original)
+++ trunk/ui/src/image/interface.py Mon Jan 29 20:52:31 2007
@@ -40,7 +40,7 @@
# freevo imports
import config
-import plugin
+from freevo.ui import plugin
import fxditem
# ImageItem
Modified: trunk/ui/src/image/plugins/apod.py
==============================================================================
--- trunk/ui/src/image/plugins/apod.py (original)
+++ trunk/ui/src/image/plugins/apod.py Mon Jan 29 20:52:31 2007
@@ -39,7 +39,7 @@
import kaa.beacon
# freevo imports
-import plugin
+from freevo.ui import plugin
import menu
from menu import Item, Action, ActionItem, Menu
Modified: trunk/ui/src/image/viewer.py
==============================================================================
--- trunk/ui/src/image/viewer.py (original)
+++ trunk/ui/src/image/viewer.py Mon Jan 29 20:52:31 2007
@@ -41,7 +41,7 @@
# freevo imports
import config
-import plugin
+from freevo.ui import plugin
import gui
import gui.widgets
import gui.imagelib
Modified: trunk/ui/src/input/__init__.py
==============================================================================
--- trunk/ui/src/input/__init__.py (original)
+++ trunk/ui/src/input/__init__.py Mon Jan 29 20:52:31 2007
@@ -1,4 +1,4 @@
-from plugin import Plugin
+from freevo.ui.plugin import Plugin
class PluginInterface(Plugin):
"""
Modified: trunk/ui/src/input/interface.py
==============================================================================
--- trunk/ui/src/input/interface.py (original)
+++ trunk/ui/src/input/interface.py Mon Jan 29 20:52:31 2007
@@ -38,7 +38,7 @@
# freevo imports
import config
-import plugin
+from freevo.ui import plugin
# get logging object
log = logging.getLogger('input')
Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py (original)
+++ trunk/ui/src/mainmenu.py Mon Jan 29 20:52:31 2007
@@ -42,7 +42,7 @@
import config
import gui.theme
import util
-import plugin
+from freevo.ui import plugin
from menu import Item, Action, Menu
from application.menuw import MenuWidget
Modified: trunk/ui/src/menu/item.py
==============================================================================
--- trunk/ui/src/menu/item.py (original)
+++ trunk/ui/src/menu/item.py Mon Jan 29 20:52:31 2007
@@ -44,7 +44,7 @@
import kaa.beacon
# freevo imports
-import plugin
+from freevo.ui import plugin
# get logging object
log = logging.getLogger()
Modified: trunk/ui/src/playlist.py
==============================================================================
--- trunk/ui/src/playlist.py (original)
+++ trunk/ui/src/playlist.py Mon Jan 29 20:52:31 2007
@@ -44,7 +44,7 @@
# freevo imports
import config
import util
-import plugin
+from freevo.ui import plugin
import fxditem
from event import *
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 20:52:31 2007
@@ -36,7 +36,7 @@
# freevo imports
import config
-import plugin
+from freevo.ui import plugin
import util
from menu import Action
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 20:52:31 2007
@@ -39,7 +39,7 @@
# freevo imports
import config
-import plugin
+from freevo.ui import plugin
import gui
import gui.imagelib
import gui.widgets
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 20:52:31 2007
@@ -37,7 +37,7 @@
import gui.widgets
import gui.theme
import config
-import plugin
+from freevo.ui import plugin
from plugins.idlebar import IdleBarPlugin
# grabber module
Modified: trunk/ui/src/plugins/lcd.py
==============================================================================
--- trunk/ui/src/plugins/lcd.py (original)
+++ trunk/ui/src/plugins/lcd.py Mon Jan 29 20:52:31 2007
@@ -30,7 +30,7 @@
from kaa.strutils import unicode_to_str
import kaa.notifier
-import plugin
+from freevo.ui import plugin
from event import *
import logging
Modified: trunk/ui/src/plugins/mbus.py
==============================================================================
--- trunk/ui/src/plugins/mbus.py (original)
+++ trunk/ui/src/plugins/mbus.py Mon Jan 29 20:52:31 2007
@@ -7,7 +7,7 @@
import freevo.ipc
# freevo ui imports
-import plugin
+from freevo.ui import plugin
import application
from event import *
from directory import DirItem
Modified: trunk/ui/src/plugins/mediamenu.py
==============================================================================
--- trunk/ui/src/plugins/mediamenu.py (original)
+++ trunk/ui/src/plugins/mediamenu.py Mon Jan 29 20:52:31 2007
@@ -43,7 +43,7 @@
# freevo imports
import config
-import plugin
+from freevo.ui import plugin
from event import *
from directory import DirItem
Modified: trunk/ui/src/plugins/mixer.py
==============================================================================
--- trunk/ui/src/plugins/mixer.py (original)
+++ trunk/ui/src/plugins/mixer.py Mon Jan 29 20:52:31 2007
@@ -71,7 +71,7 @@
import os
import config
-import plugin
+from freevo.ui import plugin
from event import *
from kaa.ioctl import *
from kaa.notifier import EventHandler
Modified: trunk/ui/src/plugins/osd.py
==============================================================================
--- trunk/ui/src/plugins/osd.py (original)
+++ trunk/ui/src/plugins/osd.py Mon Jan 29 20:52:31 2007
@@ -40,7 +40,7 @@
# freevo imports
import config
-import plugin
+from freevo.ui import plugin
import gui
import gui.widgets
import gui.theme
Modified: trunk/ui/src/plugins/ossmixer.py
==============================================================================
--- trunk/ui/src/plugins/ossmixer.py (original)
+++ trunk/ui/src/plugins/ossmixer.py Mon Jan 29 20:52:31 2007
@@ -81,7 +81,7 @@
import os
import config
-import plugin
+from freevo.ui import plugin
from event import *
from kaa.notifier import EventHandler
Modified: trunk/ui/src/plugins/shoppingcart.py
==============================================================================
--- trunk/ui/src/plugins/shoppingcart.py (original)
+++ trunk/ui/src/plugins/shoppingcart.py Mon Jan 29 20:52:31 2007
@@ -38,7 +38,7 @@
import kaa.notifier
# freevo imports
-import plugin
+from freevo.ui import plugin
from menu import Action
Modified: trunk/ui/src/plugins/shutdown.py
==============================================================================
--- trunk/ui/src/plugins/shutdown.py (original)
+++ trunk/ui/src/plugins/shutdown.py Mon Jan 29 20:52:31 2007
@@ -45,7 +45,7 @@
from menu import Action
from application import ConfirmWindow
from mainmenu import MainMenuItem
-from plugin import MainMenuPlugin
+from freevo.ui.plugin import MainMenuPlugin
class ShutdownItem(MainMenuItem):
Modified: trunk/ui/src/plugins/unpack.py
==============================================================================
--- trunk/ui/src/plugins/unpack.py (original)
+++ trunk/ui/src/plugins/unpack.py Mon Jan 29 20:52:31 2007
@@ -41,7 +41,7 @@
import kaa.notifier
# freevo imports
-import plugin
+from freevo.ui import plugin
import util
from menu import Item, Action
Modified: trunk/ui/src/tv/__init__.py
==============================================================================
--- trunk/ui/src/tv/__init__.py (original)
+++ trunk/ui/src/tv/__init__.py Mon Jan 29 20:52:31 2007
@@ -34,7 +34,7 @@
import freevo.ipc
# freevo imports
-import plugin
+from freevo.ui import plugin
class PluginInterface(plugin.MainMenuPlugin):
Modified: trunk/ui/src/tv/program.py
==============================================================================
--- trunk/ui/src/tv/program.py (original)
+++ trunk/ui/src/tv/program.py Mon Jan 29 20:52:31 2007
@@ -43,7 +43,7 @@
# freevo imports
import config
-import plugin
+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 20:52:31 2007
@@ -36,7 +36,7 @@
import freevo.ipc
import config
-import plugin
+from freevo.ui import plugin
from mainmenu import MainMenuItem
from menu import Item, ActionItem, Menu
Modified: trunk/ui/src/video/interface.py
==============================================================================
--- trunk/ui/src/video/interface.py (original)
+++ trunk/ui/src/video/interface.py Mon Jan 29 20:52:31 2007
@@ -43,7 +43,7 @@
# freevo imports
import config
import util
-import plugin
+from freevo.ui import plugin
import fxditem
from menu import Files
Modified: trunk/ui/src/video/plugins/bookmarker.py
==============================================================================
--- trunk/ui/src/video/plugins/bookmarker.py (original)
+++ trunk/ui/src/video/plugins/bookmarker.py Mon Jan 29 20:52:31 2007
@@ -50,7 +50,7 @@
import freevo.conf
from menu import Action, Menu
-from plugin import ItemPlugin
+from freevo.ui.plugin import ItemPlugin
from event import *
# the logging object
Modified: trunk/ui/src/video/plugins/mover.py
==============================================================================
--- trunk/ui/src/video/plugins/mover.py (original)
+++ trunk/ui/src/video/plugins/mover.py Mon Jan 29 20:52:31 2007
@@ -34,7 +34,7 @@
# Python imports
import os
-import plugin
+from freevo.ui import plugin
import logging
# Freevo imports
-------------------------------------------------------------------------
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
