make punctuation configurable, add emoticons

config/keyboard/desktop.conf

@@ -66,6 +66,7 @@ KEY_FENRIR,KEY_F4=toggle_speech
 KEY_FENRIR,KEY_CTRL,KEY_P=toggle_punctuation_level
 KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
 KEY_FENRIR,KEY_BACKSLASH=toggle_output
+#=toggle_emoticons
 key_FENRIR,KEY_KPENTER=toggle_auto_read
 KEY_FENRIR,KEY_Q=quit_fenrir
 KEY_FENRIR,KEY_T=time

config/keyboard/laptop.conf

@@ -66,6 +66,7 @@ KEY_FENRIR,KEY_F4=toggle_speech
 KEY_FENRIR,KEY_SHIFT,KEY_CTRL,KEY_P=toggle_punctuation_level
 KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
 KEY_FENRIR,KEY_SHIFT,KEY_ENTER=toggle_output
+#=toggle_emoticons
 KEY_FENRIR,KEY_ENTER=toggle_auto_read
 KEY_FENRIR,KEY_Q=quit_fenrir
 KEY_FENRIR,KEY_T=time

config/keyboard/test.conf

@@ -66,6 +66,7 @@ KEY_FENRIR,KEY_F4=toggle_speech
 KEY_FENRIR,KEY_CTRL,KEY_P=toggle_punctuation_level
 KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
 KEY_FENRIR,KEY_BACKSLASH=toggle_output
+#=toggle_emoticons
 key_FENRIR,KEY_KPENTER=toggle_auto_read
 KEY_FENRIR,KEY_Q=quit_fenrir
 KEY_FENRIR,KEY_T=time

config/punctuation/default.conf

@@ -0,0 +1,52 @@
+# how to use this file?
+# the # on the beginning of the line is a comment
+# the different sections are seperated by  [<name>Dict] <name> is the section name. Dict is a keyword
+# the entrys are seperated with :===: in words colon tripple equal colon ( to not collide with substitutions)
+[levelDict]
+none:===:
+some:===:.-$~+*-/\\@
+most:===:.,:-$~+*-/\\@!#%^&*()[]}{<>;
+all:===:!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~
+
+[punctDict]
+&:===:and
+':===:apostrophe
+@:===:at
+\:===:backslash
+|:===:bar
+!:===:bang
+^:===:carrot
+::===:colon
+,:===:comma
+-:===:dash
+$:===:dollar
+.:===:dot
+>:===:greater
+`:===:grave
+#:===:hash
+{:===:left brace
+[:===:left bracket
+(:===:left paren
+<:===:less
+%:===:percent
++:===:plus
+?:===:question
+":===:quote
+):===:right paren
+}:===:right brace
+]:===:right bracket
+;:===:semicolon
+/:===:slash
+*:===:star
+~:===:tilde
+_:===:line
+=:===:equals
+
+[customDict]
+chrys:===:king chrys
+
+[emoticonDict]
+:):===:smile
+;):===:twinker
+XD:===:loool
+:D:===:lought

config/settings/settings.conf

@@ -93,12 +93,14 @@ wordEcho=False
 # interrupt speech on any keypress
 interruptOnKeyPress=False
 # timeout for double tap in sec
-doubleTapDelay=0.2
+doubleTapTimeout=0.2
 
 [general]
 debugLevel=0
+punctuationProfile=default
 punctuationLevel=some
 numberOfClipboards=10
+emoticons=True
 # define the current fenrir key
 fenrirKeys=KEY_KP0,KEY_META
 timeFormat=%H:%M:%P

config/settings/settings.conf.chrys

@@ -0,0 +1,116 @@
+[sound]
+# Turn sound on or off:
+enabled=True
+
+# Select the driver used to play sounds, choices are generic and gstreamer.
+# Sox is the default.
+driver=generic
+
+# Sound themes. This is the pack of sounds used for sound alerts.
+# Sound packs may be located at /usr/share/sounds
+# For system wide availability, or ~/.local/share/fenrir/sounds
+# For the current user.
+theme=default
+
+# Sound volume controls how loud the sounds for your chosen soundpack are.
+# 0 is quietest, 1.0 is loudest.
+volume=1.0
+
+# shell commands for generic sound driver
+# the folowing variable are substituded
+# fenrirVolume = the current volume setting
+# fenrirSoundFile = the soundfile for an soundicon
+# fenrirFrequence = the frequence to play
+# fenrirDuration = the duration of the frequence
+# the following command is used for play a soundfile
+genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
+#the following command is used for generating a frequence beep
+genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
+
+[speech]
+# Turn speech on or off:
+enabled=True
+
+# Select speech driver, options are speechd (default) or espeak:
+driver=speechd
+#driver=espeak
+
+
+# The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
+rate=0.45
+
+# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
+pitch=0.5
+# Pitch for capital letters
+capitalPitch=0.9
+
+# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
+volume=1.0
+
+# Module is used for speech-dispatcher, to select the speech module you want to use.
+# Consult speech-dispatcher's configuration and help ti find out which modules are available.
+# The default is espeak.
+module=espeak
+
+# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in espeak,
+# or if using the espeak module in speech-dispatcher. To find out which voices are available, consult the documentation provided with your chosen synthesizer.
+voice=
+
+# Select the language you want fenrir to use.
+language=de
+
+# Read new text as it happens?
+autoReadIncoming=True
+
+[braille]
+#braille is not implemented yet
+enabled=True
+driver=brlapi
+layout=en
+
+[screen]
+driver=linux
+encoding=cp850
+screenUpdateDelay=0.4
+suspendingScreen=
+autodetectSuspendingScreen=True
+
+[keyboard]
+driver=evdev
+# filter input devices AUTO, ALL or a DEVICE NAME
+device=AUTO
+# gives fenrir exclusive access to the keyboard and let consume keystrokes. just disable on problems.
+grabDevices=True
+ignoreShortcuts=False
+# the current shortcut layout located in /etc/fenrir/keyboard
+keyboardLayout=test
+# echo chars while typing.
+charEcho=False
+# echo deleted chars
+charDeleteEcho=True
+# echo word after pressing space
+wordEcho=False
+# interrupt speech on any keypress
+interruptOnKeyPress=False
+# timeout for double tap in sec
+doubleTapTimeout=0.2
+
+[general]
+debugLevel=1
+punctuationProfile=default
+punctuationLevel=Some
+numberOfClipboards=10
+emoticons=True
+# define the current fenrir key
+fenrirKeys=KEY_KP0,KEY_META
+timeFormat=%H:%M:%P
+dateFormat=%A, %B %d, %Y
+autoSpellCheck=True
+spellCheckLanguage=en_US
+
+[promote]
+enabled=True
+inactiveTimeoutSec=120
+list=
+
+

config/settings/settings.conf.storm

@@ -44,12 +44,14 @@ charDeleteEcho=True
 wordEcho=False
 interruptOnKeyPress=True
 # timeout for double tap in sec
-doubleTapDelay=0.2
+doubleTapTimeout=0.2
 
 [general]
 debugLevel=0
+punctuationProfile=default
 punctuationLevel=some
 numberOfClipboards=10
+emoticons=True
 fenrirKeys=KEY_KP0
 timeFormat=%H:%M:%P
 dateFormat="%A, %B %d, %Y"

config/substitution/default.conf

@@ -1,45 +0,0 @@
-[levelProfile]
-None=
-Some=.-$~+*-/\\@
-Most=.,:-$~+*-/\\@!#%^&*()[]}{<>;
-All=!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~
-
-[punctDict]
-&=and
-'=apostrophe
-@=at
-\=backslash
-|=bar
-!=bang
-^=carrot
-:=colon
-,=comma
--=dash
-$=dollar
-.=dot
->=greater
-`=grave
-#=hash
-{=left brace
-[=left bracket
-(=left paren
-<=less
-%=percent
-+=plus
-?=question
-"=quote
-)=right paren
-}=right brace
-]=right bracket
-;=semicolon
-/=slash
-*=star
-~=tilde
-_=line
-==equals
-
-[userDict]
-:)=smile
-;)=twinker
-XD=loool
-:D=lought