[Nvda-dev] commit r2801 - in trunk: . source/NVDAObjects/IAccessible

[NVDA Subversion]

Author: nvda
Date: Wed Mar 25 20:56:04 2009
New Revision: 2801

Log:
* add ability to retrieve name of the mozilla labels using its textInfo if it returns an empty string

Modified:
   trunk/   (props changed)
   trunk/source/NVDAObjects/IAccessible/__init__.py
   trunk/source/NVDAObjects/IAccessible/mozilla.py

Modified: trunk/source/NVDAObjects/IAccessible/__init__.py
==============================================================================
--- trunk/source/NVDAObjects/IAccessible/__init__.py	(original)
+++ trunk/source/NVDAObjects/IAccessible/__init__.py	Wed Mar 25 20:56:04 2009
@@ -1205,6 +1205,7 @@
 	("MozillaContentWindowClass",IAccessibleHandler.ROLE_SYSTEM_LISTITEM):"mozilla.ListItem",
 	("MozillaContentWindowClass",IAccessibleHandler.ROLE_SYSTEM_DOCUMENT):"mozilla.Document",
 	("MozillaWindowClass",IAccessibleHandler.ROLE_SYSTEM_DOCUMENT):"mozilla.Document",
+	("MozillaUIWindowClass",IAccessibleHandler.IA2_ROLE_LABEL):"mozilla.Label",
 	("ConsoleWindowClass",IAccessibleHandler.ROLE_SYSTEM_WINDOW):"ConsoleWindowClass",
 	(None,IAccessibleHandler.ROLE_SYSTEM_LIST):"List",
 	(None,IAccessibleHandler.ROLE_SYSTEM_COMBOBOX):"ComboBox",

Modified: trunk/source/NVDAObjects/IAccessible/mozilla.py
==============================================================================
--- trunk/source/NVDAObjects/IAccessible/mozilla.py	(original)
+++ trunk/source/NVDAObjects/IAccessible/mozilla.py	Wed Mar 25 20:56:04 2009
@@ -6,6 +6,7 @@
 
 import IAccessibleHandler
 from . import IAccessible
+import textHandler
 
 class Mozilla(IAccessible):
 
@@ -56,3 +57,10 @@
 			del children[0]
 		return children
 
+class Label(Mozilla):
+
+	def _get_name(self):
+		name=super(Label,self)._get_name()
+		if not name or name=="":
+			name=self.makeTextInfo(textHandler.POSITION_ALL).text
+		return name