interrupt endofscreen

This commit is contained in:
chrys 2016-12-22 22:42:25 +01:00
parent c1c1789a86
commit f738a369f3
13 changed files with 18 additions and 13 deletions

View File

@ -29,7 +29,7 @@ class command():
self.env['runtime']['outputManager'].presentText(currWord, interrupt=True) self.env['runtime']['outputManager'].presentText(currWord, interrupt=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')

View File

@ -31,6 +31,11 @@ class command():
currChar = char_utils.getPhonetic(c) currChar = char_utils.getPhonetic(c)
self.env['runtime']['outputManager'].presentText(currChar, interrupt=firstSequence, announceCapital=True) self.env['runtime']['outputManager'].presentText(currChar, interrupt=firstSequence, announceCapital=True)
firstSequence = False firstSequence = False
if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')
def setCallback(self, callback): def setCallback(self, callback):
pass pass

View File

@ -24,6 +24,6 @@ class command():
self.env['runtime']['outputManager'].presentText(downChar ,interrupt=True, ignorePunctuation=True, announceCapital=True) self.env['runtime']['outputManager'].presentText(downChar ,interrupt=True, ignorePunctuation=True, announceCapital=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
def setCallback(self, callback): def setCallback(self, callback):
pass pass

View File

@ -25,7 +25,7 @@ class command():
self.env['runtime']['outputManager'].presentText(nextChar, interrupt=True, ignorePunctuation=True, announceCapital=True) self.env['runtime']['outputManager'].presentText(nextChar, interrupt=True, ignorePunctuation=True, announceCapital=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')

View File

@ -27,7 +27,7 @@ class command():
self.env['runtime']['outputManager'].presentText(nextChar ,interrupt=True, announceCapital=True) self.env['runtime']['outputManager'].presentText(nextChar ,interrupt=True, announceCapital=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')

View File

@ -31,6 +31,6 @@ class command():
self.env['runtime']['outputManager'].presentText(nextLine, interrupt=True) self.env['runtime']['outputManager'].presentText(nextLine, interrupt=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
def setCallback(self, callback): def setCallback(self, callback):
pass pass

View File

@ -31,7 +31,7 @@ class command():
self.env['runtime']['outputManager'].presentText(nextWord, interrupt=True) self.env['runtime']['outputManager'].presentText(nextWord, interrupt=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')

View File

@ -33,7 +33,7 @@ class command():
firstSequence = False firstSequence = False
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')

View File

@ -28,7 +28,7 @@ class command():
self.env['runtime']['outputManager'].presentText(prevChar, interrupt=True, ignorePunctuation=True, announceCapital=True) self.env['runtime']['outputManager'].presentText(prevChar, interrupt=True, ignorePunctuation=True, announceCapital=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')

View File

@ -27,7 +27,7 @@ class command():
self.env['runtime']['outputManager'].presentText(prevChar ,interrupt=True, announceCapital=True) self.env['runtime']['outputManager'].presentText(prevChar ,interrupt=True, announceCapital=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')

View File

@ -29,7 +29,7 @@ class command():
self.env['runtime']['outputManager'].presentText(prevLine, interrupt=True) self.env['runtime']['outputManager'].presentText(prevLine, interrupt=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
def setCallback(self, callback): def setCallback(self, callback):
pass pass

View File

@ -33,7 +33,7 @@ class command():
firstSequence = False firstSequence = False
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')

View File

@ -24,7 +24,7 @@ class command():
self.env['runtime']['outputManager'].presentText(upChar ,interrupt=True, ignorePunctuation=True, announceCapital=True) self.env['runtime']['outputManager'].presentText(upChar ,interrupt=True, ignorePunctuation=True, announceCapital=True)
if endOfScreen: if endOfScreen:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):
self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=False, soundIcon='EndOfScreen') self.env['runtime']['outputManager'].presentText('end of screen' ,interrupt=True, soundIcon='EndOfScreen')
if lineBreak: if lineBreak:
if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'): if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'lineBreak'):
self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine') self.env['runtime']['outputManager'].presentText('line break' ,interrupt=False, soundIcon='EndOfLine')