Merge pull request #70 from NSoiffer/UserInterfaceUpdatesMarch2024

Add Copy As to dialog

Author: NSoiffer

addon/globalPlugins/MathCAT/MathCAT.py

@@ -306,33 +306,33 @@ def script_navigate(self, gesture: KeyboardInputGesture):
     )
     def script_rawdataToClip(self, gesture: KeyboardInputGesture):
         try:
-            mathml = libmathcat.GetNavigationMathML()[0]
-            if not re.match(self._startsWithMath, mathml):
-                mathml = (
-                    "<math>\n" + mathml + "</math>"
-                )  # copy will fix up name spacing
-            elif self.init_mathml != "":
-                mathml = self.init_mathml
-            copy_as = "mathml"
+            copy_as = "mathml"      # value used even if "CopyAs" pref is invalid
+            text_to_copy = ""
             try:
                 copy_as = libmathcat.GetPreference("CopyAs").lower()
-                match copy_as:
-                    case "mathml" | "latex" | "asciimath":
-                        pass
-                    case _:
-                        copy_as = "mathml"
             except Exception as e:
                 log.error(f"Not able to get 'CopyAs' preference: {e}")
-
-            mathml = self._wrapMathMLForClipBoard(mathml)
-            if copy_as != "mathml":
+            if copy_as == "asciimath" or copy_as == "latex":
+                # save the old braille code, set the new one, get the braille, then reset the code
                 saved_braille_code: str = libmathcat.GetPreference("BrailleCode")
                 libmathcat.SetPreference("BrailleCode", "LaTeX" if copy_as == "latex" else "ASCIIMath")
-                mathml = libmathcat.GetNavigationBraille()
+                text_to_copy = libmathcat.GetNavigationBraille()
                 libmathcat.SetPreference("BrailleCode", saved_braille_code)
-            self._copyToClipAsMathML(mathml, copy_as == "mathml")
+                if copy_as == "asciimath":
+                    copy_as = "ASCIIMath"  # speaks better in at least some voices
+            else:
+                mathml = libmathcat.GetNavigationMathML()[0]
+                if not re.match(self._startsWithMath, mathml):
+                    mathml = (
+                        "<math>\n" + mathml + "</math>"
+                    )  # copy will fix up name spacing
+                elif self.init_mathml != "":
+                    mathml = self.init_mathml
+                text_to_copy = self._wrapMathMLForClipBoard(mathml)
+
+            self._copyToClipAsMathML(text_to_copy, copy_as == "mathml")
             # Translators: copy to clipboard
-            ui.message(_("copy"))
+            ui.message(_("copy as ") + copy_as)
         except Exception as e:
             log.error(e)
             # Translators: this message directs users to look in the log file

addon/globalPlugins/MathCAT/MathCATPreferences.py

@@ -35,6 +35,7 @@
 # Navigation_OverView is boolean
 Navigation_NavVerbosity = ("Terse", "Medium", "Verbose")
 # Navigation_AutoZoomOut is boolean
+Navigation_CopyMathAs = ("MathML", "LaTeX", "ASCIIMath")
 Braille_BrailleNavHighlight = ("Off", "FirstChar", "EndPoints", "All")
 
 
@@ -400,6 +401,7 @@ def set_ui_values(self):
             self.m_sliderPauseFactor.SetValue(pause_factor)
             self.m_checkBoxSpeechSound.SetValue(user_preferences["Speech"]["SpeechSound"] == "Beep")
             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"])
             self.m_choiceSpeechAmountNavigation.SetSelection(
@@ -411,6 +413,8 @@ def set_ui_values(self):
                 self.m_choiceNavigationSpeech.SetSelection(0)
             self.m_checkBoxResetNavigationSpeech.SetValue(user_preferences["Navigation"]["ResetOverview"])
             self.m_checkBoxAutomaticZoom.SetValue(user_preferences["Navigation"]["AutoZoomOut"])
+            self.m_choiceCopyMathAs.SetSelection(Navigation_CopyMathAs.index(user_preferences["Navigation"]["CopyMathAs"]))
+
             self.m_choiceBrailleHighlights.SetSelection(
                 Braille_BrailleNavHighlight.index(user_preferences["Braille"]["BrailleNavHighlight"])
             )
@@ -461,6 +465,8 @@ def get_ui_values(self):
         user_preferences["Navigation"]["Overview"] = self.m_choiceNavigationSpeech.GetSelection() != 0
         user_preferences["Navigation"]["ResetOverview"] = self.m_checkBoxResetNavigationSpeech.GetValue()
         user_preferences["Navigation"]["AutoZoomOut"] = self.m_checkBoxAutomaticZoom.GetValue()
+        user_preferences["Navigation"]["CopyMathAs"] = Navigation_CopyMathAs[self.m_choiceCopyMathAs.GetSelection()]
+
         user_preferences["Braille"]["BrailleNavHighlight"] = (
             Braille_BrailleNavHighlight[self.m_choiceBrailleHighlights.GetSelection()]
         )
@@ -575,6 +581,8 @@ def validate_user_preferences():
         UserInterface.validate("Navigation", "NavVerbosity", ["Terse", "Medium", "Full"], "Medium")
         #  AutoZoomOut: true           # Auto zoom out of 2D exprs (use shift-arrow to force zoom out if unchecked)
         UserInterface.validate("Navigation", "AutoZoomOut", [False, True], True)
+        #  NavCopyMathAs: MathML        # MathML, LaTeX, ASCIIMath
+        UserInterface.validate("Navigation", "CopyMathAs", ["MathML", "LaTeX", "ASCIIMath"], "MathML")
         # Braille:
         #  BrailleNavHighlight: EndPoints
         # Highlight with dots 7 & 8 the current nav node -- values are Off, FirstChar, EndPoints, All

addon/globalPlugins/MathCAT/MathCATgui.py

@@ -1,12 +1,3 @@
-# -*- coding: utf-8 -*-
-
-###########################################################################
-# Python code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
-# http://www.wxformbuilder.org/
-#
-# PLEASE DO *NOT* EDIT THIS FILE!
-###########################################################################
-
 import wx
 # import wx.xrc
 import gettext
@@ -205,7 +196,7 @@ def __init__(self, parent):
 
         bSizerSpeech.Add(bSizerSpeechStyle, 1, wx.EXPAND, 5)
 
-        bSizer71 = wx.BoxSizer(wx.HORIZONTAL)
+        bSizerSpeechAmount = wx.BoxSizer(wx.HORIZONTAL)
 
         self.m_staticTextSpeechAmount = wx.StaticText(
             self.m_panelSpeech,
@@ -218,7 +209,7 @@ def __init__(self, parent):
         )
         self.m_staticTextSpeechAmount.Wrap(-1)
 
-        bSizer71.Add(self.m_staticTextSpeechAmount, 0, wx.ALL, 5)
+        bSizerSpeechAmount.Add(self.m_staticTextSpeechAmount, 0, wx.ALL, 5)
 
         # Translators: options for speech verbosity.
         m_choiceSpeechAmountChoices = [
@@ -238,9 +229,9 @@ def __init__(self, parent):
             0,
         )
         self.m_choiceSpeechAmount.SetSelection(0)
-        bSizer71.Add(self.m_choiceSpeechAmount, 0, wx.ALL, 5)
+        bSizerSpeechAmount.Add(self.m_choiceSpeechAmount, 0, wx.ALL, 5)
 
-        bSizerSpeech.Add(bSizer71, 1, wx.EXPAND, 5)
+        bSizerSpeech.Add(bSizerSpeechAmount, 1, wx.EXPAND, 5)
 
         bSizerRelativeSpeed = wx.BoxSizer(wx.HORIZONTAL)
 
@@ -530,6 +521,43 @@ def __init__(self, parent):
 
         bSizerNavigation.Add(bSizerNavigationZoom, 1, wx.EXPAND, 5)
 
+        bSizerCopyMathAs = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.m_staticTextCopyMathAs = wx.StaticText(
+            self.m_panelNavigation,
+            wx.ID_ANY,
+            # Translators: label for pull down to specify how math will be copied to the clipboard
+            _("Copy math as:"),
+            wx.DefaultPosition,
+            wx.DefaultSize,
+            0,
+        )
+        self.m_staticTextCopyMathAs.Wrap(-1)
+
+        bSizerCopyMathAs.Add(self.m_staticTextCopyMathAs, 0, wx.ALL, 5)
+
+        # Translators: options for copy math as.
+        m_choiceCopyMathAsChoices = [
+            # Translators: options for Copy expression to clipboard as -- "MathML"
+            _("MathML"),
+            # Translators: options for Copy expression to clipboard as -- "LaTeX"
+            _("LaTeX"),
+            # Translators: options for Copy expression to clipboard as -- "ASCIIMath"
+            _("ASCIIMath"),
+        ]
+        self.m_choiceCopyMathAs = wx.Choice(
+            self.m_panelNavigation,
+            wx.ID_ANY,
+            wx.DefaultPosition,
+            wx.DefaultSize,
+            m_choiceCopyMathAsChoices,
+            0,
+        )
+        self.m_choiceCopyMathAs.SetSelection(0)
+        bSizerCopyMathAs.Add(self.m_choiceCopyMathAs, 0, wx.ALL, 5)
+
+        bSizerNavigation.Add(bSizerCopyMathAs, 1, wx.EXPAND, 5)
+
         self.m_panelNavigation.SetSizer(bSizerNavigation)
         self.m_panelNavigation.Layout()
         bSizerNavigation.Fit(self.m_panelNavigation)