Author: dmeyer
Date: Mon Jan 29 21:35:29 2007
New Revision: 9092
Modified:
trunk/ui/TODO
trunk/ui/bin/freevo
trunk/ui/src/application/menuw.py
trunk/ui/src/audio/audiodiskitem.py
trunk/ui/src/audio/audioitem.py
trunk/ui/src/audio/plugins/artist.py
trunk/ui/src/directory.py
trunk/ui/src/fxditem.py
trunk/ui/src/games/gameitem.py
trunk/ui/src/image/imageitem.py
trunk/ui/src/image/plugins/apod.py
trunk/ui/src/input/plugins/sdl.py
trunk/ui/src/mainmenu.py
trunk/ui/src/playlist.py
trunk/ui/src/plugins/file_ops.py
trunk/ui/src/plugins/mediamenu.py
trunk/ui/src/plugins/shoppingcart.py
trunk/ui/src/plugins/shutdown.py
trunk/ui/src/plugins/unpack.py
trunk/ui/src/tv/favorite.py
trunk/ui/src/tv/program.py
trunk/ui/src/tv/tvguide.py
trunk/ui/src/tv/tvmenu.py
trunk/ui/src/video/configure.py
trunk/ui/src/video/fxdhandler.py
trunk/ui/src/video/interface.py
trunk/ui/src/video/plugins/bookmarker.py
trunk/ui/src/video/plugins/mover.py
trunk/ui/src/video/videoitem.py
Log:
import menu as module with full path
Modified: trunk/ui/TODO
==============================================================================
--- trunk/ui/TODO (original)
+++ trunk/ui/TODO Mon Jan 29 21:35:29 2007
@@ -1,6 +1,6 @@
Change all imports so that freevo.ui does not need to be in the path.
The following modules have been ported: plugin, event, input, config,
-util
+util, menu
Note: this file is a mix beween several mail on the list. So when it
says 'I', it may not be me :-)
Modified: trunk/ui/bin/freevo
==============================================================================
--- trunk/ui/bin/freevo (original)
+++ trunk/ui/bin/freevo Mon Jan 29 21:35:29 2007
@@ -172,8 +172,6 @@
import gui.theme
import beacon
-from mainmenu import MainMenu
-
# new style imports
from freevo.ui import plugin, util
@@ -184,6 +182,8 @@
# freevo core imports
import freevo.ipc
+from mainmenu import MainMenu
+
class Splashscreen(gui.areas.Area):
"""
A simple splash screen for osd startup
Modified: trunk/ui/src/application/menuw.py
==============================================================================
--- trunk/ui/src/application/menuw.py (original)
+++ trunk/ui/src/application/menuw.py Mon Jan 29 21:35:29 2007
@@ -32,7 +32,7 @@
__all__ = [ 'MenuWidget' ]
# freevo imports
-from menu import MenuStack
+from freevo.ui.menu import MenuStack
# application imports
from base import Application, STATUS_RUNNING, CAPABILITY_TOGGLE
Modified: trunk/ui/src/audio/audiodiskitem.py
==============================================================================
--- trunk/ui/src/audio/audiodiskitem.py (original)
+++ trunk/ui/src/audio/audiodiskitem.py Mon Jan 29 21:35:29 2007
@@ -39,7 +39,7 @@
# Freevo imports
from freevo.ui import config
-from menu import Action, Menu
+from freevo.ui.menu import Action, Menu
from audioitem import AudioItem
from playlist import Playlist
from directory import DirItem
Modified: trunk/ui/src/audio/audioitem.py
==============================================================================
--- trunk/ui/src/audio/audioitem.py (original)
+++ trunk/ui/src/audio/audioitem.py Mon Jan 29 21:35:29 2007
@@ -42,7 +42,7 @@
from kaa.strutils import str_to_unicode
# freevo imports
-from menu import MediaItem, Action
+from freevo.ui.menu import MediaItem, Action
from freevo.ui.event import *
# audio player
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 21:35:29 2007
@@ -41,7 +41,7 @@
# Freevo imports
from freevo.ui.plugin import MainMenuPlugin
-from menu import Item, ActionItem, Menu, Action
+from freevo.ui.menu import Item, ActionItem, Menu, Action
from playlist import Playlist
class AlbumItem(Item):
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Mon Jan 29 21:35:29 2007
@@ -47,11 +47,11 @@
from freevo.ui import config
from freevo.ui import util
-import menu
+from freevo.ui import menu
from freevo.ui import plugin
import fxditem
-from menu import Item, Files, Action, ActionItem
+from freevo.ui.menu import Item, Files, Action, ActionItem
from playlist import Playlist
from freevo.ui.event import *
Modified: trunk/ui/src/fxditem.py
==============================================================================
--- trunk/ui/src/fxditem.py (original)
+++ trunk/ui/src/fxditem.py Mon Jan 29 21:35:29 2007
@@ -54,7 +54,7 @@
import os
import freevo.fxdparser
-from menu import Item, Action, Menu
+from freevo.ui.menu import Item, Action, Menu
# get logging object
log = logging.getLogger()
Modified: trunk/ui/src/games/gameitem.py
==============================================================================
--- trunk/ui/src/games/gameitem.py (original)
+++ trunk/ui/src/games/gameitem.py Mon Jan 29 21:35:29 2007
@@ -30,7 +30,7 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------------
-from menu import MediaItem, Action
+from freevo.ui.menu import MediaItem, Action
import machine
from freevo.ui import config
import logging
Modified: trunk/ui/src/image/imageitem.py
==============================================================================
--- trunk/ui/src/image/imageitem.py (original)
+++ trunk/ui/src/image/imageitem.py Mon Jan 29 21:35:29 2007
@@ -39,7 +39,7 @@
# freevo imports
from freevo.ui import config
-from menu import MediaItem, Action
+from freevo.ui.menu import MediaItem, Action
from viewer import viewer
class ImageItem(MediaItem):
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 21:35:29 2007
@@ -40,9 +40,9 @@
# freevo imports
from freevo.ui import plugin
-import menu
+from freevo.ui import menu
-from menu import Item, Action, ActionItem, Menu
+from freevo.ui.menu import Item, Action, ActionItem, Menu
from image import ImageItem
from application import TextWindow, MessageWindow
Modified: trunk/ui/src/input/plugins/sdl.py
==============================================================================
--- trunk/ui/src/input/plugins/sdl.py (original)
+++ trunk/ui/src/input/plugins/sdl.py Mon Jan 29 21:35:29 2007
@@ -39,7 +39,7 @@
from freevo.ui import config
import gui
-from menu import Item
+from freevo.ui.menu import Item
from freevo.ui.event import *
from interface import InputPlugin
Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py (original)
+++ trunk/ui/src/mainmenu.py Mon Jan 29 21:35:29 2007
@@ -44,7 +44,7 @@
from freevo.ui import util
from freevo.ui import plugin
-from menu import Item, Action, Menu
+from freevo.ui.menu import Item, Action, Menu
from application.menuw import MenuWidget
from freevo.ui.event import *
Modified: trunk/ui/src/playlist.py
==============================================================================
--- trunk/ui/src/playlist.py (original)
+++ trunk/ui/src/playlist.py Mon Jan 29 21:35:29 2007
@@ -48,7 +48,7 @@
import fxditem
from freevo.ui.event import *
-from menu import Action, Item, MediaItem, Menu
+from freevo.ui.menu import Action, Item, MediaItem, Menu
# get logging object
log = logging.getLogger()
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 21:35:29 2007
@@ -39,7 +39,7 @@
from freevo.ui import plugin
from freevo.ui import util
-from menu import Action
+from freevo.ui.menu import Action
from application import ConfirmWindow
# get logging object
Modified: trunk/ui/src/plugins/mediamenu.py
==============================================================================
--- trunk/ui/src/plugins/mediamenu.py (original)
+++ trunk/ui/src/plugins/mediamenu.py Mon Jan 29 21:35:29 2007
@@ -48,7 +48,7 @@
from freevo.ui.event import *
from directory import DirItem
from mainmenu import MainMenuItem
-from menu import Menu, Item
+from freevo.ui.menu import Menu, Item
# from games import machine
# get logging object
Modified: trunk/ui/src/plugins/shoppingcart.py
==============================================================================
--- trunk/ui/src/plugins/shoppingcart.py (original)
+++ trunk/ui/src/plugins/shoppingcart.py Mon Jan 29 21:35:29 2007
@@ -39,7 +39,7 @@
# freevo imports
from freevo.ui import plugin
-from menu import Action
+from freevo.ui.menu import Action
class PluginInterface(plugin.ItemPlugin):
Modified: trunk/ui/src/plugins/shutdown.py
==============================================================================
--- trunk/ui/src/plugins/shutdown.py (original)
+++ trunk/ui/src/plugins/shutdown.py Mon Jan 29 21:35:29 2007
@@ -42,7 +42,7 @@
import gui
import gui.widgets
-from menu import Action
+from freevo.ui.menu import Action
from application import ConfirmWindow
from mainmenu import MainMenuItem
from freevo.ui.plugin import MainMenuPlugin
Modified: trunk/ui/src/plugins/unpack.py
==============================================================================
--- trunk/ui/src/plugins/unpack.py (original)
+++ trunk/ui/src/plugins/unpack.py Mon Jan 29 21:35:29 2007
@@ -44,7 +44,7 @@
from freevo.ui import plugin
from freevo.ui import util
-from menu import Item, Action
+from freevo.ui.menu import Item, Action
from application import TextWindow
# possible archives and how to unpack them
Modified: trunk/ui/src/tv/favorite.py
==============================================================================
--- trunk/ui/src/tv/favorite.py (original)
+++ trunk/ui/src/tv/favorite.py Mon Jan 29 21:35:29 2007
@@ -35,7 +35,7 @@
import freevo.ipc
# freevo imports
-from menu import Item, Action, Menu
+from freevo.ui.menu import Item, Action, Menu
from application import MessageWindow
# get tvserver interface
Modified: trunk/ui/src/tv/program.py
==============================================================================
--- trunk/ui/src/tv/program.py (original)
+++ trunk/ui/src/tv/program.py Mon Jan 29 21:35:29 2007
@@ -44,7 +44,7 @@
# freevo imports
from freevo.ui import config
from freevo.ui import plugin
-from menu import Item, Action, Menu, ActionItem
+from freevo.ui.menu import Item, Action, Menu, ActionItem
from application import MessageWindow
# tv imports
Modified: trunk/ui/src/tv/tvguide.py
==============================================================================
--- trunk/ui/src/tv/tvguide.py (original)
+++ trunk/ui/src/tv/tvguide.py Mon Jan 29 21:35:29 2007
@@ -39,7 +39,7 @@
import kaa.notifier
from freevo.ui.event import *
-from menu import Item, Menu
+from freevo.ui.menu import Item, Menu
from program import ProgramItem
# get logging object
Modified: trunk/ui/src/tv/tvmenu.py
==============================================================================
--- trunk/ui/src/tv/tvmenu.py (original)
+++ trunk/ui/src/tv/tvmenu.py Mon Jan 29 21:35:29 2007
@@ -39,7 +39,7 @@
from freevo.ui import plugin
from mainmenu import MainMenuItem
-from menu import Item, ActionItem, Menu
+from freevo.ui.menu import Item, ActionItem, Menu
import tvguide
from directory import DirItem
Modified: trunk/ui/src/video/configure.py
==============================================================================
--- trunk/ui/src/video/configure.py (original)
+++ trunk/ui/src/video/configure.py Mon Jan 29 21:35:29 2007
@@ -39,7 +39,7 @@
__all__ = [ 'get_items', 'get_menu' ]
# freevo imports
-from menu import *
+from freevo.ui.menu import *
def play_movie(item, mplayer_options=None):
Modified: trunk/ui/src/video/fxdhandler.py
==============================================================================
--- trunk/ui/src/video/fxdhandler.py (original)
+++ trunk/ui/src/video/fxdhandler.py Mon Jan 29 21:35:29 2007
@@ -70,7 +70,7 @@
# freevo imports
from videoitem import VideoItem
-from menu import Files
+from freevo.ui.menu import Files
# get logging object
log = logging.getLogger('video')
Modified: trunk/ui/src/video/interface.py
==============================================================================
--- trunk/ui/src/video/interface.py (original)
+++ trunk/ui/src/video/interface.py Mon Jan 29 21:35:29 2007
@@ -45,7 +45,7 @@
from freevo.ui import util
from freevo.ui import plugin
import fxditem
-from menu import Files
+from freevo.ui.menu import Files
# video imports
from videoitem import VideoItem
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 21:35:29 2007
@@ -49,7 +49,7 @@
# freevo imports
import freevo.conf
-from menu import Action, Menu
+from freevo.ui.menu import Action, Menu
from freevo.ui.plugin import ItemPlugin
from freevo.ui.event import *
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 21:35:29 2007
@@ -38,7 +38,7 @@
import logging
# Freevo imports
-from menu import ItemPlugin, Action
+from freevo.ui.menu import ItemPlugin, Action
# get logging object
log = logging.getLogger('video')
Modified: trunk/ui/src/video/videoitem.py
==============================================================================
--- trunk/ui/src/video/videoitem.py (original)
+++ trunk/ui/src/video/videoitem.py Mon Jan 29 21:35:29 2007
@@ -50,7 +50,7 @@
from freevo.ui import util
from application import MessageWindow, ConfirmWindow
-from menu import Menu, MediaItem, Files, Action
+from freevo.ui.menu import Menu, MediaItem, Files, Action
from freevo.ui.event import *
# video 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
