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

Merge pull request #2474 from PySimpleGUI/Dev-latest 

Changed warning about layout reuse to indicate Element Reuse instead.…
This commit is contained in:
PySimpleGUI 2020-01-04 23:23:25 -05:00 committed by GitHub
parent 479d588b0f 370c01e783
commit 9798d8ea5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PySimpleGUI.py
View File

@ -2289,6 +2289,13 @@ class Output(Element):
self._TKOut.frame.pack(expand=True, fill=fill) self._TKOut.frame.pack(expand=True, fill=fill)
self.ParentRowFrame.pack(expand=True, fill=fill) self.ParentRowFrame.pack(expand=True, fill=fill)
def __del__(self):
"""
Delete this element. Normally Elements do not have their delete method specified, but for this one
it's important that the underlying TKOut object get deleted so that the stdout will get restored properly
"""
self._TKOut.__del__()
set_focus = Element.SetFocus set_focus = Element.SetFocus
set_tooltip = Element.SetTooltip set_tooltip = Element.SetTooltip
tk_out = TKOut tk_out = TKOut
@ -5589,7 +5596,7 @@ class Window:
'This item will be stripped from your layout') 'This item will be stripped from your layout')
continue continue
if element.ParentContainer is not None: if element.ParentContainer is not None:
warnings.warn('*** YOU ARE ATTEMPTING TO RESUSE A LAYOUT! You must not attempt this kind of re-use ***', UserWarning) warnings.warn('*** YOU ARE ATTEMPTING TO RESUSE AN ELEMENT IN YOUR LAYOUT! Once placed in a layout, an element cannot be used in another layout. ***', UserWarning)
PopupError('Error creating layout', PopupError('Error creating layout',
'The layout specified has already been used', 'The layout specified has already been used',
'You MUST start witha "clean", unused layout every time you create a window', 'You MUST start witha "clean", unused layout every time you create a window',
@ -9371,17 +9378,15 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
expand=row_should_expand, fill=tk.BOTH if row_should_expand else tk.NONE) expand=row_should_expand, fill=tk.BOTH if row_should_expand else tk.NONE)
if form.BackgroundColor is not None and form.BackgroundColor != COLOR_SYSTEM_DEFAULT: if form.BackgroundColor is not None and form.BackgroundColor != COLOR_SYSTEM_DEFAULT:
tk_row_frame.configure(background=form.BackgroundColor) tk_row_frame.configure(background=form.BackgroundColor)
toplevel_form.TKroot.configure(padx=toplevel_form.Margins[0], pady=toplevel_form.Margins[1])
return return
def ConvertFlexToTK(MyFlexForm): def ConvertFlexToTK(MyFlexForm):
""" """
:param MyFlexForm: :param MyFlexForm: (Window)
""" """
MyFlexForm # type: Window
master = MyFlexForm.TKroot master = MyFlexForm.TKroot
master.title(MyFlexForm.Title) master.title(MyFlexForm.Title)
InitializeResults(MyFlexForm) InitializeResults(MyFlexForm)
@ -9393,7 +9398,11 @@ def ConvertFlexToTK(MyFlexForm):
MyFlexForm.TKroot.wm_overrideredirect(True) MyFlexForm.TKroot.wm_overrideredirect(True)
except: except:
pass pass
PackFormIntoFrame(MyFlexForm, master, MyFlexForm) PackFormIntoFrame(MyFlexForm, master, MyFlexForm)
MyFlexForm.TKroot.configure(padx=MyFlexForm.Margins[0], pady=MyFlexForm.Margins[1])
# ....................................... DONE creating and laying out window ..........................# # ....................................... DONE creating and laying out window ..........................#
if MyFlexForm._Size != (None, None): if MyFlexForm._Size != (None, None):
master.geometry("%sx%s" % (MyFlexForm._Size[0], MyFlexForm._Size[1])) master.geometry("%sx%s" % (MyFlexForm._Size[0], MyFlexForm._Size[1]))
@ -13040,7 +13049,7 @@ def main():
event, values = window.Read(timeout=5) event, values = window.Read(timeout=5)
if event != TIMEOUT_KEY: if event != TIMEOUT_KEY:
print(event, values) print(event, values)
Print(event, text_color='green', background_color='white', end='') Print(event, text_color='white', background_color='red', end='')
Print(values) Print(values)
if event is None or event == 'Exit': if event is None or event == 'Exit':
break break