From 8054df6c3cdb99df33620bd2cc0231e88cba1b6c Mon Sep 17 00:00:00 2001 From: chrys Date: Tue, 23 Aug 2016 23:31:36 +0200 Subject: [PATCH] add forgotten split --- config/settings/settings.conf | 56 +++---------------- config/settings/settings.conf.chrys | 44 --------------- .../commands/copy_marked_to_clipboard.py | 2 +- .../commands/commands/marked_text.py | 2 +- 4 files changed, 9 insertions(+), 95 deletions(-) delete mode 100644 config/settings/settings.conf.chrys diff --git a/config/settings/settings.conf b/config/settings/settings.conf index 91f8a567..48c147f0 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -1,54 +1,21 @@ [sound] -# Turn sound on or off: enabled=True - -# Select the driver used to play sounds, choices are sox and gstreamer. -# Sox is the default. driver=sox - -# 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 [speech] -# Turn speech on or off: enabled=True - -# Select speech driver, options are speechd (default) or espeak: driver=speechd - -# 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. +rate=0.75 pitch=0.5 - -# 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=english-us - -# Read new text as it happens? +voice=de +language=de +volume=0.8 autoReadIncomming=True [braille] -#braille is not implemented yet enabled=False layout=en @@ -58,29 +25,20 @@ screenUpdateDelay=0.4 [keyboard] device=all -# 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=desktop -# echo chars while typing. -charEcho=False -# echo deleted chars +keyboardLayout=test +charEcho=True charDeleteEcho=True -# echo word after pressing space wordEcho=True -# interrupt speech on any keypress interruptOnKeyPress=False [general] debugLevel=0 punctuationLevel=1 -# define the current fenrir key fenrirKeys=KEY_KP0 [promote] enabled=True inactiveTimeoutSec=120 -list= - - +list=chrys,test diff --git a/config/settings/settings.conf.chrys b/config/settings/settings.conf.chrys deleted file mode 100644 index 48c147f0..00000000 --- a/config/settings/settings.conf.chrys +++ /dev/null @@ -1,44 +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=0.8 -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 -fenrirKeys=KEY_KP0 - -[promote] -enabled=True -inactiveTimeoutSec=120 -list=chrys,test diff --git a/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py b/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py index 36530ca0..05aec1f8 100644 --- a/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py +++ b/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py @@ -10,7 +10,7 @@ class command(): environment['runtime']['outputManager'].presentText(environment, "two marks needed", interrupt=True) return environment - marked = mark_utils.getTextBetweenMarks(environment['commandBuffer']['Marks']['1'], environment['commandBuffer']['Marks']['2'], environment['screenData']['newContentText']) + marked = mark_utils.getTextBetweenMarks(environment['commandBuffer']['Marks']['1'], environment['commandBuffer']['Marks']['2'], environment['screenData']['newContentText'].split('\n')) environment['commandBuffer']['clipboard'] = [marked] + environment['commandBuffer']['clipboard'][:9] environment['commandBuffer']['clipboard'] = 0 diff --git a/src/fenrir-package/commands/commands/marked_text.py b/src/fenrir-package/commands/commands/marked_text.py index 7af3b49d..bb3a6c9b 100644 --- a/src/fenrir-package/commands/commands/marked_text.py +++ b/src/fenrir-package/commands/commands/marked_text.py @@ -10,7 +10,7 @@ class command(): environment['runtime']['outputManager'].presentText(environment, "two marks needed", interrupt=True) return environment - marked = mark_utils.getTextBetweenMarks(environment['commandBuffer']['Marks']['1'], environment['commandBuffer']['Marks']['2'], environment['screenData']['newContentText']) + marked = mark_utils.getTextBetweenMarks(environment['commandBuffer']['Marks']['1'], environment['commandBuffer']['Marks']['2'], environment['screenData']['newContentText'].split('\n')) if marked.strip(" \t\n") == '': environment['runtime']['outputManager'].presentText(environment, "blank", soundIcon='EmptyLine', interrupt=True)