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

Release 1.16.0

This commit is contained in:
MikeTheWatchGuy 2018-11-26 08:51:12 -05:00
parent ebb4d20784
commit 4fd7e7a7a4
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PySimpleGUI27.py
View File

@ -50,7 +50,7 @@ def TimerStop():
g_time_end = time.time() g_time_end = time.time()
g_time_delta = g_time_end - g_time_start g_time_delta = g_time_end - g_time_start
print(g_time_delta) print(int(g_time_delta*1000))
""" """
@ -2221,12 +2221,13 @@ class TkScrollableFrame(tk.Frame):
class Column(Element): class Column(Element):
def __init__(self, layout, background_color=None, size=(None, None), pad=None, scrollable=False, vertical_scroll_only=False, key=None): def __init__(self, layout, background_color=None, size=(None, None), pad=None, scrollable=False, vertical_scroll_only=False, key=None):
''' '''
Column Element Container for elements that are stacked into rows
:param layout: :param layout:
:param background_color: :param background_color:
:param size: :param size:
:param pad: :param pad:
:param scrollable: :param scrollable:
:param vertical_scroll_only:
:param key: :param key:
''' '''
self.UseDictionary = False self.UseDictionary = False
@ -2239,10 +2240,6 @@ class Column(Element):
self.TKFrame = None self.TKFrame = None
self.Scrollable = scrollable self.Scrollable = scrollable
self.VerticalScrollOnly = vertical_scroll_only self.VerticalScrollOnly = vertical_scroll_only
# self.ImageFilename = image_filename
# self.ImageData = image_data
# self.ImageSize = image_size
# self.ImageSubsample = image_subsample
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.Layout(layout) self.Layout(layout)
@ -2803,6 +2800,7 @@ class ErrorElement(Element):
def __del__(self): def __del__(self):
super().__del__() super().__del__()
Stretch = ErrorElement
# ------------------------------------------------------------------------- # # ------------------------------------------------------------------------- #
# Window CLASS # # Window CLASS #
@ -2816,13 +2814,14 @@ class Window(object):
alpha_channel=1, return_keyboard_events=False, use_default_focus=True, text_justification=None, alpha_channel=1, return_keyboard_events=False, use_default_focus=True, text_justification=None,
no_titlebar=False, grab_anywhere=False, keep_on_top=False, resizable=False, disable_close=False): no_titlebar=False, grab_anywhere=False, keep_on_top=False, resizable=False, disable_close=False):
''' '''
Window Main window object where Elements will be laid out in rows
:param title: :param title:
:param default_element_size: :param default_element_size:
:param default_button_element_size: :param default_button_element_size:
:param auto_size_text: :param auto_size_text:
:param auto_size_buttons: :param auto_size_buttons:
:param location: :param location:
:param size:
:param button_color: :param button_color:
:param font: :param font:
:param progress_bar_color: :param progress_bar_color:
@ -2832,6 +2831,7 @@ class Window(object):
:param auto_close_duration: :param auto_close_duration:
:param icon: :param icon:
:param force_toplevel: :param force_toplevel:
:param alpha_channel:
:param return_keyboard_events: :param return_keyboard_events:
:param use_default_focus: :param use_default_focus:
:param text_justification: :param text_justification:
@ -2839,6 +2839,7 @@ class Window(object):
:param grab_anywhere: :param grab_anywhere:
:param keep_on_top: :param keep_on_top:
:param resizable: :param resizable:
:param disable_close:
''' '''
self.AutoSizeText = auto_size_text if auto_size_text is not None else DEFAULT_AUTOSIZE_TEXT self.AutoSizeText = auto_size_text if auto_size_text is not None else DEFAULT_AUTOSIZE_TEXT
self.AutoSizeButtons = auto_size_buttons if auto_size_buttons is not None else DEFAULT_AUTOSIZE_BUTTONS self.AutoSizeButtons = auto_size_buttons if auto_size_buttons is not None else DEFAULT_AUTOSIZE_BUTTONS
@ -3152,6 +3153,9 @@ class Window(object):
return ErrorElement(key=key) return ErrorElement(key=key)
return element return element
Element = FindElement # Shortcut function
def FindElementWithFocus(self): def FindElementWithFocus(self):
element = _FindElementWithFocusInSubForm(self) element = _FindElementWithFocusInSubForm(self)
return element return element
@ -5416,10 +5420,12 @@ def PopupScrolled(*args, **_3to2kwargs):
if yes_no: if yes_no:
form.AddRow(Text('', size=(pad, 1), auto_size_text=False), Yes(), No()) form.AddRow(Text('', size=(pad, 1), auto_size_text=False), Yes(), No())
button, values = form.Read() button, values = form.Read()
form.Close()
return button return button
else: else:
form.AddRow(Text('', size=(pad, 1), auto_size_text=False), Button('OK', size=(5, 1), button_color=button_color)) form.AddRow(Text('', size=(pad, 1), auto_size_text=False), Button('OK', size=(5, 1), button_color=button_color))
button, values = form.Read() button, values = form.Read()
form.Close()
return button return button