make beep for indentation work and configurable

config/settings/espeak.settings.conf

@@ -179,7 +179,13 @@ commandPath=
 #fenrirFont = the font
 #fenrirFontSize = the fontsize
 attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
+# present indentation
 autoPresentIndent=False
+# speak is only invoked on changeing ident level, sound always
+# 0 = sound and speak
+# 1 = sound only
+# 2 = speak only
+autoPresentIndentMode=1
 # play a sound when attributes are changeing
 hasAttributes=True
 # shell for PTY emulatiun (empty = default shell)

config/settings/settings-daemon.conf

@@ -184,7 +184,13 @@ commandPath=
 #fenrirFont = the font
 #fenrirFontSize = the fontsize
 attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
+# present indentation
 autoPresentIndent=False
+# speak is only invoked on changeing ident level, sound always
+# 0 = sound and speak
+# 1 = sound only
+# 2 = speak only
+autoPresentIndentMode=1
 # play a sound when attributes are changeing
 hasAttributes=True
 # shell for PTY emulatiun (empty = default shell)

config/settings/settings-pty.conf

@@ -184,7 +184,13 @@ commandPath=
 #fenrirFont = the font
 #fenrirFontSize = the fontsize
 attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
+# present indentation
 autoPresentIndent=False
+# speak is only invoked on changeing ident level, sound always
+# 0 = sound and speak
+# 1 = sound only
+# 2 = speak only
+autoPresentIndentMode=1
 # play a sound when attributes are changeing
 hasAttributes=True
 # shell for PTY emulatiun (empty = default shell)

config/settings/settings.conf

@@ -185,7 +185,13 @@ commandPath=
 #fenrirFont = the font
 #fenrirFontSize = the fontsize
 attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
+# present indentation
 autoPresentIndent=False
+# speak is only invoked on changeing ident level, sound always
+# 0 = sound and speak
+# 1 = sound only
+# 2 = speak only
+autoPresentIndentMode=1
 # play a sound when attributes are changeing
 hasAttributes=True
 # shell for PTY emulatiun (empty = default shell)

config/settings/settings.conf.example

@@ -185,7 +185,13 @@ commandPath=
 #fenrirFont = the font
 #fenrirFontSize = the fontsize
 attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
+# present indentation
 autoPresentIndent=False
+# speak is only invoked on changeing ident level, sound always
+# 0 = sound and speak
+# 1 = sound only
+# 2 = speak only
+autoPresentIndentMode=1
 # play a sound when attributes are changeing
 hasAttributes=True
 # shell for PTY emulatiun (empty = default shell)

config/settings/settings.conf.storm

@@ -130,7 +130,13 @@ commandPath=
 #fenrirFont = the font
 #fenrirFontSize = the fontsize
 attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
+# present indentation
 autoPresentIndent=False
+# speak is only invoked on changeing ident level, sound always
+# 0 = sound and speak
+# 1 = sound only
+# 2 = speak only
+autoPresentIndentMode=1
 # play a sound when attributes are changeing
 hasAttributes=False
 # shell for PTY emulatiun (empty = default shell)

config/settings/speech-dispatcher.settings.conf

@@ -184,7 +184,13 @@ commandPath=
 #fenrirFont = the font
 #fenrirFontSize = the fontsize
 attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
+# present indentation
 autoPresentIndent=False
+# speak is only invoked on changeing ident level, sound always
+# 0 = sound and speak
+# 1 = sound only
+# 2 = speak only
+autoPresentIndentMode=1
 # play a sound when attributes are changeing
 hasAttributes=True
 # shell for PTY emulatiun (empty = default shell)

src/fenrirscreenreader/commands/onCursorChange/65000-present_line_if_cursor_change_vertical.py

@@ -42,9 +42,12 @@ class command():
                 self.lastIdent = currIdent
             doInterrupt = True
             if self.env['runtime']['settingsManager'].getSettingAsBool('general', 'autoPresentIndent'):
-                if self.lastIdent != currIdent: 
+                if self.env['runtime']['settingsManager'].getSettingAsInt('general', 'autoPresentIndentMode') in [0,1]:
-                    self.env['runtime']['outputManager'].presentText(_('indented ') + str(currIdent) + ' ', interrupt=doInterrupt, flush=False)
+                    self.env['runtime']['outputManager'].playFrequence(currIdent * 50, 0.1, interrupt=doInterrupt)
-                    doInterrupt = False    
+                if self.env['runtime']['settingsManager'].getSettingAsInt('general', 'autoPresentIndentMode') in [0,2]:
+                    if self.lastIdent != currIdent: 
+                        self.env['runtime']['outputManager'].presentText(_('indented ') + str(currIdent) + ' ', interrupt=doInterrupt, flush=False)
+                        doInterrupt = False
             # barrier
             sayLine = currLine
             if self.env['runtime']['settingsManager'].getSettingAsBool('barrier','enabled'):

src/fenrirscreenreader/core/fenrirManager.py

@@ -23,11 +23,7 @@ class fenrirManager():
                 raise RuntimeError('Cannot Initialize. Maybe the configfile is not available or not parseable')
         except RuntimeError:
             raise
-        for m in range(1, 280):
+        self.environment['runtime']['outputManager'].presentText(_("Start Fenrir"), soundIcon='ScreenReaderOn', interrupt=True)
-            if m % 4 ==0:
-                self.environment['runtime']['outputManager'].playFrequence(m * 40, 0.2, interrupt=True)
-                time.sleep(0.3)
-        #self.environment['runtime']['outputManager'].presentText(_("Start Fenrir"), soundIcon='ScreenReaderOn', interrupt=True)
         signal.signal(signal.SIGINT, self.captureSignal)
         signal.signal(signal.SIGTERM, self.captureSignal)
         self.initialized = True

src/fenrirscreenreader/core/settingsData.py

@@ -73,6 +73,7 @@ settingsData = {
   'commandPath': '/usr/share/fenrirscreenreader/commands',
   'attributeFormatString': 'Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize',
   'autoPresentIndent': False,
+  'autoPresentIndentMode': 1,
   'hasAttributes': True,
   'shell': '',
 },