mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4765 from PySimpleGUI/Dev-latest 

User Settings Support for Trinket
This commit is contained in:
PySimpleGUI 2021-10-01 13:43:18 -04:00 committed by GitHub
parent 81a950ac5a 99eb2b7c6c
commit 5d636ce3eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.49.0.2 Unreleased" version = __version__ = "4.49.0.3 Unreleased"
_change_log = """ _change_log = """
@ -10,7 +10,8 @@ _change_log = """
Element.set_right_click_menu added so can set or change the right click menu for an element Element.set_right_click_menu added so can set or change the right click menu for an element
4.49.0.2 4.49.0.2
Element.set_right_click_menu - If no menu supplied, use the parent form's right click menu Element.set_right_click_menu - If no menu supplied, use the parent form's right click menu
4.49.0.3
User Settings path created specifically for Trinkets
""" """
@ -600,6 +601,7 @@ else:
DEFAULT_USER_SETTINGS_WIN_PATH = r'~\AppData\Local\PySimpleGUI\settings' DEFAULT_USER_SETTINGS_WIN_PATH = r'~\AppData\Local\PySimpleGUI\settings'
DEFAULT_USER_SETTINGS_LINUX_PATH = r'~/.config/PySimpleGUI/settings' DEFAULT_USER_SETTINGS_LINUX_PATH = r'~/.config/PySimpleGUI/settings'
DEFAULT_USER_SETTINGS_MAC_PATH = r'~/Library/Application Support/PySimpleGUI/settings' DEFAULT_USER_SETTINGS_MAC_PATH = r'~/Library/Application Support/PySimpleGUI/settings'
DEFAULT_USER_SETTINGS_TRINKET_PATH = r'.'
DEFAULT_USER_SETTINGS_UNKNOWN_OS_PATH = r'~/Library/Application Support/PySimpleGUI/settings' DEFAULT_USER_SETTINGS_UNKNOWN_OS_PATH = r'~/Library/Application Support/PySimpleGUI/settings'
DEFAULT_USER_SETTINGS_PATH = None # value set by user to override all paths above DEFAULT_USER_SETTINGS_PATH = None # value set by user to override all paths above
DEFAULT_USER_SETTINGS_PYSIMPLEGUI_PATH = None # location of the global PySimpleGUI settings DEFAULT_USER_SETTINGS_PYSIMPLEGUI_PATH = None # location of the global PySimpleGUI settings
@ -19193,6 +19195,8 @@ class UserSettings:
path = os.path.expanduser(self.path) # expand user provided path in case it has user ~ in it. Don't think it'll hurt path = os.path.expanduser(self.path) # expand user provided path in case it has user ~ in it. Don't think it'll hurt
elif DEFAULT_USER_SETTINGS_PATH is not None: # if user set the path manually system-wide using set options elif DEFAULT_USER_SETTINGS_PATH is not None: # if user set the path manually system-wide using set options
path = os.path.expanduser(DEFAULT_USER_SETTINGS_PATH) path = os.path.expanduser(DEFAULT_USER_SETTINGS_PATH)
elif running_trinket():
path = os.path.expanduser(DEFAULT_USER_SETTINGS_TRINKET_PATH)
elif running_windows(): elif running_windows():
path = os.path.expanduser(DEFAULT_USER_SETTINGS_WIN_PATH) path = os.path.expanduser(DEFAULT_USER_SETTINGS_WIN_PATH)
elif running_linux(): elif running_linux():