Author: dmeyer
Date: Sun Mar 18 19:29:30 2007
New Revision: 9355
Added:
trunk/core/src/plugin.py
- copied unchanged from r9352, /trunk/ui/src/plugin.py
Removed:
trunk/ui/src/plugin.py
Modified:
trunk/ui/src/audio/interface.py
trunk/ui/src/config.py
trunk/ui/src/fxditem.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/viewer.py
trunk/ui/src/input/plugins/interface.py
trunk/ui/src/mainmenu.py
trunk/ui/src/menu/plugin.py
trunk/ui/src/playlist.py
trunk/ui/src/plugins/idlebar/plugin.py
trunk/ui/src/plugins/lcd.py
trunk/ui/src/plugins/mbus.py
trunk/ui/src/plugins/osd.py
trunk/ui/src/tv/program.py
trunk/ui/src/video/interface.py
trunk/ui/src/video/plugins/mover.py
Log:
move plugin.py to core
Modified: trunk/ui/src/audio/interface.py
==============================================================================
--- trunk/ui/src/audio/interface.py (original)
+++ trunk/ui/src/audio/interface.py Sun Mar 18 19:29:30 2007
@@ -45,7 +45,8 @@
import stat
# Freevo imports
-from freevo.ui import util, plugin, fxditem
+from freevo import plugin
+from freevo.ui import util, fxditem
from freevo.ui.config import config
from freevo.ui.menu import MediaPlugin
Modified: trunk/ui/src/config.py
==============================================================================
--- trunk/ui/src/config.py (original)
+++ trunk/ui/src/config.py Sun Mar 18 19:29:30 2007
@@ -41,9 +41,7 @@
# freevo core imports
import freevo.conf
from freevo.xmlconfig import xmlconfig
-
-# freevo ui imports
-from freevo.ui import plugin
+from freevo import plugin
# generate config
pycfgfile = freevo.conf.datafile('freevo_config.py')
Modified: trunk/ui/src/fxditem.py
==============================================================================
--- trunk/ui/src/fxditem.py (original)
+++ trunk/ui/src/fxditem.py Sun Mar 18 19:29:30 2007
@@ -42,7 +42,7 @@
import freevo.fxdparser
# freevo imports
-import plugin
+from freevo import plugin
from menu import Item, Action, Menu, MediaPlugin
# get logging object
Modified: trunk/ui/src/gui/displays/imlib2.py
==============================================================================
--- trunk/ui/src/gui/displays/imlib2.py (original)
+++ trunk/ui/src/gui/displays/imlib2.py Sun Mar 18 19:29:30 2007
@@ -32,7 +32,7 @@
__all__ = [ 'Display' ]
# python imports
-from freevo.ui import plugin
+from freevo import plugin
# 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 Sun Mar 18 19:29:30 2007
@@ -41,8 +41,8 @@
from kaa.mevas.displays.pygamecanvas import PygameCanvas
# Freevo imports
+from freevo import plugin
from freevo.ui import config
-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 Sun Mar 18 19:29:30 2007
@@ -56,9 +56,9 @@
# freevo imports
import freevo.conf
+from freevo import plugin
from freevo.ui.config import config
from freevo.ui import util
-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 Sun Mar 18 19:29:30 2007
@@ -59,7 +59,6 @@
# Freevo imports
from freevo.ui.config import config
-from freevo.ui import plugin
from freevo.ui import menu
from freevo.ui.util import match_files
Modified: trunk/ui/src/image/interface.py
==============================================================================
--- trunk/ui/src/image/interface.py (original)
+++ trunk/ui/src/image/interface.py Sun Mar 18 19:29:30 2007
@@ -40,7 +40,8 @@
__all__ = [ 'PluginInterface' ]
# freevo imports
-from freevo.ui import plugin, fxditem
+from freevo import plugin
+from freevo.ui import fxditem
from freevo.ui.menu import MediaPlugin
from freevo.ui.config import config
Modified: trunk/ui/src/image/viewer.py
==============================================================================
--- trunk/ui/src/image/viewer.py (original)
+++ trunk/ui/src/image/viewer.py Sun Mar 18 19:29:30 2007
@@ -40,7 +40,8 @@
from kaa.strutils import to_unicode
# freevo imports
-from freevo.ui import plugin, gui
+from freevo import plugin
+from freevo.ui import gui
from freevo.ui.gui import theme, imagelib, widgets
from freevo.ui.config import config
Modified: trunk/ui/src/input/plugins/interface.py
==============================================================================
--- trunk/ui/src/input/plugins/interface.py (original)
+++ trunk/ui/src/input/plugins/interface.py Sun Mar 18 19:29:30 2007
@@ -37,7 +37,8 @@
import logging
# freevo imports
-from freevo.ui import plugin, input
+from freevo import plugin
+from freevo.ui import input
from freevo.ui.config import config
from freevo.ui.event import Event
Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py (original)
+++ trunk/ui/src/mainmenu.py Sun Mar 18 19:29:30 2007
@@ -39,9 +39,9 @@
import os
# freevo imports
+from freevo import plugin
import gui.theme
import util
-import plugin
from menu import Item, Action, Menu
from application.menuw import MenuWidget
Modified: trunk/ui/src/menu/plugin.py
==============================================================================
--- trunk/ui/src/menu/plugin.py (original)
+++ trunk/ui/src/menu/plugin.py Sun Mar 18 19:29:30 2007
@@ -32,8 +32,7 @@
__all__ = [ 'ItemPlugin', 'MediaPlugin' ]
# freevo imports
-from freevo.ui import plugin
-
+from freevo import plugin
class ItemPlugin(plugin.Plugin):
"""
Modified: trunk/ui/src/playlist.py
==============================================================================
--- trunk/ui/src/playlist.py (original)
+++ trunk/ui/src/playlist.py Sun Mar 18 19:29:30 2007
@@ -42,9 +42,9 @@
from kaa.weakref import weakref
# freevo imports
+from freevo import plugin
from config import config
import util
-import plugin
import fxditem
from event import *
Modified: trunk/ui/src/plugins/idlebar/plugin.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/plugin.py (original)
+++ trunk/ui/src/plugins/idlebar/plugin.py Sun Mar 18 19:29:30 2007
@@ -29,7 +29,7 @@
#
# -----------------------------------------------------------------------------
-from freevo.ui import plugin
+from freevo import plugin
class IdleBarPlugin(plugin.Plugin):
def __init__(self):
Modified: trunk/ui/src/plugins/lcd.py
==============================================================================
--- trunk/ui/src/plugins/lcd.py (original)
+++ trunk/ui/src/plugins/lcd.py Sun Mar 18 19:29:30 2007
@@ -30,7 +30,8 @@
from kaa.strutils import unicode_to_str
import kaa.notifier
-from freevo.ui import plugin, application
+from freevo import plugin
+from freevo.ui import application
from freevo.ui.event import *
import logging
Modified: trunk/ui/src/plugins/mbus.py
==============================================================================
--- trunk/ui/src/plugins/mbus.py (original)
+++ trunk/ui/src/plugins/mbus.py Sun Mar 18 19:29:30 2007
@@ -5,9 +5,10 @@
# freevo core imports
import freevo.ipc
+from freevo import plugin
# freevo ui imports
-from freevo.ui import plugin, application
+from freevo.ui import application
from freevo.ui.event import *
from freevo.ui.directory import DirItem
from freevo.ui.menu import MediaPlugin
Modified: trunk/ui/src/plugins/osd.py
==============================================================================
--- trunk/ui/src/plugins/osd.py (original)
+++ trunk/ui/src/plugins/osd.py Sun Mar 18 19:29:30 2007
@@ -39,7 +39,8 @@
from kaa.notifier import OneShotTimer, EventHandler
# freevo imports
-from freevo.ui import plugin, gui
+from freevo import plugin
+from freevo.ui import gui
from freevo.ui.gui import theme, widgets
from freevo.ui.config import config
Modified: trunk/ui/src/tv/program.py
==============================================================================
--- trunk/ui/src/tv/program.py (original)
+++ trunk/ui/src/tv/program.py Sun Mar 18 19:29:30 2007
@@ -43,7 +43,6 @@
# freevo imports
from freevo.ui.config import config
-from freevo.ui import plugin
from freevo.ui.menu import Item, Action, Menu, ActionItem
from freevo.ui.application import MessageWindow
Modified: trunk/ui/src/video/interface.py
==============================================================================
--- trunk/ui/src/video/interface.py (original)
+++ trunk/ui/src/video/interface.py Sun Mar 18 19:29:30 2007
@@ -41,7 +41,8 @@
import string
# freevo imports
-from freevo.ui import util, plugin, fxditem
+from freevo import plugin
+from freevo.ui import util, fxditem
from freevo.ui.menu import Files, MediaPlugin
from freevo.ui.config import config
Modified: trunk/ui/src/video/plugins/mover.py
==============================================================================
--- trunk/ui/src/video/plugins/mover.py (original)
+++ trunk/ui/src/video/plugins/mover.py Sun Mar 18 19:29:30 2007
@@ -34,7 +34,6 @@
# Python imports
import os
-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
