diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md deleted file mode 100644 index 96f14162..00000000 --- a/.github/ISSUE_TEMPLATE/custom.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Custom issue template -about: Describe this issue template's purpose here. -title: '' -labels: '' -assignees: '' - ---- - -### Type of Issues (Enhancement, Error, Bug, Question) - -### Operating System - -### Python version - -### PySimpleGUI Port and Version - -### Code or partial code causing the problem diff --git a/.github/ISSUE_TEMPLATE/issue-form---must-fill-in-this-form-with-every-new-issue-submitted.md b/.github/ISSUE_TEMPLATE/issue-form---must-fill-in-this-form-with-every-new-issue-submitted.md new file mode 100644 index 00000000..65b5bfb5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue-form---must-fill-in-this-form-with-every-new-issue-submitted.md @@ -0,0 +1,35 @@ +--- +name: Issue Form - Must fill in this form with every new issue submitted +about: This form contains the information needed to help you solve your problem +title: "[ Enhancement/Bug/Question] My problem is..." +labels: '' +assignees: '' + +--- + +### Type of Issues (Enhancement, Error, Bug, Question) + +### Operating System + +### Python version + +### PySimpleGUI Port and Version + +### Your Experience Levels In Months or Years + +_________ Python programming experience +_________ Programming experience overall +_________ Have used another Python GUI Framework (tkiner, Qt, etc) previously (yes/no is fine)? + +### You have completed these steps: + +- [ ] Read instructions on how to file an Issue +- [ ] Searched through main docs http://www.PySimpleGUI.org for your problem +- [ ] Searched through the readme for your specific port if not PySimpleGUI (Qt, WX, Remi) +- [ ] Looked for Demo Programs that are similar to your goal http://www.PySimpleGUI.com +- [ ] Note that there are also Demo Programs under each port on GitHub +- [ ] Run your program outside of your debugger (from a command line) +- [ ] Searched through Issues (open and closed) to see if already reported + + +### Code or partial code causing the problem diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 00000000..20f25f0c --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -0,0 +1,16 @@ +## Pull Request Instructions + +**Pull requests are not currently accepted for for core code which are these files:** + +* PySimpleGUI.py +* PySimpleGUIQt.py +* PySimpleGUIWx.py +* PySimpleGUIWeb.py + +The bandwidth required to review and merge these changes simply isn't there. Because PySimpleGUI core files are a single file, +ALL submitted pull requests required a manual merge of the code. + +If you have code that you believe will fix a problem in the core code, post it in the Issue that discusses the problem. +This has worked well in the past as it enables the community to see the proposed changes. + +Pull Requests for the Demo Files are being accepted and are welcomed. diff --git a/Chess/readme.md b/Chess/readme.md index 1464783b..037f5100 100644 --- a/Chess/readme.md +++ b/Chess/readme.md @@ -1,5 +1,8 @@ # PySimpleGUI-Chess A Chess Game Playback Program +![image](https://user-images.githubusercontent.com/46163555/64135781-4c58a600-cdba-11e9-968d-60ddfb4c8952.png) + + ## Introduction This is the start of a front-end GUI for an AI engine that plays chess. It simply reads moves the a PGN file and steps through it showing each of the moves on the board. @@ -10,4 +13,4 @@ Locate where the pacakge was installed and run the programs from that folder. Y ## Home Page (GitHub) -[www.PySimpleGUI.com](www.PySimpleGUI.com) \ No newline at end of file +[www.PySimpleGUI.com](www.PySimpleGUI.com) diff --git a/DemoPrograms/Demo_PyGame_Integration.py b/DemoPrograms/Demo_PyGame_Integration.py index e9f6c5ba..2ad78c36 100644 --- a/DemoPrograms/Demo_PyGame_Integration.py +++ b/DemoPrograms/Demo_PyGame_Integration.py @@ -21,8 +21,7 @@ graph = window['-GRAPH-'] # -------------- Magic code to integrate PyGame with tkinter ------- embed = graph.TKCanvas os.environ['SDL_WINDOWID'] = str(embed.winfo_id()) -# change this to 'x11' to make it work on Linux -os.environ['SDL_VIDEODRIVER'] = 'windib' +os.environ['SDL_VIDEODRIVER'] = 'windib' # change this to 'x11' to make it work on Linux # ----------------------------- PyGame Code ----------------------------- diff --git a/HowDoI/PySimpleGUI-HowDoI.py b/HowDoI/PySimpleGUI-HowDoI.py index 8ae5fa79..7df8a04e 100644 --- a/HowDoI/PySimpleGUI-HowDoI.py +++ b/HowDoI/PySimpleGUI-HowDoI.py @@ -47,7 +47,7 @@ def HowDoI(): history_offset = 0 while True: (button, value) = window.Read() - if button is 'SEND': + if button == 'SEND': query = value['query'].rstrip() print(query) QueryHowDoI(query, value['Num Answers'], value['full text']) # send the string to HowDoI @@ -55,7 +55,7 @@ def HowDoI(): history_offset = len(command_history)-1 window.FindElement('query').Update('') # manually clear input because keyboard events blocks clear window.FindElement('history').Update('\n'.join(command_history[-3:])) - elif button is None or button is 'EXIT': # if exit button or closed using X + elif button in (None, 'EXIT'): # if exit button or closed using X break elif 'Up' in button and len(command_history): # scroll back in history command = command_history[history_offset] diff --git a/PySimpleGUIQt/Demo Programs/Qt_Demo_Desktop_Widget_Timer.py b/PySimpleGUIQt/Demo Programs/Qt_Demo_Desktop_Widget_Timer.py index 65d4bdc6..7f108c9c 100644 --- a/PySimpleGUIQt/Demo Programs/Qt_Demo_Desktop_Widget_Timer.py +++ b/PySimpleGUIQt/Demo Programs/Qt_Demo_Desktop_Widget_Timer.py @@ -14,7 +14,7 @@ import time of the timer that is displayed comes from the system timer, time.time(). This guarantees an accurate time value is displayed regardless of the accuracy of the PySimpleGUI timer tick. If this design were not used, then the time value displayed would slowly drift by the amount of time - it takes to execute the PySimpleGUI read and update calls (not good!) + it takes to execute the PySimpleGUI read and update calls (not good!) NOTE - you will get a warning message printed when you exit using exit button. It will look something like: invalid command name \"1616802625480StopMove\" @@ -48,9 +48,9 @@ while (True): if event == 'button': event = window.FindElement(event).GetText() # --------- Do Button Operations -------- - if event is None or event == 'Exit': # ALWAYS give a way out of program + if event in (None, 'Exit'): # ALWAYS give a way out of program break - if event is 'Reset': + if event == 'Reset': start_time = int(round(time.time() * 100)) current_time = 0 paused_time = start_time diff --git a/PySimpleGUIWeb/Demo Programs/Web_Timer.py b/PySimpleGUIWeb/Demo Programs/Web_Timer.py index 17c82450..b81203d7 100644 --- a/PySimpleGUIWeb/Demo Programs/Web_Timer.py +++ b/PySimpleGUIWeb/Demo Programs/Web_Timer.py @@ -30,9 +30,9 @@ while (True): if event == 'button': event = window.FindElement(event).GetText() # --------- Do Button Operations -------- - if event is None or event == 'Exit': # ALWAYS give a way out of program + if event in (None, 'Exit'): # ALWAYS give a way out of program break - if event is 'Reset': + if event == 'Reset': start_time = int(round(time.time() * 100)) current_time = 0 paused_time = start_time diff --git a/YoloObjectDetection/Readme.md b/YoloObjectDetection/Readme.md index dfd22829..24f19658 100644 --- a/YoloObjectDetection/Readme.md +++ b/YoloObjectDetection/Readme.md @@ -5,6 +5,13 @@ # PySimpleGUI openCV YOLO Deep Learning + +![SNAG-0360](https://user-images.githubusercontent.com/13696193/58116963-93d07300-7bcb-11e9-8402-142913710b82.jpg) + +![YOLO May 21](https://user-images.githubusercontent.com/13696193/58117189-017c9f00-7bcc-11e9-9569-c65775d15559.gif) + + + ## Running the Demos You will need to pip install openCV and PySimpleGUI diff --git a/exemaker/pysimplegui-exemaker/pysimplegui-exemaker.py b/exemaker/pysimplegui-exemaker/pysimplegui-exemaker.py index 0f6c5178..1b246c38 100644 --- a/exemaker/pysimplegui-exemaker/pysimplegui-exemaker.py +++ b/exemaker/pysimplegui-exemaker/pysimplegui-exemaker.py @@ -25,7 +25,7 @@ def Launcher(): # ---===--- Loop taking in user input --- # while True: (button, values) = window.Read() - if button is 'Quit' or button is None: + if button in ('Quit', None): break # exit button clicked source_file = values['_sourcefile_'] @@ -40,7 +40,7 @@ def Launcher(): file_to_remove = os.path.join(source_path, source_filename[:-3]+'.spec') command_line = 'pyinstaller -wF "{}" {} {} {} {}'.format(source_file, icon_option, workpath_option, dispath_option, specpath_option) - if button is 'Make EXE': + if button == 'Make EXE': out='' try: print(command_line) diff --git a/exemaker/readme.md b/exemaker/readme.md index 5bf9a2ce..89399bda 100644 --- a/exemaker/readme.md +++ b/exemaker/readme.md @@ -1,4 +1,4 @@ -# PySimpleGUI-HowDoI +# PySimpleGUI-exemaker ## Introduction This package contains a GUI front-end to PyInstaller. Use this tool to create EXE files from your python programs @@ -6,11 +6,9 @@ This package contains a GUI front-end to PyInstaller. Use this tool to create E ![snag-0086](https://user-images.githubusercontent.com/13696193/46968655-c2103200-d081-11e8-926f-d5f977e726f3.jpg) - - ## Installing -When you install PySimpleGUI-HowDoI, it will install the other components that it requires. To install, on windows, type this into a command prompt: +When you install PySimpleGUI-exemaker, it will install the other components that it requires. To install, on windows, type this into a command prompt: pip install pysimplegui-exemaker