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

Merge pull request #5389 from PySimpleGUI/Dev-latest 

Dev latest
This commit is contained in:
PySimpleGUI 2022-04-20 10:09:50 -04:00 committed by GitHub
parent dfa19b2da3 85d664925a
commit eaef03f21b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
DemoPrograms/Demo_Tabs_Nested.py
View File

@ -1,7 +1,21 @@
#!/usr/bin/env python
import PySimpleGUI as sg import PySimpleGUI as sg
# Yet another example of TabGroup element """
Demo - Yet another example of TabGroup element
These are simple tabs and tab groups. This example simply shows groups within groups.
Be careful with tabs to make sure you don't re-use a layout. If you used a layout in one tab
you cannot use it again in another tab.
There was an error in this demo for quite some time that makes for a great example of this error.
See how tab_layout is in both Tab elements? That's a no-go and you'll get an error poup
tab_group = sg.TabGroup([[sg.Tab('Tab 7', tab_layout), sg.Tab('Tab 8', tab_layout)]])
Copyright 2022 PySimpleGUI
"""
sg.theme('GreenTan') sg.theme('GreenTan')
tab2_layout = [[sg.Text('This is inside tab 2')], tab2_layout = [[sg.Text('This is inside tab 2')],
@ -12,11 +26,12 @@ tab1_layout = [[sg.Text('Type something here and click button'), sg.Input(key='i
tab3_layout = [[sg.Text('This is inside tab 3')]] tab3_layout = [[sg.Text('This is inside tab 3')]]
tab4_layout = [[sg.Text('This is inside tab 4')]] tab4_layout = [[sg.Text('This is inside tab 4')]]
tab_layout = [[sg.Text('This is inside of a tab')]] tab_layout7 = [[sg.Text('This is inside of a tab')]]
tab_group = sg.TabGroup([[sg.Tab('Tab 7', tab_layout), sg.Tab('Tab 8', tab_layout)]]) tab_layout8 = [[sg.Text('This is inside of a tab')]]
tab_group = sg.TabGroup([[sg.Tab('Tab 7', tab_layout7), sg.Tab('Tab 8', tab_layout8)]])
tab5_layout = [[sg.Text('Watch this window')], tab5_layout = [[sg.Text('Watch this window')],
[sg.Output(size=(40,5))]] [sg.Output(size=(40,5))]] # generally better to use a Multline, but for super-simple examples, Output is OK
tab6_layout = [[sg.Text('This is inside tab 6')], tab6_layout = [[sg.Text('This is inside tab 6')],
[sg.Text('How about a second row of stuff in tab 6?'), tab_group]] [sg.Text('How about a second row of stuff in tab 6?'), tab_group]]

40
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.59.0.22 Released 5-Apr-2022" version = __version__ = "4.59.0.23 Released 5-Apr-2022"
_change_log = """ _change_log = """
Changelog since 4.59.0 released to PyPI on 5-Apr-2022 Changelog since 4.59.0 released to PyPI on 5-Apr-2022
@ -83,6 +83,10 @@ _change_log = """
"Ding-dong the Output's dead" - finally replaced the Output element with Multiline by subclassing Multiline "Ding-dong the Output's dead" - finally replaced the Output element with Multiline by subclassing Multiline
This solves a bunch of problems including duplication of funcationality using 2 different techniques. This solves a bunch of problems including duplication of funcationality using 2 different techniques.
Problem may be in backward compatibility if anyone is using internal Output element member variables, etc. Problem may be in backward compatibility if anyone is using internal Output element member variables, etc.
4.59.0.23
Changed the popup errors for Tabs to be popup error with traceback. Much nicer experience with this newer error popup
Removed Output Element from the packer function... you know it's really gone when it's not in there
To be clear, there still is an Output Element... it's just a Multiline in disguise now.
""" """
__version__ = version.split()[0] # For PEP 396 and PEP 345 __version__ = version.split()[0] # For PEP 396 and PEP 345
@ -7015,34 +7019,33 @@ class Tab(Element):
# ------------------------- Add the elements to a row ------------------------- # # ------------------------- Add the elements to a row ------------------------- #
for i, element in enumerate(args): # Loop through list of elements and add them to the row for i, element in enumerate(args): # Loop through list of elements and add them to the row
if type(element) == list: if type(element) == list:
PopupError('Error creating Tab layout', popup_error_with_traceback('Error creating Tab layout',
'Layout has a LIST instead of an ELEMENT', 'Layout has a LIST instead of an ELEMENT',
'This means you have a badly placed ]', 'This means you have a badly placed ]',
'The offensive list is:', 'The offensive list is:',
element, element,
'This list will be stripped from your layout', keep_on_top=True, image=_random_error_emoji() 'This list will be stripped from your layout')
)
continue continue
elif callable(element) and not isinstance(element, Element): elif callable(element) and not isinstance(element, Element):
PopupError('Error creating Tab layout', popup_error_with_traceback('Error creating Tab layout',
'Layout has a FUNCTION instead of an ELEMENT', 'Layout has a FUNCTION instead of an ELEMENT',
'This likely means you are missing () from your layout', 'This likely means you are missing () from your layout',
'The offensive list is:', 'The offensive list is:',
element, element,
'This item will be stripped from your layout', keep_on_top=True, image=_random_error_emoji()) 'This item will be stripped from your layout')
continue continue
if element.ParentContainer is not None: if element.ParentContainer is not None:
warnings.warn( 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. ***', '*** YOU ARE ATTEMPTING TO RESUSE AN ELEMENT IN YOUR LAYOUT! Once placed in a layout, an element cannot be used in another layout. ***',
UserWarning) UserWarning)
PopupError('Error creating Tab layout', popup_error_with_traceback('Error creating Tab 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',
'The offensive Element = ', 'The offensive Element = ',
element, element,
'and has a key = ', element.Key, 'and has a key = ', element.Key,
'This item will be stripped from your layout', 'This item will be stripped from your layout',
'Hint - try printing your layout and matching the IDs "print(layout)"', keep_on_top=True, image=_random_error_emoji()) 'Hint - try printing your layout and matching the IDs "print(layout)"')
continue continue
element.Position = (CurrentRowNumber, i) element.Position = (CurrentRowNumber, i)
element.ParentContainer = self element.ParentContainer = self
@ -10147,8 +10150,7 @@ class Window:
if self.TKrootDestroyed: if self.TKrootDestroyed:
self.read_closed_window_count += 1 self.read_closed_window_count += 1
if self.read_closed_window_count > 100: if self.read_closed_window_count > 100:
popup_error('You have tried 100 times to read a closed window.', 'You need to add a check for event == WIN_CLOSED', popup_error_with_traceback('Trying to read a closed window', 'You have tried 100 times to read a closed window.', 'You need to add a check for event == WIN_CLOSED',)
title='Trying to read a closed window')
return None, None return None, None
if not self.Shown: if not self.Shown:
self._Show() self._Show()
@ -15764,24 +15766,6 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
if theme_input_text_color() not in (COLOR_SYSTEM_DEFAULT, None): if theme_input_text_color() not in (COLOR_SYSTEM_DEFAULT, None):
element.Widget.config(insertbackground=theme_input_text_color()) element.Widget.config(insertbackground=theme_input_text_color())
_add_right_click_menu_and_grab(element) _add_right_click_menu_and_grab(element)
# ------------------------- OUTPUT placement element ------------------------- #
elif element_type == ELEM_TYPE_OUTPUT:
element = element # type: Output
width, height = element_size
element._TKOut = element.Widget = TKOutput(tk_row_frame, width=width, height=height, bd=border_depth,
background_color=element.BackgroundColor,
text_color=text_color, font=font,
pad=elementpad, echo_stdout_stderr=element.echo_stdout_stderr)
element._TKOut.output.configure(takefocus=0) # make it so that Output does not get focus
expand, fill, row_should_expand, row_fill_direction = _add_expansion(element, row_should_expand, row_fill_direction)
element._TKOut.pack(side=tk.LEFT, expand=expand, fill=fill)
if element.visible is False:
element._pack_forget_save_settings(alternate_widget=element._TKOut.frame)
# element._TKOut.frame.pack_forget()
if element.Tooltip is not None:
element.TooltipObject = ToolTip(element._TKOut, text=element.Tooltip, timeout=DEFAULT_TOOLTIP_TIME)
_add_right_click_menu_and_grab(element)
# row_should_expand = True
# ------------------------- IMAGE placement element ------------------------- # # ------------------------- IMAGE placement element ------------------------- #
elif element_type == ELEM_TYPE_IMAGE: elif element_type == ELEM_TYPE_IMAGE:
element = element # type: Image element = element # type: Image