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

Removed the new right_justify_buttons from popup and replaced with button_justification

This commit is contained in:
PySimpleGUI 2022-09-16 15:15:25 -04:00
parent 961f7ba137
commit cd9b5e4b93
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.60.3.94 Unreleased" version = __version__ = "4.60.3.95 Unreleased"
_change_log = """ _change_log = """
Changelog since 4.60.0 released to PyPI on 8-May-2022 Changelog since 4.60.0 released to PyPI on 8-May-2022
@ -243,6 +243,9 @@ _change_log = """
the right side if set to True the right side if set to True
4.60.3.94 4.60.3.94
Added Element.save_element_screenshot_to_disk - uses the same PIL integration that the save window screenshot to disk uses but applied to a single element Added Element.save_element_screenshot_to_disk - uses the same PIL integration that the save window screenshot to disk uses but applied to a single element
4.60.3.95
Changed popup again - replaced right_justify_buttons with button_justification. Also removed the extra padding that was being added to the buttons. This
matches a changed made to popup_scrolled earlier
""" """
__version__ = version.split()[0] # For PEP 396 and PEP 345 __version__ = version.split()[0] # For PEP 396 and PEP 345
@ -20042,7 +20045,7 @@ def clipboard_get():
def popup(*args, title=None, button_color=None, background_color=None, text_color=None, button_type=POPUP_BUTTONS_OK, auto_close=False, def popup(*args, title=None, button_color=None, background_color=None, text_color=None, button_type=POPUP_BUTTONS_OK, auto_close=False,
auto_close_duration=None, custom_text=(None, None), non_blocking=False, icon=None, line_width=None, font=None, no_titlebar=False, grab_anywhere=False, auto_close_duration=None, custom_text=(None, None), non_blocking=False, icon=None, line_width=None, font=None, no_titlebar=False, grab_anywhere=False,
keep_on_top=None, location=(None, None), relative_location=(None, None), any_key_closes=False, image=None, modal=True, right_justify_buttons=False, drop_whitespace=True): keep_on_top=None, location=(None, None), relative_location=(None, None), any_key_closes=False, image=None, modal=True, button_justification=None, drop_whitespace=True):
""" """
Popup - Display a popup Window with as many parms as you wish to include. This is the GUI equivalent of the Popup - Display a popup Window with as many parms as you wish to include. This is the GUI equivalent of the
"print" statement. It's also great for "pausing" your program's flow until the user can read some error messages. "print" statement. It's also great for "pausing" your program's flow until the user can read some error messages.
@ -20095,8 +20098,8 @@ def popup(*args, title=None, button_color=None, background_color=None, text_colo
:type modal: bool :type modal: bool
:param right_justify_buttons: If True then the buttons will be "pushed" to the right side of the Window :param right_justify_buttons: If True then the buttons will be "pushed" to the right side of the Window
:type right_justify_buttons: bool :type right_justify_buttons: bool
:param drop_whitespace: Passed to the wraptext.fill method. If True (default) whitespace is stripped :param button_justification: Speficies if buttons should be left, right or centered. Default is left justified
:type drop_whitespace: bool :type button_justification: str
:return: Returns text of the button that was pressed. None will be returned if user closed window with X :return: Returns text of the button that was pressed. None will be returned if user closed window with X
:rtype: str | None :rtype: str | None
""" """
@ -20160,24 +20163,27 @@ def popup(*args, title=None, button_color=None, background_color=None, text_colo
size=(len(custom_text[0]), 1)), size=(len(custom_text[0]), 1)),
PopupButton(custom_text[1], button_color=button_color, size=(len(custom_text[1]), 1))]] PopupButton(custom_text[1], button_color=button_color, size=(len(custom_text[1]), 1))]]
elif button_type == POPUP_BUTTONS_YES_NO: elif button_type == POPUP_BUTTONS_YES_NO:
layout += [[PopupButton('Yes', button_color=button_color, focus=True, bind_return_key=True, pad=((20, 5), 3), layout += [[PopupButton('Yes', button_color=button_color, focus=True, bind_return_key=True,
size=(5, 1)), PopupButton('No', button_color=button_color, size=(5, 1))]] size=(5, 1)), PopupButton('No', button_color=button_color, size=(5, 1))]]
elif button_type == POPUP_BUTTONS_CANCELLED: elif button_type == POPUP_BUTTONS_CANCELLED:
layout += [[ layout += [[
PopupButton('Cancelled', button_color=button_color, focus=True, bind_return_key=True, pad=((20, 0), 3))]] PopupButton('Cancelled', button_color=button_color, focus=True, bind_return_key=True )]]
elif button_type == POPUP_BUTTONS_ERROR: elif button_type == POPUP_BUTTONS_ERROR:
layout += [[PopupButton('Error', size=(6, 1), button_color=button_color, focus=True, bind_return_key=True, layout += [[PopupButton('Error', size=(6, 1), button_color=button_color, focus=True, bind_return_key=True)]]
pad=((20, 0), 3))]]
elif button_type == POPUP_BUTTONS_OK_CANCEL: elif button_type == POPUP_BUTTONS_OK_CANCEL:
layout += [[PopupButton('OK', size=(6, 1), button_color=button_color, focus=True, bind_return_key=True), layout += [[PopupButton('OK', size=(6, 1), button_color=button_color, focus=True, bind_return_key=True),
PopupButton('Cancel', size=(6, 1), button_color=button_color)]] PopupButton('Cancel', size=(6, 1), button_color=button_color)]]
elif button_type == POPUP_BUTTONS_NO_BUTTONS: elif button_type == POPUP_BUTTONS_NO_BUTTONS:
pass pass
else: else:
layout += [[PopupButton('OK', size=(5, 1), button_color=button_color, focus=True, bind_return_key=True, layout += [[PopupButton('OK', size=(5, 1), button_color=button_color, focus=True, bind_return_key=True,)]]
pad=((20, 0), 3))]] if button_justification is not None:
if right_justify_buttons is True and button_type != POPUP_BUTTONS_NO_BUTTONS: justification = button_justification.lower()[0]
layout[-1] = [Push()] + layout[-1] if justification == 'r':
layout[-1] = [Push()] + layout[-1]
elif justification == 'c':
layout[-1] = [Push()] + layout[-1] + [Push()]
window = Window(_title, layout, auto_size_text=True, background_color=background_color, button_color=button_color, window = Window(_title, layout, auto_size_text=True, background_color=background_color, button_color=button_color,
auto_close=auto_close, auto_close_duration=auto_close_duration, icon=icon, font=font, auto_close=auto_close, auto_close_duration=auto_close_duration, icon=icon, font=font,
@ -20212,9 +20218,7 @@ def MsgBox(*args):
# ======================== Scrolled Text Box =====# # ======================== Scrolled Text Box =====#
# ===================================================# # ===================================================#
def popup_scrolled(*args, title=None, button_color=None, background_color=None, text_color=None, yes_no=False, no_buttons=False, button_justification='l', auto_close=False, auto_close_duration=None, def popup_scrolled(*args, title=None, button_color=None, background_color=None, text_color=None, yes_no=False, no_buttons=False, button_justification='l', auto_close=False, auto_close_duration=None, size=(None, None), location=(None, None), relative_location=(None, None), non_blocking=False, no_titlebar=False, grab_anywhere=False, keep_on_top=None, font=None, image=None, icon=None, modal=True, no_sizegrip=False):
size=(None, None), location=(None, None), relative_location=(None, None), non_blocking=False, no_titlebar=False, grab_anywhere=False, keep_on_top=None, font=None,
image=None, icon=None, modal=True, no_sizegrip=False):
""" """
Show a scrolled Popup window containing the user's text that was supplied. Use with as many items to print as you Show a scrolled Popup window containing the user's text that was supplied. Use with as many items to print as you
want, just like a print statement. want, just like a print statement.