New shortcut functions Button - B, Btn, Butt. InputText - I. Button Text converted to string when initialized

This commit is contained in:
MikeTheWatchGuy 2019-04-02 11:37:16 -04:00
parent 644b597263
commit 816a7341c5
4 changed files with 37 additions and 8 deletions

View File

@ -605,7 +605,7 @@ class InputText(Element):
# ------------------------- INPUT TEXT Element lazy functions ------------------------- # # ------------------------- INPUT TEXT Element lazy functions ------------------------- #
In = InputText In = InputText
Input = InputText Input = InputText
I = InputText
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Combo # # Combo #
@ -1180,6 +1180,7 @@ class Text(Element):
:param key: :param key:
:param right_click_menu: :param right_click_menu:
:param tooltip: :param tooltip:
:param tooltip:
:param visible: :param visible:
''' '''
self.DisplayText = str(text) self.DisplayText = str(text)
@ -1700,6 +1701,10 @@ class Button(Element):
super().__del__() super().__del__()
# ------------------------- Button lazy functions ------------------------- #
B = Button
Btn = Button
Butt = Button
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# ButtonMenu Class # # ButtonMenu Class #
@ -1875,7 +1880,7 @@ class Image(Element):
self.CurrentFrameNumber = 0 self.CurrentFrameNumber = 0
self.TotalAnimatedFrames = 0 self.TotalAnimatedFrames = 0
self.LastFrameTime = 0 self.LastFrameTime = 0
self.Source = filename or data self.Source = filename if filename is not None else data
super().__init__(ELEM_TYPE_IMAGE, size=size, background_color=background_color, pad=pad, key=key, super().__init__(ELEM_TYPE_IMAGE, size=size, background_color=background_color, pad=pad, key=key,
tooltip=tooltip, visible=visible) tooltip=tooltip, visible=visible)

View File

@ -603,9 +603,10 @@ class InputText(Element):
super().__del__() super().__del__()
# ------------------------- INPUT TEXT Element lazy functions ------------------------- # # ------------------------- INPUT TEXT lazy functions ------------------------- #
In = InputText In = InputText
Input = InputText Input = InputText
I = InputText
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
@ -1334,7 +1335,7 @@ class Button(Element):
self.FileTypes = file_types self.FileTypes = file_types
self.TKButton = None self.TKButton = None
self.Target = target self.Target = target
self.ButtonText = button_text self.ButtonText = str(button_text)
self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR
self.TextColor = self.ButtonColor[0] self.TextColor = self.ButtonColor[0]
self.BackgroundColor = self.ButtonColor[1] self.BackgroundColor = self.ButtonColor[1]
@ -1530,6 +1531,13 @@ class Button(Element):
super().__del__() super().__del__()
# ------------------------- Button lazy functions ------------------------- #
B = Button
Btn = Button
Butt = Button
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# ButtonMenu Class # # ButtonMenu Class #
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #

View File

@ -578,7 +578,7 @@ class InputText(Element):
# ------------------------- INPUT TEXT Element lazy functions ------------------------- # # ------------------------- INPUT TEXT Element lazy functions ------------------------- #
In = InputText In = InputText
Input = InputText Input = InputText
I = InputText
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Combo # # Combo #
@ -1343,7 +1343,7 @@ class Button(Element):
self.FileTypes = file_types self.FileTypes = file_types
self.TKButton = None self.TKButton = None
self.Target = target self.Target = target
self.ButtonText = button_text self.ButtonText = str(button_text)
self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR
self.TextColor = self.ButtonColor[0] self.TextColor = self.ButtonColor[0]
self.BackgroundColor = self.ButtonColor[1] self.BackgroundColor = self.ButtonColor[1]
@ -1539,6 +1539,12 @@ class Button(Element):
super().__del__() super().__del__()
# ------------------------- Button lazy functions ------------------------- #
B = Button
Btn = Button
Butt = Button
def convert_tkinter_filetypes_to_wx(filetypes): def convert_tkinter_filetypes_to_wx(filetypes):
wx_filetypes = '' wx_filetypes = ''
for item in filetypes: for item in filetypes:
@ -1546,6 +1552,10 @@ def convert_tkinter_filetypes_to_wx(filetypes):
wx_filetypes += filetype wx_filetypes += filetype
return wx_filetypes return wx_filetypes
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# ProgreessBar # # ProgreessBar #
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #

View File

@ -612,7 +612,7 @@ class InputText(Element):
# ------------------------- INPUT TEXT Element lazy functions ------------------------- # # ------------------------- INPUT TEXT Element lazy functions ------------------------- #
In = InputText In = InputText
Input = InputText Input = InputText
I = InputText
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Combo # # Combo #
@ -1396,7 +1396,7 @@ class Button(Element):
self.FileTypes = file_types self.FileTypes = file_types
self.TKButton = None self.TKButton = None
self.Target = target self.Target = target
self.ButtonText = button_text self.ButtonText = str(button_text)
self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR
self.TextColor = self.ButtonColor[0] self.TextColor = self.ButtonColor[0]
self.BackgroundColor = self.ButtonColor[1] self.BackgroundColor = self.ButtonColor[1]
@ -1620,6 +1620,12 @@ def convert_tkinter_filetypes_to_wx(filetypes):
return wx_filetypes return wx_filetypes
# ------------------------- Button lazy functions ------------------------- #
B = Button
Btn = Button
Butt = Button
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# ProgreessBar # # ProgreessBar #
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #