Merge pull request #14 from NSoiffer/Fix-tab-order-issue

Update MathCATPreferences.py

Author: NSoiffer

NVDA-addon/addon/globalPlugins/MathCAT/MathCATPreferences.py

@@ -233,6 +233,24 @@ def MathCATPreferencesDialogOnCharHook(self,event):
             self.m_listBoxPreferencesTopic.SetFocus()
             #jump out so the tab key is not processed
             return
+        if (event.GetModifiers()  == wx.MOD_NONE) and (MathCATgui.MathCATPreferencesDialog.FindFocus() == self.m_listBoxPreferencesTopic):
+            #user tabbed from into the paged content, set the focus on the first control
+            if self.m_listBoxPreferencesTopic.GetSelection() == 0:
+                self.m_choiceImpairment.SetFocus()
+            elif self.m_listBoxPreferencesTopic.GetSelection() == 1:
+                self.m_choiceNavigationMode.SetFocus()
+            elif self.m_listBoxPreferencesTopic.GetSelection() == 2:
+                self.m_choiceBrailleMathCode.SetFocus()
+            return
+        if (event.GetModifiers()  == wx.MOD_SHIFT) and (MathCATgui.MathCATPreferencesDialog.FindFocus() == self.m_buttonOK):
+            #user shift+tabbed from into the paged content, set the focus on the last control
+            if self.m_listBoxPreferencesTopic.GetSelection() == 0:
+                self.m_choiceSpeechForChemical.SetFocus()
+            elif self.m_listBoxPreferencesTopic.GetSelection() == 1:
+                self.m_choiceSpeechAmountNavigation.SetFocus()
+            elif self.m_listBoxPreferencesTopic.GetSelection() == 2:
+                self.m_choiceBrailleHighlights.SetFocus()
+            return
         #continue handling keyboard event
         event.Skip()