From 83357d02fa6181b7fba39cfc114a0547ded99f53 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Wed, 3 Nov 2010 19:29:10 +0100
Subject: [PATCH] install keymaps

---
 configure.ac                      |   1 +
 data/Makefile.am                  |   2 +-
 data/keymaps/Makefile.am          |   6 ++++++
 data/keymaps/dream-de.info        |   2 ++
 data/keymaps/dream-de.kmap        | Bin 0 -> 2823 bytes
 data/keymaps/eng.info             |   2 ++
 data/keymaps/eng.kmap             | Bin 0 -> 2823 bytes
 lib/python/Components/Keyboard.py |   7 ++++---
 8 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 data/keymaps/Makefile.am
 create mode 100644 data/keymaps/dream-de.info
 create mode 100644 data/keymaps/dream-de.kmap
 create mode 100644 data/keymaps/eng.info
 create mode 100644 data/keymaps/eng.kmap

diff --git a/configure.ac b/configure.ac
index 1f83b0f..5b3082e 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 1ed9444..0eaa082 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 0000000..8499d99
--- /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 0000000..d7f5b07
--- /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
new file mode 100644
index 0000000000000000000000000000000000000000..693317a781145b060e19509cb4b353d69b7a58d7
GIT binary patch
literal 2823
zcmd^>*-{%v6o&uPt=9alBLQOHf(@9>;C;6--uHdqV#i?P4P)aKV`Ka-sZ`}QmE{fc
z47o~GZt@Jd%0*fui9#Su2)>J^q?w+XbEd!k&-q6qW1~~!!xJKc*)RTo9|N>t6E<TD
zwqhH$V+VF(7dGM#^xzY`zR*b>)tCBO-|HKFtj~2q|3<%&$mp=X();>AAL=80qGS40
z|I$A(7y+F+rSJ5fzSR+ZrsEjEdaR3J(~-q$6X8z0>Q)lsBq@<lyrJ<nvb5f+O;~4>
zHf6;cYb|W0NrssYN=npV?q(|@V>4)t#5k!<T4_v5(nv!R(j;|KFU^vcjI>CrRN1V2
zH8(bY9QfPOf$y;fUFgOJ^r8=Yu@84+{tJ3dkLX3ctT*+Fp3rl8UVq2hnE!xY(!+XG
zkLhtesi*X`{-(cTDDd~_4ZW_1^r{}zvw8-5up8gZ;r}6?Ri#u(R;r~&+GJJWw@dI3
z$!cjYC791|w8(E#|BgSG4?p6k!fJfLE!@UOd|ept*GYU=s(-kDro8@fuIVUb%;}GB
z^ZMhL+<6B5eSHu(=+8SY?J};?Rk^IIb~Ucn)%jXueAZX{8sFe6e5J4Qjb44)XMC!l
z|Fo-j4f%N$e|=MAeBDa)kLMh^Al|nX^A`8Wq5%%os6{jC;8BUH_*$rc2x^c(5)p_L
z6zP0ajvq~EghhQgtU#uCKCXX+`frmC>69+%mLBPqK3OaMLI1?(^$!mmkafkG<@fXT
zUw-|U=9@qIa{O48umA9buykcM8Z5=XFlxp8GYfMfxCC1B=f51k31yPgKjd9Dze(r(
zuiW-|{t#CZRnGs|!cE-FE!@g&+|C``$z9wS`t@giqUQ@va+ELmn(z6BkNKPv;aWd4
zk>N03@jf5$As_Jx$M`h=w9pQnoZ>s)<6DmK8OJ%m^|}7f@#p&A!HI#hF5#R@y2#PR
z{_i7CAN=1Zyz{~TeRwT+>kIzRL6>r6{htN@H`UT;s!Vnn{y!7=+u0GA*077++`wM;
zaWD7rZp?py*LZ{%d6_qPg(rB9=fl0R|MLJZ@i33_7?1NLPx16De-Cf)IuG$G5ArO}
za1VF0;Qu-PQdJ70CF`F<3*++o7x@>y|4Jju=s&Oi`GL21n;%*5f9@}*f5;mAZ*l#@
z3YF-epT&Q#|GfWmx|Ak2S}}jz9|U9nUznd+Hqfz}wQOcx=!Z(q`agv=OfboaWQxi;
l{?8^h(z2e06)f?8hW=lq{ulMXV*f8y|MT@X>81Yv`~zCTk&^%b

literal 0
HcmV?d00001

diff --git a/data/keymaps/eng.info b/data/keymaps/eng.info
new file mode 100644
index 0000000..d73372c
--- /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
new file mode 100644
index 0000000000000000000000000000000000000000..15a722f164e16e74b016786d85e82a94ecdda36f
GIT binary patch
literal 2823
zcmd^>`F9jW6ov1rn(DqaZ}v5-D4>7>vM&-41qIwt7C{M00$~e*Kp>C=n17wBo{R)=
z5;-1zN>^8%I<Ko<_gA<2c27=EEzC^JiU|IxSbv8BhOrxauowHV9|v#{hj19XumeZY
zf!BxnRHyWjKGp?&qIdLx&f*HL8cB^#=$zirn|e!c>s_7JdpLqExRwIrx~R|ey3XsQ
z-q#sy$4-2i!WL4Ck4>7bxe+Tlags<X6mMv}O)agrYID}v#OAG7W37d)m?S*unB+wb
zRu)@IjV)p%72~9lSQ$tpG15*TgVL0i3`s$XGAtufu~iveIk(#n{GZ@BHeoY9#b5Xg
zpJOYw;ctAA@&Bfm^gBJL7xWLksAu%7{)#2M$oRj}^LkRh*He00f6yQGCwzsCcp3Pg
z>z{gAPw4OZt^T4vV+_ae^$PyLkv&&Q%2JW4)TD0e0d;l$WBvFIdi+Lv{3ie3_~R<z
zc&MAR-cnQ-FEHL+ov6PbcvJr{_GRSv4W09CKlobz?wmAajQabQ&iiK6zZZ}Chkoh`
zuINgx>?*G6YOd}Yt{L<<zUphfZq=83*;j1dt1tMX&oAr$+_hZ0o2%D$^?%L({`$vE
z;TXmUM)46gpp!*5geXI;q78={8W=<q9%WR**wM%jK^-|HNI~SGD1`Ar{BVw72m`Qa
zh2$j^L&g$1%lZfYKKnnny8hvYA7KA?`D44XAn?cXZ~WPnKK$`o)c+m+EZ)<<oBORc
ztoB;`Z_Nlf|F`~`+VAFFKM@XdH}`Na_i;ZD@E{NIFn4hWkFrD0hkVK@KH_68@Conm
z0cUxIS6NIACpgC&yvbX<&AXiDJs#l}UJI|oI2ZYh*E!Eg-scRrb0?SmpTYkfoH*mG
z%Q@!~mpZ!4|9$G|ga7-ScRu*P51$2Z{j&da%;nvh{%<O#`X2tj-t}Ma{J}$3E3C3j
z#~K?PWHY=EWmdBB!T%_%GslD}$vl<8|6_^%#~}{TvPHuZqyJ~|p8xgP|9$<>6ypDn
QLBIXq@B3#8YyJPc0_5grSpWb4

literal 0
HcmV?d00001

diff --git a/lib/python/Components/Keyboard.py b/lib/python/Components/Keyboard.py
index 820d103..b026cd5 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:
-- 
2.7.4