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

Merge pull request #6384 from PySimpleGUI/Dev-latest 

Dev latest
This commit is contained in:
PySimpleGUI 2023-05-21 19:39:33 -04:00 committed by GitHub
parent ca66e38c99 955a7cba07
commit 935285f715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.61.0.182 Unreleased" version = __version__ = "4.61.0.183 Unreleased"
_change_log = """ _change_log = """
Changelog since 4.60.0 released to PyPI on 8-May-2022 Changelog since 4.60.0 released to PyPI on 8-May-2022
@ -434,7 +434,8 @@ _change_log = """
Added check for None and COLOR_SYSTEM_DEFAULT before any colors being set in Input.update Added check for None and COLOR_SYSTEM_DEFAULT before any colors being set in Input.update
4.61.0.182 4.61.0.182
Only enable the Mac alpha channel 0.99 patch when tkinter version is 8.6.12. Have learned this is not needed for any other tkinter version Only enable the Mac alpha channel 0.99 patch when tkinter version is 8.6.12. Have learned this is not needed for any other tkinter version
4.61.0.183
Show Critical upgrade service messages. Removed the extra upgrade from github button from tab.
""" """
__version__ = version.split()[0] # For PEP 396 and PEP 345 __version__ = version.split()[0] # For PEP 396 and PEP 345
@ -458,7 +459,7 @@ port = 'PySimpleGUI'
""" """
Copyright 2018, 2019, 2020, 2021, 2022 PySimpleGUI(tm) Copyright 2018, 2019, 2020, 2021, 2022, 2023 PySimpleGUI(tm)
Before getting into the details, let's talk about the high level goals of the PySimpleGUI project. Before getting into the details, let's talk about the high level goals of the PySimpleGUI project.
@ -24964,7 +24965,8 @@ def __show_previous_upgrade_information():
recommended_version = pysimplegui_user_settings.get('-upgrade recommendation-', '') recommended_version = pysimplegui_user_settings.get('-upgrade recommendation-', '')
severity_level = pysimplegui_user_settings.get('-severity level-', '') severity_level = pysimplegui_user_settings.get('-severity level-', '')
# message2 = r'https://www.PySimpleGUI.org' if severity_level != 'Critical':
return
layout = [[Image(EMOJI_BASE64_HAPPY_THUMBS_UP), T('An upgrade is available & recommended', font='_ 14')], layout = [[Image(EMOJI_BASE64_HAPPY_THUMBS_UP), T('An upgrade is available & recommended', font='_ 14')],
[T('It is recommended you upgrade to version {}'.format(recommended_version))], [T('It is recommended you upgrade to version {}'.format(recommended_version))],
@ -25075,7 +25077,7 @@ def __perform_upgrade_check_thread():
def __perform_upgrade_check(): def __perform_upgrade_check():
# For now, do not show data returned. Still testing and do not want to "SPAM" users with any popups # For now, do not show data returned. Still testing and do not want to "SPAM" users with any popups
# __show_previous_upgrade_information() __show_previous_upgrade_information()
threading.Thread(target=lambda: __perform_upgrade_check_thread(), daemon=True).start() threading.Thread(target=lambda: __perform_upgrade_check_thread(), daemon=True).start()
@ -26521,7 +26523,7 @@ def _create_main_window():
[T(pysimplegui_user_settings.get('-upgrade message 1-',''))], [T(pysimplegui_user_settings.get('-upgrade message 1-',''))],
[T(pysimplegui_user_settings.get('-upgrade message 2-',''))], [T(pysimplegui_user_settings.get('-upgrade message 2-',''))],
[Checkbox('Show Only Critical Messages', default=pysimplegui_user_settings.get('-upgrade show only critical-', False), key='-UPGRADE SHOW ONLY CRITICAL-', enable_events=True)], [Checkbox('Show Only Critical Messages', default=pysimplegui_user_settings.get('-upgrade show only critical-', False), key='-UPGRADE SHOW ONLY CRITICAL-', enable_events=True)],
[Button('Show Notification Again'), B('Upgrade from GitHub', button_color='white on red', key='-UPGRADE FROM GITHUB-'), [Button('Show Notification Again'),
], ],
] ]
tab_upgrade = Tab('Upgrade\n',upgrade_recommendation_tab_layout, expand_x=True) tab_upgrade = Tab('Upgrade\n',upgrade_recommendation_tab_layout, expand_x=True)
@ -26682,7 +26684,6 @@ def main():
elif event in ('-EMOJI-HEARTS-', '-HEART-', '-PYTHON HEARTS-'): elif event in ('-EMOJI-HEARTS-', '-HEART-', '-PYTHON HEARTS-'):
popup_scrolled("Oh look! It's a Udemy discount coupon!", '9AF99B123C49D51EB547', popup_scrolled("Oh look! It's a Udemy discount coupon!", '9AF99B123C49D51EB547',
'A personal message from Mike -- thank you so very much for supporting PySimpleGUI!', title='Udemy Coupon', image=EMOJI_BASE64_MIKE, keep_on_top=True) 'A personal message from Mike -- thank you so very much for supporting PySimpleGUI!', title='Udemy Coupon', image=EMOJI_BASE64_MIKE, keep_on_top=True)
elif event == 'Themes': elif event == 'Themes':
search_string = popup_get_text('Enter a search term or leave blank for all themes', 'Show Available Themes', keep_on_top=True) search_string = popup_get_text('Enter a search term or leave blank for all themes', 'Show Available Themes', keep_on_top=True)
if search_string is not None: if search_string is not None:

16
docs/index.md
View File

@ -10134,6 +10134,22 @@ Test Harness and Settings Windows fit on small screens better
* Emergency Patch Release for Mac OS 12.3 and greater * Emergency Patch Release for Mac OS 12.3 and greater
* Fixed bug in Mac OS version check in yesterday's 4.60.2 release * Fixed bug in Mac OS version check in yesterday's 4.60.2 release
## 4.60.4 PySimpleGUI 10-Oct-2022
* Dot release to quickly fix the Trinket detection which stopped working recently
## 4.60.5 PySimpleGUI 21-May-2023
* Mac fixes
* Fix for Input Element not working in no-titlebar windows on MacOs 13.2.1
* Change to the 0.99 Alpha fix made in 4.60.2. Now only applies patch when running on 8.6.12, regardless of Mac Control Panel setting in PySimpleGUI Global Settings. Removes the need for users to disable when upgrading tkinter.
* Added Intelligent Upgrade Service - inform users when there are releases of PySimpleGUI that fix a problem that may be unique to their combination of components
* Change to GitHub Issue GUI
* Added checkbox for checking if running latest PyPI version
* Recommended using Demo Browser to search Demo Programs
* Use platform module to fill in the OS information field
* SDK Help Window - changed all readthedocs links to use the PySimpleGUI.org hostname for better portability
## Code Condition ## Code Condition
Make it run Make it run

19
readme_creator/markdown input files/4_Release_notes.md
View File

@ -2590,6 +2590,25 @@ Test Harness and Settings Windows fit on small screens better
* Emergency Patch Release for Mac OS 12.3 and greater * Emergency Patch Release for Mac OS 12.3 and greater
* Fixed bug in Mac OS version check in yesterday's 4.60.2 release * Fixed bug in Mac OS version check in yesterday's 4.60.2 release
## 4.60.4 PySimpleGUI 10-Oct-2022
* Dot release to quickly fix the Trinket detection which stopped working recently
## 4.60.5 PySimpleGUI 21-May-2023
* Mac fixes
* Fix for Input Element not working in no-titlebar windows on MacOs 13.2.1
* Change to the 0.99 Alpha fix made in 4.60.2. Now only applies patch when running on 8.6.12, regardless of Mac Control Panel setting in PySimpleGUI Global Settings. Removes the need for users to disable when upgrading tkinter.
* Added Intelligent Upgrade Service - inform users when there are releases of PySimpleGUI that fix a problem that may be unique to their combination of components
* Change to GitHub Issue GUI
* Added checkbox for checking if running latest PyPI version
* Recommended using Demo Browser to search Demo Programs
* Use platform module to fill in the OS information field
* SDK Help Window - changed all readthedocs links to use the PySimpleGUI.org hostname for better portability
## Code Condition ## Code Condition

16
readme_creator/output/index.md
View File

@ -10134,6 +10134,22 @@ Test Harness and Settings Windows fit on small screens better
* Emergency Patch Release for Mac OS 12.3 and greater * Emergency Patch Release for Mac OS 12.3 and greater
* Fixed bug in Mac OS version check in yesterday's 4.60.2 release * Fixed bug in Mac OS version check in yesterday's 4.60.2 release
## 4.60.4 PySimpleGUI 10-Oct-2022
* Dot release to quickly fix the Trinket detection which stopped working recently
## 4.60.5 PySimpleGUI 21-May-2023
* Mac fixes
* Fix for Input Element not working in no-titlebar windows on MacOs 13.2.1
* Change to the 0.99 Alpha fix made in 4.60.2. Now only applies patch when running on 8.6.12, regardless of Mac Control Panel setting in PySimpleGUI Global Settings. Removes the need for users to disable when upgrading tkinter.
* Added Intelligent Upgrade Service - inform users when there are releases of PySimpleGUI that fix a problem that may be unique to their combination of components
* Change to GitHub Issue GUI
* Added checkbox for checking if running latest PyPI version
* Recommended using Demo Browser to search Demo Programs
* Use platform module to fill in the OS information field
* SDK Help Window - changed all readthedocs links to use the PySimpleGUI.org hostname for better portability
## Code Condition ## Code Condition
Make it run Make it run