From 1b2f75903244b6c03e1f123533d4385c0c271c78 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Wed, 31 Aug 2005 01:46:06 +0000 Subject: [PATCH] moved keymap.xml into data-dir --- data/Makefile.am | 2 +- data/keymap.xml | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ keymapparser.py | 10 +++--- 3 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 data/keymap.xml diff --git a/data/Makefile.am b/data/Makefile.am index fcd4e50..05dcebb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = gnu installdir = $(DATADIR)/enigma2 install_DATA = \ - skin.xml menu.xml setup.xml + skin.xml menu.xml setup.xml keymap.xml diff --git a/data/keymap.xml b/data/keymap.xml new file mode 100644 index 0000000..eb06d0e --- /dev/null +++ b/data/keymap.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keymapparser.py b/keymapparser.py index c7bbce1..11c8530 100644 --- a/keymapparser.py +++ b/keymapparser.py @@ -9,12 +9,14 @@ def readKeymap(): enigma.eActionMap.getInstance(p) assert p - filename = "keymap.xml" - + filename1 = "data/keymap.xml" + filename2 = "/usr/share/enigma2/keymap.xml" + try: - source = open(filename) + source = open(filename1) except: - raise "couldn't open keymap.xml!" + source = open(filename2) +# raise "couldn't open keymap.xml!" try: dom = xml.dom.minidom.parse(source) -- 2.7.4