Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for uncontracted and contracted braille input. #6449

Merged
merged 29 commits into from Jul 7, 2017
Merged

Support for uncontracted and contracted braille input. #6449

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
75b163b
Support for uncontracted and contracted braille input.
jcsteh Oct 11, 2016
eb7babf
Address code review comments.
jcsteh Oct 11, 2016
0b643d6
brailleInput: Fix exceptions when typing a single cell, pressing spac…
jcsteh Oct 12, 2016
11912ca
User Guide: Add note about translation only reflecting the braille wo…
jcsteh Oct 12, 2016
f4859a5
Pressing dot7+dot8 translates immediately but without adding a space …
jcsteh Oct 12, 2016
5ff07e5
Mask braille input in protected fields.
jcsteh Oct 12, 2016
2f3f4fc
Merge branch 'master' into i2439ContractedBrailleInput
jcsteh Oct 13, 2016
e78f955
Update to a temporary NV Access branch of liblouis which incorporates…
jcsteh Oct 17, 2016
414504d
Add the Unicode braille input table.
jcsteh Oct 17, 2016
7efa322
Use new liblouis modes to improve back-translation:
jcsteh Oct 17, 2016
a224cab
liblouis sconscript: Add additional source file added in liblouis 3.1.0.
jcsteh Mar 20, 2017
84bbd53
Merge branch 'master' into i2439ContractedBrailleInput
jcsteh Mar 20, 2017
f240afc
Merge branch 'i6935Liblouis3.1' into i2439ContractedBrailleInput
jcsteh Mar 20, 2017
61d7c16
Update to liblouis 3.1.0, though we're still using a temporary NV Acc…
jcsteh Mar 20, 2017
5d202d4
Merge branch 'master' into i2439ContractedBrailleInput
jcsteh Jun 9, 2017
7aef11d
Upgrade to liblouis 3.2.0.
jcsteh Jun 9, 2017
99b1fbf
Don't need liblouis.def any more.
jcsteh Jun 9, 2017
1d6035b
Place indicators at the start and end of braille input so users under…
jcsteh Jun 14, 2017
36dac59
Clear braille input state if the caret gets moved (other than by text…
jcsteh Jun 15, 2017
243d39f
Fix keyboardHandler's treatment of Unicode characters sent by SendInp…
jcsteh Jun 16, 2017
840e516
braille: Remove RENAMED_TABLES, as this got moved to brailleTables.
jcsteh Jun 19, 2017
9f0d714
brailleInput: Handle renamed tables like we do for braille output, wh…
jcsteh Jun 19, 2017
77abb34
Switch to a fork of liblouis 3.2.0 which contains some additional bac…
jcsteh Jun 19, 2017
9a4537c
readme: Update liblouis version.
jcsteh Jun 19, 2017
ff6f627
brailleTables: Update for rename of Greek table in liblouis 3.2.0. Al…
jcsteh Jun 19, 2017
e2f8609
Switch liblouis to official liblouis master, since all fixes from us …
jcsteh Jun 20, 2017
c0004f0
Review actions.
jcsteh Jun 20, 2017
84e6565
BrailleInputGesture: Don't use Python set order for gesture identifie…
jcsteh Jun 21, 2017
c2c7162
inputCore: Update code doc.
jcsteh Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions source/NVDAObjects/__init__.py
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@
import treeInterceptorHandler
import braille
import globalPluginHandler
import brailleInput

class NVDAObjectTextInfo(textInfos.offsets.OffsetsTextInfo):
"""A default TextInfo which is used to enable text review of information about widgets that don't support text content.
Expand Down Expand Up @@ -891,6 +892,7 @@ def event_gainFocus(self):
"""
self.reportFocus()
braille.handler.handleGainFocus(self)
brailleInput.handler.handleGainFocus(self)

def event_foreground(self):
"""Called when the foreground window changes.
Expand Down
305 changes: 29 additions & 276 deletions source/braille.py
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions source/brailleDisplayDrivers/brailleNote.py
View file
Open in desktop
Expand Up @@ -270,10 +270,10 @@ def display(self, cells):
"kb:end": ("br(braillenote):space+d4+d5",),
"kb:control+home": ("br(braillenote):space+d1+d2+d3",),
"kb:control+end": ("br(braillenote):space+d4+d5+d6",),
"kb:enter": ("br(braillenote):space+d8",),
"braille_enter": ("br(braillenote):space+d8",),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming this change is a new line conversion?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird. This doesn't even show up in diffs from command line git. I reckon this is a GitHub bogus thingy. :(

"kb:shift+tab": ("br(braillenote):space+d1+d2+d5+d6",),
"kb:tab": ("br(braillenote):space+d2+d3+d4+d5",),
"kb:backspace": ("br(braillenote):space+d7",),
"braille_eraseLastCell": ("br(braillenote):space+d7",),
"showGui": ("br(braillenote):space+d1+d3+d4+d5",),
"kb:windows": ("br(braillenote):space+d2+d4+d5+d6",),
"kb:alt": ("br(braillenote):space+d1+d3+d4",),
Expand Down
1 change: 0 additions & 1 deletion source/brailleDisplayDrivers/brailliantB.py
View file
Open in desktop
Expand Up @@ -254,7 +254,6 @@ def display(self, cells):
"kb:tab": ("br(brailliantB):space+dot4+dot6",),
"kb:alt": ("br(brailliantB):space+dot1+dot3+dot4",),
"kb:escape": ("br(brailliantB):space+dot1+dot5",),
"kb:enter": ("br(brailliantB):dot8",),
"kb:windows+d": ("br(brailliantB):c1+c4+c5",),
"kb:windows": ("br(brailliantB):space+dot3+dot4",),
"kb:alt+tab": ("br(brailliantB):space+dot2+dot3+dot4+dot5",),
Expand Down
2 changes: 0 additions & 2 deletions source/brailleDisplayDrivers/freedomScientific.py
View file
Open in desktop
Expand Up @@ -233,8 +233,6 @@ def script_toggleRightWizWheelAction(self,gesture):
"braille_scrollForward" : ("br(freedomScientific):rightAdvanceBar","br(freedomScientific):leftBumperBarDown","br(freedomScientific):rightBumperBarDown",),
"braille_previousLine" : ("br(freedomScientific):leftRockerBarUp", "br(freedomScientific):rightRockerBarUp",),
"braille_nextLine" : ("br(freedomScientific):leftRockerBarDown", "br(freedomScientific):rightRockerBarDown",),
"kb:backspace" : ("br(freedomScientific):dot7",),
"kb:enter" : ("br(freedomScientific):dot8",),
"kb:shift+tab": ("br(freedomScientific):dot1+dot2+brailleSpaceBar",),
"kb:tab" : ("br(freedomScientific):dot4+dot5+brailleSpaceBar",),
"kb:upArrow" : ("br(freedomScientific):dot1+brailleSpaceBar",),
Expand Down
2 changes: 0 additions & 2 deletions source/brailleDisplayDrivers/hims/__init__.py
View file
Open in desktop
Expand Up @@ -190,8 +190,6 @@ def display(self, cells):
"kb:shift+alt+downArrow": ("br(hims):dot5+dot6+dot7+advance1",),
"kb:alt+downArrow": ("br(hims):dot5+dot6+dot7",),
"kb:shift+downArrow": ("br(hims):space+rightSideScrollDown",),
"kb:backspace": ("br(hims):dot7",),
"kb:enter": ("br(hims):dot8",),
"kb:escape": ("br(hims):dot1+dot5+space",),
"kb:delete": ("br(hims):dot1+dot3+dot5+space",),
"kb:f1": ("br(hims):dot1+dot2+dot5+space",),
Expand Down
2 changes: 0 additions & 2 deletions source/brailleDisplayDrivers/papenmeier.py
View file
Open in desktop
Expand Up @@ -498,8 +498,6 @@ def script_upperRouting(self, gesture):

"title": ("br(papenmeier):l1,up",),
"reportStatusLine": ("br(papenmeier):l2,dn",),
"kb:enter": ("br(papenmeier):d8",),
"kb:backspace": ("br(papenmeier):d7",),
"kb:alt": ("br(papenmeier):lt+d3",),
"kb:control": ("br(papenmeier):lt+d2",),
"kb:escape": ("br(papenmeier):space+d7",),
Expand Down