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

Merge pull request #1975 from PySimpleGUI/Dev-latest 

The text parm of the Text element is now OPTIONAL. The default is ''.
This commit is contained in:
PySimpleGUI 2019-09-16 16:01:35 -04:00 committed by GitHub
parent caeec0ccfe 97db1d9cd4
commit eba31e79e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PySimpleGUI.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.5.0.6 Unreleased Mac Buttons Justify fix" version = __version__ = "4.5.0.7 Unreleased Mac Buttons Justify fix"
# 888888ba .d88888b oo dP .88888. dP dP dP # 888888ba .d88888b oo dP .88888. dP dP dP
@ -1650,7 +1650,7 @@ class Text(Element):
""" """
Text - Display some text in the window. Usually this means a single line of text. However, the text can also be multiple lines. If multi-lined there are no scroll bars. Text - Display some text in the window. Usually this means a single line of text. However, the text can also be multiple lines. If multi-lined there are no scroll bars.
""" """
def __init__(self, text, size=(None, None), auto_size_text=None, click_submits=False, enable_events=False, def __init__(self, text='', size=(None, None), auto_size_text=None, click_submits=False, enable_events=False,
relief=None, font=None, text_color=None, background_color=None, justification=None, pad=None, key=None, relief=None, font=None, text_color=None, background_color=None, justification=None, pad=None, key=None,
right_click_menu=None, tooltip=None, visible=True, metadata=None): right_click_menu=None, tooltip=None, visible=True, metadata=None):
""" """

4
PySimpleGUIQt/PySimpleGUIQt.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "0.29.0.1 Unreleased" version = __version__ = "0.29.0.2 Unreleased"
import sys import sys
import types import types
@ -1092,7 +1092,7 @@ class MultilineOutput(Element):
# Text # # Text #
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
class Text(Element): class Text(Element):
def __init__(self, text, size=(None, None), auto_size_text=None, click_submits=None, enable_events=False, relief=None, font=None, text_color=None, background_color=None, justification=None, pad=None, margins=None, key=None, tooltip=None, visible=True, size_px=(None,None)): def __init__(self, text='', size=(None, None), auto_size_text=None, click_submits=None, enable_events=False, relief=None, font=None, text_color=None, background_color=None, justification=None, pad=None, margins=None, key=None, tooltip=None, visible=True, size_px=(None,None)):
''' '''
Text Element Text Element
:param text: :param text:

4
PySimpleGUIWeb/PySimpleGUIWeb.py
View File

@ -1,6 +1,6 @@
#usr/bin/python3 #usr/bin/python3
version = __version__ = "0.31.0.5 Unreleased" version = __version__ = "0.31.0.6 Unreleased"
import sys import sys
import datetime import datetime
@ -993,7 +993,7 @@ class MultilineOutput(Element):
# Text # # Text #
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
class Text(Element): class Text(Element):
def __init__(self, text, size=(None, None), auto_size_text=None, click_submits=None, enable_events=False, relief=None, border_width=None, font=None, text_color=None, background_color=None, justification=None, pad=None, margins=None, key=None, tooltip=None, visible=True, size_px=(None,None)): def __init__(self, text='', size=(None, None), auto_size_text=None, click_submits=None, enable_events=False, relief=None, border_width=None, font=None, text_color=None, background_color=None, justification=None, pad=None, margins=None, key=None, tooltip=None, visible=True, size_px=(None,None)):
""" """
Text Text
:param text: :param text:

4
PySimpleGUIWx/PySimpleGUIWx.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
from sphinx.ext.autosummary import autosummary_table from sphinx.ext.autosummary import autosummary_table
version = __version__ = "0.13.0.2 Unreleased" version = __version__ = "0.13.0.3 Unreleased"
import sys import sys
import wx import wx
@ -1093,7 +1093,7 @@ class MultilineOutput(Element):
# Text # # Text #
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
class Text(Element): class Text(Element):
def __init__(self, text, size=(None, None), auto_size_text=None, click_submits=None, enable_events=False, relief=None, border_width=None, font=None, text_color=None, background_color=None, justification=None, pad=None, margins=None, key=None, tooltip=None, visible=True, size_px=(None,None)): def __init__(self, text='', size=(None, None), auto_size_text=None, click_submits=None, enable_events=False, relief=None, border_width=None, font=None, text_color=None, background_color=None, justification=None, pad=None, margins=None, key=None, tooltip=None, visible=True, size_px=(None,None)):
""" """
Text Text
:param text: :param text: