[Nvda-dev] commit r2670 - in trunk: . source

[NVDA Subversion]

Author: bzr
Date: Tue Jan 20 00:03:19 2009
New Revision: 2670

Log:
When focus inside a document moves inside a list, announce the list. This also means using quick keys in virtualBuffers will now announce entering and exiting lists again. This was disabled because sites like msdn where there are lots of stacked lists this becomes too verbose. But until we can come up with a better sollution its probably best that way say something rather than nothing.

Modified:
   trunk/   (props changed)
   trunk/source/speech.py

Modified: trunk/source/speech.py
==============================================================================
--- trunk/source/speech.py	(original)
+++ trunk/source/speech.py	Tue Jan 20 00:03:19 2009
@@ -642,9 +642,9 @@
 		return " ".join([x for x in nameText,roleText,stateText,keyboardShortcutText if x])
 	elif not extraDetail and fieldType in ("end_removedFromControlFieldStack") and role==controlTypes.ROLE_EDITABLETEXT and not controlTypes.STATE_READONLY in states and controlTypes.STATE_MULTILINE in states: 
 		return _("out of %s")%roleText
-	elif not extraDetail and fieldType=="start_addedToControlFieldStack" and reason in (REASON_CARET,REASON_SAYALL) and role==controlTypes.ROLE_LIST and controlTypes.STATE_READONLY in states:
+	elif not extraDetail and fieldType=="start_addedToControlFieldStack" and reason in (REASON_CARET,REASON_SAYALL,REASON_FOCUS) and role==controlTypes.ROLE_LIST and controlTypes.STATE_READONLY in states:
 		return roleText+_("with %s items")%childCount
-	elif not extraDetail and fieldType=="end_removedFromControlFieldStack" and reason in (REASON_CARET,REASON_SAYALL) and role==controlTypes.ROLE_LIST and controlTypes.STATE_READONLY in states:
+	elif not extraDetail and fieldType=="end_removedFromControlFieldStack" and reason in (REASON_CARET,REASON_SAYALL,REASON_FOCUS) and role==controlTypes.ROLE_LIST and controlTypes.STATE_READONLY in states:
 		return _("out of %s")%roleText
 	elif not extraDetail and fieldType=="start_addedToControlFieldStack" and role==controlTypes.ROLE_BLOCKQUOTE:
 		return roleText