Author: dmeyer
Date: Mon Jan 29 21:12:34 2007
New Revision: 9088
Modified:
trunk/ui/src/application/handler.py
trunk/ui/src/config.py
trunk/ui/src/input/plugins/event_device.py
trunk/ui/src/input/plugins/interface.py
trunk/ui/src/input/plugins/x11.py
Log:
import input as module with full path
Modified: trunk/ui/src/application/handler.py
==============================================================================
--- trunk/ui/src/application/handler.py (original)
+++ trunk/ui/src/application/handler.py Mon Jan 29 21:12:34 2007
@@ -47,8 +47,7 @@
# freevo imports
import config
-import input
-
+from freevo.ui.input import set_mapping
from freevo.ui.event import *
# the logging object
@@ -96,7 +95,7 @@
if self.windows:
focus = self.windows[-1]
log.info('set focus to %s' % focus)
- input.set_mapping(focus.eventmap)
+ set_mapping(focus.eventmap)
if app == self.current:
# same app as before
Modified: trunk/ui/src/config.py
==============================================================================
--- trunk/ui/src/config.py (original)
+++ trunk/ui/src/config.py Mon Jan 29 21:12:34 2007
@@ -63,9 +63,7 @@
# input inputs variables for the input system
# and event.py (which has no more deps)
-import input
-
-from freevo.ui import plugin
+from freevo.ui import input, plugin
# import event names (no deps)
from freevo.ui.event import *
Modified: trunk/ui/src/input/plugins/event_device.py
==============================================================================
--- trunk/ui/src/input/plugins/event_device.py (original)
+++ trunk/ui/src/input/plugins/event_device.py Mon Jan 29 21:12:34 2007
@@ -91,8 +91,8 @@
import config
-import input.linux_input as li
-import input.evdev_keymaps as ek
+import freevo.ui.input.linux_input as li
+import freevo.ui.input.evdev_keymaps as ek
from interface import InputPlugin
from freevo.ui.event import *
Modified: trunk/ui/src/input/plugins/interface.py
==============================================================================
--- trunk/ui/src/input/plugins/interface.py (original)
+++ trunk/ui/src/input/plugins/interface.py Mon Jan 29 21:12:34 2007
@@ -37,8 +37,7 @@
# freevo imports
import config
-import input
-from freevo.ui import plugin
+from freevo.ui import plugin, input
# get logging object
log = logging.getLogger('input')
Modified: trunk/ui/src/input/plugins/x11.py
==============================================================================
--- trunk/ui/src/input/plugins/x11.py (original)
+++ trunk/ui/src/input/plugins/x11.py Mon Jan 29 21:12:34 2007
@@ -38,7 +38,7 @@
import config
# input imports
-from input import linux_input
+from freevo.ui.input import linux_input
from interface import InputPlugin
# get logging object
-------------------------------------------------------------------------
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
