Author: dmeyer
Date: Sat Feb 3 21:17:30 2007
New Revision: 9153
Modified:
trunk/ui/src/audio/plugins/artist.py
trunk/ui/src/image/plugins/apod.py
trunk/ui/src/mainmenu.py
trunk/ui/src/plugin.py
trunk/ui/src/plugins/mediamenu.py
trunk/ui/src/plugins/shutdown.py
trunk/ui/src/tv/__init__.py
trunk/ui/src/tv/plugins/genre.py
trunk/ui/src/tv/tvmenu.py
Log:
move MainMenuPlugin to mainmenu.py
Modified: trunk/ui/src/audio/plugins/artist.py
==============================================================================
--- trunk/ui/src/audio/plugins/artist.py (original)
+++ trunk/ui/src/audio/plugins/artist.py Sat Feb 3 21:17:30 2007
@@ -40,7 +40,7 @@
from kaa.strutils import str_to_unicode
# Freevo imports
-from freevo.ui.plugin import MainMenuPlugin
+from freevo.ui.mainmenu import MainMenuPlugin
from freevo.ui.menu import Item, ActionItem, Menu, Action
from freevo.ui.playlist import Playlist
Modified: trunk/ui/src/image/plugins/apod.py
==============================================================================
--- trunk/ui/src/image/plugins/apod.py (original)
+++ trunk/ui/src/image/plugins/apod.py Sat Feb 3 21:17:30 2007
@@ -39,10 +39,8 @@
import kaa.beacon
# freevo imports
-from freevo.ui import plugin
-from freevo.ui import menu
-
-from freevo.ui.menu import Item, Action, ActionItem, Menu
+from freevo.ui.menu import Item, Action, ActionItem, Menu, MediaPlugin
+from freevo.ui.mainmenu import MainMenuPlugin
from freevo.ui.image import ImageItem
from freevo.ui.application import TextWindow, MessageWindow
@@ -91,7 +89,7 @@
# get items
items = []
- for p in menu.MediaPlugin.plugins('image'):
+ for p in MediaPlugin.plugins('image'):
items += p.get(self, listing)
if items:
@@ -157,7 +155,7 @@
-class PluginInterface(plugin.MainMenuPlugin):
+class PluginInterface(MainMenuPlugin):
"""
Astronomy Picture of the Day download plugin. Downloads the picture
for the current day and allow access to the dir for browsing the old
@@ -187,7 +185,7 @@
self.imagedir = imagedir
# init the plugin
- plugin.MainMenuPlugin.__init__(self)
+ MainMenuPlugin.__init__(self)
Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py (original)
+++ trunk/ui/src/mainmenu.py Sat Feb 3 21:17:30 2007
@@ -33,7 +33,7 @@
# -----------------------------------------------------------------------------
-__all__ = [ 'MainMenuItem', 'MainMenu' ]
+__all__ = [ 'MainMenuItem', 'MainMenu', 'MainMenuPlugin' ]
# python imports
import os
@@ -92,6 +92,34 @@
return [ Action(self.name, self.function[0]) ]
+class MainMenuPlugin(plugin.Plugin):
+ """
+ Plugin class for plugins to add something to the main menu
+ """
+ def __init__(self, name=''):
+ plugin.Plugin.__init__(self, name)
+ self._plugin_type = 'mainmenu'
+ self._plugin_special = True
+
+
+ def items(self, parent):
+ """
+ return the list of items for the main menu
+ """
+ return []
+
+
+ def plugins(subtype=''):
+ """
+ Static function to return all MainMenuPlugins.
+ """
+ if not subtype:
+ return plugin.get('mainmenu')
+ return plugin.get('mainmenu_%s' % subtype)
+
+ plugins = staticmethod(plugins)
+
+
class MainMenu(Item):
"""
This class handles the main menu. It will start the main menu widget
@@ -103,7 +131,7 @@
"""
Item.__init__(self)
items = []
- for p in plugin.MainMenuPlugin.plugins():
+ for p in MainMenuPlugin.plugins():
items += p.items(self)
menu = Menu(_('Freevo Main Menu'), items, type='main')
menu.autoselect = True
Modified: trunk/ui/src/plugin.py
==============================================================================
--- trunk/ui/src/plugin.py (original)
+++ trunk/ui/src/plugin.py Sat Feb 3 21:17:30 2007
@@ -62,34 +62,6 @@
pass
-class MainMenuPlugin(Plugin):
- """
- Plugin class for plugins to add something to the main menu
- """
- def __init__(self, name=''):
- Plugin.__init__(self, name)
- self._plugin_type = 'mainmenu'
- self._plugin_special = True
-
-
- def items(self, parent):
- """
- return the list of items for the main menu
- """
- return []
-
-
- def plugins(subtype=''):
- """
- Static function to return all MainMenuPlugins.
- """
- if not subtype:
- return get('mainmenu')
- return get('mainmenu_%s' % subtype)
-
- plugins = staticmethod(plugins)
-
-
class PluginLoader(object):
"""
Class for handling the different plugins.
Modified: trunk/ui/src/plugins/mediamenu.py
==============================================================================
--- trunk/ui/src/plugins/mediamenu.py (original)
+++ trunk/ui/src/plugins/mediamenu.py Sat Feb 3 21:17:30 2007
@@ -43,10 +43,9 @@
# freevo imports
import freevo.conf
-from freevo.ui.plugin import MainMenuPlugin
from freevo.ui.event import EJECT
from freevo.ui.directory import DirItem
-from freevo.ui.mainmenu import MainMenuItem
+from freevo.ui.mainmenu import MainMenuItem, MainMenuPlugin
from freevo.ui.menu import Menu, Item, MediaPlugin
# from games import machine
Modified: trunk/ui/src/plugins/shutdown.py
==============================================================================
--- trunk/ui/src/plugins/shutdown.py (original)
+++ trunk/ui/src/plugins/shutdown.py Sat Feb 3 21:17:30 2007
@@ -41,8 +41,7 @@
from freevo.ui import config, gui
from freevo.ui.menu import Action
from freevo.ui.application import ConfirmWindow
-from freevo.ui.mainmenu import MainMenuItem
-from freevo.ui.plugin import MainMenuPlugin
+from freevo.ui.mainmenu import MainMenuItem, MainMenuPlugin
from freevo.ui.gui import theme, widgets
Modified: trunk/ui/src/tv/__init__.py
==============================================================================
--- trunk/ui/src/tv/__init__.py (original)
+++ trunk/ui/src/tv/__init__.py Sat Feb 3 21:17:30 2007
@@ -34,10 +34,10 @@
import freevo.ipc
# freevo imports
-from freevo.ui import plugin
+from freevo.ui.mainmenu import MainMenuPlugin
-class PluginInterface(plugin.MainMenuPlugin):
+class PluginInterface(MainMenuPlugin):
"""
Plugin interface to integrate the tv module into Freevo
"""
@@ -45,7 +45,7 @@
"""
init the plugin.
"""
- plugin.MainMenuPlugin.__init__(self)
+ MainMenuPlugin.__init__(self)
# import here to avoid importing all this when some helpers only
# want to import something from iside the tv directory
Modified: trunk/ui/src/tv/plugins/genre.py
==============================================================================
--- trunk/ui/src/tv/plugins/genre.py (original)
+++ trunk/ui/src/tv/plugins/genre.py Sat Feb 3 21:17:30 2007
@@ -39,8 +39,7 @@
import kaa.epg
# freevo imports
-from freevo.ui.plugin import MainMenuPlugin
-from freevo.ui.mainmenu import MainMenuItem
+from freevo.ui.mainmenu import MainMenuItem, MainMenuPlugin
from freevo.ui.menu import Item, Action, ActionItem, Menu
from freevo.ui.tv.program import ProgramItem
Modified: trunk/ui/src/tv/tvmenu.py
==============================================================================
--- trunk/ui/src/tv/tvmenu.py (original)
+++ trunk/ui/src/tv/tvmenu.py Sat Feb 3 21:17:30 2007
@@ -36,9 +36,7 @@
import freevo.ipc
from freevo.ui import config
-from freevo.ui import plugin
-
-from freevo.ui.mainmenu import MainMenuItem
+from freevo.ui.mainmenu import MainMenuItem, MainMenuPlugin
from freevo.ui.menu import Item, ActionItem, Menu
import tvguide
@@ -86,7 +84,7 @@
# items.append(menu.MenuItem(_('Search Guide'),
# action=self.show_search))
- plugins_list = plugin.MainMenuPlugin.plugins('tv')
+ plugins_list = MainMenuPlugin.plugins('tv')
for p in plugins_list:
items += p.items(self)
-------------------------------------------------------------------------
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
