github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 04:49:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update systray lib

Browse source
This commit is contained in:
JonnyWong16 2020-04-25 12:09:47 -07:00
commit 922bb2760c
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/systray/traybar.py
View file

@ -37,8 +37,8 @@ class SysTrayIcon(object):
self._hover_text = hover_text self._hover_text = hover_text
self._on_quit = on_quit self._on_quit = on_quit
menu_options = menu_options or () menu_options = menu_options or []
menu_options = menu_options + (('Quit', None, SysTrayIcon.QUIT, None),) menu_options = menu_options + [['Quit', None, SysTrayIcon.QUIT, None]]
self._next_action_id = SysTrayIcon.FIRST_ID self._next_action_id = SysTrayIcon.FIRST_ID
self._menu_actions_by_id = set() self._menu_actions_by_id = set()
self._menu_options = self._add_ids_to_menu_options(list(menu_options)) self._menu_options = self._add_ids_to_menu_options(list(menu_options))
@ -122,13 +122,21 @@ class SysTrayIcon(object):
PostMessage(self._hwnd, WM_CLOSE, 0, 0) PostMessage(self._hwnd, WM_CLOSE, 0, 0)
self._message_loop_thread.join() self._message_loop_thread.join()
def update(self, icon=None, hover_text=None): def update(self, icon=None, hover_text=None, menu_options=None):
""" update icon image and/or hover text """ """ update icon image and/or hover text and/or menu options"""
if icon: if icon:
self._icon = icon self._icon = icon
self._load_icon() self._load_icon()
if hover_text: if hover_text:
self._hover_text = hover_text self._hover_text = hover_text
# "if menu_options" added to be allow the update of the menu options
if menu_options:
menu_options = menu_options + [['Quit', None, SysTrayIcon.QUIT, None]]
self._next_action_id = SysTrayIcon.FIRST_ID
self._menu_actions_by_id = set()
self._menu_options = self._add_ids_to_menu_options(list(menu_options))
self._menu_actions_by_id = dict(self._menu_actions_by_id)
self._menu = None # detroy the old menu created by right clicking the icon
self._refresh_icon() self._refresh_icon()
def _add_ids_to_menu_options(self, menu_options): def _add_ids_to_menu_options(self, menu_options):
@ -137,7 +145,7 @@ class SysTrayIcon(object):
option_text, option_icon, option_action, option_state = menu_option option_text, option_icon, option_action, option_state = menu_option
if callable(option_action) or option_action in SysTrayIcon.SPECIAL_ACTIONS: if callable(option_action) or option_action in SysTrayIcon.SPECIAL_ACTIONS:
self._menu_actions_by_id.add((self._next_action_id, option_action)) self._menu_actions_by_id.add((self._next_action_id, option_action))
result.append(menu_option + (self._next_action_id,)) result.append(menu_option + [self._next_action_id])
elif option_action == 'separator': elif option_action == 'separator':
result.append((option_text, result.append((option_text,
option_icon, option_icon,