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

Merge pull request #1578 from PySimpleGUI/Dev-latest 

Added __version__ (finally), Renamed Debugger class (will help a lot …
This commit is contained in:
MikeTheWatchGuy 2019-06-18 11:47:30 -04:00 committed by GitHub
parent 1a630a4125 eb01f803fb
commit 3bdb9e3a97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PySimpleGUI.py
View File

@ -1,4 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
__version__ = "4.0.0 Unreleased"
import sys import sys
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
@ -2009,7 +2011,7 @@ class Button(Element):
pass pass
elif self.BType == BUTTON_TYPE_SHOW_DEBUGGER: elif self.BType == BUTTON_TYPE_SHOW_DEBUGGER:
if self.ParentForm.DebuggerEnabled: if self.ParentForm.DebuggerEnabled:
Debugger.debugger._build_floating_window() _Debugger.debugger._build_floating_window()
# show_debugger_window() # show_debugger_window()
if should_submit_window: if should_submit_window:
@ -5347,7 +5349,7 @@ class Window:
:param event: :param event:
""" """
Debugger.debugger._build_main_debugger_window() _Debugger.debugger._build_main_debugger_window()
def _callback_popout_window_create_keystroke(self, event): def _callback_popout_window_create_keystroke(self, event):
""" """
@ -5355,7 +5357,7 @@ class Window:
:param event: :param event:
""" """
Debugger.debugger._build_floating_window() _Debugger.debugger._build_floating_window()
def EnableDebugger(self): def EnableDebugger(self):
""" """ """ """
@ -9738,6 +9740,8 @@ def PopupGetText(message, title=None, default_text='', password_char='', size=(N
return path return path
# --------------------------- PopupAnimated ---------------------------
def PopupAnimated(image_source, message=None, background_color=None, text_color=None, font=None, no_titlebar=True, def PopupAnimated(image_source, message=None, background_color=None, text_color=None, font=None, no_titlebar=True,
grab_anywhere=True, keep_on_top=True, location=(None, None), alpha_channel=None, grab_anywhere=True, keep_on_top=True, location=(None, None), alpha_channel=None,
time_between_frames=0, transparent_color=None): time_between_frames=0, transparent_color=None):
@ -9809,7 +9813,7 @@ MAX_LINES_PER_RESULT_MAIN = 3
POPOUT_WINDOW_FONT = 'Sans 8' POPOUT_WINDOW_FONT = 'Sans 8'
class Debugger(): class _Debugger():
""" """ """ """
debugger = None debugger = None
@ -10290,9 +10294,9 @@ def show_debugger_window(location=(None, None), *args):
:param *args: :param *args:
""" """
if Debugger.debugger is None: if _Debugger.debugger is None:
Debugger.debugger = Debugger() _Debugger.debugger = _Debugger()
debugger = Debugger.debugger debugger = _Debugger.debugger
frame = inspect.currentframe() frame = inspect.currentframe()
prev_frame = inspect.currentframe().f_back prev_frame = inspect.currentframe().f_back
# frame, *others = inspect.stack()[1] # frame, *others = inspect.stack()[1]
@ -10314,9 +10318,9 @@ def show_debugger_popout_window(location=(None, None), *args):
:param *args: :param *args:
""" """
if Debugger.debugger is None: if _Debugger.debugger is None:
Debugger.debugger = Debugger() _Debugger.debugger = _Debugger()
debugger = Debugger.debugger debugger = _Debugger.debugger
frame = inspect.currentframe() frame = inspect.currentframe()
prev_frame = inspect.currentframe().f_back prev_frame = inspect.currentframe().f_back
# frame = inspect.getframeinfo(prev_frame) # frame = inspect.getframeinfo(prev_frame)
@ -10334,9 +10338,9 @@ def show_debugger_popout_window(location=(None, None), *args):
def refresh_debugger(): def refresh_debugger():
""" """ """ """
if Debugger.debugger is None: if _Debugger.debugger is None:
Debugger.debugger = Debugger() _Debugger.debugger = _Debugger()
debugger = Debugger.debugger debugger = _Debugger.debugger
Window.read_call_from_debugger = True Window.read_call_from_debugger = True
frame = inspect.currentframe() frame = inspect.currentframe()
frame = inspect.currentframe().f_back frame = inspect.currentframe().f_back