diff --git a/TODO v2.0 b/TODO v2.0 index f69e9192..b5b251a7 100644 --- a/TODO v2.0 +++ b/TODO v2.0 @@ -40,6 +40,10 @@ Imporove attribute handling - [X] Soundicon on barrier detection - [] Barrier detection in hilight tracking - [] valid barriers by window edges + - [] make barrirs configurable + - [] enter barrier mode detection + - [] leave barrier mode detection + - [] soundicon barrier start/end Improved Say all [] speech callbacks diff --git a/config/settings/espeak.settings.conf b/config/settings/espeak.settings.conf index b74dfb29..42d8d7c8 100644 --- a/config/settings/espeak.settings.conf +++ b/config/settings/espeak.settings.conf @@ -186,7 +186,11 @@ shell= [focus] cursor=True highlight=False -barrier=True + +[barrier] +enabled=True +leftBarriers=│,└,┌,─ +rightBarriers=│,┘,┐,─ [review] lineBreak=True diff --git a/config/settings/settings.conf b/config/settings/settings.conf index 048d2507..505e7725 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -196,8 +196,12 @@ shell= cursor=True #follow highlighted text changes highlight=False -barrier=True - + +[barrier] +enabled=True +leftBarriers=│,└,┌,─ +rightBarriers=│,┘,┐,─ + [review] lineBreak=True endOfScreen=True diff --git a/config/settings/settings.conf.example b/config/settings/settings.conf.example index 7a9b2b96..66f1f3cf 100644 --- a/config/settings/settings.conf.example +++ b/config/settings/settings.conf.example @@ -197,7 +197,11 @@ shell= cursor=True #follow highlighted text changes highlight=False -barrier=True + +[barrier] +enabled=True +leftBarriers=│,└,┌,─ +rightBarriers=│,┘,┐,─ [review] lineBreak=True diff --git a/config/settings/settings.conf.storm b/config/settings/settings.conf.storm index 0668ae1a..f87acb0a 100644 --- a/config/settings/settings.conf.storm +++ b/config/settings/settings.conf.storm @@ -142,7 +142,11 @@ shell= cursor=True #follow highlighted text changes highlight=False -barrier=True + +[barrier] +enabled=True +leftBarriers=│,└,┌,─ +rightBarriers=│,┘,┐,─ [review] lineBreak=True diff --git a/config/settings/speech-dispatcher.settings.conf b/config/settings/speech-dispatcher.settings.conf index 3ee9788c..82524334 100644 --- a/config/settings/speech-dispatcher.settings.conf +++ b/config/settings/speech-dispatcher.settings.conf @@ -196,7 +196,11 @@ shell= cursor=True #follow highlighted text changes highlight=False -barrier=True + +[barrier] +enabled=True +leftBarriers=│,└,┌,─ +rightBarriers=│,┘,┐,─ [review] lineBreak=True diff --git a/src/fenrirscreenreader/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py b/src/fenrirscreenreader/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py index b42da4d6..e36ca032 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py +++ b/src/fenrirscreenreader/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py @@ -47,7 +47,7 @@ class command(): doInterrupt = False # barrier sayLine = currLine - if self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'barrier'): + if self.env['runtime']['settingsManager'].getSettingAsBool('barrier','enabled'): sayLine = self.env['runtime']['barrierManager'].handleLineBarrier(sayLine, self.env['screen']['newCursor']['x']) # output self.env['runtime']['outputManager'].presentText(sayLine, interrupt=doInterrupt, flush=False) diff --git a/src/fenrirscreenreader/core/settingsData.py b/src/fenrirscreenreader/core/settingsData.py index e3b0d681..db08a324 100644 --- a/src/fenrirscreenreader/core/settingsData.py +++ b/src/fenrirscreenreader/core/settingsData.py @@ -80,7 +80,12 @@ settingsData = { 'focus':{ 'cursor': True, 'highlight': False, - 'barrier': True, + +}, +'barrier':{ + 'enabled': True, + 'leftBarriers': '│,└,┌,─', + 'rightBarriers': '│,┘,┐,─', }, 'review':{ 'lineBreak': True,