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

Merge pull request #201 from MikeTheWatchGuy/Dev-latest 

Renamed all of the Update 'disable' parameters to be 'disabled'
This commit is contained in:
MikeTheWatchGuy 2018-09-11 14:59:46 -04:00 committed by GitHub
parent 93f8b81a29 1f2819c9a9
commit 9be8aa7897
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Demo_Disable_Elements.py
View File

@ -31,29 +31,29 @@ while True:
if button is None or button == 'Exit': if button is None or button == 'Exit':
break break
elif button == 'Disable': elif button == 'Disable':
form.FindElement('cbox').Update(disable=True) form.FindElement('cbox').Update(disabled=True)
form.FindElement('listbox').Update(disable=True) form.FindElement('listbox').Update(disabled=True)
form.FindElement('radio1').Update(disable=True) form.FindElement('radio1').Update(disabled=True)
form.FindElement('radio2').Update(disable=True) form.FindElement('radio2').Update(disabled=True)
form.FindElement('spin').Update(disable=True) form.FindElement('spin').Update(disabled=True)
form.FindElement('option').Update(disable=True) form.FindElement('option').Update(disabled=True)
form.FindElement('combo').Update(disable=True) form.FindElement('combo').Update(disabled=True)
form.FindElement('reset').Update(disable=True) form.FindElement('reset').Update(disabled=True)
form.FindElement('notes').Update(disable=True) form.FindElement('notes').Update(disabled=True)
form.FindElement('multi').Update(disable=True) form.FindElement('multi').Update(disabled=True)
form.FindElement('slider').Update(disable=True) form.FindElement('slider').Update(disabled=True)
elif button == 'Enable': elif button == 'Enable':
form.FindElement('cbox').Update(disable=False) form.FindElement('cbox').Update(disabled=False)
form.FindElement('listbox').Update(disable=False) form.FindElement('listbox').Update(disabled=False)
form.FindElement('radio1').Update(disable=False) form.FindElement('radio1').Update(disabled=False)
form.FindElement('radio2').Update(disable=False) form.FindElement('radio2').Update(disabled=False)
form.FindElement('spin').Update(disable=False) form.FindElement('spin').Update(disabled=False)
form.FindElement('option').Update(disable=False) form.FindElement('option').Update(disabled=False)
form.FindElement('combo').Update(disable=False) form.FindElement('combo').Update(disabled=False)
form.FindElement('reset').Update(disable=False) form.FindElement('reset').Update(disabled=False)
form.FindElement('notes').Update(disable=False) form.FindElement('notes').Update(disabled=False)
form.FindElement('multi').Update(disable=False) form.FindElement('multi').Update(disabled=False)
form.FindElement('slider').Update(disable=False) form.FindElement('slider').Update(disabled=False)
elif button == 'Values': elif button == 'Values':
sg.Popup(values, keep_on_top=True) sg.Popup(values, keep_on_top=True)

60
PySimpleGUI.py
View File

@ -282,10 +282,10 @@ class InputText(Element):
super().__init__(ELEM_TYPE_INPUT_TEXT, scale=scale, size=size, auto_size_text=auto_size_text, background_color=bg, text_color=fg, key=key, pad=pad) super().__init__(ELEM_TYPE_INPUT_TEXT, scale=scale, size=size, auto_size_text=auto_size_text, background_color=bg, text_color=fg, key=key, pad=pad)
def Update(self, value=None, disable=None): def Update(self, value=None, disabled=None):
if disable is True: if disabled is True:
self.TKEntry['state'] = 'disabled' self.TKEntry['state'] = 'disabled'
elif disable is False: elif disabled is False:
self.TKEntry['state'] = 'normal' self.TKEntry['state'] = 'normal'
if value is not None: if value is not None:
try: try:
@ -322,7 +322,7 @@ class InputCombo(Element):
super().__init__(ELEM_TYPE_INPUT_COMBO, scale=scale, size=size, auto_size_text=auto_size_text, background_color=bg, text_color=fg, key=key, pad=pad) super().__init__(ELEM_TYPE_INPUT_COMBO, scale=scale, size=size, auto_size_text=auto_size_text, background_color=bg, text_color=fg, key=key, pad=pad)
def Update(self, value=None, values=None, disable=None): def Update(self, value=None, values=None, disabled=None):
if values is not None: if values is not None:
try: try:
self.TKCombo['values'] = values self.TKCombo['values'] = values
@ -336,9 +336,9 @@ class InputCombo(Element):
except: pass except: pass
self.DefaultValue = value self.DefaultValue = value
break break
if disable == True: if disabled == True:
self.TKCombo['state'] = 'disable' self.TKCombo['state'] = 'disable'
elif disable == False: elif disabled == False:
self.TKCombo['state'] = 'enable' self.TKCombo['state'] = 'enable'
@ -371,7 +371,7 @@ class InputOptionMenu(Element):
super().__init__(ELEM_TYPE_INPUT_OPTION_MENU, scale=scale, size=size, auto_size_text=auto_size_text, background_color=bg, text_color=fg, key=key, pad=pad) super().__init__(ELEM_TYPE_INPUT_OPTION_MENU, scale=scale, size=size, auto_size_text=auto_size_text, background_color=bg, text_color=fg, key=key, pad=pad)
def Update(self, value=None, values=None, disable=None): def Update(self, value=None, values=None, disabled=None):
if values is not None: if values is not None:
self.Values = values self.Values = values
if self.Values is not None: if self.Values is not None:
@ -382,9 +382,9 @@ class InputOptionMenu(Element):
except: pass except: pass
self.DefaultValue = value self.DefaultValue = value
break break
if disable == True: if disabled == True:
self.TKOptionMenu['state'] = 'disabled' self.TKOptionMenu['state'] = 'disabled'
elif disable == False: elif disabled == False:
self.TKOptionMenu['state'] = 'normal' self.TKOptionMenu['state'] = 'normal'
@ -428,10 +428,10 @@ class Listbox(Element):
super().__init__(ELEM_TYPE_INPUT_LISTBOX, scale=scale, size=size, auto_size_text=auto_size_text, font=font, background_color=bg, text_color=fg, key=key, pad=pad) super().__init__(ELEM_TYPE_INPUT_LISTBOX, scale=scale, size=size, auto_size_text=auto_size_text, font=font, background_color=bg, text_color=fg, key=key, pad=pad)
def Update(self, values=None, disable=None): def Update(self, values=None, disabled=None):
if disable == True: if disabled == True:
self.TKListbox.configure(state='disabled') self.TKListbox.configure(state='disabled')
elif disable == False: elif disabled == False:
self.TKListbox.configure(state='normal') self.TKListbox.configure(state='normal')
if values is not None: if values is not None:
self.TKListbox.delete(0, 'end') self.TKListbox.delete(0, 'end')
@ -486,16 +486,16 @@ class Radio(Element):
super().__init__(ELEM_TYPE_INPUT_RADIO, scale=scale , size=size, auto_size_text=auto_size_text, font=font, background_color=background_color, text_color=self.TextColor, key=key, pad=pad) super().__init__(ELEM_TYPE_INPUT_RADIO, scale=scale , size=size, auto_size_text=auto_size_text, font=font, background_color=background_color, text_color=self.TextColor, key=key, pad=pad)
def Update(self, value=None, disable=None): def Update(self, value=None, disabled=None):
location = EncodeRadioRowCol(self.Position[0], self.Position[1]) location = EncodeRadioRowCol(self.Position[0], self.Position[1])
if value is not None: if value is not None:
try: try:
self.TKIntVar.set(location) self.TKIntVar.set(location)
except: pass except: pass
self.InitialState = value self.InitialState = value
if disable == True: if disabled == True:
self.TKRadio['state'] = 'disabled' self.TKRadio['state'] = 'disabled'
elif disable == False: elif disabled == False:
self.TKRadio['state'] = 'normal' self.TKRadio['state'] = 'normal'
def __del__(self): def __del__(self):
@ -531,15 +531,15 @@ class Checkbox(Element):
def Get(self): def Get(self):
return self.TKIntVar.get() return self.TKIntVar.get()
def Update(self, value=None, disable=None): def Update(self, value=None, disabled=None):
if value is not None: if value is not None:
try: try:
self.TKIntVar.set(value) self.TKIntVar.set(value)
self.InitialState = value self.InitialState = value
except: pass except: pass
if disable == True: if disabled == True:
self.TKCheckbutton.configure(state='disabled') self.TKCheckbutton.configure(state='disabled')
elif disable == False: elif disabled == False:
self.TKCheckbutton.configure(state='normal') self.TKCheckbutton.configure(state='normal')
@ -574,7 +574,7 @@ class Spin(Element):
super().__init__(ELEM_TYPE_INPUT_SPIN, scale, size, auto_size_text, font=font,background_color=bg, text_color=fg, key=key, pad=pad) super().__init__(ELEM_TYPE_INPUT_SPIN, scale, size, auto_size_text, font=font,background_color=bg, text_color=fg, key=key, pad=pad)
return return
def Update(self, value=None, values=None, disable=None): def Update(self, value=None, values=None, disabled=None):
if values != None: if values != None:
old_value = self.TKStringVar.get() old_value = self.TKStringVar.get()
self.Values = values self.Values = values
@ -585,9 +585,9 @@ class Spin(Element):
self.TKStringVar.set(value) self.TKStringVar.set(value)
except: pass except: pass
self.DefaultValue = value self.DefaultValue = value
if disable == True: if disabled == True:
self.TKSpinBox.configure(state='disabled') self.TKSpinBox.configure(state='disabled')
elif disable == False: elif disabled == False:
self.TKSpinBox.configure(state='normal') self.TKSpinBox.configure(state='normal')
@ -629,16 +629,16 @@ class Multiline(Element):
super().__init__(ELEM_TYPE_INPUT_MULTILINE, scale=scale, size=size, auto_size_text=auto_size_text, background_color=bg, text_color=fg, key=key, pad=pad) super().__init__(ELEM_TYPE_INPUT_MULTILINE, scale=scale, size=size, auto_size_text=auto_size_text, background_color=bg, text_color=fg, key=key, pad=pad)
return return
def Update(self, value=None, disable=None): def Update(self, value=None, disabled=None):
if value is not None: if value is not None:
try: try:
self.TKText.delete('1.0', tk.END) self.TKText.delete('1.0', tk.END)
self.TKText.insert(1.0, value) self.TKText.insert(1.0, value)
except: pass except: pass
self.DefaultText = value self.DefaultText = value
if disable == True: if disabled == True:
self.TKText.configure(state='disabled') self.TKText.configure(state='disabled')
elif disable == False: elif disabled == False:
self.TKText.configure(state='normal') self.TKText.configure(state='normal')
def Get(self): def Get(self):
@ -956,7 +956,7 @@ class Button(Element):
return return
def Update(self, value=None, text=None, button_color=(None, None), disable=None): def Update(self, value=None, text=None, button_color=(None, None), disabled=None):
try: try:
if text is not None: if text is not None:
self.TKButton.configure(text=text) self.TKButton.configure(text=text)
@ -967,9 +967,9 @@ class Button(Element):
return return
if value is not None: if value is not None:
self.DefaultValue = value self.DefaultValue = value
if disable == True: if disabled == True:
self.TKButton['state'] = 'disabled' self.TKButton['state'] = 'disabled'
elif disable == False: elif disabled == False:
self.TKButton['state'] = 'normal' self.TKButton['state'] = 'normal'
@ -1129,7 +1129,7 @@ class Slider(Element):
super().__init__(ELEM_TYPE_INPUT_SLIDER, scale=scale, size=size, font=font, background_color=background_color, text_color=text_color, key=key, pad=pad) super().__init__(ELEM_TYPE_INPUT_SLIDER, scale=scale, size=size, font=font, background_color=background_color, text_color=text_color, key=key, pad=pad)
return return
def Update(self, value=None, range=(None, None), disable=None): def Update(self, value=None, range=(None, None), disabled=None):
if value is not None: if value is not None:
try: try:
self.TKIntVar.set(value) self.TKIntVar.set(value)
@ -1137,9 +1137,9 @@ class Slider(Element):
self.TKScale.config(from_ = range[0], to_ = range[1]) self.TKScale.config(from_ = range[0], to_ = range[1])
except: pass except: pass
self.DefaultValue = value self.DefaultValue = value
if disable == True: if disabled == True:
self.TKScale['state'] = 'disabled' self.TKScale['state'] = 'disabled'
elif disable == False: elif disabled == False:
self.TKScale['state'] = 'normal' self.TKScale['state'] = 'normal'
def SliderChangedHandler(self, event): def SliderChangedHandler(self, event):