Factorise gesture mapping in Outlook appModule, taking advantage of B…

…aseOutlookWordDocument class introduced by nvaccess#11925.
CyrilleB79 · Jan 22, 2021 · f77b5ef · f77b5ef
1 parent c5c34ed
commit f77b5ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/include/cldr b/include/cldr
diff --git a/source/appModules/outlook.py b/source/appModules/outlook.py
@@ -565,6 +565,12 @@ def script_tab(self, gesture):
 		if not caretMoved:
 			return
 		self.reportTab()
+
+	__gestures = {
+		"kb:control+shift+w": None,  # Shortcut existing in Word but not in Outlook
+		"kb:control+shift+b": None,  # Shortcut existing in Word but opens address book in Outlook
+		"kb:control+shift+a": "changeCase",  # In Outlook Ctrl+Shift+A is equivalent to Shift+F3
+	}
 
 
 class OutlookWordDocument(WordDocument, BaseOutlookWordDocument):
@@ -589,12 +595,6 @@ def _get_role(self):
 
 	ignoreEditorRevisions=True
 	ignorePageNumbers=True # This includes page sections, and page columns. None of which are appropriate for outlook.
-
-	__gestures = {
-		"kb:control+shift+w": None,  # Shortcut existing in Word but not in Outlook
-		"kb:control+shift+b": None,  # Shortcut existing in Word but opens address book in Outlook
-		"kb:control+shift+a": "changeCase",  # In Outlook Ctrl+Shift+A is equivalent to Shift+F3
-	}
 
 
 class OutlookUIAWordDocument(UIAWordDocument, BaseOutlookWordDocument):
@@ -606,12 +606,6 @@ def _get_isReadonlyViewer(self):
 	def _get_shouldCreateTreeInterceptor(self):
 		return self.isReadonlyViewer
 
-	__gestures = {
-		"kb:control+shift+w": None,  # Shortcut existing in Word but not in Outlook
-		"kb:control+shift+b": None,  # Shortcut existing in Word but opens address book in Outlook
-		"kb:control+shift+a": "changeCase",  # In Outlook Ctrl+Shift+A is equivalent to Shift+F3
-	}
-
 class DatePickerButton(IAccessible):
 	# Value is a duplicate of name so get rid of it
 	value=None