-
-
Notifications
You must be signed in to change notification settings - Fork 634
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add "report formatting for text under braille cell" command (#7189)
* Add a "report formatting info for text under this braille cell" command. * Assign the Alva BC6 secondary cursor routing keys to the new report formatting command. * Update copyrights. * Update user guide for the new Alva BC6 key assignment. * Also use the new report formatting braille command in both Papenmeier drivers. This removes their "route to and report formatting" behavior. Instead, it now only reports formatting without routing the cursor. * Address review actions. * Update user docs. * Add the report text formatting under braille cell command to the EuroBraille displays. * Revert browseable message for the report text formatting under braille cell command. * Incorporate PR #7990. * Add translator comment
- Loading branch information
1 parent
99c3ca6
commit 9dd4836
Showing
8 changed files
with
67 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,9 +2,9 @@ | |
#A part of NonVisual Desktop Access (NVDA) | ||
#This file is covered by the GNU General Public License. | ||
#See the file COPYING for more details. | ||
#Copyright (C) 2012-2015 Tobias Platen, Halim Sahin, Ali-Riza Ciftcioglu, NV Access Limited | ||
#Copyright (C) 2012-2017 Tobias Platen, Halim Sahin, Ali-Riza Ciftcioglu, NV Access Limited, Davy Kager | ||
#Author: Tobias Platen ([email protected]) | ||
#minor changes by Halim Sahin ([email protected]), Ali-Riza Ciftcioglu <[email protected]> and James Teh | ||
#minor changes by Halim Sahin ([email protected]), Ali-Riza Ciftcioglu <[email protected]>, James Teh and Davy Kager | ||
|
||
import time | ||
import itertools | ||
|
@@ -472,12 +472,6 @@ def _handleKeyPresses(self): | |
if(self._dev!=None): self._dev.close() | ||
self._dev=None | ||
|
||
def script_upperRouting(self, gesture): | ||
globalCommands.commands.script_braille_routeTo(gesture) | ||
wx.CallLater(50, scriptHandler.executeScript, globalCommands.commands.script_reportFormatting, gesture) | ||
|
||
script_upperRouting.__doc__ = _("Route to and report formatting") | ||
|
||
#global gestures | ||
gestureMap = inputCore.GlobalGestureMap({ | ||
"globalCommands.GlobalCommands": { | ||
|
@@ -486,6 +480,7 @@ def script_upperRouting(self, gesture): | |
"braille_previousLine": ("br(papenmeier):up",), | ||
"braille_nextLine": ("br(papenmeier):dn",), | ||
"braille_routeTo": ("br(papenmeier):route",), | ||
"braille_reportFormatting": ("br(papenmeier):upperRouting",), | ||
|
||
"braille_toggleTether": ("br(papenmeier):r2",), | ||
"review_currentCharacter": ("br(papenmeier):l1",), | ||
|
@@ -510,10 +505,6 @@ def script_upperRouting(self, gesture): | |
} | ||
}) | ||
|
||
__gestures = { | ||
"br(papenmeier):upperRouting": "upperRouting", | ||
} | ||
|
||
class InputGesture(braille.BrailleDisplayGesture, brailleInput.BrailleInputGesture): | ||
"""Input gesture for papenmeier displays""" | ||
source = BrailleDisplayDriver.name | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,9 +2,9 @@ | |
#A part of NonVisual Desktop Access (NVDA) | ||
#This file is covered by the GNU General Public License. | ||
#See the file COPYING for more details. | ||
#Copyright (C) 2012-2013 Tobias Platen, Halim Sahin, Ali-Riza Ciftcioglu, NV Access Limited | ||
#Copyright (C) 2012-2017 Tobias Platen, Halim Sahin, Ali-Riza Ciftcioglu, NV Access Limited, Davy Kager | ||
#Author: Tobias Platen ([email protected]) | ||
#minor changes by Halim Sahin ([email protected]), Ali-Riza Ciftcioglu <[email protected]> and James Teh | ||
#minor changes by Halim Sahin ([email protected]), Ali-Riza Ciftcioglu <[email protected]>, James Teh and Davy Kager | ||
#used braille port selection code from braillenote driver | ||
|
||
from collections import OrderedDict | ||
|
@@ -150,13 +150,6 @@ def __init__(self, port): | |
self._keyCheckTimer = wx.PyTimer(self._handleKeyPresses) | ||
self._keyCheckTimer.Start(KEY_CHECK_INTERVAL) | ||
|
||
def script_upperRouting(self, gesture): | ||
globalCommands.commands.script_braille_routeTo(gesture) | ||
wx.CallLater(50, scriptHandler.executeScript, globalCommands.commands.script_reportFormatting, gesture) | ||
|
||
# Translators: Describes action of routing buttons on a braille display. | ||
script_upperRouting.__doc__ = _("Route to and report formatting") | ||
|
||
def terminate(self): | ||
"""free resources""" | ||
super(BrailleDisplayDriver, self).terminate() | ||
|
@@ -211,6 +204,7 @@ def _handleKeyPresses(self): #called by the keycheck timer | |
"braille_previousLine": ("br(papenmeier_serial):up",), | ||
"braille_nextLine": ("br(papenmeier_serial):dn",), | ||
"braille_routeTo": ("br(papenmeier_serial):route",), | ||
"braille_reportFormatting": ("br(papenmeier_serial):upperRouting",), | ||
|
||
"braille_toggleTether": ("br(papenmeier_serial):r2",), | ||
"review_currentCharacter": ("br(papenmeier_serial):l1",), | ||
|
@@ -227,10 +221,6 @@ def _handleKeyPresses(self): #called by the keycheck timer | |
} | ||
}) | ||
|
||
__gestures = { | ||
"br(papenmeier_serial):upperRouting": "upperRouting", | ||
} | ||
|
||
def brl_keyname2(keys): | ||
"""returns keyname for key index on displays with eab""" | ||
if(keys & 4 == 4): return 'l1' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters