make fenrir key configurable

config/keyboard/desktop.conf

@@ -1,4 +1,3 @@
-1-KEY_KP0=fenrirKey
 #1-KEY_LEFTCTRL=shut_up
 1-KEY_RIGHTCTRL=shut_up
 1-KEY_KP8=curr_line

config/keyboard/laptop.conf

@@ -1,5 +1,3 @@
-
-1-KEY_CAPSLOCK=fenrirKey
 #1-KEY_LEFTCTRL=shut_up
 1-KEY_RIGHTCTRL=shut_up
 1-KEY_I=curr_line

config/keyboard/test.conf

@@ -1,21 +1,20 @@
-1-KEY_KP0=fenrirKey
 #1-KEY_LEFTCTRL=shut_up
-1-KEY_KP0,1-KEY_RIGHTCTRL=shut_up
-1-KEY_KP0,1-KEY_KP8=curr_line
-1-KEY_KP0,1-KEY_KP7=prev_line
-1-KEY_KP0,1-KEY_KP9=next_line
-1-KEY_KP0,1-KEY_KP5=curr_word
-1-KEY_KP0,1-KEY_KP4=prev_word
-1-KEY_KP0,1-KEY_KP6=next_word
-1-KEY_KP0,1-KEY_KP2=curr_char
-1-KEY_KP0,1-KEY_KP1=prev_char
-1-KEY_KP0,1-KEY_KP3=next_char
-1-KEY_KP0,1-KEY_KPDOT=exit_review
+1-FENRIR,1-KEY_RIGHTCTRL=shut_up
+1-FENRIR,1-KEY_KP8=curr_line
+1-FENRIR,1-KEY_KP7=prev_line
+1-FENRIR,1-KEY_KP9=next_line
+1-FENRIR,1-KEY_KP5=curr_word
+1-FENRIR,1-KEY_KP4=prev_word
+1-FENRIR,1-KEY_KP6=next_word
+1-FENRIR,1-KEY_KP2=curr_char
+1-FENRIR,1-KEY_KP1=prev_char
+1-FENRIR,1-KEY_KP3=next_char
+1-FENRIR,1-KEY_KPDOT=exit_review
 #=curr_screen
 #=last_incomming
-1-KEY_KP0,1-KEY_F2=toggle_braille
-1-KEY_KP0,1-KEY_F3=toggle_sound
-1-KEY_KP0,1-KEY_F4=toggle_speech
+1-FENRIR,1-KEY_F2=toggle_braille
+1-FENRIR,1-KEY_F3=toggle_sound
+1-FENRIR,1-KEY_F4=toggle_speech
 #=toggle_output
 #=toggle_autoRead
 #=quit_fenrir

config/settings/settings.conf

@@ -6,12 +6,12 @@ volume=1.0
 
 [speech]
 enabled=True
-driver=espeak
+driver=speechd
 rate=0.75
 pitch=0.5
 module=espeak
-voice=en-us
-language=en-us
+voice=de
+language=de
 volume=1.0
 autoReadIncomming=True
 
@@ -27,8 +27,8 @@ screenUpdateDelay=0.4
 device=all
 grabDevices=True
 ignoreShortcuts=False
-keyboardLayout=desktop
-charEcho=False
+keyboardLayout=test
+charEcho=True
 charDeleteEcho=True
 wordEcho=True
 interruptOnKeyPress=False
@@ -36,3 +36,4 @@ interruptOnKeyPress=False
 [general]
 debugLevel=0
 punctuationLevel=1
+fenrirKeys=KEY_KP0

config/settings/settings.conf.chrys

@@ -1,38 +0,0 @@
-[sound]
-enabled=True
-driver=sox
-theme=default
-volume=1.0
-
-[speech]
-enabled=True
-driver=speechd
-rate=0.75
-pitch=0.5
-module=espeak
-voice=de
-language=de
-volume=1.0
-autoReadIncomming=True
-
-[braille]
-enabled=False
-layout=en
-
-[screen]
-driver=linux
-screenUpdateDelay=0.4
-
-[keyboard]
-device=all
-grabDevices=True
-ignoreShortcuts=False
-keyboardLayout=test
-charEcho=True
-charDeleteEcho=True
-wordEcho=True
-interruptOnKeyPress=False
-
-[general]
-debugLevel=0
-punctuationLevel=1

config/settings/settings.conf.orig

@@ -36,3 +36,4 @@ interruptOnKeyPress=False
 [general]
 debugLevel=0
 punctuationLevel=1
+fenrirKeys=KEY_KP0