Merge branch 'master' into next

nvaccess · Aug 2, 2017 · fe66356 · fe66356
2 parents 058595e + baf0c32
commit fe66356
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/source/config/configSpec.py b/source/config/configSpec.py
@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 #A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2006-2017 NV Access Limited, Babbage B.V.
+#Copyright (C) 2006-2017 NV Access Limited, Babbage B.V., Davy Kager
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 

diff --git a/source/contentRecog/recogUi.py b/source/contentRecog/recogUi.py
@@ -120,6 +120,11 @@ def recognizeNavigatorObject(recognizer):
 	@type recognizer: L{contentRecog.ContentRecognizer}
 	"""
 	global _activeRecog
+	if isinstance(api.getFocusObject(), RecogResultNVDAObject):
+		# Translators: Reported when content recognition (e.g. OCR) is attempted,
+		# but the user is already reading a content recognition result.
+		ui.message(_("Already in a content recognition result"))
+		return
 	nav = api.getNavigatorObject()
 	left, top, width, height = nav.location
 	try:

diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 #settingsDialogs.py
 #A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2006-2017 NV Access Limited, Peter Vágner, Aleksey Sadovoy, Rui Batista, Joseph Lee, Heiko Folkerts, Zahari Yurukov, Leonard de Ruijter, Derek Riemer, Babbage B.V.
+#Copyright (C) 2006-2017 NV Access Limited, Peter Vágner, Aleksey Sadovoy, Rui Batista, Joseph Lee, Heiko Folkerts, Zahari Yurukov, Leonard de Ruijter, Derek Riemer, Babbage B.V., Davy Kager
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -58,6 +58,7 @@ Highlights of this release include input of contracted braille, support for new
 - By default, NVDA now only shows the parts of the context information that have changed on a braille display when an object gets focus. (#217)
  - Previously, it always showed as much context information as possible, regardless of whether you have seen the same context information before.
  - You can revert to the old behaviour by changing the new "Focus context presentation" setting in the Braille Settings dialog to "Always fill display".
+- When using Braille, the cursor can be configured to be a different shape when tethered to focus or review. (#7112)
 
 
 == Bug Fixes ==