Tidy up path references

Author: ways2read

.vs/MathCATForPython/v17/.suo

@@ -6,6 +6,6 @@
     "\\NVDA-addon\\addon\\globalPlugins",
     "\\NVDA-addon\\addon\\globalPlugins\\MathCAT"
   ],
-  "SelectedNode": "\\NVDA-addon\\addon\\globalPlugins\\MathCAT\\MathCATPreferences.py",
+  "SelectedNode": "\\NVDA-addon\\addon\\globalPlugins\\MathCAT\\MathCATgui.py",
   "PreviewInSolutionExplorer": false
 }

.vs/VSWorkspaceState.json

@@ -37,6 +37,10 @@ def path_to_user_preferences():
     #the user preferences file is stored at: C:\Users\<user-name>AppData\Roaming\MathCAT\prefs.yaml
     return path_to_user_preferences_folder() + "\\prefs.yaml"
 
+def path_to_languages_folder():
+    #the user preferences file is stored at: MathCAT\Rules\Languages
+    return os.path.expanduser('~')+"\\AppData\\Roaming\\nvda\\addons\\mathCAT\\globalPlugins\\MathCAT\\Rules\\Languages"
+
 def load_default_preferences():
     global user_preferences
     #load default preferences into the user preferences data structure (overwites existing)
@@ -65,21 +69,20 @@ def write_user_preferences():
         yaml.dump(user_preferences, f)
 
 class UserInterface(MathCATgui.MathCATPreferencesDialog):
-
     def GetLanguages(self):
         #clear the language choices
         self.m_choiceLanguage.Clear()
         #populate the language choices
-        for f in os.listdir(os.path.expanduser('~')+"\\AppData\\Roaming\\nvda\\addons\\mathCAT\\globalPlugins\\MathCAT\\Rules\\Languages"):
-            if os.path.isdir(os.path.expanduser('~')+"\\AppData\\Roaming\\nvda\\addons\\mathCAT\\globalPlugins\\MathCAT\\Rules\\Languages\\"+f):
+        for f in os.listdir(path_to_languages_folder()):
+            if os.path.isdir(path_to_languages_folder()+"\\"+f):
                 self.m_choiceLanguage.Append(f)
 
     def GetSpeechStyles(self, this_SpeechStyle):
         #clear the SpeechStyle choices
         self.m_choiceSpeechStyle.Clear()
         #get the currently selected language
         this_language = self.m_choiceLanguage.GetStringSelection()
-        this_path = os.path.expanduser('~')+"\\AppData\\Roaming\\nvda\\addons\\mathCAT\\globalPlugins\\MathCAT\\Rules\\Languages\\"+this_language+"\\*_Rules.yaml"
+        this_path = path_to_languages_folder()+"\\"+this_language+"\\*_Rules.yaml"
         #populate the m_choiceSpeechStyle choices
         for f in glob.glob(this_path):
             fname = os.path.basename(f)
@@ -190,6 +193,8 @@ def MathCATPreferencesDialogOnCharHook(self,event):
             UserInterface.OnClickCancel(self,event)
         if keyCode == wx.WXK_RETURN:
             UserInterface.OnClickOK(self,event)
+        #if keyCode == wx.WXK_TAB and wx.KeyboardState.GetModifiers():
+        #    print("Tab")
         event.Skip()
 
 app = wx.App(False)

.vs/slnx.sqlite

@@ -78,7 +78,7 @@ def __init__( self, parent ):
 
 		bSizer7.Add( self.m_staticText311, 0, wx.ALL, 5 )
 
-		m_choiceLanguageChoices = [ _(u"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") ]
+		m_choiceLanguageChoices = [ _(u"xxxxxxxxxxxxxxxx") ]
 		self.m_choiceLanguage = wx.Choice( self.m_panelSpeech, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceLanguageChoices, 0 )
 		self.m_choiceLanguage.SetSelection( 0 )
 		bSizer7.Add( self.m_choiceLanguage, 0, wx.ALL, 5 )