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

Changed MsgBox to Popup, fix for when button target is key

This commit is contained in:
MikeTheWatchGuy 2018-09-20 10:03:17 -04:00
parent 5fbfed05f7
commit 91a3178c7b
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Demo_Compare_Files.py
View File

@ -5,16 +5,18 @@ sg.SetOptions(button_color=sg.COLOR_SYSTEM_DEFAULT)
def GetFilesToCompare(): def GetFilesToCompare():
with sg.FlexForm('File Compare') as form: with sg.FlexForm('File Compare') as form:
form_rows = [[sg.Text('Enter 2 files to comare')], form_rows = [[sg.Text('Enter 2 files to comare')],
[sg.Text('File 1', size=(15, 1)), sg.InputText(), sg.FileBrowse()], [sg.Text('File 1', size=(15, 1)), sg.InputText(key='file1'), sg.FileBrowse()],
[sg.Text('File 2', size=(15, 1)), sg.InputText(), sg.FileBrowse()], [sg.Text('File 2', size=(15, 1)), sg.InputText(key='file2'), sg.FileBrowse(target='file2')],
[sg.Submit(), sg.Cancel()]] [sg.Submit(), sg.Cancel()]]
button, values = form.LayoutAndRead(form_rows) button, values = form.LayoutAndRead(form_rows)
return button, values return button, values
def main(): def main():
button, (f1, f2) = GetFilesToCompare() button, values = GetFilesToCompare()
f1 = values['file1']
f2 = values['file2']
if any((button != 'Submit', f1 =='', f2 == '')): if any((button != 'Submit', f1 =='', f2 == '')):
sg.MsgBoxError('Operation cancelled') sg.PopupError('Operation cancelled')
exit(69) exit(69)
with open(f1, 'rb') as file1: with open(f1, 'rb') as file1:
@ -24,11 +26,11 @@ def main():
for i, x in enumerate(a): for i, x in enumerate(a):
if x != b[i]: if x != b[i]:
sg.MsgBox('Compare results for files', f1, f2, '**** Mismatch at offset {} ****'.format(i)) sg.Popup('Compare results for files', f1, f2, '**** Mismatch at offset {} ****'.format(i))
break break
else: else:
if len(a) == len(b): if len(a) == len(b):
sg.MsgBox('**** The files are IDENTICAL ****') sg.Popup('**** The files are IDENTICAL ****')
if __name__ == '__main__': if __name__ == '__main__':

6
PySimpleGUI.py
View File

@ -969,7 +969,7 @@ class Button(Element):
if target == (None, None): if target == (None, None):
strvar = self.TKStringVar strvar = self.TKStringVar
else: else:
if len(target) == 2: if not isinstance(target, str):
if target[0] < 0: if target[0] < 0:
target = [self.Position[0] + target[0], target[1]] target = [self.Position[0] + target[0], target[1]]
target_element = self.ParentForm._GetElementAtLocation(target) target_element = self.ParentForm._GetElementAtLocation(target)
@ -2179,6 +2179,8 @@ def ReadFormButton(button_text, image_filename=None, image_size=(None, None),ima
return Button(BUTTON_TYPE_READ_FORM, image_filename=image_filename, image_size=image_size, image_subsample=image_subsample, border_width=border_width, button_text=button_text, scale=scale, size=size, auto_size_button=auto_size_button, button_color=button_color, font=font, bind_return_key=bind_return_key, focus=focus, pad=pad, key=key) return Button(BUTTON_TYPE_READ_FORM, image_filename=image_filename, image_size=image_size, image_subsample=image_subsample, border_width=border_width, button_text=button_text, scale=scale, size=size, auto_size_button=auto_size_button, button_color=button_color, font=font, bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
ReadButton = ReadFormButton ReadButton = ReadFormButton
RButton = ReadFormButton
RFButton = ReadFormButton
# ------------------------- Realtime BUTTON Element lazy function ------------------------- # # ------------------------- Realtime BUTTON Element lazy function ------------------------- #
@ -2552,7 +2554,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
tktext_label.configure(background=element.BackgroundColor) tktext_label.configure(background=element.BackgroundColor)
if element.TextColor != COLOR_SYSTEM_DEFAULT and element.TextColor is not None: if element.TextColor != COLOR_SYSTEM_DEFAULT and element.TextColor is not None:
tktext_label.configure(fg=element.TextColor) tktext_label.configure(fg=element.TextColor)
tktext_label.pack(side=tk.LEFT,padx=element.Pad[0], pady=element.Pad[1], fill='both', expand=True) tktext_label.pack(side=tk.LEFT,padx=element.Pad[0], pady=element.Pad[1], expand=True)
element.TKText = tktext_label element.TKText = tktext_label
if element.ClickSubmits: if element.ClickSubmits:
tktext_label.bind('<Button-1>', element.TextClickedHandler) tktext_label.bind('<Button-1>', element.TextClickedHandler)