Merge pull request #7 from NSoiffer/dePickle

Control tab support

Author: NSoiffer

.vs/MathCATForPython/v17/.suo

@@ -1,11 +1,7 @@
 {
   "ExpandedNodes": [
-    "",
-    "\\NVDA-addon",
-    "\\NVDA-addon\\addon",
-    "\\NVDA-addon\\addon\\globalPlugins",
-    "\\NVDA-addon\\addon\\globalPlugins\\MathCAT"
+    ""
   ],
   "SelectedNode": "\\NVDA-addon\\addon\\globalPlugins\\MathCAT\\MathCATgui.py",
   "PreviewInSolutionExplorer": false
-}
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "justMyCode": true
+        }
+    ]
+}

.vs/slnx.sqlite

@@ -54,17 +54,17 @@ def load_user_preferences():
     global user_preferences
     #merge user file values into the user preferences data structure
     if os.path.exists(path_to_user_preferences()):
-        with open(path_to_user_preferences()) as f:
+        with open(path_to_user_preferences(), encoding='utf-8') as f:
             # merge with the default preferences, overwriting with the user's values
             user_preferences.update(yaml.load(f, Loader=yaml.FullLoader))
 
 def write_user_preferences():
     if not os.path.exists(path_to_user_preferences_folder()):
         #create a folder for the user preferences
         os.mkdir(path_to_user_preferences_folder())
-    with open(path_to_user_preferences(), 'w') as f:
+    with open(path_to_user_preferences(), 'w', encoding="utf-8") as f:
         #write values to the user preferences file, NOT the default
-        yaml.dump(user_preferences, f)
+        yaml.dump(user_preferences, stream=f, allow_unicode=True)
 
 class UserInterface(MathCATgui.MathCATPreferencesDialog):
 
@@ -105,6 +105,7 @@ def set_ui_values(self):
             #now get the available SpeechStyles from the folder structure and set to the preference setting is possible
             UserInterface.GetSpeechStyles(self, user_preferences["Speech"]["SpeechStyle"])
             self.m_choiceSpeechAmount.SetSelection(Speech_Verbosity.index(user_preferences["Speech"]["Verbosity"]))
+            self.m_sliderRelativeSpeed.SetValue(user_preferences["Speech"]["MathRate"])
             self.m_choiceSpeechForChemical.SetSelection(Speech_Chemistry.index(user_preferences["Speech"]["Chemistry"]))
             self.m_choiceNavigationMode.SetSelection(Navigation_NavMode.index(user_preferences["Navigation"]["NavMode"]))
             self.m_checkBoxResetNavigationMode.SetValue(user_preferences["Navigation"]["ResetNavMode"])
@@ -127,6 +128,7 @@ def get_ui_values(self):
         user_preferences["Speech"]["Language"] = self.m_choiceLanguage.GetStringSelection()
         user_preferences["Speech"]["SpeechStyle"] = self.m_choiceSpeechStyle.GetStringSelection()
         user_preferences["Speech"]["Verbosity"] = Speech_Verbosity[self.m_choiceSpeechAmount.GetSelection()]
+        user_preferences["Speech"]["MathRate"] = self.m_sliderRelativeSpeed.GetValue()
         user_preferences["Speech"]["Chemistry"] = Speech_Chemistry[self.m_choiceSpeechForChemical.GetSelection()]
         user_preferences["Navigation"]["NavMode"] = Navigation_NavMode[self.m_choiceNavigationMode.GetSelection()]
         user_preferences["Navigation"]["ResetNavMode"] = self.m_checkBoxResetNavigationMode.GetValue()
@@ -195,6 +197,31 @@ def MathCATPreferencesDialogOnCharHook(self,event):
         keyCode = event.GetKeyCode()
         if keyCode == wx.WXK_ESCAPE:
             UserInterface.OnClickCancel(self,event)
+            return
         if keyCode == wx.WXK_RETURN:
             UserInterface.OnClickOK(self,event)
-        event.Skip()
+        if keyCode == wx.WXK_TAB and (event.GetModifiers()  == wx.MOD_CONTROL):
+            #cycle the category forward
+            new_category = self.m_listBoxPreferencesTopic.GetSelection() + 1
+            if new_category == 3:
+                new_category = 0
+            self.m_listBoxPreferencesTopic.SetSelection(new_category)
+            #update the ui to show the new page
+            UserInterface.OnListBoxCategories(self,event)
+            #set the focus into the category list box
+            self.m_listBoxPreferencesTopic.SetFocus()
+            #jump out so the tab key is not processed
+            return
+        if keyCode == wx.WXK_TAB and (event.GetModifiers()  == wx.MOD_CONTROL|wx.MOD_SHIFT):
+            #cycle the category back
+            new_category = self.m_listBoxPreferencesTopic.GetSelection() - 1
+            if new_category == -1:
+                new_category = 2
+            self.m_listBoxPreferencesTopic.SetSelection(new_category)
+            #update the ui to show the new page
+            UserInterface.OnListBoxCategories(self,event)
+            #update the ui to show the new page
+            self.m_listBoxPreferencesTopic.SetFocus()
+            #jump out so the tab key is not processed
+            return
+          

.vscode/launch.json

@@ -8,7 +8,7 @@
 ###########################################################################
 
 import wx
-# from . import xrc
+import wx.xrc
 
 import gettext
 _ = gettext.gettext
@@ -116,6 +116,19 @@ def __init__( self, parent ):
 
 		bSizer121.Add( bSizer71, 1, wx.EXPAND, 5 )
 
+		bSizer7131 = wx.BoxSizer( wx.HORIZONTAL )
+
+		self.m_staticText21111 = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Relative speed:"), wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText21111.Wrap( -1 )
+
+		bSizer7131.Add( self.m_staticText21111, 0, wx.ALL, 5 )
+
+		self.m_sliderRelativeSpeed = wx.Slider( self.m_panelSpeech, wx.ID_ANY, 100, 10, 1000, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL )
+		bSizer7131.Add( self.m_sliderRelativeSpeed, 0, wx.ALL, 5 )
+
+
+		bSizer121.Add( bSizer7131, 1, wx.EXPAND, 5 )
+
 		bSizer712 = wx.BoxSizer( wx.HORIZONTAL )
 
 		self.m_staticText411 = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Subject area to be used when it cannot be determined automatically:"), wx.DefaultPosition, wx.DefaultSize, 0 )
@@ -147,12 +160,6 @@ def __init__( self, parent ):
 		bSizer121.Add( bSizer711, 1, wx.EXPAND, 5 )
 
 
-		bSizer121.Add( ( 0, 0), 1, wx.EXPAND, 5 )
-
-
-		bSizer121.Add( ( 0, 0), 1, wx.EXPAND, 5 )
-
-
 		self.m_panelSpeech.SetSizer( bSizer121 )
 		self.m_panelSpeech.Layout()
 		bSizer121.Fit( self.m_panelSpeech )