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

Merge pull request #1864 from PySimpleGUI/Dev-latest 

Dev latest
This commit is contained in:
PySimpleGUI 2019-08-22 16:36:47 -04:00 committed by GitHub
parent dc1addf9b0 769ae81746
commit ea9aaf5c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
PySimpleGUI.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.3.0.2 Unreleased PEP8 SDK Version" version = __version__ = "4.2.11 UNreleased PEP8 SDK & Layout Control Version"
# 888888ba .d88888b oo dP .88888. dP dP dP # 888888ba .d88888b oo dP .88888. dP dP dP
@ -542,7 +542,6 @@ class Element():
self.Widget = None # Set when creating window. Has the main tkinter widget for element self.Widget = None # Set when creating window. Has the main tkinter widget for element
self.Tearoff = False self.Tearoff = False
self.ParentRowFrame = None # type tk.Frame self.ParentRowFrame = None # type tk.Frame
# self.CenterEverything = False # used for container frames
def _RightClickMenuCallback(self, event): def _RightClickMenuCallback(self, event):
""" """
@ -3501,7 +3500,6 @@ class TabGroup(Element):
self.BackgroundColor = background_color if background_color is not None else DEFAULT_BACKGROUND_COLOR self.BackgroundColor = background_color if background_color is not None else DEFAULT_BACKGROUND_COLOR
self.ChangeSubmits = change_submits or enable_events self.ChangeSubmits = change_submits or enable_events
self.TabLocation = tab_location self.TabLocation = tab_location
self.CenterEverything = False
self.ElementJustification = 'left' self.ElementJustification = 'left'
self.Layout(layout) self.Layout(layout)
@ -3853,7 +3851,7 @@ class Column(Element):
""" """
def __init__(self, layout, background_color=None, size=(None, None), pad=None, scrollable=False, def __init__(self, layout, background_color=None, size=(None, None), pad=None, scrollable=False,
vertical_scroll_only=False, right_click_menu=None, key=None, visible=True, element_justification='left'): vertical_scroll_only=False, right_click_menu=None, key=None, visible=True, justification='left', element_justification='left'):
""" """
:param layout: List[List[Element]] Layout that will be shown in the Column container :param layout: List[List[Element]] Layout that will be shown in the Column container
:param background_color: (str) color of background of entire Column :param background_color: (str) color of background of entire Column
@ -3884,7 +3882,7 @@ class Column(Element):
bg = background_color if background_color is not None else DEFAULT_BACKGROUND_COLOR bg = background_color if background_color is not None else DEFAULT_BACKGROUND_COLOR
self.ContainerElemementNumber = Window.GetAContainerNumber() self.ContainerElemementNumber = Window.GetAContainerNumber()
self.ElementJustification = element_justification self.ElementJustification = element_justification
self.Justification = justification
self.Layout(layout) self.Layout(layout)
super().__init__(ELEM_TYPE_COLUMN, background_color=bg, size=size, pad=pad, key=key, visible=visible) super().__init__(ELEM_TYPE_COLUMN, background_color=bg, size=size, pad=pad, key=key, visible=visible)
@ -6018,7 +6016,7 @@ class Window:
self.DebuggerEnabled = False self.DebuggerEnabled = False
def visibility_changed(self): def VisibilityChanged(self):
""" """
This is a completely dummy method that does nothing. It is here so that PySimpleGUIQt programs can make this This is a completely dummy method that does nothing. It is here so that PySimpleGUIQt programs can make this
call and then have that same source run on plain PySimpleGUI. call and then have that same source run on plain PySimpleGUI.
@ -7316,6 +7314,8 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
""" """ """ """
return tkinter.font.Font().measure('A') # single character width return tkinter.font.Font().measure('A') # single character width
print(f'Packing a form... justification = {form.ElementJustification}')
border_depth = toplevel_form.BorderDepth if toplevel_form.BorderDepth is not None else DEFAULT_BORDER_WIDTH border_depth = toplevel_form.BorderDepth if toplevel_form.BorderDepth is not None else DEFAULT_BORDER_WIDTH
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# **************** Use FlexForm to build the tkinter window ********** ----- # # **************** Use FlexForm to build the tkinter window ********** ----- #
@ -7330,6 +7330,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
# *********** Make TK Row ***********# # *********** Make TK Row ***********#
tk_row_frame = tk.Frame(containing_frame) tk_row_frame = tk.Frame(containing_frame)
row_should_expand = False row_should_expand = False
row_justify = ''
for col_num, element in enumerate(flex_row): for col_num, element in enumerate(flex_row):
element.ParentRowFrame = tk_row_frame element.ParentRowFrame = tk_row_frame
element.ParentForm = toplevel_form # save the button's parent form object element.ParentForm = toplevel_form # save the button's parent form object
@ -7362,7 +7363,6 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
# ------------------------- COLUMN element ------------------------- # # ------------------------- COLUMN element ------------------------- #
if element_type == ELEM_TYPE_COLUMN: if element_type == ELEM_TYPE_COLUMN:
element = element # type: Column element = element # type: Column
print(ObjToStringSingleObj(element))
if element.Scrollable: if element.Scrollable:
element.TKColFrame = element.Widget = TkScrollableFrame(tk_row_frame, element.TKColFrame = element.Widget = TkScrollableFrame(tk_row_frame,
element.VerticalScrollOnly) # do not use yet! not working element.VerticalScrollOnly) # do not use yet! not working
@ -7406,8 +7406,19 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
if not element.BackgroundColor in (None, COLOR_SYSTEM_DEFAULT): if not element.BackgroundColor in (None, COLOR_SYSTEM_DEFAULT):
element.TKColFrame.config(background=element.BackgroundColor, borderwidth=0, element.TKColFrame.config(background=element.BackgroundColor, borderwidth=0,
highlightthickness=0) highlightthickness=0)
if element.Justification.lower().startswith('c'):
element.TKColFrame.pack(side=tk.LEFT, padx=elementpad[0], pady=elementpad[1], expand=True, fill='both') anchor=tk.N
side=tk.TOP
elif element.Justification.lower().startswith('r'):
anchor=tk.NE
side = tk.RIGHT
else:
anchor=tk.NW
side = tk.LEFT
print(f'Column side, anchor = {side}, {anchor} element ={element.Key}')
row_justify = element.Justification
element.TKColFrame.pack(side=side, anchor=anchor, padx=elementpad[0], pady=elementpad[1], expand=True, fill='both')
# element.TKColFrame.pack(side=side, padx=elementpad[0], pady=elementpad[1], expand=True, fill='both')
if element.Visible is False: if element.Visible is False:
element.TKColFrame.pack_forget() element.TKColFrame.pack_forget()
# element.TKColFrame = element.TKColFrame # element.TKColFrame = element.TKColFrame
@ -8579,16 +8590,31 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
# done with row, pack the row of widgets # done with row, pack the row of widgets
# tk_row_frame.grid(row=row_num+2, sticky=tk.NW, padx=DEFAULT_MARGINS[0]) # tk_row_frame.grid(row=row_num+2, sticky=tk.NW, padx=DEFAULT_MARGINS[0])
# if form.CenterEverything: if row_justify.lower().startswith('c'):
# anchor = 'n'
# else:
# anchor = 'nw'
if form.ElementJustification.lower().startswith('c'):
anchor='n' anchor='n'
elif form.ElementJustification.lower().startswith('r'): side=tk.CENTER
elif row_justify.lower().startswith('r'):
print('Right justify this row')
anchor='ne' anchor='ne'
else: side = tk.RIGHT
elif row_justify.lower().startswith('l'):
anchor='nw' anchor='nw'
side = tk.LEFT
elif toplevel_form.ElementJustification.lower().startswith('c'):
print('Center justify the form')
anchor = 'n'
side = tk.TOP
elif toplevel_form.ElementJustification.lower().startswith('r'):
print('right justify the form')
anchor = 'ne'
side = tk.TOP
else:
print(f'Form justify = {form.ElementJustification}')
print('left justify the form')
anchor = 'nw'
side = tk.TOP
tk_row_frame.pack(side=tk.TOP, anchor=anchor, padx=toplevel_form.Margins[0], tk_row_frame.pack(side=tk.TOP, anchor=anchor, padx=toplevel_form.Margins[0],
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:
@ -11186,14 +11212,14 @@ def main():
[Frame('Multiple Choice Group', frame2, title_color='green'), [Frame('Multiple Choice Group', frame2, title_color='green'),
Frame('Binary Choice Group', frame3, title_color='purple', tooltip='Binary Choice'), Frame('Binary Choice Group', frame3, title_color='purple', tooltip='Binary Choice'),
Frame('Variable Choice Group', frame4, title_color='blue')], Frame('Variable Choice Group', frame4, title_color='blue')],
[Frame('Structured Data Group', frame5, title_color='red'), ], [Column([[Frame('Structured Data Group', frame5, title_color='red', element_justification='l')]]), ],
# [Frame('Graphing Group', frame6)], # [Frame('Graphing Group', frame6)],
[TabGroup([[tab1, tab2]],key='_TAB_GROUP_' )], [TabGroup([[tab1, tab2]],key='_TAB_GROUP_' )],
[ProgressBar(max_value=800, size=(60, 25), key='+PROGRESS+'), Button('Button'), B('Normal'), [ProgressBar(max_value=800, size=(60, 25), key='+PROGRESS+'), Button('Button'), B('Normal'),
Button('Exit', tooltip='Exit button')], Button('Exit', tooltip='Exit button')],
] ]
layout = [[Menu(menu_def, key='_MENU_')],[Column(layout1)]] layout = [[Menu(menu_def, key='_MENU_')]] + layout1
window = Window('Window Title', layout, window = Window('Window Title', layout,
font=('Helvetica', 13), font=('Helvetica', 13),
@ -11203,13 +11229,13 @@ def main():
resizable=True, resizable=True,
debugger_enabled=False, debugger_enabled=False,
keep_on_top=True, keep_on_top=True,
element_justification='c',
# icon=r'X:\VMWare Virtual Machines\SHARED FOLDER\kingb.ico' # icon=r'X:\VMWare Virtual Machines\SHARED FOLDER\kingb.ico'
).Finalize() )
graph_elem.DrawCircle((200, 200), 50, 'blue') # graph_elem.DrawCircle((200, 200), 50, 'blue')
i = 0 i = 0
while True: # Event Loop while True: # Event Loop
event, values = window.Read(timeout=1) event, values = window.Read(timeout=10)
if event != TIMEOUT_KEY: if event != TIMEOUT_KEY:
print(event, values) print(event, values)
if event is None or event == 'Exit': if event is None or event == 'Exit':