From ce285b0fd47e5fa88c7397cefbcb5363143fdf4d Mon Sep 17 00:00:00 2001 From: NSoiffer Date: Thu, 24 Oct 2024 09:20:10 -0700 Subject: [PATCH] Change lookup for MathCAT rules to use the file location, not hard coding in the path. Fixes #79 (hopefully) --- .../globalPlugins/MathCAT/MathCATPreferences.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/addon/globalPlugins/MathCAT/MathCATPreferences.py b/addon/globalPlugins/MathCAT/MathCATPreferences.py index 6258c3d..e1607b3 100644 --- a/addon/globalPlugins/MathCAT/MathCATPreferences.py +++ b/addon/globalPlugins/MathCAT/MathCATPreferences.py @@ -48,7 +48,7 @@ def __init__(self, parent): # load the logo into the dialog full_path_to_logo = ( - os.path.expanduser("~") + "\\AppData\\Roaming\\nvda\\addons\\mathCAT\\globalPlugins\\MathCAT\\logo.png" + os.path.join(os.path.dirname(os.path.abspath(__file__)), "logo.png") ) if os.path.exists(full_path_to_logo): self.m_bitmapLogo.SetBitmap(wx.Bitmap(full_path_to_logo)) @@ -82,12 +82,12 @@ def __init__(self, parent): @staticmethod 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" + return os.path.join(os.path.dirname(os.path.abspath(__file__)), "Rules", "Languages") @staticmethod def path_to_braille_folder(): # the user preferences file is stored at: MathCAT\Rules\Languages - return os.path.expanduser("~") + "\\AppData\\Roaming\\nvda\\addons\\mathCAT\\globalPlugins\\MathCAT\\Rules\\Braille" + return os.path.join(os.path.dirname(os.path.abspath(__file__)), "Rules", "Braille") @staticmethod def LanguagesDict() -> Dict[str, str]: @@ -373,10 +373,8 @@ def getSpeechStyleFromDirectory(dir: str, lang: str) -> list[str]: languageCode = getCurrentLanguage().lower().replace("_", "-") languageCode = languageCode.replace("-", "\\") - languagePath = ( - os.path.expanduser("~") - + "\\AppData\\Roaming\\nvda\\addons\\MathCAT\\globalPlugins\\MathCAT\\Rules\\Languages\\" - ) + languagePath = UserInterface.path_to_languages_folder() + "\\" + log.info(f"languagePath={languagePath}") # populate the m_choiceSpeechStyle choices all_style_files = [ # remove "_Rules.yaml" from the list @@ -529,10 +527,8 @@ def get_ui_values(self): @staticmethod def path_to_default_preferences(): - # the default preferences file is: - # C:\Users\AppData\Roaming\\nvda\\addons\\MathCAT\\globalPlugins\\MathCAT\\Rules\\prefs.yaml return ( - os.path.expanduser("~") + "\\AppData\\Roaming\\nvda\\addons\\MathCAT\\globalPlugins\\MathCAT\\Rules\\prefs.yaml" + os.path.join(os.path.dirname(os.path.abspath(__file__)), "Rules", "prefs.yaml") ) @staticmethod