From 700a9e39877c5b5aacf91fb5c487e5e128c2ff73 Mon Sep 17 00:00:00 2001
From: chrys <chrys87@web.de>
Date: Tue, 26 Jul 2016 00:15:26 +0200
Subject: [PATCH] fix toggle messages

---
 config/settings/settings.cfg                  | 18 ++++++----
 config/settings/settings.cfg.chrys            | 36 -------------------
 .../commands/toggle_braille_enable.py         |  6 ++--
 .../commands/commands/toggle_sound_enable.py  |  6 ++--
 .../commands/commands/toggle_speech_enable.py |  6 ++--
 5 files changed, 21 insertions(+), 51 deletions(-)
 delete mode 100644 config/settings/settings.cfg.chrys

diff --git a/config/settings/settings.cfg b/config/settings/settings.cfg
index d6708f84..4d62ded9 100644
--- a/config/settings/settings.cfg
+++ b/config/settings/settings.cfg
@@ -1,3 +1,4 @@
+
 [sound]
 enabled=False,
 driver=sox
@@ -5,19 +6,23 @@ theme=default
 
 [speech]
 enabled=True
-driver=espeak
-rate=800
+#driver=espeak
+#language=en-us
+#voice=en-us
+driver=speechd
+#rate=800
+rate=50
+volume=100
 pitch=50
 module=espeak
-voice=en-us
-language=en-us
-volume=200
+voice=de
+language=de
 
 [braille]
 enabled=False
 layout=en
 
-[screen]
+['screen]
 driver=linux
 
 [keyboard]
@@ -28,3 +33,4 @@ wordEcho=True
 [general]
 debugLevel=0
 punctuationLevel=1
+
diff --git a/config/settings/settings.cfg.chrys b/config/settings/settings.cfg.chrys
deleted file mode 100644
index 4d62ded9..00000000
--- a/config/settings/settings.cfg.chrys
+++ /dev/null
@@ -1,36 +0,0 @@
-
-[sound]
-enabled=False,
-driver=sox
-theme=default
-
-[speech]
-enabled=True
-#driver=espeak
-#language=en-us
-#voice=en-us
-driver=speechd
-#rate=800
-rate=50
-volume=100
-pitch=50
-module=espeak
-voice=de
-language=de
-
-[braille]
-enabled=False
-layout=en
-
-['screen]
-driver=linux
-
-[keyboard]
-keyboardLayout=desktop
-charEcho=False
-wordEcho=True
-
-[general]
-debugLevel=0
-punctuationLevel=1
-
diff --git a/src/fenrir-package/commands/commands/toggle_braille_enable.py b/src/fenrir-package/commands/commands/toggle_braille_enable.py
index a2ea5637..88351815 100644
--- a/src/fenrir-package/commands/commands/toggle_braille_enable.py
+++ b/src/fenrir-package/commands/commands/toggle_braille_enable.py
@@ -7,9 +7,9 @@ class command():
         
         if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'braille', 'enabled'): 
             environment['runtime']['outputManager'].presentText(environment, "braille disabled")
-        else:
-            environment['runtime']['outputManager'].presentText(environment, "braille enabled")
-        environment = environment['runtime']['settingsManager'].setSetting(environment, 'braille', 'enabled', str(not environment['runtime']['settingsManager'].getSettingAsBool(environment, 'braille', 'enabled')))            
+        environment = environment['runtime']['settingsManager'].setSetting(environment, 'braille', 'enabled', str(not environment['runtime']['settingsManager'].getSettingAsBool(environment, 'braille', 'enabled')))   
+        if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'braille', 'enabled'): 
+            environment['runtime']['outputManager'].presentText(environment, "braille enabled")                 
         return environment    
     def setCallback(self, callback):
         pass
diff --git a/src/fenrir-package/commands/commands/toggle_sound_enable.py b/src/fenrir-package/commands/commands/toggle_sound_enable.py
index 21e42aaa..cb5274d4 100644
--- a/src/fenrir-package/commands/commands/toggle_sound_enable.py
+++ b/src/fenrir-package/commands/commands/toggle_sound_enable.py
@@ -7,9 +7,9 @@ class command():
         
         if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'sound', 'enabled'): 
             environment['runtime']['outputManager'].presentText(environment, "sound disabled")
-        else:
-            environment['runtime']['outputManager'].presentText(environment, "sound enabled")
-        environment = environment['runtime']['settingsManager'].setSetting(environment, 'sound', 'enabled', str(not environment['runtime']['settingsManager'].getSettingAsBool(environment, 'sound', 'enabled')))            
+        environment = environment['runtime']['settingsManager'].setSetting(environment, 'sound', 'enabled', str(not environment['runtime']['settingsManager'].getSettingAsBool(environment, 'sound', 'enabled')))   
+        if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'sound', 'enabled'): 
+            environment['runtime']['outputManager'].presentText(environment, "sound enabled")                 
         return environment    
     def setCallback(self, callback):
         pass
diff --git a/src/fenrir-package/commands/commands/toggle_speech_enable.py b/src/fenrir-package/commands/commands/toggle_speech_enable.py
index d0519a46..44b05d8e 100644
--- a/src/fenrir-package/commands/commands/toggle_speech_enable.py
+++ b/src/fenrir-package/commands/commands/toggle_speech_enable.py
@@ -7,9 +7,9 @@ class command():
         
         if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'speech', 'enabled'): 
             environment['runtime']['outputManager'].presentText(environment, "speech disabled")
-        else:
-            environment['runtime']['outputManager'].presentText(environment, "speech enabled")
-        environment = environment['runtime']['settingsManager'].setSetting(environment, 'speech', 'enabled', str(not environment['runtime']['settingsManager'].getSettingAsBool(environment, 'speech', 'enabled')))            
+        environment = environment['runtime']['settingsManager'].setSetting(environment, 'speech', 'enabled', str(not environment['runtime']['settingsManager'].getSettingAsBool(environment, 'speech', 'enabled')))   
+        if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'speech', 'enabled'): 
+            environment['runtime']['outputManager'].presentText(environment, "speech enabled")                 
         return environment    
     def setCallback(self, callback):
         pass