diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/keymaps/Makefile.am | 6 | ||||
| -rw-r--r-- | data/keymaps/dream-de.info | 2 | ||||
| -rw-r--r-- | data/keymaps/dream-de.kmap | bin | 0 -> 2823 bytes | |||
| -rw-r--r-- | data/keymaps/eng.info | 2 | ||||
| -rw-r--r-- | data/keymaps/eng.kmap | bin | 0 -> 2823 bytes | |||
| -rwxr-xr-x | lib/python/Components/Keyboard.py | 7 |
8 files changed, 16 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1f83b0f7..5b3082ec 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ data/defaults/Dream/Makefile data/defaults/Dream/hdbouquets/Makefile data/defaults/Dream/sdbouquets/Makefile data/extensions/Makefile +data/keymaps/Makefile data/skin_default/Makefile data/skin_default/menu/Makefile data/skin_default/icons/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 1ed9444b..0eaa082d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = countries fonts defaults extensions skin_default +SUBDIRS = countries fonts defaults extensions keymaps skin_default dist_pkgdata_DATA = \ defaultsatlists.xml \ diff --git a/data/keymaps/Makefile.am b/data/keymaps/Makefile.am new file mode 100644 index 00000000..8499d992 --- /dev/null +++ b/data/keymaps/Makefile.am @@ -0,0 +1,6 @@ +keymapsdir = $(datadir)/keymaps +keymaps_DATA = \ + dream-de.info \ + dream-de.kmap \ + eng.info \ + eng.kmap diff --git a/data/keymaps/dream-de.info b/data/keymaps/dream-de.info new file mode 100644 index 00000000..d7f5b074 --- /dev/null +++ b/data/keymaps/dream-de.info @@ -0,0 +1,2 @@ +kmap=dream-de.kmap +name=Dreambox Keyboard Deutsch diff --git a/data/keymaps/dream-de.kmap b/data/keymaps/dream-de.kmap Binary files differnew file mode 100644 index 00000000..693317a7 --- /dev/null +++ b/data/keymaps/dream-de.kmap diff --git a/data/keymaps/eng.info b/data/keymaps/eng.info new file mode 100644 index 00000000..d73372c6 --- /dev/null +++ b/data/keymaps/eng.info @@ -0,0 +1,2 @@ +kmap=eng.kmap +name=Keyboard English diff --git a/data/keymaps/eng.kmap b/data/keymaps/eng.kmap Binary files differnew file mode 100644 index 00000000..15a722f1 --- /dev/null +++ b/data/keymaps/eng.kmap diff --git a/lib/python/Components/Keyboard.py b/lib/python/Components/Keyboard.py index 820d1036..b026cd56 100755 --- a/lib/python/Components/Keyboard.py +++ b/lib/python/Components/Keyboard.py @@ -1,6 +1,7 @@ from Components.Console import Console from os import listdir as os_listdir, path as os_path from re import compile as re_compile +from enigma import eEnv class Keyboard: def __init__(self): @@ -8,9 +9,9 @@ class Keyboard: self.readKeyboardMapFiles() def readKeyboardMapFiles(self): - for keymapfile in os_listdir('/usr/share/keymaps/'): + for keymapfile in os_listdir(eEnv.resolve('${datadir}/keymaps/')): if (keymapfile.endswith(".info")): - f = open('/usr/share/keymaps/' + keymapfile) + f = open(eEnv.resolve('${datadir}/keymaps/') + keymapfile) mapfile = None mapname = None for line in f: @@ -32,7 +33,7 @@ class Keyboard: try: keymap = self.keyboardmaps[index] print "Activating keymap:",keymap[1] - keymappath = '/usr/share/keymaps/' + keymap[0] + keymappath = eEnv.resolve('${datadir}/keymaps/') + keymap[0] if os_path.exists(keymappath): Console().ePopen(("loadkmap < " + str(keymappath))) except: |