Change MovableScreen a little bit. Use MovableSceenActions.

diff --git a/ac3lipsync/src/AC3main.py b/ac3lipsync/src/AC3main.py
index dd1906b..7c4ba04 100644 (file)
--- a/ac3lipsync/src/AC3main.py
+++ b/ac3lipsync/src/AC3main.py
@@ -109,7 +109,7 @@ class AC3LipSync(Screen, HelpableScreen, MovableScreen, InfoBarAudioSelection):
         }, -1)
 
         HelpableScreen.__init__(self)
-        MovableScreen.__init__(self, config.plugins.AC3LipSync, 600, 100)
+        MovableScreen.__init__(self, config.plugins.AC3LipSync, [self["actions"]], 600, 100)
         
     def __onShow(self):
         for sAudio in AC3PCM:
@@ -237,7 +237,7 @@ class AC3LipSync(Screen, HelpableScreen, MovableScreen, InfoBarAudioSelection):
     def DoShowMenu(self, answer):
         if answer is not None:
             if answer[1] == "1":
-                self.startMoving([self["actions"]])
+                self.startMoving()
             else:
                 sResponse = _("Invalid selection")
                 iType = MessageBox.TYPE_ERROR

diff --git a/ac3lipsync/src/MovableScreen.py b/ac3lipsync/src/MovableScreen.py
index ce54989..d4c9154 100644 (file)
--- a/ac3lipsync/src/MovableScreen.py
+++ b/ac3lipsync/src/MovableScreen.py
@@ -4,14 +4,15 @@ from __init__ import _
 from enigma import ePoint, eTimer, getDesktop
 
 class MovableScreen():
-    def __init__(self, configRoot, screenSize_x, screenSize_y, moveMinMargin=30, moveStepSize=10):
+    def __init__(self, configRoot, disableKeymaps, screenSize_x, screenSize_y, moveMinMargin=30, moveStepSize=10):
         self.configRoot = configRoot
+        self.disableKeymaps = disableKeymaps
         self.screenSize_x = screenSize_x
         self.screenSize_y = screenSize_y
         self.moveMinMargin = moveMinMargin
         self.moveStepSize = moveStepSize
 
-        self["MovableScreenActions"] = HelpableNumberActionMap(self, "PluginAudioSyncActions",
+        self["MovableScreenActions"] = HelpableNumberActionMap(self, "MovableScreenActions",
         {
             "ok":       (self.moveKeyOk,                   _("Save values and close screen")),
             "cancel":   (self.moveKeyCancel,            _("Discard changes and close screen")),
@@ -40,9 +41,8 @@ class MovableScreen():
         self.desktopHeight = desktop.size().height()
         
 
-    def startMoving(self,disableKeymaps):
-        self.disableKeymaps = disableKeymaps
-        self.switchKeymaps(False)
+    def startMoving(self):
+        self.setEnableMoveKeymap(True)
 
         self.moveTimer = eTimer()
         self.moveTimer.callback.append(self.movePositionTimer)
@@ -112,14 +112,14 @@ class MovableScreen():
     def moveKeyOk(self):
         self.configRoot.position_x.save()
         self.configRoot.position_y.save()
-        self.switchKeymaps(True)
+        self.setEnableMoveKeymap(False)
 
     def moveKeyCancel(self):
         self.configRoot.position_x.cancel()
         self.configRoot.position_y.cancel()
-        self.switchKeymaps(True)
+        self.setEnableMoveKeymap(False)
 
-    def switchKeymaps(self,enabled):
+    def setEnableMoveKeymap(self,enabled):
+        self["MovableScreenActions"].setEnabled(enabled)
         for keymap in self.disableKeymaps:
-            keymap.setEnabled(enabled)
-        self["MovableScreenActions"].setEnabled(not(enabled))
\ No newline at end of file
+            keymap.setEnabled(not(enabled))

diff --git a/ac3lipsync/src/keymap.xml b/ac3lipsync/src/keymap.xml
index 26513a6..6dfcf14 100644 (file)
--- a/ac3lipsync/src/keymap.xml
+++ b/ac3lipsync/src/keymap.xml
@@ -24,4 +24,26 @@
                <key id="KEY_9" mapto="9" flags="m" />
                <key id="KEY_0" mapto="0" flags="m" />
        </map>
+       <map context="MovableScreenActions">
+               <key id="KEY_ENTER" mapto="ok" flags="m" />
+               <key id="KEY_OK" mapto="ok" flags="m" />
+               <key id="KEY_EXIT" mapto="cancel" flags="m" />
+               <key id="KEY_ESC" mapto="cancel" flags="m" />
+               <key id="KEY_LEFT" mapto="left" flags="mr" />
+               <key id="KEY_RIGHT" mapto="right" flags="mr" />
+               <key id="KEY_UP" mapto="up" flags="mr" />
+               <key id="KEY_DOWN" mapto="down" flags="mr" />
+               <key id="KEY_RED" mapto="red" flags="m" />
+               <key id="KEY_GREEN" mapto="green" flags="m" />
+               <key id="KEY_1" mapto="1" flags="m" />
+               <key id="KEY_2" mapto="2" flags="m" />
+               <key id="KEY_3" mapto="3" flags="m" />
+               <key id="KEY_4" mapto="4" flags="m" />
+               <key id="KEY_5" mapto="5" flags="m" />
+               <key id="KEY_6" mapto="6" flags="m" />
+               <key id="KEY_7" mapto="7" flags="m" />
+               <key id="KEY_8" mapto="8" flags="m" />
+               <key id="KEY_9" mapto="9" flags="m" />
+               <key id="KEY_0" mapto="0" flags="m" />
+       </map>
 </keymap>