fix toggle messages

config/settings/settings.cfg

@@ -1,3 +1,4 @@
+
 [sound]
 enabled=False,
 driver=sox
@@ -5,19 +6,23 @@ theme=default
 
 [speech]
 enabled=True
-driver=espeak
+#driver=espeak
-rate=800
+#language=en-us
+#voice=en-us
+driver=speechd
+#rate=800
+rate=50
+volume=100
 pitch=50
 module=espeak
-voice=en-us
+voice=de
-language=en-us
+language=de
-volume=200
 
 [braille]
 enabled=False
 layout=en
 
-[screen]
+['screen]
 driver=linux
 
 [keyboard]
@@ -28,3 +33,4 @@ wordEcho=True
 [general]
 debugLevel=0
 punctuationLevel=1
+

config/settings/settings.cfg.chrys

@@ -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
-

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')))   
+        if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'braille', 'enabled'): 
+            environment['runtime']['outputManager'].presentText(environment, "braille enabled")                 
         return environment    
     def setCallback(self, callback):
         pass

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')))   
+        if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'sound', 'enabled'): 
+            environment['runtime']['outputManager'].presentText(environment, "sound enabled")                 
         return environment    
     def setCallback(self, callback):
         pass

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')))   
+        if environment['runtime']['settingsManager'].getSettingAsBool(environment, 'speech', 'enabled'): 
+            environment['runtime']['outputManager'].presentText(environment, "speech enabled")                 
         return environment    
     def setCallback(self, callback):
         pass