[Freevo-cvslog] r9104 - in trunk/ui: bin src src/tv

[Dirk M. <di...@fr...>]

Author: dmeyer
Date: Tue Jan 30 17:33:59 2007
New Revision: 9104

Modified:
   trunk/ui/bin/freevo
   trunk/ui/src/mainmenu.py
   trunk/ui/src/plugins/mediamenu.py
   trunk/ui/src/plugins/shutdown.py
   trunk/ui/src/tv/tvmenu.py

Log:
import mainmenu as module with full path

Modified: trunk/ui/bin/freevo
==============================================================================
--- trunk/ui/bin/freevo	(original)
+++ trunk/ui/bin/freevo	Tue Jan 30 17:33:59 2007
@@ -174,7 +174,7 @@
 # freevo core imports
 import freevo.ipc
 
-from mainmenu import MainMenu
+from freevo.ui.mainmenu import MainMenu
 
 class Splashscreen(areas.Area):
     """

Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py	(original)
+++ trunk/ui/src/mainmenu.py	Tue Jan 30 17:33:59 2007
@@ -39,14 +39,14 @@
 import os
 
 # freevo imports
-from freevo.ui import config
-import freevo.ui.gui.theme
-from freevo.ui import util
-from freevo.ui import plugin
-
-from freevo.ui.menu import Item, Action, Menu
-from freevo.ui.application.menuw import MenuWidget
-from freevo.ui.event import *
+import config
+import gui.theme
+import util
+import plugin
+
+from menu import Item, Action, Menu
+from application.menuw import MenuWidget
+from event import *
 
 
 class MainMenuItem(Item):
@@ -72,7 +72,7 @@
             return
 
         # load extra informations for the skin fxd file
-        theme = freevo.ui.gui.theme.get()
+        theme = gui.theme.get()
         skin_info = theme.mainmenu.items
         if skin_info.has_key(skin_type):
             skin_info  = skin_info[skin_type]

Modified: trunk/ui/src/plugins/mediamenu.py
==============================================================================
--- trunk/ui/src/plugins/mediamenu.py	(original)
+++ trunk/ui/src/plugins/mediamenu.py	Tue Jan 30 17:33:59 2007
@@ -47,7 +47,7 @@
 
 from freevo.ui.event import *
 from directory import DirItem
-from mainmenu import MainMenuItem
+from freevo.ui.mainmenu import MainMenuItem
 from freevo.ui.menu import Menu, Item
 # from games import machine
 

Modified: trunk/ui/src/plugins/shutdown.py
==============================================================================
--- trunk/ui/src/plugins/shutdown.py	(original)
+++ trunk/ui/src/plugins/shutdown.py	Tue Jan 30 17:33:59 2007
@@ -41,7 +41,7 @@
 from freevo.ui import config, gui
 from freevo.ui.menu import Action
 from freevo.ui.application import ConfirmWindow
-from mainmenu import MainMenuItem
+from freevo.ui.mainmenu import MainMenuItem
 from freevo.ui.plugin import MainMenuPlugin
 from freevo.ui.gui import theme, widgets
 

Modified: trunk/ui/src/tv/tvmenu.py
==============================================================================
--- trunk/ui/src/tv/tvmenu.py	(original)
+++ trunk/ui/src/tv/tvmenu.py	Tue Jan 30 17:33:59 2007
@@ -38,7 +38,7 @@
 from freevo.ui import config
 from freevo.ui import plugin
 
-from mainmenu import MainMenuItem
+from freevo.ui.mainmenu import MainMenuItem
 from freevo.ui.menu import Item, ActionItem, Menu
 
 import tvguide