Added support for zipped up directories and finding speech style files in them

Added `DecimalSeparator` support

Author: NSoiffer

addon/globalPlugins/MathCAT/MathCATPreferences.py

@@ -13,6 +13,7 @@
 from typing import List, Dict, Union
 from .MathCAT import ConvertSSMLTextForNVDA
 from speech import speak
+from zipfile import ZipFile
 
 addonHandler.initTranslation()
 _ = gettext.gettext
@@ -25,6 +26,7 @@
 # initialize the user preferences tuples
 user_preferences: Dict[str, Dict[str, Union[int, str, bool]]] = {}
 # Speech_Language is derived from the folder structures
+Speech_DecimalSeparator = ("Auto", ".", ",", "Custom")
 Speech_Impairment = ("LearningDisability", "Blindness", "LowVision")
 # Speech_SpeechStyle is derived from the yaml files under the selected language
 Speech_Verbosity = ("Terse", "Medium", "Verbose")
@@ -329,13 +331,18 @@ def GetSpeechStyles(self, this_SpeechStyle: str):
             # FIX: when dialog is aware of regional dialects, remove this next line that removes the dialect part
             this_language_code = this_language_code.split("-")[0]  # grab the first part
 
-        this_path = (
+        this_language_path = (
             os.path.expanduser("~")
             + "\\AppData\\Roaming\\nvda\\addons\\MathCAT\\globalPlugins\\MathCAT\\Rules\\Languages\\"
             + this_language_code
-            + "\\*_Rules.yaml"
         )
+        this_path = this_language_path + "\\*_Rules.yaml"
         # populate the m_choiceSpeechStyle choices
+        all_style_files = glob.glob(this_path)  # works for unzipped dirs
+        if len(all_style_files) == 0:
+            # look in the .zip file for the style files
+            zip_file = ZipFile(f"{this_language_path}\\{this_language_code}.zip", "r")
+            all_style_files = [name for name in zip_file.namelist() if name.endswith('.jpg')]
         for f in glob.glob(this_path):
             fname = os.path.basename(f)
             self.m_choiceSpeechStyle.Append((fname[: fname.find("_Rules.yaml")]))
@@ -389,6 +396,7 @@ def set_ui_values(self):
                     "Error when setting SpeechStyle for " + self.m_choiceLanguage.GetStringSelection()
                 )
             # set the rest of the UI elements
+            self.m_choiceDecimalSeparator.SetSelection(Speech_DecimalSeparator.index(user_preferences["Other"]["DecimalSeparator"]))
             self.m_choiceSpeechAmount.SetSelection(Speech_Verbosity.index(user_preferences["Speech"]["Verbosity"]))
             self.m_sliderRelativeSpeed.SetValue(user_preferences["Speech"]["MathRate"])
             pause_factor = (
@@ -445,6 +453,7 @@ def get_ui_values(self):
         # read the values from the UI and update the user preferences dictionary
         user_preferences["Speech"]["Impairment"] = Speech_Impairment[self.m_choiceImpairment.GetSelection()]
         user_preferences["Speech"]["Language"] = self.GetLanguageCode()
+        user_preferences["Other"]["DecimalSeparator"] = Speech_DecimalSeparator[self.m_choiceDecimalSeparator.GetSelection()]
         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()

addon/globalPlugins/MathCAT/MathCATgui.py

@@ -167,6 +167,46 @@ def __init__(self, parent):
 
         bSizerSpeech.Add(bSizerLanguage, 1, wx.EXPAND, 5)
 
+        bSizerDecimalSeparator = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.m_staticTextDecimalSeparator = wx.StaticText(
+            self.m_panelSpeech,
+            wx.ID_ANY,
+            # Translators: label for pull down to specify what character to use in numbers as the decimal separator
+            _("Decimal separator for numbers:"),
+            wx.DefaultPosition,
+            wx.DefaultSize,
+            0,
+        )
+        self.m_staticTextDecimalSeparator.Wrap(-1)
+
+        bSizerDecimalSeparator.Add(self.m_staticTextDecimalSeparator, 0, wx.ALL, 5)
+
+        # Translators: options for decimal separator.
+        m_choiceDecimalSeparatorChoices = [
+            # Translators: options for decimal separator -- "Auto" = automatically pick the choice based on the language
+            _("Auto"),
+            # options for decimal separator -- use "."  (and use ", " for block separators)
+            ("."),
+            # options for decimal separator -- use ","  (and use ". " for block separators)
+            (","),
+            # Translators: options for decimal separator -- "Custom" = user sets it
+            #   Currently there is no UI for how it is done yet, but eventually there will be a dialog that pops up to set it
+            _("Custom"),
+        ]
+        self.m_choiceDecimalSeparator = wx.Choice(
+            self.m_panelSpeech,
+            wx.ID_ANY,
+            wx.DefaultPosition,
+            wx.DefaultSize,
+            m_choiceDecimalSeparatorChoices,
+            0,
+        )
+        self.m_choiceDecimalSeparator.SetSelection(0)
+        bSizerDecimalSeparator.Add(self.m_choiceDecimalSeparator, 0, wx.ALL, 5)
+
+        bSizerSpeech.Add(bSizerDecimalSeparator, 1, wx.EXPAND, 5)
+
         bSizerSpeechStyle = wx.BoxSizer(wx.HORIZONTAL)
 
         self.m_staticTextSpeechStyle = wx.StaticText(