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

Merge pull request #3808 from PySimpleGUI/Dev-latest 

Set the default demo programs path to "." since likely running from t…
This commit is contained in:
PySimpleGUI 2021-01-18 15:08:53 -05:00 committed by GitHub
parent 1bb571776f f56b1e7fd1
commit e37978bdbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DemoPrograms/Demo_Demo_Programs_Browser.py
View File

@ -40,7 +40,7 @@ def get_demo_git_files():
:rtype: Tuple[List[str], List[str]] :rtype: Tuple[List[str], List[str]]
""" """
demo_path = sg.user_settings_get_entry('-demos folder-', '') demo_path = sg.user_settings_get_entry('-demos folder-', '.')
try: try:
demo_files = os.listdir(demo_path) demo_files = os.listdir(demo_path)
@ -89,11 +89,11 @@ def settings_window():
""" """
layout = [[sg.T('Program Settings', font='DEFAIULT 18')], layout = [[sg.T('Program Settings', font='DEFAIULT 18')],
[sg.T('Path to Demos', size=(20,1)), sg.In(sg.user_settings_get_entry('-demos folder-', ''), k='-DEMOS-'), sg.FolderBrowse()], [sg.T('Path to Demos', size=(20,1)), sg.In(sg.user_settings_get_entry('-demos folder-', '.'), k='-DEMOS-'), sg.FolderBrowse()],
[sg.T('Editor Program', size=(20,1)), sg.In(sg.user_settings_get_entry('-Editor Program-', ''),k='-EDITOR PROGRAM-'), sg.FileBrowse()], [sg.T('Editor Program', size=(20,1)), sg.In(sg.user_settings_get_entry('-Editor Program-', ''),k='-EDITOR PROGRAM-'), sg.FileBrowse()],
[sg.T(r"For PyCharm, Add this to your PyCharm main program's folder \bin\pycharm.bat")], [sg.T(r"For PyCharm, Add this to your PyCharm main program's folder \bin\pycharm.bat")],
[sg.Combo(sg.theme_list(), sg.user_settings_get_entry('-theme-', None), k='-THEME-')], [sg.Combo(sg.theme_list(), sg.user_settings_get_entry('-theme-', None), k='-THEME-')],
[sg.B('Ok'), sg.B('Cancel')], [sg.B('Ok', bind_return_key=True), sg.B('Cancel')],
] ]
window = sg.Window('Settings', layout) window = sg.Window('Settings', layout)
@ -157,7 +157,7 @@ def main():
It will call the make_window function to create the window. It will call the make_window function to create the window.
""" """
demo_path = sg.user_settings_get_entry('-demos folder-', '') demo_path = sg.user_settings_get_entry('-demos folder-', '.')
editor_program = sg.user_settings_get_entry('-Editor Program-', '') editor_program = sg.user_settings_get_entry('-Editor Program-', '')
demo_files = get_demo_git_files() demo_files = get_demo_git_files()