Skip to content

Commit 3f943bb

Browse files
seanbuddseanbudd
authored
Merge c424041 into c5d301d 
2 parents c5d301d + c424041 commit 3f943bb

97 files changed

Lines changed: 1116 additions & 1095 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎source/IAccessibleHandler/__init__.py‎

Lines changed: 135 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -59,142 +59,142 @@
5959
liveNVDAObjectTable = weakref.WeakValueDictionary()
6060

6161
IAccessibleRolesToNVDARoles = {
62-
oleacc.ROLE_SYSTEM_WINDOW: controlTypes.ROLE_WINDOW,
63-
oleacc.ROLE_SYSTEM_CLIENT: controlTypes.ROLE_PANE,
64-
oleacc.ROLE_SYSTEM_TITLEBAR: controlTypes.ROLE_TITLEBAR,
65-
oleacc.ROLE_SYSTEM_DIALOG: controlTypes.ROLE_DIALOG,
66-
oleacc.ROLE_SYSTEM_PANE: controlTypes.ROLE_PANE,
67-
oleacc.ROLE_SYSTEM_CHECKBUTTON: controlTypes.ROLE_CHECKBOX,
68-
oleacc.ROLE_SYSTEM_RADIOBUTTON: controlTypes.ROLE_RADIOBUTTON,
69-
oleacc.ROLE_SYSTEM_STATICTEXT: controlTypes.ROLE_STATICTEXT,
70-
oleacc.ROLE_SYSTEM_TEXT: controlTypes.ROLE_EDITABLETEXT,
71-
oleacc.ROLE_SYSTEM_PUSHBUTTON: controlTypes.ROLE_BUTTON,
72-
oleacc.ROLE_SYSTEM_MENUBAR: controlTypes.ROLE_MENUBAR,
73-
oleacc.ROLE_SYSTEM_MENUITEM: controlTypes.ROLE_MENUITEM,
74-
oleacc.ROLE_SYSTEM_MENUPOPUP: controlTypes.ROLE_POPUPMENU,
75-
oleacc.ROLE_SYSTEM_COMBOBOX: controlTypes.ROLE_COMBOBOX,
76-
oleacc.ROLE_SYSTEM_LIST: controlTypes.ROLE_LIST,
77-
oleacc.ROLE_SYSTEM_LISTITEM: controlTypes.ROLE_LISTITEM,
78-
oleacc.ROLE_SYSTEM_GRAPHIC: controlTypes.ROLE_GRAPHIC,
79-
oleacc.ROLE_SYSTEM_HELPBALLOON: controlTypes.ROLE_HELPBALLOON,
80-
oleacc.ROLE_SYSTEM_TOOLTIP: controlTypes.ROLE_TOOLTIP,
81-
oleacc.ROLE_SYSTEM_LINK: controlTypes.ROLE_LINK,
82-
oleacc.ROLE_SYSTEM_OUTLINE: controlTypes.ROLE_TREEVIEW,
83-
oleacc.ROLE_SYSTEM_OUTLINEITEM: controlTypes.ROLE_TREEVIEWITEM,
84-
oleacc.ROLE_SYSTEM_OUTLINEBUTTON: controlTypes.ROLE_TREEVIEWITEM,
85-
oleacc.ROLE_SYSTEM_PAGETAB: controlTypes.ROLE_TAB,
86-
oleacc.ROLE_SYSTEM_PAGETABLIST: controlTypes.ROLE_TABCONTROL,
87-
oleacc.ROLE_SYSTEM_SLIDER: controlTypes.ROLE_SLIDER,
88-
oleacc.ROLE_SYSTEM_PROGRESSBAR: controlTypes.ROLE_PROGRESSBAR,
89-
oleacc.ROLE_SYSTEM_SCROLLBAR: controlTypes.ROLE_SCROLLBAR,
90-
oleacc.ROLE_SYSTEM_STATUSBAR: controlTypes.ROLE_STATUSBAR,
91-
oleacc.ROLE_SYSTEM_TABLE: controlTypes.ROLE_TABLE,
92-
oleacc.ROLE_SYSTEM_CELL: controlTypes.ROLE_TABLECELL,
93-
oleacc.ROLE_SYSTEM_COLUMN: controlTypes.ROLE_TABLECOLUMN,
94-
oleacc.ROLE_SYSTEM_ROW: controlTypes.ROLE_TABLEROW,
95-
oleacc.ROLE_SYSTEM_TOOLBAR: controlTypes.ROLE_TOOLBAR,
96-
oleacc.ROLE_SYSTEM_COLUMNHEADER: controlTypes.ROLE_TABLECOLUMNHEADER,
97-
oleacc.ROLE_SYSTEM_ROWHEADER: controlTypes.ROLE_TABLEROWHEADER,
98-
oleacc.ROLE_SYSTEM_SPLITBUTTON: controlTypes.ROLE_SPLITBUTTON,
99-
oleacc.ROLE_SYSTEM_BUTTONDROPDOWN: controlTypes.ROLE_DROPDOWNBUTTON,
100-
oleacc.ROLE_SYSTEM_SEPARATOR: controlTypes.ROLE_SEPARATOR,
101-
oleacc.ROLE_SYSTEM_DOCUMENT: controlTypes.ROLE_DOCUMENT,
102-
oleacc.ROLE_SYSTEM_ANIMATION: controlTypes.ROLE_ANIMATION,
103-
oleacc.ROLE_SYSTEM_APPLICATION: controlTypes.ROLE_APPLICATION,
104-
oleacc.ROLE_SYSTEM_GROUPING: controlTypes.ROLE_GROUPING,
105-
oleacc.ROLE_SYSTEM_PROPERTYPAGE: controlTypes.ROLE_PROPERTYPAGE,
106-
oleacc.ROLE_SYSTEM_ALERT: controlTypes.ROLE_ALERT,
107-
oleacc.ROLE_SYSTEM_BORDER: controlTypes.ROLE_BORDER,
108-
oleacc.ROLE_SYSTEM_BUTTONDROPDOWNGRID: controlTypes.ROLE_DROPDOWNBUTTONGRID,
109-
oleacc.ROLE_SYSTEM_CARET: controlTypes.ROLE_CARET,
110-
oleacc.ROLE_SYSTEM_CHARACTER: controlTypes.ROLE_CHARACTER,
111-
oleacc.ROLE_SYSTEM_CHART: controlTypes.ROLE_CHART,
112-
oleacc.ROLE_SYSTEM_CURSOR: controlTypes.ROLE_CURSOR,
113-
oleacc.ROLE_SYSTEM_DIAGRAM: controlTypes.ROLE_DIAGRAM,
114-
oleacc.ROLE_SYSTEM_DIAL: controlTypes.ROLE_DIAL,
115-
oleacc.ROLE_SYSTEM_DROPLIST: controlTypes.ROLE_DROPLIST,
116-
oleacc.ROLE_SYSTEM_BUTTONMENU: controlTypes.ROLE_MENUBUTTON,
117-
oleacc.ROLE_SYSTEM_EQUATION: controlTypes.ROLE_MATH,
118-
oleacc.ROLE_SYSTEM_GRIP: controlTypes.ROLE_GRIP,
119-
oleacc.ROLE_SYSTEM_HOTKEYFIELD: controlTypes.ROLE_HOTKEYFIELD,
120-
oleacc.ROLE_SYSTEM_INDICATOR: controlTypes.ROLE_INDICATOR,
121-
oleacc.ROLE_SYSTEM_SPINBUTTON: controlTypes.ROLE_SPINBUTTON,
122-
oleacc.ROLE_SYSTEM_SOUND: controlTypes.ROLE_SOUND,
123-
oleacc.ROLE_SYSTEM_WHITESPACE: controlTypes.ROLE_WHITESPACE,
124-
oleacc.ROLE_SYSTEM_IPADDRESS: controlTypes.ROLE_IPADDRESS,
125-
oleacc.ROLE_SYSTEM_OUTLINEBUTTON: controlTypes.ROLE_TREEVIEWBUTTON,
126-
oleacc.ROLE_SYSTEM_CLOCK: controlTypes.ROLE_CLOCK,
62+
oleacc.ROLE_SYSTEM_WINDOW: controlTypes.Role.WINDOW,
63+
oleacc.ROLE_SYSTEM_CLIENT: controlTypes.Role.PANE,
64+
oleacc.ROLE_SYSTEM_TITLEBAR: controlTypes.Role.TITLEBAR,
65+
oleacc.ROLE_SYSTEM_DIALOG: controlTypes.Role.DIALOG,
66+
oleacc.ROLE_SYSTEM_PANE: controlTypes.Role.PANE,
67+
oleacc.ROLE_SYSTEM_CHECKBUTTON: controlTypes.Role.CHECKBOX,
68+
oleacc.ROLE_SYSTEM_RADIOBUTTON: controlTypes.Role.RADIOBUTTON,
69+
oleacc.ROLE_SYSTEM_STATICTEXT: controlTypes.Role.STATICTEXT,
70+
oleacc.ROLE_SYSTEM_TEXT: controlTypes.Role.EDITABLETEXT,
71+
oleacc.ROLE_SYSTEM_PUSHBUTTON: controlTypes.Role.BUTTON,
72+
oleacc.ROLE_SYSTEM_MENUBAR: controlTypes.Role.MENUBAR,
73+
oleacc.ROLE_SYSTEM_MENUITEM: controlTypes.Role.MENUITEM,
74+
oleacc.ROLE_SYSTEM_MENUPOPUP: controlTypes.Role.POPUPMENU,
75+
oleacc.ROLE_SYSTEM_COMBOBOX: controlTypes.Role.COMBOBOX,
76+
oleacc.ROLE_SYSTEM_LIST: controlTypes.Role.LIST,
77+
oleacc.ROLE_SYSTEM_LISTITEM: controlTypes.Role.LISTITEM,
78+
oleacc.ROLE_SYSTEM_GRAPHIC: controlTypes.Role.GRAPHIC,
79+
oleacc.ROLE_SYSTEM_HELPBALLOON: controlTypes.Role.HELPBALLOON,
80+
oleacc.ROLE_SYSTEM_TOOLTIP: controlTypes.Role.TOOLTIP,
81+
oleacc.ROLE_SYSTEM_LINK: controlTypes.Role.LINK,
82+
oleacc.ROLE_SYSTEM_OUTLINE: controlTypes.Role.TREEVIEW,
83+
oleacc.ROLE_SYSTEM_OUTLINEITEM: controlTypes.Role.TREEVIEWITEM,
84+
oleacc.ROLE_SYSTEM_OUTLINEBUTTON: controlTypes.Role.TREEVIEWITEM,
85+
oleacc.ROLE_SYSTEM_PAGETAB: controlTypes.Role.TAB,
86+
oleacc.ROLE_SYSTEM_PAGETABLIST: controlTypes.Role.TABCONTROL,
87+
oleacc.ROLE_SYSTEM_SLIDER: controlTypes.Role.SLIDER,
88+
oleacc.ROLE_SYSTEM_PROGRESSBAR: controlTypes.Role.PROGRESSBAR,
89+
oleacc.ROLE_SYSTEM_SCROLLBAR: controlTypes.Role.SCROLLBAR,
90+
oleacc.ROLE_SYSTEM_STATUSBAR: controlTypes.Role.STATUSBAR,
91+
oleacc.ROLE_SYSTEM_TABLE: controlTypes.Role.TABLE,
92+
oleacc.ROLE_SYSTEM_CELL: controlTypes.Role.TABLECELL,
93+
oleacc.ROLE_SYSTEM_COLUMN: controlTypes.Role.TABLECOLUMN,
94+
oleacc.ROLE_SYSTEM_ROW: controlTypes.Role.TABLEROW,
95+
oleacc.ROLE_SYSTEM_TOOLBAR: controlTypes.Role.TOOLBAR,
96+
oleacc.ROLE_SYSTEM_COLUMNHEADER: controlTypes.Role.TABLECOLUMNHEADER,
97+
oleacc.ROLE_SYSTEM_ROWHEADER: controlTypes.Role.TABLEROWHEADER,
98+
oleacc.ROLE_SYSTEM_SPLITBUTTON: controlTypes.Role.SPLITBUTTON,
99+
oleacc.ROLE_SYSTEM_BUTTONDROPDOWN: controlTypes.Role.DROPDOWNBUTTON,
100+
oleacc.ROLE_SYSTEM_SEPARATOR: controlTypes.Role.SEPARATOR,
101+
oleacc.ROLE_SYSTEM_DOCUMENT: controlTypes.Role.DOCUMENT,
102+
oleacc.ROLE_SYSTEM_ANIMATION: controlTypes.Role.ANIMATION,
103+
oleacc.ROLE_SYSTEM_APPLICATION: controlTypes.Role.APPLICATION,
104+
oleacc.ROLE_SYSTEM_GROUPING: controlTypes.Role.GROUPING,
105+
oleacc.ROLE_SYSTEM_PROPERTYPAGE: controlTypes.Role.PROPERTYPAGE,
106+
oleacc.ROLE_SYSTEM_ALERT: controlTypes.Role.ALERT,
107+
oleacc.ROLE_SYSTEM_BORDER: controlTypes.Role.BORDER,
108+
oleacc.ROLE_SYSTEM_BUTTONDROPDOWNGRID: controlTypes.Role.DROPDOWNBUTTONGRID,
109+
oleacc.ROLE_SYSTEM_CARET: controlTypes.Role.CARET,
110+
oleacc.ROLE_SYSTEM_CHARACTER: controlTypes.Role.CHARACTER,
111+
oleacc.ROLE_SYSTEM_CHART: controlTypes.Role.CHART,
112+
oleacc.ROLE_SYSTEM_CURSOR: controlTypes.Role.CURSOR,
113+
oleacc.ROLE_SYSTEM_DIAGRAM: controlTypes.Role.DIAGRAM,
114+
oleacc.ROLE_SYSTEM_DIAL: controlTypes.Role.DIAL,
115+
oleacc.ROLE_SYSTEM_DROPLIST: controlTypes.Role.DROPLIST,
116+
oleacc.ROLE_SYSTEM_BUTTONMENU: controlTypes.Role.MENUBUTTON,
117+
oleacc.ROLE_SYSTEM_EQUATION: controlTypes.Role.MATH,
118+
oleacc.ROLE_SYSTEM_GRIP: controlTypes.Role.GRIP,
119+
oleacc.ROLE_SYSTEM_HOTKEYFIELD: controlTypes.Role.HOTKEYFIELD,
120+
oleacc.ROLE_SYSTEM_INDICATOR: controlTypes.Role.INDICATOR,
121+
oleacc.ROLE_SYSTEM_SPINBUTTON: controlTypes.Role.SPINBUTTON,
122+
oleacc.ROLE_SYSTEM_SOUND: controlTypes.Role.SOUND,
123+
oleacc.ROLE_SYSTEM_WHITESPACE: controlTypes.Role.WHITESPACE,
124+
oleacc.ROLE_SYSTEM_IPADDRESS: controlTypes.Role.IPADDRESS,
125+
oleacc.ROLE_SYSTEM_OUTLINEBUTTON: controlTypes.Role.TREEVIEWBUTTON,
126+
oleacc.ROLE_SYSTEM_CLOCK: controlTypes.Role.CLOCK,
127127
# IAccessible2 roles
128-
IA2.IA2_ROLE_UNKNOWN: controlTypes.ROLE_UNKNOWN,
129-
IA2.IA2_ROLE_CANVAS: controlTypes.ROLE_CANVAS,
130-
IA2.IA2_ROLE_CAPTION: controlTypes.ROLE_CAPTION,
131-
IA2.IA2_ROLE_CHECK_MENU_ITEM: controlTypes.ROLE_CHECKMENUITEM,
132-
IA2.IA2_ROLE_COLOR_CHOOSER: controlTypes.ROLE_COLORCHOOSER,
133-
IA2.IA2_ROLE_DATE_EDITOR: controlTypes.ROLE_DATEEDITOR,
134-
IA2.IA2_ROLE_DESKTOP_ICON: controlTypes.ROLE_DESKTOPICON,
135-
IA2.IA2_ROLE_DESKTOP_PANE: controlTypes.ROLE_DESKTOPPANE,
136-
IA2.IA2_ROLE_DIRECTORY_PANE: controlTypes.ROLE_DIRECTORYPANE,
137-
IA2.IA2_ROLE_EDITBAR: controlTypes.ROLE_EDITBAR,
138-
IA2.IA2_ROLE_EMBEDDED_OBJECT: controlTypes.ROLE_EMBEDDEDOBJECT,
139-
IA2.IA2_ROLE_ENDNOTE: controlTypes.ROLE_ENDNOTE,
140-
IA2.IA2_ROLE_FILE_CHOOSER: controlTypes.ROLE_FILECHOOSER,
141-
IA2.IA2_ROLE_FONT_CHOOSER: controlTypes.ROLE_FONTCHOOSER,
142-
IA2.IA2_ROLE_FOOTER: controlTypes.ROLE_FOOTER,
143-
IA2.IA2_ROLE_FOOTNOTE: controlTypes.ROLE_FOOTNOTE,
144-
IA2.IA2_ROLE_FORM: controlTypes.ROLE_FORM,
145-
IA2.IA2_ROLE_FRAME: controlTypes.ROLE_FRAME,
146-
IA2.IA2_ROLE_GLASS_PANE: controlTypes.ROLE_GLASSPANE,
147-
IA2.IA2_ROLE_HEADER: controlTypes.ROLE_HEADER,
148-
IA2.IA2_ROLE_HEADING: controlTypes.ROLE_HEADING,
149-
IA2.IA2_ROLE_ICON: controlTypes.ROLE_ICON,
150-
IA2.IA2_ROLE_IMAGE_MAP: controlTypes.ROLE_IMAGEMAP,
151-
IA2.IA2_ROLE_INPUT_METHOD_WINDOW: controlTypes.ROLE_INPUTWINDOW,
152-
IA2.IA2_ROLE_INTERNAL_FRAME: controlTypes.ROLE_INTERNALFRAME,
153-
IA2.IA2_ROLE_LABEL: controlTypes.ROLE_LABEL,
154-
IA2.IA2_ROLE_LAYERED_PANE: controlTypes.ROLE_LAYEREDPANE,
155-
IA2.IA2_ROLE_NOTE: controlTypes.ROLE_NOTE,
156-
IA2.IA2_ROLE_OPTION_PANE: controlTypes.ROLE_OPTIONPANE,
157-
IA2.IA2_ROLE_PAGE: controlTypes.ROLE_PAGE,
158-
IA2.IA2_ROLE_PARAGRAPH: controlTypes.ROLE_PARAGRAPH,
159-
IA2.IA2_ROLE_RADIO_MENU_ITEM: controlTypes.ROLE_RADIOMENUITEM,
160-
IA2.IA2_ROLE_REDUNDANT_OBJECT: controlTypes.ROLE_REDUNDANTOBJECT,
161-
IA2.IA2_ROLE_ROOT_PANE: controlTypes.ROLE_ROOTPANE,
162-
IA2.IA2_ROLE_RULER: controlTypes.ROLE_RULER,
163-
IA2.IA2_ROLE_SCROLL_PANE: controlTypes.ROLE_SCROLLPANE,
164-
IA2.IA2_ROLE_SECTION: controlTypes.ROLE_SECTION,
165-
IA2.IA2_ROLE_SHAPE: controlTypes.ROLE_SHAPE,
166-
IA2.IA2_ROLE_SPLIT_PANE: controlTypes.ROLE_SPLITPANE,
167-
IA2.IA2_ROLE_TEAR_OFF_MENU: controlTypes.ROLE_TEAROFFMENU,
168-
IA2.IA2_ROLE_TERMINAL: controlTypes.ROLE_TERMINAL,
169-
IA2.IA2_ROLE_TEXT_FRAME: controlTypes.ROLE_TEXTFRAME,
170-
IA2.IA2_ROLE_TOGGLE_BUTTON: controlTypes.ROLE_TOGGLEBUTTON,
171-
IA2.IA2_ROLE_VIEW_PORT: controlTypes.ROLE_VIEWPORT,
172-
IA2.IA2_ROLE_CONTENT_DELETION: controlTypes.ROLE_DELETED_CONTENT,
173-
IA2.IA2_ROLE_CONTENT_INSERTION: controlTypes.ROLE_INSERTED_CONTENT,
174-
IA2.IA2_ROLE_BLOCK_QUOTE: controlTypes.ROLE_BLOCKQUOTE,
175-
IA2.IA2_ROLE_LANDMARK: controlTypes.ROLE_LANDMARK,
176-
IA2.IA2_ROLE_MARK: controlTypes.ROLE_MARKED_CONTENT,
128+
IA2.IA2_ROLE_UNKNOWN: controlTypes.Role.UNKNOWN,
129+
IA2.IA2_ROLE_CANVAS: controlTypes.Role.CANVAS,
130+
IA2.IA2_ROLE_CAPTION: controlTypes.Role.CAPTION,
131+
IA2.IA2_ROLE_CHECK_MENU_ITEM: controlTypes.Role.CHECKMENUITEM,
132+
IA2.IA2_ROLE_COLOR_CHOOSER: controlTypes.Role.COLORCHOOSER,
133+
IA2.IA2_ROLE_DATE_EDITOR: controlTypes.Role.DATEEDITOR,
134+
IA2.IA2_ROLE_DESKTOP_ICON: controlTypes.Role.DESKTOPICON,
135+
IA2.IA2_ROLE_DESKTOP_PANE: controlTypes.Role.DESKTOPPANE,
136+
IA2.IA2_ROLE_DIRECTORY_PANE: controlTypes.Role.DIRECTORYPANE,
137+
IA2.IA2_ROLE_EDITBAR: controlTypes.Role.EDITBAR,
138+
IA2.IA2_ROLE_EMBEDDED_OBJECT: controlTypes.Role.EMBEDDEDOBJECT,
139+
IA2.IA2_ROLE_ENDNOTE: controlTypes.Role.ENDNOTE,
140+
IA2.IA2_ROLE_FILE_CHOOSER: controlTypes.Role.FILECHOOSER,
141+
IA2.IA2_ROLE_FONT_CHOOSER: controlTypes.Role.FONTCHOOSER,
142+
IA2.IA2_ROLE_FOOTER: controlTypes.Role.FOOTER,
143+
IA2.IA2_ROLE_FOOTNOTE: controlTypes.Role.FOOTNOTE,
144+
IA2.IA2_ROLE_FORM: controlTypes.Role.FORM,
145+
IA2.IA2_ROLE_FRAME: controlTypes.Role.FRAME,
146+
IA2.IA2_ROLE_GLASS_PANE: controlTypes.Role.GLASSPANE,
147+
IA2.IA2_ROLE_HEADER: controlTypes.Role.HEADER,
148+
IA2.IA2_ROLE_HEADING: controlTypes.Role.HEADING,
149+
IA2.IA2_ROLE_ICON: controlTypes.Role.ICON,
150+
IA2.IA2_ROLE_IMAGE_MAP: controlTypes.Role.IMAGEMAP,
151+
IA2.IA2_ROLE_INPUT_METHOD_WINDOW: controlTypes.Role.INPUTWINDOW,
152+
IA2.IA2_ROLE_INTERNAL_FRAME: controlTypes.Role.INTERNALFRAME,
153+
IA2.IA2_ROLE_LABEL: controlTypes.Role.LABEL,
154+
IA2.IA2_ROLE_LAYERED_PANE: controlTypes.Role.LAYEREDPANE,
155+
IA2.IA2_ROLE_NOTE: controlTypes.Role.NOTE,
156+
IA2.IA2_ROLE_OPTION_PANE: controlTypes.Role.OPTIONPANE,
157+
IA2.IA2_ROLE_PAGE: controlTypes.Role.PAGE,
158+
IA2.IA2_ROLE_PARAGRAPH: controlTypes.Role.PARAGRAPH,
159+
IA2.IA2_ROLE_RADIO_MENU_ITEM: controlTypes.Role.RADIOMENUITEM,
160+
IA2.IA2_ROLE_REDUNDANT_OBJECT: controlTypes.Role.REDUNDANTOBJECT,
161+
IA2.IA2_ROLE_ROOT_PANE: controlTypes.Role.ROOTPANE,
162+
IA2.IA2_ROLE_RULER: controlTypes.Role.RULER,
163+
IA2.IA2_ROLE_SCROLL_PANE: controlTypes.Role.SCROLLPANE,
164+
IA2.IA2_ROLE_SECTION: controlTypes.Role.SECTION,
165+
IA2.IA2_ROLE_SHAPE: controlTypes.Role.SHAPE,
166+
IA2.IA2_ROLE_SPLIT_PANE: controlTypes.Role.SPLITPANE,
167+
IA2.IA2_ROLE_TEAR_OFF_MENU: controlTypes.Role.TEAROFFMENU,
168+
IA2.IA2_ROLE_TERMINAL: controlTypes.Role.TERMINAL,
169+
IA2.IA2_ROLE_TEXT_FRAME: controlTypes.Role.TEXTFRAME,
170+
IA2.IA2_ROLE_TOGGLE_BUTTON: controlTypes.Role.TOGGLEBUTTON,
171+
IA2.IA2_ROLE_VIEW_PORT: controlTypes.Role.VIEWPORT,
172+
IA2.IA2_ROLE_CONTENT_DELETION: controlTypes.Role.DELETED_CONTENT,
173+
IA2.IA2_ROLE_CONTENT_INSERTION: controlTypes.Role.INSERTED_CONTENT,
174+
IA2.IA2_ROLE_BLOCK_QUOTE: controlTypes.Role.BLOCKQUOTE,
175+
IA2.IA2_ROLE_LANDMARK: controlTypes.Role.LANDMARK,
176+
IA2.IA2_ROLE_MARK: controlTypes.Role.MARKED_CONTENT,
177177
# some common string roles
178-
"frame": controlTypes.ROLE_FRAME,
179-
"iframe": controlTypes.ROLE_INTERNALFRAME,
180-
"page": controlTypes.ROLE_PAGE,
181-
"form": controlTypes.ROLE_FORM,
182-
"div": controlTypes.ROLE_SECTION,
183-
"li": controlTypes.ROLE_LISTITEM,
184-
"ul": controlTypes.ROLE_LIST,
185-
"tbody": controlTypes.ROLE_TABLEBODY,
186-
"browser": controlTypes.ROLE_WINDOW,
187-
"h1": controlTypes.ROLE_HEADING1,
188-
"h2": controlTypes.ROLE_HEADING2,
189-
"h3": controlTypes.ROLE_HEADING3,
190-
"h4": controlTypes.ROLE_HEADING4,
191-
"h5": controlTypes.ROLE_HEADING5,
192-
"h6": controlTypes.ROLE_HEADING6,
193-
"p": controlTypes.ROLE_PARAGRAPH,
194-
"hbox": controlTypes.ROLE_BOX,
195-
"embed": controlTypes.ROLE_EMBEDDEDOBJECT,
196-
"object": controlTypes.ROLE_EMBEDDEDOBJECT,
197-
"applet": controlTypes.ROLE_EMBEDDEDOBJECT,
178+
"frame": controlTypes.Role.FRAME,
179+
"iframe": controlTypes.Role.INTERNALFRAME,
180+
"page": controlTypes.Role.PAGE,
181+
"form": controlTypes.Role.FORM,
182+
"div": controlTypes.Role.SECTION,
183+
"li": controlTypes.Role.LISTITEM,
184+
"ul": controlTypes.Role.LIST,
185+
"tbody": controlTypes.Role.TABLEBODY,
186+
"browser": controlTypes.Role.WINDOW,
187+
"h1": controlTypes.Role.HEADING1,
188+
"h2": controlTypes.Role.HEADING2,
189+
"h3": controlTypes.Role.HEADING3,
190+
"h4": controlTypes.Role.HEADING4,
191+
"h5": controlTypes.Role.HEADING5,
192+
"h6": controlTypes.Role.HEADING6,
193+
"p": controlTypes.Role.PARAGRAPH,
194+
"hbox": controlTypes.Role.BOX,
195+
"embed": controlTypes.Role.EMBEDDEDOBJECT,
196+
"object": controlTypes.Role.EMBEDDEDOBJECT,
197+
"applet": controlTypes.Role.EMBEDDEDOBJECT,
198198
}
199199

200200
IAccessibleStatesToNVDAStates = {
@@ -666,7 +666,7 @@ def _get_name(self):
666666
return _("Secure Desktop")
667667

668668
def _get_role(self):
669-
return controlTypes.ROLE_PANE
669+
return controlTypes.Role.PANE
670670

671671
def event_gainFocus(self):
672672
super(SecureDesktopNVDAObject, self).event_gainFocus()

‎source/JABHandler.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ def event_gainFocus(vmID,accContext,hwnd):
625625
if (isinstance(focus,NVDAObjects.JAB.JAB) and focus.jabContext==jabContext):
626626
return
627627
obj=NVDAObjects.JAB.JAB(jabContext=jabContext)
628-
if obj.role==controlTypes.ROLE_UNKNOWN:
628+
if obj.role==controlTypes.Role.UNKNOWN:
629629
return
630630
eventHandler.queueEvent("gainFocus",obj)
631631

@@ -700,7 +700,7 @@ def event_stateChange(vmID,accContext,oldState,newState):
700700
obj=NVDAObjects.JAB.JAB(jabContext=jabContext)
701701
if not obj:
702702
return
703-
if focus!=obj and eventHandler.lastQueuedFocusObject!=obj and obj.role in (controlTypes.ROLE_MENUITEM,controlTypes.ROLE_TAB,controlTypes.ROLE_MENU):
703+
if focus!=obj and eventHandler.lastQueuedFocusObject!=obj and obj.role in (controlTypes.Role.MENUITEM,controlTypes.Role.TAB,controlTypes.Role.MENU):
704704
eventHandler.queueEvent("gainFocus",obj)
705705
return
706706
if isinstance(focus,NVDAObjects.JAB.JAB) and focus.jabContext==jabContext:

0 commit comments

Comments
 (0)