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

Merge pull request #974 from MikeTheWatchGuy/Dev-latest 

Dev latest
This commit is contained in:
MikeTheWatchGuy 2018-12-25 15:32:16 -05:00 committed by GitHub
parent 5652d86ff3 cc2d7afc1b
commit 578833569d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DemoPrograms/Demo_Base64_Image_Encoder.py
View File

@ -19,7 +19,7 @@ def main():
sg.PopupCancel('Cancelled - No valid folder entered') sg.PopupCancel('Cancelled - No valid folder entered')
return return
try: try:
namesonly = [f for f in os.listdir(folder) if f.endswith('.png')] namesonly = [f for f in os.listdir(folder) if f.endswith('.png') or f.endswith('.ico')]
except: except:
sg.PopupCancel('Cancelled - No valid folder entered') sg.PopupCancel('Cancelled - No valid folder entered')
return return
@ -29,11 +29,11 @@ def main():
for i, file in enumerate(namesonly): for i, file in enumerate(namesonly):
contents = open(os.path.join(folder, file), 'rb').read() contents = open(os.path.join(folder, file), 'rb').read()
encoded = base64.b64encode(contents) encoded = base64.b64encode(contents)
outfile.write(f'{file[:file.index(".")]} = {encoded}\n') outfile.write('\n{} = {}\n\n'.format(file[:file.index(".")], encoded))
sg.OneLineProgressMeter('Base64 Encoding', i+1, len(namesonly),key='_METER_') sg.OneLineProgressMeter('Base64 Encoding', i+1, len(namesonly),key='_METER_')
outfile.close() outfile.close()
sg.Popup('Completed!', 'Encoded %s files'% i) sg.Popup('Completed!', 'Encoded %s files'%(i+1))
if __name__ == '__main__': if __name__ == '__main__':

30
PySimpleGUIWx.py → PySimpleGUIWx/PySimpleGUIWx.py
View File

@ -2527,7 +2527,7 @@ class SystemTray:
self.App = wx.App(False) self.App = wx.App(False)
frame = wx.Frame(None, title='Tray icon frame') frame = wx.Frame(None, title='Tray icon frame')
self.TaskBarIcon = SystemTray.CustomTaskBarIcon(frame, self.App, self.Menu, filename=self.Filename, tooltip=tooltip) self.TaskBarIcon = SystemTray.CustomTaskBarIcon(frame, self.App, self.Menu, filename=self.Filename, data_base64=data_base64, tooltip=tooltip)
# self.App.MainLoop() # self.App.MainLoop()
@ -2540,20 +2540,21 @@ class SystemTray:
self.menu_item_chosen = None self.menu_item_chosen = None
self.menu = menu self.menu = menu
self.id_to_text = {} self.id_to_text = {}
self.filename = filename
self.data_base64 = data_base64
self.tooltip = tooltip or wx.EmptyString
if filename: if filename:
icon = wx.Icon(filename, wx.BITMAP_TYPE_ICO) self.icon = wx.Icon(filename, wx.BITMAP_TYPE_ICO)
if tooltip is not None: self.SetIcon(self.icon, tooltip=self.tooltip)
self.SetIcon(icon, tooltip=tooltip)
else:
self.SetIcon(icon)
elif data_base64: elif data_base64:
ico1 = base64.b64decode(data_base64) ico1 = base64.b64decode(data_base64)
fout = open("zzztemp_icon.ico", "wb") fout = open("zzztemp_icon.ico", "wb")
fout.write(ico1) fout.write(ico1)
fout.close() fout.close()
icon = wx.Icon('zzztemp_icon.ico', wx.BITMAP_TYPE_ICO) self.icon = wx.Icon('zzztemp_icon.ico', wx.BITMAP_TYPE_ICO)
self.TrayIcon.SetIcon(icon, tooltip=tooltip) self.SetIcon(self.icon, tooltip=self.tooltip)
# os.remove("zzztemp_icon.ico") os.remove("zzztemp_icon.ico")
self.Bind(wx.adv.EVT_TASKBAR_LEFT_DOWN, self.OnTaskBarLeftClick) self.Bind(wx.adv.EVT_TASKBAR_LEFT_DOWN, self.OnTaskBarLeftClick)
self.Bind(wx.adv.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarLeftDoubleClick) self.Bind(wx.adv.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarLeftDoubleClick)
self.Bind(wx.adv.EVT_TASKBAR_RIGHT_DOWN, self.OnTaskBarRightClick) self.Bind(wx.adv.EVT_TASKBAR_RIGHT_DOWN, self.OnTaskBarRightClick)
@ -2657,11 +2658,11 @@ class SystemTray:
def Hide(self): def Hide(self):
self.TrayIcon.hide() self.TaskBarIcon.RemoveIcon()
def UnHide(self): def UnHide(self):
self.TrayIcon.show() self.TaskBarIcon.SetIcon(icon=self.TaskBarIcon.icon, tooltip=self.TaskBarIcon.tooltip)
def ShowMessage(self, title, message, filename=None, data=None, data_base64=None, messageicon=None, time=10000): def ShowMessage(self, title, message, filename=None, data=None, data_base64=None, messageicon=None, time=10000):
@ -5053,7 +5054,12 @@ def StartupTK(window):
frame.Bind(wx.EVT_CLOSE, window.OnClose) frame.Bind(wx.EVT_CLOSE, window.OnClose)
frame.SetIcon(wx.Icon(window.WindowIcon)) try:
with open(window.WindowIcon, 'r') as icon_file:
pass
frame.SetIcon(wx.Icon(window.WindowIcon))
except:
pass
if window.BackgroundColor is not None and window.BackgroundColor != COLOR_SYSTEM_DEFAULT: if window.BackgroundColor is not None and window.BackgroundColor != COLOR_SYSTEM_DEFAULT:
panel.SetBackgroundColour(window.BackgroundColor) panel.SetBackgroundColour(window.BackgroundColor)