make keymap configurable with config.usage.keymap

3 files changed, 7 insertions, 5 deletions

diff --git a/keymapparser.py b/keymapparser.py
index 5c93092d..71625651 100644
--- a/keymapparser.py
+++ b/keymapparser.py
@@ -7,8 +7,7 @@ from keyids import KEYIDS;
 # these are only informational (for help)...
 from Tools.KeyBindings import addKeyBinding
 
-def readKeymap(filename = "/usr/share/enigma2/keymap.xml"):
-
+def readKeymap(filename):
 	p = enigma.eActionMap.getInstance()
 	assert p
 
diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 393dbbc4..0c976db6 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,4 +1,4 @@
-from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection
+from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText
 from enigma import Misc_Options
 import os
 
@@ -34,3 +34,5 @@ def InitUsageConfig():
 		elif configElement.value == "off":
 			Misc_Options.getInstance().set_12V_output(0)
 	config.usage.output_12V.addNotifier(set12VOutput)
+
+	config.usage.keymap = ConfigText(default = "/usr/share/enigma2/keymap.xml")
diff --git a/mytest.py b/mytest.py
index 66d9eb39..ddc9af47 100644
--- a/mytest.py
+++ b/mytest.py
@@ -521,8 +521,6 @@ def runScreenTest():
 
 	return 0
 
-import keymapparser
-keymapparser.readKeymap()
 import skin
 skin.loadSkinData(getDesktop(0))
 
@@ -538,6 +536,9 @@ Components.RecordingConfig.InitRecordingConfig()
 import Components.UsageConfig
 Components.UsageConfig.InitUsageConfig()
 
+import keymapparser
+keymapparser.readKeymap(config.usage.keymap.value)
+
 import Components.Network
 Components.Network.InitNetwork()