Author: dmeyer
Date: Mon Jan 29 21:30:44 2007
New Revision: 9091
Modified:
trunk/ui/TODO
trunk/ui/bin/freevo
trunk/ui/src/audio/interface.py
trunk/ui/src/directory.py
trunk/ui/src/fxditem.py
trunk/ui/src/gui/areas/area.py
trunk/ui/src/gui/areas/info_area.py
trunk/ui/src/gui/areas/listing_area.py
trunk/ui/src/gui/imagelib.py
trunk/ui/src/gui/theme.py
trunk/ui/src/image/fxdhandler.py
trunk/ui/src/image/viewer.py
trunk/ui/src/input/linux_input.py
trunk/ui/src/mainmenu.py
trunk/ui/src/menu/files.py
trunk/ui/src/playlist.py
trunk/ui/src/plugins/file_ops.py
trunk/ui/src/plugins/unpack.py
trunk/ui/src/video/database.py
trunk/ui/src/video/interface.py
trunk/ui/src/video/videoitem.py
Log:
import util as module with full path
Modified: trunk/ui/TODO
==============================================================================
--- trunk/ui/TODO (original)
+++ trunk/ui/TODO Mon Jan 29 21:30:44 2007
@@ -1,3 +1,7 @@
+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
+
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:30:44 2007
@@ -170,13 +170,12 @@
import gui.animation
import gui.widgets
import gui.theme
-import util
import beacon
from mainmenu import MainMenu
# new style imports
-from freevo.ui import plugin
+from freevo.ui import plugin, util
# load the fxditem to make sure it's the first in the
# mimetypes list
Modified: trunk/ui/src/audio/interface.py
==============================================================================
--- trunk/ui/src/audio/interface.py (original)
+++ trunk/ui/src/audio/interface.py Mon Jan 29 21:30:44 2007
@@ -45,7 +45,7 @@
# Freevo imports
from freevo.ui import config
-import util
+from freevo.ui import util
from freevo.ui import plugin
import fxditem
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Mon Jan 29 21:30:44 2007
@@ -45,7 +45,7 @@
# freevo imports
from freevo.ui import config
-import util
+from freevo.ui import util
import menu
from freevo.ui import plugin
Modified: trunk/ui/src/fxditem.py
==============================================================================
--- trunk/ui/src/fxditem.py (original)
+++ trunk/ui/src/fxditem.py Mon Jan 29 21:30:44 2007
@@ -49,7 +49,7 @@
import copy
import logging
-import util
+from freevo.ui import util
from freevo.ui import plugin
import os
import freevo.fxdparser
Modified: trunk/ui/src/gui/areas/area.py
==============================================================================
--- trunk/ui/src/gui/areas/area.py (original)
+++ trunk/ui/src/gui/areas/area.py Mon Jan 29 21:30:44 2007
@@ -54,7 +54,7 @@
# freevo imports
from freevo.ui import config
-import util
+from freevo.ui import util
# gui imports
from gui.widgets import Rectangle, Text, Textbox, Image
Modified: trunk/ui/src/gui/areas/info_area.py
==============================================================================
--- trunk/ui/src/gui/areas/info_area.py (original)
+++ trunk/ui/src/gui/areas/info_area.py Mon Jan 29 21:30:44 2007
@@ -39,7 +39,7 @@
import time
# freevo imports
-import util
+from freevo.ui import util
# gui imports
from area import Area
Modified: trunk/ui/src/gui/areas/listing_area.py
==============================================================================
--- trunk/ui/src/gui/areas/listing_area.py (original)
+++ trunk/ui/src/gui/areas/listing_area.py Mon Jan 29 21:30:44 2007
@@ -46,7 +46,7 @@
# freevo imports
from freevo.ui import config
-import util
+from freevo.ui import util
# gui import
from area import Area
Modified: trunk/ui/src/gui/imagelib.py
==============================================================================
--- trunk/ui/src/gui/imagelib.py (original)
+++ trunk/ui/src/gui/imagelib.py Mon Jan 29 21:30:44 2007
@@ -41,7 +41,7 @@
import kaa.mevas
from freevo.ui import config
-import util
+from freevo.ui import util
import theme
# get logging object
Modified: trunk/ui/src/gui/theme.py
==============================================================================
--- trunk/ui/src/gui/theme.py (original)
+++ trunk/ui/src/gui/theme.py Mon Jan 29 21:30:44 2007
@@ -57,7 +57,7 @@
# freevo imports
import freevo.conf
from freevo.ui import config
-import util
+from freevo.ui import util
from freevo.ui import plugin
# gui imports
Modified: trunk/ui/src/image/fxdhandler.py
==============================================================================
--- trunk/ui/src/image/fxdhandler.py (original)
+++ trunk/ui/src/image/fxdhandler.py Mon Jan 29 21:30:44 2007
@@ -61,7 +61,7 @@
from freevo.ui import config
from freevo.ui import plugin
-from util import match_files
+from freevo.ui.util import match_files
from playlist import Playlist
# ImageItem
Modified: trunk/ui/src/image/viewer.py
==============================================================================
--- trunk/ui/src/image/viewer.py (original)
+++ trunk/ui/src/image/viewer.py Mon Jan 29 21:30:44 2007
@@ -48,7 +48,7 @@
import gui.theme
# cache for loading images
-from util import ObjectCache
+from freevo.ui.util import ObjectCache
# Transition/Move/VERTICAL
from gui.animation import *
Modified: trunk/ui/src/input/linux_input.py
==============================================================================
--- trunk/ui/src/input/linux_input.py (original)
+++ trunk/ui/src/input/linux_input.py Mon Jan 29 21:30:44 2007
@@ -13,26 +13,6 @@
# Test the ioctls and put some to use.
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.4 2004/11/17 03:01:56 rshortt
-# Use util.ioctl.
-#
-# Revision 1.3 2004/09/30 02:19:44 rshortt
-# -remove duplicates from util.ioctl
-# -clean up keycode ioclts
-# -add convenience functions for:
-# -requesting exclusive access to a device
-# -get the name of a device (use for autodetection)
-# -get and set keycodes
-# -get keymap
-#
-# Revision 1.2 2004/09/27 18:40:34 dischi
-# reworked input handling again
-#
-# Revision 1.1 2004/09/25 04:37:41 rshortt
-# Support files for freevo input.
-#
-#
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py (original)
+++ trunk/ui/src/mainmenu.py Mon Jan 29 21:30:44 2007
@@ -41,7 +41,7 @@
# freevo imports
from freevo.ui import config
import gui.theme
-import util
+from freevo.ui import util
from freevo.ui import plugin
from menu import Item, Action, Menu
Modified: trunk/ui/src/menu/files.py
==============================================================================
--- trunk/ui/src/menu/files.py (original)
+++ trunk/ui/src/menu/files.py Mon Jan 29 21:30:44 2007
@@ -37,7 +37,7 @@
import logging
# freevo imports
-import util
+from freevo.ui import util
# 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 21:30:44 2007
@@ -43,7 +43,7 @@
# freevo imports
from freevo.ui import config
-import util
+from freevo.ui import util
from freevo.ui import plugin
import fxditem
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:30:44 2007
@@ -37,7 +37,7 @@
# freevo imports
from freevo.ui import config
from freevo.ui import plugin
-import util
+from freevo.ui import util
from menu import Action
from application import ConfirmWindow
Modified: trunk/ui/src/plugins/unpack.py
==============================================================================
--- trunk/ui/src/plugins/unpack.py (original)
+++ trunk/ui/src/plugins/unpack.py Mon Jan 29 21:30:44 2007
@@ -42,7 +42,7 @@
# freevo imports
from freevo.ui import plugin
-import util
+from freevo.ui import util
from menu import Item, Action
from application import TextWindow
Modified: trunk/ui/src/video/database.py
==============================================================================
--- trunk/ui/src/video/database.py (original)
+++ trunk/ui/src/video/database.py Mon Jan 29 21:30:44 2007
@@ -40,7 +40,7 @@
# freevo imports
from freevo.ui import config
-import util
+from freevo.ui import util
import logging
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:30:44 2007
@@ -42,7 +42,7 @@
# freevo imports
from freevo.ui import config
-import util
+from freevo.ui import util
from freevo.ui import plugin
import fxditem
from menu import Files
Modified: trunk/ui/src/video/videoitem.py
==============================================================================
--- trunk/ui/src/video/videoitem.py (original)
+++ trunk/ui/src/video/videoitem.py Mon Jan 29 21:30:44 2007
@@ -47,7 +47,7 @@
# freevo imports
from freevo.ui import config
-import util
+from freevo.ui import util
from application import MessageWindow, ConfirmWindow
from menu import Menu, MediaItem, Files, Action
-------------------------------------------------------------------------
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
