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

Merge pull request #1443 from PySimpleGUI/Dev-latest 

Better duplicate key handling, added border_depth to multiline element
This commit is contained in:
MikeTheWatchGuy 2019-05-19 10:34:54 -04:00 committed by GitHub
parent 37b15eb9a0 e670157f71
commit 9655700307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DemoPrograms/Demo_Threaded_Work.py
View File

@ -48,7 +48,7 @@ def long_function_wrapper(work_id, gui_queue):
# at this point, the thread exits # at this point, the thread exits
return return
############################# Begin GUI code ############################# ############################# Begin GUI code #############################
def the_gui(): def the_gui():
gui_queue = queue.Queue() # queue used to communicate between the gui and long-running code gui_queue = queue.Queue() # queue used to communicate between the gui and long-running code
@ -57,7 +57,8 @@ def the_gui():
[sg.Text('Click Go to start a long-running function call')], [sg.Text('Click Go to start a long-running function call')],
[sg.Text('', size=(25, 1), key='_OUTPUT_')], [sg.Text('', size=(25, 1), key='_OUTPUT_')],
[sg.Text('', size=(25, 1), key='_OUTPUT2_')], [sg.Text('', size=(25, 1), key='_OUTPUT2_')],
[sg.Button('Go'), sg.Button('Popup'), sg.Button('Exit')], ] [sg.Graph((10,10),(0,0),(10,10),background_color='black',key=i) for i in range(20)],
[sg.Button('Go'), sg.Button('Stop'), sg.Button('Popup'), sg.Button('Exit')], ]
window = sg.Window('Multithreaded Window').Layout(layout) window = sg.Window('Multithreaded Window').Layout(layout)
# --------------------- EVENT LOOP --------------------- # --------------------- EVENT LOOP ---------------------
@ -68,10 +69,14 @@ def the_gui():
break break
if event == 'Go': # clicking "Go" starts a long running work item by starting thread if event == 'Go': # clicking "Go" starts a long running work item by starting thread
window.Element('_OUTPUT_').Update('Starting long work %s'%work_id) window.Element('_OUTPUT_').Update('Starting long work %s'%work_id)
window.Element(work_id).Update(background_color='red')
# LOCATION 2 # LOCATION 2
# STARTING long run by starting a thread # STARTING long run by starting a thread
threading.Thread(target=long_function_wrapper, args=(work_id, gui_queue,), daemon=True).start() thread_id = threading.Thread(target=long_function_wrapper, args=(work_id, gui_queue,), daemon=True)
work_id += 1 thread_id.start()
work_id = work_id+1 if work_id < 19 else 0
elif event == 'Stop':
thread_id.exit
# --------------- Read next message coming in from threads --------------- # --------------- Read next message coming in from threads ---------------
try: try:
message = gui_queue.get_nowait() # see if something has been posted to Queue message = gui_queue.get_nowait() # see if something has been posted to Queue
@ -83,8 +88,10 @@ def the_gui():
# LOCATION 3 # LOCATION 3
# this is the place you would execute code at ENDING of long running task # this is the place you would execute code at ENDING of long running task
# You can check the completed_work_id variable to see exactly which long-running function completed # You can check the completed_work_id variable to see exactly which long-running function completed
completed_work_id = message[:message.index(' :::')] completed_work_id = int(message[:message.index(' :::')])
window.Element('_OUTPUT2_').Update('Complete Work ID "{}"'.format(completed_work_id)) window.Element('_OUTPUT2_').Update('Complete Work ID "{}"'.format(completed_work_id))
window.Element(completed_work_id).Update(background_color='green')
if event == 'Popup': if event == 'Popup':
sg.Popup('This is a popup showing that the GUI is running') sg.Popup('This is a popup showing that the GUI is running')
# if user exits the window, then close the window and exit the GUI func # if user exits the window, then close the window and exit the GUI func

30
PySimpleGUI.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
#!/usr/bin/python3
import sys import sys
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
import tkinter as tk import tkinter as tk
@ -1087,8 +1088,7 @@ class Spin(Element):
# Multiline # # Multiline #
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
class Multiline(Element): class Multiline(Element):
def __init__(self, default_text='', enter_submits=False, disabled=False, autoscroll=False, size=(None, None), def __init__(self, default_text='', enter_submits=False, disabled=False, autoscroll=False, border_width=None, size=(None, None), auto_size_text=None, background_color=None, text_color=None, change_submits=False, enable_events=False,do_not_clear=True, key=None, focus=False, font=None, pad=None, tooltip=None, right_click_menu=None, visible=True):
auto_size_text=None, background_color=None, text_color=None, change_submits=False, enable_events=False,do_not_clear=True, key=None, focus=False, font=None, pad=None, tooltip=None, right_click_menu=None, visible=True):
''' '''
Multiline Multiline
:param default_text: :param default_text:
@ -1121,6 +1121,7 @@ class Multiline(Element):
self.Disabled = disabled self.Disabled = disabled
self.ChangeSubmits = change_submits or enable_events self.ChangeSubmits = change_submits or enable_events
self.RightClickMenu = right_click_menu self.RightClickMenu = right_click_menu
self.BorderWidth = border_width if border_width is not None else DEFAULT_BORDER_WIDTH
super().__init__(ELEM_TYPE_INPUT_MULTILINE, size=size, auto_size_text=auto_size_text, background_color=bg, super().__init__(ELEM_TYPE_INPUT_MULTILINE, size=size, auto_size_text=auto_size_text, background_color=bg,
text_color=fg, key=key, pad=pad, tooltip=tooltip, font=font or DEFAULT_FONT, visible=visible) text_color=fg, key=key, pad=pad, tooltip=tooltip, font=font or DEFAULT_FONT, visible=visible)
@ -3538,7 +3539,6 @@ class Window:
hidden_master_root = None hidden_master_root = None
animated_popup_dict = {} animated_popup_dict = {}
container_element_counter = 0 # used to get a number of Container Elements (Frame, Column, Tab) container_element_counter = 0 # used to get a number of Container Elements (Frame, Column, Tab)
def __init__(self, title, layout=None, default_element_size=DEFAULT_ELEMENT_SIZE, default_button_element_size=(None, None), def __init__(self, title, layout=None, default_element_size=DEFAULT_ELEMENT_SIZE, default_button_element_size=(None, None),
auto_size_text=None, auto_size_buttons=None, location=(None, None), size=(None, None), element_padding=None, margins=(None, None), button_color=None, font=None, auto_size_text=None, auto_size_buttons=None, location=(None, None), size=(None, None), element_padding=None, margins=(None, None), button_color=None, font=None,
progress_bar_color=(None, None), background_color=None, border_depth=None, auto_close=False, progress_bar_color=(None, None), background_color=None, border_depth=None, auto_close=False,
@ -3633,7 +3633,7 @@ class Window:
self.ContainerElemementNumber = Window.GetAContainerNumber() self.ContainerElemementNumber = Window.GetAContainerNumber()
self.AllKeysDict = {} self.AllKeysDict = {}
self.TransparentColor = transparent_color self.TransparentColor = transparent_color
self.UniqueKeyCounter = 0
if layout is not None: if layout is not None:
self.Layout(layout) self.Layout(layout)
@ -3931,6 +3931,8 @@ class Window:
return self return self
def FindElement(self, key, silent_on_error=False): def FindElement(self, key, silent_on_error=False):
# print(f'In find elem key={key}', self.AllKeysDict)
try: try:
element = self.AllKeysDict[key] element = self.AllKeysDict[key]
except KeyError: except KeyError:
@ -3985,7 +3987,10 @@ class Window:
top_window.DictionaryKeyCounter += 1 top_window.DictionaryKeyCounter += 1
if element.Key is not None: if element.Key is not None:
if element.Key in key_dict.keys(): if element.Key in key_dict.keys():
print('*** Duplicate key found in your layout {} ***'.format(element.Key)) print('*** Duplicate key found in your layout {} ***'.format(element.Key)) if element.Type != ELEM_TYPE_BUTTON else None
element.Key = element.Key + str(self.UniqueKeyCounter)
self.UniqueKeyCounter += 1
print('*** Replaced new key with {} ***'.format(element.Key)) if element.Type != ELEM_TYPE_BUTTON else None
key_dict[element.Key] = element key_dict[element.Key] = element
return key_dict return key_dict
@ -5293,8 +5298,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
justification = DEFAULT_TEXT_JUSTIFICATION justification = DEFAULT_TEXT_JUSTIFICATION
justify = tk.LEFT if justification == 'left' else tk.CENTER if justification == 'center' else tk.RIGHT justify = tk.LEFT if justification == 'left' else tk.CENTER if justification == 'center' else tk.RIGHT
# anchor = tk.NW if justification == 'left' else tk.N if justification == 'center' else tk.NE # anchor = tk.NW if justification == 'left' else tk.N if justification == 'center' else tk.NE
element.TKEntry = element.Widget = tk.Entry(tk_row_frame, width=element_size[0], textvariable=element.TKStringVar, element.TKEntry = element.Widget = tk.Entry(tk_row_frame, width=element_size[0], textvariable=element.TKStringVar, bd=border_depth, font=font, show=show, justify=justify)
bd=border_depth, font=font, show=show, justify=justify)
if element.ChangeSubmits: if element.ChangeSubmits:
element.TKEntry.bind('<Key>', element.KeyboardHandler) element.TKEntry.bind('<Key>', element.KeyboardHandler)
element.TKEntry.bind('<Return>', element.ReturnKeyHandler) element.TKEntry.bind('<Return>', element.ReturnKeyHandler)
@ -5466,8 +5470,8 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
element = element # type: Multiline element = element # type: Multiline
default_text = element.DefaultText default_text = element.DefaultText
width, height = element_size width, height = element_size
element.TKText = element.Widget = tk.scrolledtext.ScrolledText(tk_row_frame, width=width, height=height, wrap='word', border_depth = element.BorderWidth
bd=border_depth, font=font, relief=tk.FLAT) element.TKText = element.Widget = tk.scrolledtext.ScrolledText(tk_row_frame, width=width, height=height, wrap='word', bd=border_depth, font=font, relief=RELIEF_SUNKEN)
element.TKText.insert(1.0, default_text) # set the default text element.TKText.insert(1.0, default_text) # set the default text
if element.BackgroundColor is not None and element.BackgroundColor != COLOR_SYSTEM_DEFAULT: if element.BackgroundColor is not None and element.BackgroundColor != COLOR_SYSTEM_DEFAULT:
element.TKText.configure(background=element.BackgroundColor) element.TKText.configure(background=element.BackgroundColor)
@ -7837,6 +7841,7 @@ def main():
# background_color='black', # background_color='black',
right_click_menu=['&Right', ['Right', '!&Click', '&Menu', 'E&xit', 'Properties']], right_click_menu=['&Right', ['Right', '!&Click', '&Menu', 'E&xit', 'Properties']],
# transparent_color= '#9FB8AD', # transparent_color= '#9FB8AD',
resizable=False,
).Finalize() ).Finalize()
graph_elem.DrawCircle((200, 200), 50, 'blue') graph_elem.DrawCircle((200, 200), 50, 'blue')
i = 0 i = 0
@ -7857,12 +7862,9 @@ def main():
window.Element('_IMAGE_').UpdateAnimation(DEFAULT_BASE64_LOADING_GIF, time_between_frames=50) window.Element('_IMAGE_').UpdateAnimation(DEFAULT_BASE64_LOADING_GIF, time_between_frames=50)
i += 1 i += 1
if event == 'Button': if event == 'Button':
print(window.AllKeysDict)
window.Element('_TEXT1_').SetTooltip('NEW TEXT') window.Element('_TEXT1_').SetTooltip('NEW TEXT')
window.SetTransparentColor( '#9FB8AD') # window.SetTransparentColor( '#9FB8AD')
# window.TKroot.wm_attributes("-transparent", '#9FB8AD') window.Maximize()
# window.TKroot.wm_attributes("-transparentcolor", '#9FB8AD')
# TimerStop() # TimerStop()
window.Close() window.Close()