RELEASE 3.11.0 and 1.11.0
This commit is contained in:
MikeTheWatchGuy
parent
27602d46f2
commit
3bea475611
|
|
@ -1658,7 +1658,6 @@ class Graph(Element):
|
|||
def MoveFigure(self, figure, x_direction, y_direction):
|
||||
zero_converted = self._convert_xy_to_canvas_xy(0, 0)
|
||||
shift_converted = self._convert_xy_to_canvas_xy(x_direction, y_direction)
|
||||
shift_converted = self._convert_xy_to_canvas_xy(x_direction, y_direction)
|
||||
shift_amount = (shift_converted[0] - zero_converted[0], shift_converted[1] - zero_converted[1])
|
||||
if figure is None:
|
||||
print('*** WARNING - Your figure is None. It most likely means your did not Finalize your Window ***')
|
||||
|
|
@ -3246,6 +3245,12 @@ def SimpleButton(button_text, image_filename=None, image_data=None, image_size=(
|
|||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
||||
# ------------------------- CLOSE BUTTON Element lazy function ------------------------- #
|
||||
def CloseButton(button_text, image_filename=None, image_data=None, image_size=(None, None), image_subsample=None, border_width=None, tooltip=None, size=(None, None), auto_size_button=None, button_color=None, font=None, bind_return_key=False, disabled=False, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, image_filename=image_filename, image_data=image_data, image_size=image_size, image_subsample=image_subsample, border_width=border_width, tooltip=tooltip, disabled=disabled, 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)
|
||||
|
||||
CButton = CloseButton
|
||||
|
||||
# ------------------------- GENERIC BUTTON Element lazy function ------------------------- #
|
||||
def ReadButton(button_text, image_filename=None, image_data=None, image_size=(None, None), image_subsample=None,
|
||||
border_width=None, tooltip=None, size=(None, None), auto_size_button=None, button_color=None, font=None,
|
||||
|
|
|
|||
|
|
@ -1186,7 +1186,7 @@ class Button(Element):
|
|||
def __init__(self, button_text='', button_type=BUTTON_TYPE_CLOSES_WIN, target=(None, None), tooltip=None,
|
||||
file_types=(("ALL Files", "*.*"),), initial_folder=None, disabled=False, image_filename=None,
|
||||
image_data=None, image_size=(None, None), image_subsample=None, border_width=None, size=(None, None),
|
||||
auto_size_button=None, button_color=None, default_value=None, font=None, bind_return_key=False,
|
||||
auto_size_button=None, button_color=None, font=None, bind_return_key=False,
|
||||
focus=False, pad=None, key=None):
|
||||
'''
|
||||
Button Element
|
||||
|
|
@ -1227,7 +1227,6 @@ class Button(Element):
|
|||
self.BindReturnKey = bind_return_key
|
||||
self.Focus = focus
|
||||
self.TKCal = None
|
||||
self.DefaultValue = default_value
|
||||
self.InitialFolder = initial_folder
|
||||
self.Disabled = disabled
|
||||
|
||||
|
|
@ -1366,8 +1365,7 @@ class Button(Element):
|
|||
|
||||
return
|
||||
|
||||
def Update(self, text=None, button_color=(None, None), value=None, disabled=None, image_data=None,
|
||||
image_filename=None):
|
||||
def Update(self, text=None, button_color=(None, None), disabled=None, image_data=None, image_filename=None):
|
||||
try:
|
||||
if text is not None:
|
||||
self.TKButton.configure(text=text)
|
||||
|
|
@ -1376,8 +1374,6 @@ class Button(Element):
|
|||
self.TKButton.config(foreground=button_color[0], background=button_color[1])
|
||||
except:
|
||||
return
|
||||
if value is not None:
|
||||
self.DefaultValue = value
|
||||
if disabled == True:
|
||||
self.TKButton['state'] = 'disabled'
|
||||
elif disabled == False:
|
||||
|
|
@ -3164,7 +3160,7 @@ def SaveAs(button_text='Save As...', target=(ThisRow, -1), file_types=(("ALL Fil
|
|||
# ------------------------- SAVE BUTTON Element lazy function ------------------------- #
|
||||
def Save(button_text='Save', size=(None, None), auto_size_button=None, button_color=None, bind_return_key=True,
|
||||
disabled=False, tooltip=None, font=None, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3172,7 +3168,7 @@ def Save(button_text='Save', size=(None, None), auto_size_button=None, button_co
|
|||
# ------------------------- SUBMIT BUTTON Element lazy function ------------------------- #
|
||||
def Submit(button_text='Submit', size=(None, None), auto_size_button=None, button_color=None, disabled=False,
|
||||
bind_return_key=True, tooltip=None, font=None, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3181,7 +3177,7 @@ def Submit(button_text='Submit', size=(None, None), auto_size_button=None, butto
|
|||
# ------------------------- OPEN BUTTON Element lazy function ------------------------- #
|
||||
def Open(button_text='Open', size=(None, None), auto_size_button=None, button_color=None, disabled=False,
|
||||
bind_return_key=True, tooltip=None, font=None, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3189,7 +3185,7 @@ def Open(button_text='Open', size=(None, None), auto_size_button=None, button_co
|
|||
# ------------------------- OK BUTTON Element lazy function ------------------------- #
|
||||
def OK(button_text='OK', size=(None, None), auto_size_button=None, button_color=None, disabled=False,
|
||||
bind_return_key=True, tooltip=None, font=None, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3197,7 +3193,7 @@ def OK(button_text='OK', size=(None, None), auto_size_button=None, button_color=
|
|||
# ------------------------- YES BUTTON Element lazy function ------------------------- #
|
||||
def Ok(button_text='Ok', size=(None, None), auto_size_button=None, button_color=None, disabled=False,
|
||||
bind_return_key=True, tooltip=None, font=None, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3205,7 +3201,7 @@ def Ok(button_text='Ok', size=(None, None), auto_size_button=None, button_color=
|
|||
# ------------------------- CANCEL BUTTON Element lazy function ------------------------- #
|
||||
def Cancel(button_text='Cancel', size=(None, None), auto_size_button=None, button_color=None, disabled=False,
|
||||
tooltip=None, font=None, bind_return_key=False, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3213,7 +3209,7 @@ def Cancel(button_text='Cancel', size=(None, None), auto_size_button=None, butto
|
|||
# ------------------------- QUIT BUTTON Element lazy function ------------------------- #
|
||||
def Quit(button_text='Quit', size=(None, None), auto_size_button=None, button_color=None, disabled=False, tooltip=None,
|
||||
font=None, bind_return_key=False, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3221,7 +3217,7 @@ def Quit(button_text='Quit', size=(None, None), auto_size_button=None, button_co
|
|||
# ------------------------- Exit BUTTON Element lazy function ------------------------- #
|
||||
def Exit(button_text='Exit', size=(None, None), auto_size_button=None, button_color=None, disabled=False, tooltip=None,
|
||||
font=None, bind_return_key=False, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3229,7 +3225,7 @@ def Exit(button_text='Exit', size=(None, None), auto_size_button=None, button_co
|
|||
# ------------------------- YES BUTTON Element lazy function ------------------------- #
|
||||
def Yes(button_text='Yes', size=(None, None), auto_size_button=None, button_color=None, disabled=False, tooltip=None,
|
||||
font=None, bind_return_key=True, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3237,7 +3233,7 @@ def Yes(button_text='Yes', size=(None, None), auto_size_button=None, button_colo
|
|||
# ------------------------- NO BUTTON Element lazy function ------------------------- #
|
||||
def No(button_text='No', size=(None, None), auto_size_button=None, button_color=None, disabled=False, tooltip=None,
|
||||
font=None, bind_return_key=False, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3245,7 +3241,7 @@ def No(button_text='No', size=(None, None), auto_size_button=None, button_color=
|
|||
# ------------------------- NO BUTTON Element lazy function ------------------------- #
|
||||
def Help(button_text='Help', size=(None, None), auto_size_button=None, button_color=None, disabled=False, font=None,
|
||||
tooltip=None, bind_return_key=False, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, tooltip=tooltip, size=size,
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_READ_FORM, tooltip=tooltip, size=size,
|
||||
auto_size_button=auto_size_button, button_color=button_color, font=font, disabled=disabled,
|
||||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
|
@ -3261,6 +3257,12 @@ def SimpleButton(button_text, image_filename=None, image_data=None, image_size=(
|
|||
bind_return_key=bind_return_key, focus=focus, pad=pad, key=key)
|
||||
|
||||
|
||||
# ------------------------- CLOSE BUTTON Element lazy function ------------------------- #
|
||||
def CloseButton(button_text, image_filename=None, image_data=None, image_size=(None, None), image_subsample=None, border_width=None, tooltip=None, size=(None, None), auto_size_button=None, button_color=None, font=None, bind_return_key=False, disabled=False, focus=False, pad=None, key=None):
|
||||
return Button(button_text=button_text, button_type=BUTTON_TYPE_CLOSES_WIN, image_filename=image_filename, image_data=image_data, image_size=image_size, image_subsample=image_subsample, border_width=border_width, tooltip=tooltip, disabled=disabled, 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)
|
||||
|
||||
CButton = CloseButton
|
||||
|
||||
# ------------------------- GENERIC BUTTON Element lazy function ------------------------- #
|
||||
def ReadButton(button_text, image_filename=None, image_data=None, image_size=(None, None), image_subsample=None,
|
||||
border_width=None, tooltip=None, size=(None, None), auto_size_button=None, button_color=None, font=None,
|
||||
|
|
@ -5482,7 +5484,10 @@ LOOK_AND_FEEL_TABLE = {'SystemDefault':
|
|||
'BUTTON': ('#E7C855', '#284B5A'),
|
||||
'PROGRESS': DEFAULT_PROGRESS_BAR_COLOR,
|
||||
'BORDER': 1, 'SLIDER_DEPTH': 0,
|
||||
'PROGRESS_DEPTH': 0},
|
||||
'PROGRESS_DEPTH': 0,
|
||||
'ACCENT1': '#c15226',
|
||||
'ACCENT2': '#7a4d5f',
|
||||
'ACCENT3': '#889743'},
|
||||
|
||||
'GreenTan': {'BACKGROUND': '#9FB8AD',
|
||||
'TEXT': COLOR_SYSTEM_DEFAULT,
|
||||
|
|
|
|||
Loading…
Reference in New Issue