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

Merge pull request #2284 from PySimpleGUI/Dev-latest 

Dev latest
This commit is contained in:
PySimpleGUI 2019-11-30 16:29:58 -05:00 committed by GitHub
parent 324a457671 42faecaf54
commit b631111070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
DemoPrograms/Demo_Color_Chooser_Custom.py
View File

@ -1,6 +1,7 @@
import PySimpleGUI as sg import PySimpleGUI as sg
def color_chooser():
def popup_color_chooser(look_and_feel=None):
""" """
:return: Any(str, None) Returns hex string of color chosen or None if nothing was chosen :return: Any(str, None) Returns hex string of color chosen or None if nothing was chosen
@ -658,9 +659,13 @@ def color_chooser():
'YellowGreen': '#9ACD32', 'YellowGreen': '#9ACD32',
} }
sg.change_look_and_feel('Dark Blue 3') old_look_and_feel = sg.CURRENT_LOOK_AND_FEEL
if look_and_feel is None:
look_and_feel = sg.CURRENT_LOOK_AND_FEEL
sg.change_look_and_feel(look_and_feel)
button_size = (1, 1)
button_size = (1,1)
# button_size = (None,None) # for very compact buttons # button_size = (None,None) # for very compact buttons
def ColorButton(color): def ColorButton(color):
@ -669,20 +674,20 @@ def color_chooser():
:param color: Tuple[str, str] ( color name, hex string) :param color: Tuple[str, str] ( color name, hex string)
:return: sg.Button object :return: sg.Button object
""" """
return sg.B(button_color=('white', color[1]), pad=(0,0), size=button_size,key=color, tooltip=f'{color[0]}:{color[1]}', border_width=0) return sg.B(button_color=('white', color[1]), pad=(0, 0), size=button_size, key=color, tooltip=f'{color[0]}:{color[1]}', border_width=0)
num_colors = len(list(color_map.keys())) num_colors = len(list(color_map.keys()))
row_len=40 row_len = 40
grid = [[ColorButton(list(color_map.items())[c+j*row_len]) for c in range(0,row_len)] for j in range(0,num_colors//row_len)] grid = [[ColorButton(list(color_map.items())[c + j * row_len]) for c in range(0, row_len)] for j in range(0, num_colors // row_len)]
grid += [[ColorButton(list(color_map.items())[c+num_colors-num_colors%row_len]) for c in range(0,num_colors%row_len)]] grid += [[ColorButton(list(color_map.items())[c + num_colors - num_colors % row_len]) for c in range(0, num_colors % row_len)]]
layout = [ [sg.Text('Pick a color', font='Def 18')]] + grid + \ layout = [[sg.Text('Pick a color', font='Def 18')]] + grid + \
[[sg.Button('OK'), sg.T(size=(30,1), key='-OUT-')]] [[sg.Button('OK'), sg.T(size=(30, 1), key='-OUT-')]]
window = sg.Window('Window Title', layout, no_titlebar=True, grab_anywhere=True, keep_on_top=True, use_ttk_buttons=True) window = sg.Window('Window Title', layout, no_titlebar=True, grab_anywhere=True, keep_on_top=True, use_ttk_buttons=True)
color_chosen = None color_chosen = None
while True: # Event Loop while True: # Event Loop
event, values = window.read() event, values = window.read()
if event in (None, 'OK'): if event in (None, 'OK'):
if event is None: if event is None:
@ -691,6 +696,7 @@ def color_chooser():
window['-OUT-'](f'You chose {event[0]} : {event[1]}') window['-OUT-'](f'You chose {event[0]} : {event[1]}')
color_chosen = event[1] color_chosen = event[1]
window.close() window.close()
sg.change_look_and_feel(old_look_and_feel)
return color_chosen return color_chosen
@ -705,6 +711,8 @@ if __name__ == '__main__':
break break
if event.startswith('Color'): if event.startswith('Color'):
window.hide() window.hide()
color_chosen = color_chooser() color_chosen = popup_color_chooser('Dark Blue 3')
window['-CHOICE-'].update(color_chosen) window['-CHOICE-'].update(color_chosen)
window.un_hide() window.un_hide()
else:
print(f'The current look and feel = {sg.CURRENT_LOOK_AND_FEEL}')

8
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.7.1.2 Unreleased - included 4.7.1 patch, ability to update ttk buttons, images for ttk buttons" version = __version__ = "4.7.1.3 Unreleased - included 4.7.1 patch, ability to update ttk buttons, images for ttk buttons, CURRENT_LOOK_AND_FEEL variable"
port = 'PySimpleGUI' port = 'PySimpleGUI'
# 888888ba .d88888b oo dP .88888. dP dP dP # 888888ba .d88888b oo dP .88888. dP dP dP
@ -223,6 +223,8 @@ if sys.platform == 'darwin':
else: else:
DEFAULT_BUTTON_COLOR = ('white', BLUES[0]) # Foreground, Background (None, None) == System Default DEFAULT_BUTTON_COLOR = ('white', BLUES[0]) # Foreground, Background (None, None) == System Default
OFFICIAL_PYSIMPLEGUI_BUTTON_COLOR = ('white', BLUES[0]) # Colors should never be this long OFFICIAL_PYSIMPLEGUI_BUTTON_COLOR = ('white', BLUES[0]) # Colors should never be this long
CURRENT_LOOK_AND_FEEL = 'Default'
DEFAULT_ERROR_BUTTON_COLOR = ("#FFFFFF", "#FF0000") DEFAULT_ERROR_BUTTON_COLOR = ("#FFFFFF", "#FF0000")
DEFAULT_BACKGROUND_COLOR = None DEFAULT_BACKGROUND_COLOR = None
@ -10706,6 +10708,8 @@ def ChangeLookAndFeel(index, force=False):
:param force: (bool) if True allows Macs to use the look and feel feature. Otherwise Macs are blocked due to problems with button colors :param force: (bool) if True allows Macs to use the look and feel feature. Otherwise Macs are blocked due to problems with button colors
""" """
global CURRENT_LOOK_AND_FEEL
# if sys.platform.startswith('darwin') and not force: # if sys.platform.startswith('darwin') and not force:
# print('*** Changing look and feel is not supported on Mac platform ***') # print('*** Changing look and feel is not supported on Mac platform ***')
# return # return
@ -10734,7 +10738,7 @@ def ChangeLookAndFeel(index, force=False):
print('Instead, please enjoy a random Theme named {}'.format(list_of_look_and_feel_values()[ix])) print('Instead, please enjoy a random Theme named {}'.format(list_of_look_and_feel_values()[ix]))
selection = list_of_look_and_feel_values()[ix] selection = list_of_look_and_feel_values()[ix]
CURRENT_LOOK_AND_FEEL = selection
try: try:
colors = LOOK_AND_FEEL_TABLE[selection] colors = LOOK_AND_FEEL_TABLE[selection]