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

Merge pull request #2138 from PySimpleGUI/Dev-latest 

Pre-release of release 4.5.0 - removed  experimental Mac buttons, fix…
This commit is contained in:
PySimpleGUI 2019-11-05 09:36:30 -05:00 committed by GitHub
parent 478a8d4a3d 460b4c95e2
commit 23ce3aea6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.5.0.27 Unreleased Mac Buttons. Element size get/set. Screen Size. hide/unhide row, Button rebinding, Element.expand, Experimental Finalize, Update parms added for Input, Frame, delete window when close, Slider.Update range parm" version = __version__ = "4.5.0.0.1 The ALMOST Released but still un-released version 04-Nov-2019"
# 888888ba .d88888b oo dP .88888. dP dP dP # 888888ba .d88888b oo dP .88888. dP dP dP
@ -213,10 +213,10 @@ NICE_BUTTON_COLORS = ((GREENS[3], TANS[0]),
(YELLOWS[0], BLUES[2])) (YELLOWS[0], BLUES[2]))
COLOR_SYSTEM_DEFAULT = '1234567890' # Colors should never be this long COLOR_SYSTEM_DEFAULT = '1234567890' # Colors should never be this long
# if sys.platform == 'darwin': if sys.platform == 'darwin':
# DEFAULT_BUTTON_COLOR = COLOR_SYSTEM_DEFAULT # Foreground, Background (None, None) == System Default DEFAULT_BUTTON_COLOR = COLOR_SYSTEM_DEFAULT # Foreground, Background (None, None) == System Default
# OFFICIAL_PYSIMPLEGUI_BUTTON_COLOR = COLOR_SYSTEM_DEFAULT # Colors should never be this long OFFICIAL_PYSIMPLEGUI_BUTTON_COLOR = COLOR_SYSTEM_DEFAULT # Colors should never be this long
# else: else:
DEFAULT_BUTTON_COLOR = ('white', BLUES[0]) # Foreground, Background (None, None) == System Default DEFAULT_BUTTON_COLOR = ('white', BLUES[0]) # Foreground, Background (None, None) == System Default
OFFICIAL_PYSIMPLEGUI_BUTTON_COLOR = ('white', BLUES[0]) # Colors should never be this long OFFICIAL_PYSIMPLEGUI_BUTTON_COLOR = ('white', BLUES[0]) # Colors should never be this long
@ -628,7 +628,6 @@ class Element():
:param event: :param event:
""" """
# print(f'In return handler. event = {event}')
MyForm = self.ParentForm MyForm = self.ParentForm
button_element = self._FindReturnKeyBoundButton(MyForm) button_element = self._FindReturnKeyBoundButton(MyForm)
if button_element is not None: if button_element is not None:
@ -2208,11 +2207,10 @@ class Button(Element):
self.Widget = self.TKButton = None # type: tk.Button self.Widget = self.TKButton = None # type: tk.Button
self.Target = target self.Target = target
self.ButtonText = str(button_text) self.ButtonText = str(button_text)
# if sys.platform == 'darwin' and button_color is not None: if sys.platform == 'darwin' and button_color is not None:
# print('Button *** WARNING - Button colors are not supported on the Mac ***') print('Button *** WARNING - Button colors are not supported on the Mac ***')
# self.ButtonColor = DEFAULT_BUTTON_COLOR self.ButtonColor = DEFAULT_BUTTON_COLOR
# else: else:
# self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR
self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR
self.ImageFilename = image_filename self.ImageFilename = image_filename
self.ImageData = image_data self.ImageData = image_data
@ -5463,34 +5461,34 @@ class Window:
def SetIcon(self, icon=None, pngbase64=None): def SetIcon(self, icon=None, pngbase64=None):
""" """
Sets the icon that is shown on the title bar and on the task bar. Can pass in: Sets the icon that is shown on the title bar and on the task bar. Can pass in:
* a filename which must be a .ICO icon file. * a filename which must be a .ICO icon file for windows
* a bytes object * a bytes object
* a BASE64 encoded file held in a variable * a BASE64 encoded file held in a variable
:param icon: (str) Filename or bytes object :param icon: (str) Filename or bytes object
:param pngbase64: (str) Base64 encoded GIF or PNG file :param pngbase64: (str) Base64 encoded GIF or PNG file
""" """
if type(icon) is bytes: if type(icon) is bytes or pngbase64 is not None:
wicon = tkinter.PhotoImage(data=icon) wicon = tkinter.PhotoImage(data=icon if icon is not None else pngbase64)
try:
self.TKroot.tk.call('wm', 'iconphoto', self.TKroot._w, wicon)
except:
wicon = tkinter.PhotoImage(data=DEFAULT_BASE64_ICON)
try: try:
self.TKroot.tk.call('wm', 'iconphoto', self.TKroot._w, wicon) self.TKroot.tk.call('wm', 'iconphoto', self.TKroot._w, wicon)
except: except:
pass pass
elif pngbase64 != None:
wicon = tkinter.PhotoImage(data=pngbase64)
try:
self.TKroot.tk.call('wm', 'iconphoto', self.TKroot._w, wicon)
except:
pass
else:
wicon = icon
self.WindowIcon = wicon self.WindowIcon = wicon
return
try: try:
# print(f'icon bitmap = {wicon}') self.TKroot.iconbitmap(icon)
self.TKroot.iconbitmap(wicon) wicon = icon
except:
try:
wicon = tkinter.PhotoImage(file=icon)
self.TKroot.tk.call('wm', 'iconphoto', self.TKroot._w, wicon)
except: except:
# if can't set trying any other ways, just default to the built-in icon
try: try:
wicon = tkinter.PhotoImage(data=DEFAULT_BASE64_ICON) wicon = tkinter.PhotoImage(data=DEFAULT_BASE64_ICON)
try: try:
@ -5499,6 +5497,8 @@ class Window:
pass pass
except: except:
pass pass
self.WindowIcon = wicon
def _GetElementAtLocation(self, location): def _GetElementAtLocation(self, location):
""" """
@ -7341,7 +7341,6 @@ def _BuildResultsForSubform(form, initialize_only, top_level_form):
value = element.MenuItemChosen value = element.MenuItemChosen
element.MenuItemChosen = None element.MenuItemChosen = None
elif element.Type == ELEM_TYPE_BUTTONMENU: elif element.Type == ELEM_TYPE_BUTTONMENU:
print(f'Building results. Menu item chosen = {element.MenuItemChosen}')
value = element.MenuItemChosen value = element.MenuItemChosen
element.MenuItemChosen = None element.MenuItemChosen = None
@ -7858,10 +7857,10 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
tkbutton.bind('<ButtonRelease-1>', element.ButtonReleaseCallBack) tkbutton.bind('<ButtonRelease-1>', element.ButtonReleaseCallBack)
tkbutton.bind('<ButtonPress-1>', element.ButtonPressCallBack) tkbutton.bind('<ButtonPress-1>', element.ButtonPressCallBack)
if bc != (None, None) and bc != COLOR_SYSTEM_DEFAULT and bc[1] != COLOR_SYSTEM_DEFAULT: if bc != (None, None) and bc != COLOR_SYSTEM_DEFAULT and bc[1] != COLOR_SYSTEM_DEFAULT:
if sys.platform.startswith('darwin'): # if sys.platform.startswith('darwin'):
print('*** USING MAC BUTTON COLORS ****', bc) # print('*** USING MAC BUTTON COLORS ****', bc)
tkbutton.config(foreground=bc[0], highlightbackground=bc[1],background=bc[1], activebackground=bc[1], highlightcolor=bc[1], activeforeground=bc[1], highlightthickness=-10, bd=0, relief='solid') # tkbutton.config(foreground=bc[0], highlightbackground=bc[1],background=bc[1], activebackground=bc[1], highlightcolor=bc[1], activeforeground=bc[1], highlightthickness=-10, bd=0, relief='solid')
else: # else:
tkbutton.config(foreground=bc[0], background=bc[1], activebackground=bc[1]) tkbutton.config(foreground=bc[0], background=bc[1], activebackground=bc[1])
elif bc[1] == COLOR_SYSTEM_DEFAULT: elif bc[1] == COLOR_SYSTEM_DEFAULT:
tkbutton.config(foreground=bc[0]) tkbutton.config(foreground=bc[0])
@ -9414,6 +9413,7 @@ class DebugWin():
def Close(self): def Close(self):
""" """ """ """
self.window.Close() self.window.Close()
del self.window
self.window = None self.window = None
@ -9980,6 +9980,8 @@ def ChangeLookAndFeel(index, force=False):
There are 13 different color settings that are changed at one time using a single call to ChangeLookAndFeel There are 13 different color settings that are changed at one time using a single call to ChangeLookAndFeel
The look and feel table itself has these indexe into the dictionary LOOK_AND_FEEL_TABLE The look and feel table itself has these indexe into the dictionary LOOK_AND_FEEL_TABLE
SystemDefault SystemDefault
Material1
Material2
Reddit Reddit
Topanga Topanga
GreenTan GreenTan
@ -11581,7 +11583,6 @@ def main():
] ]
layout = [[Menu(menu_def, key='_MENU_')]] + layout1 layout = [[Menu(menu_def, key='_MENU_')]] + layout1
window = Window('Window Title', layout, window = Window('Window Title', layout,
font=('Helvetica', 13), font=('Helvetica', 13),
# background_color='black', # background_color='black',
@ -11590,8 +11591,8 @@ def main():
resizable=True, resizable=True,
keep_on_top=True, keep_on_top=True,
element_justification='left', element_justification='left',
metadata='My window metadata' metadata='My window metadata',
# icon=r'X:\VMWare Virtual Machines\SHARED FOLDER\kingb.ico' # icon=PSG_DEBUGGER_LOGO
) )
# graph_elem.DrawCircle((200, 200), 50, 'blue') # graph_elem.DrawCircle((200, 200), 50, 'blue')
i = 0 i = 0
@ -11621,6 +11622,8 @@ def main():
show_debugger_popout_window() show_debugger_popout_window()
elif event == 'Launch Debugger': elif event == 'Launch Debugger':
show_debugger_window() show_debugger_window()
elif event == 'About...':
popup('About this program...')
window.Close() window.Close()