Merge branch 'main' into dePickle

Author: NSoiffer

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

@@ -8,6 +8,8 @@
 import gettext
 _ = gettext.gettext
 
+from logHandler import log                  # logging
+
 # initialize the user preferences tuples
 user_preferences = dict([("", "")])
 #Speech_Language is derived from the folder structure
@@ -37,10 +39,6 @@ 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 (overwrites existing)
@@ -58,7 +56,7 @@ def load_user_preferences():
     if os.path.exists(path_to_user_preferences()):
         with open(path_to_user_preferences(), encoding='utf-8') as f:
             # merge with the default preferences, overwriting with the user's values
-            user_preferences |= yaml.load(f, Loader=yaml.FullLoader)
+            user_preferences.update(yaml.load(f, Loader=yaml.FullLoader))
 
 def write_user_preferences():
     if not os.path.exists(path_to_user_preferences_folder()):
@@ -69,6 +67,7 @@ def write_user_preferences():
         yaml.dump(user_preferences, stream=f, allow_unicode=True)
 
 class UserInterface(MathCATgui.MathCATPreferencesDialog):
+
     def GetLanguages(self):
         #clear the language choices
         self.m_choiceLanguage.Clear()
@@ -82,7 +81,7 @@ def GetSpeechStyles(self, this_SpeechStyle):
         self.m_choiceSpeechStyle.Clear()
         #get the currently selected language
         this_language = self.m_choiceLanguage.GetStringSelection()
-        this_path = path_to_languages_folder()+"\\"+this_language+"\\*_Rules.yaml"
+        this_path = os.path.expanduser('~')+"\\AppData\\Roaming\\nvda\\addons\\mathCAT\\globalPlugins\\MathCAT\\Rules\\Languages\\"+this_language+"\\*_Rules.yaml"
         #populate the m_choiceSpeechStyle choices
         for f in glob.glob(this_path):
             fname = os.path.basename(f)
@@ -147,6 +146,11 @@ def get_ui_values(self):
     def __init__(self,parent):
         #initialize parent class
         MathCATgui.MathCATPreferencesDialog.__init__(self,parent)
+
+        # load in the system values followed by the user prefs (if any)
+        load_default_preferences()
+        load_user_preferences()
+
         if "MathCATPreferencesLastCategory" in user_preferences:
             #set the categories selection to what we used on last run
             self.m_listBoxPreferencesTopic.SetSelection(user_preferences["MathCATPreferencesLastCategory"])
@@ -164,10 +168,10 @@ def __init__(self,parent):
     def OnClickOK(self,event):
         UserInterface.get_ui_values(self)
         write_user_preferences()
-        app.ExitMainLoop()
+        self.Destroy()
 
     def OnClickCancel(self,event):
-        app.ExitMainLoop()
+        self.Destroy()
 
     def OnClickApply(self,event):
         UserInterface.get_ui_values(self)
@@ -220,13 +224,4 @@ def MathCATPreferencesDialogOnCharHook(self,event):
             self.m_listBoxPreferencesTopic.SetFocus()
             #jump out so the tab key is not processed
             return
-        event.Skip()
-
-app = wx.App(False)
-#get the default preferences (we don't write to this file)
-load_default_preferences()
-#having grabbed the default values, let's see if there is a preferences file for this user
-load_user_preferences()
-frame = UserInterface(None)
-frame.Show(True)
-app.MainLoop()
+          

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

@@ -24,6 +24,8 @@
 from synthDriverHandler import getSynth     # speech engine param setting
 import winUser                              # clipboard manipultation
 from ctypes import windll                   # register clipboard formats
+from gui import mainFrame
+import wx
 
 from . import libmathcat
 
@@ -170,7 +172,7 @@ def script_navigate(self, gesture):
         except Exception as e:
             log.error(e)
 
-    _startsWithMath = re.compile("\s*?<math")
+    _startsWithMath = re.compile("\\s*?<math")
     @script(
         gesture="kb:control+c",
     )
@@ -203,10 +205,9 @@ def _copyToClipAsMathML(self, text: str, notify: Optional[bool] = False) -> bool
         # copied from api.py and modified to use CF_MathML_Presentation 
         if not isinstance(text, str) or len(text) == 0:
             return False
-        import gui
         from api import getClipData
         try:
-            with winUser.openClipboard(gui.mainFrame.Handle):
+            with winUser.openClipboard(mainFrame.Handle):
                 winUser.emptyClipboard()
                 self._setClipboardData(self.CF_MathML, self._wrapMathMLForClipBoard(text))
                 self._setClipboardData(self.CF_MathML_Presentation, self._wrapMathMLForClipBoard(text))
@@ -247,7 +248,7 @@ def _setClipboardData(self, format,data):
         # NULL the global memory handle so that it is not freed at the end of scope as the clipboard now has it.
         h.forget()
 
-
+from .MathCATPreferences import UserInterface
 class MathCAT(mathPres.MathPresentationProvider):
     def __init__(self):
         # super(MathCAT, self).__init__(*args, **kwargs)
@@ -305,7 +306,7 @@ def _setSpeechLanguage(self, mathMl):
             libmathcat.SetPreference("Language", lang.replace("_", "-"))
             self._language = lang
         except Exception as e:
-            log.error(e)     
+            log.error(e)
 
 
 mathPres.registerProvider(MathCAT(), speech=True, braille=True, interaction=True)
@@ -314,3 +315,22 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         MathCAT.__init__(self)
+        log.info("about to call add_MathCAT_menu\n")
+        self.add_MathCAT_menu()
+
+    def add_MathCAT_menu(self):
+        log.info("in add_MathCAT_menu\n")
+        self.toolsMenu = mainFrame.sysTrayIcon.toolsMenu
+        self.settings = self.toolsMenu.Append(wx.ID_ANY, _("&MathCAT Settings..."))
+        mainFrame.sysTrayIcon.Bind(wx.EVT_MENU, self.on_settings, self.settings)
+
+    def on_settings(self, evt):
+        mainFrame._popupSettingsDialog(UserInterface)
+
+    def terminate(self):
+        log.info("======== in terminate (remove settings menu\n")
+        try:
+            self.toolsMenu.Remove(self.settings)
+        except (AttributeError, RuntimeError):
+            pass
+

NVDA-addon/buildVars.py

@@ -29,7 +29,7 @@ def _(arg):
 		The initial version of MathCAT is English-only but is designed with translations in mind.
 		"""),
 	# version
-	"addon_version": "0.1.5",
+	"addon_version": "0.1.6",
 	# Author(s)
 	"addon_author": "Neil Soiffer <soiffer@alum.mit.edu>",
 	# URL for the add-on documentation support