github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add divder to MacOS system tray menu

Browse source
This commit is contained in:
JonnyWong16 2020-04-25 18:55:35 -07:00
parent cd5ed1d748
commit b8ea04f5a4
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Tautulli.py
View file

@ -243,7 +243,6 @@ def main():
# Try to start the server. Will exit here is address is already in use. # Try to start the server. Will exit here is address is already in use.
webstart.start() webstart.start()
# Windows system tray icon
if common.PLATFORM == 'Windows': if common.PLATFORM == 'Windows':
if plexpy.CONFIG.SYS_TRAY_ICON: if plexpy.CONFIG.SYS_TRAY_ICON:
plexpy.WIN_SYS_TRAY_ICON = windows.WindowsSystemTray() plexpy.WIN_SYS_TRAY_ICON = windows.WindowsSystemTray()
@ -260,6 +259,8 @@ def main():
plexpy.HTTP_ROOT) plexpy.HTTP_ROOT)
if common.PLATFORM == 'Darwin' and plexpy.CONFIG.SYS_TRAY_ICON: if common.PLATFORM == 'Darwin' and plexpy.CONFIG.SYS_TRAY_ICON:
# MacOS system tray icon must be run on the main thread and is blocking
# Start the rest of Tautulli on a new thread
threading.Thread(target=wait).start() threading.Thread(target=wait).start()
plexpy.MAC_SYS_TRAY_ICON = macos.MacOSSystemTray() plexpy.MAC_SYS_TRAY_ICON = macos.MacOSSystemTray()
plexpy.MAC_SYS_TRAY_ICON.start() plexpy.MAC_SYS_TRAY_ICON.start()
@ -268,7 +269,7 @@ def main():
def wait(): def wait():
# Wait endlessy for a signal to happen # Wait endlessly for a signal to happen
while True: while True:
if not plexpy.SIGNAL: if not plexpy.SIGNAL:
try: try:
@ -294,6 +295,6 @@ def wait():
plexpy.SIGNAL = None plexpy.SIGNAL = None
# Call main()
if __name__ == "__main__": if __name__ == "__main__":
main() main()

5
plexpy/macos.py
View file

@ -43,7 +43,9 @@ class MacOSSystemTray(object):
self.menu = [ self.menu = [
rumps.MenuItem('Open Tautulli', callback=self.tray_open), rumps.MenuItem('Open Tautulli', callback=self.tray_open),
None,
rumps.MenuItem('Start Tautulli at Login', callback=self.tray_startup), rumps.MenuItem('Start Tautulli at Login', callback=self.tray_startup),
None,
rumps.MenuItem('Check for Updates', callback=self.tray_check_update), rumps.MenuItem('Check for Updates', callback=self.tray_check_update),
rumps.MenuItem('Restart', callback=self.tray_restart), rumps.MenuItem('Restart', callback=self.tray_restart),
rumps.MenuItem('Quit', callback=self.tray_quit) rumps.MenuItem('Quit', callback=self.tray_quit)
@ -96,8 +98,7 @@ class MacOSSystemTray(object):
self.update(icon=self.icon) self.update(icon=self.icon)
def change_tray_startup_icon(self): def change_tray_startup_icon(self):
self.menu[1].state = plexpy.CONFIG.LAUNCH_STARTUP self.tray_icon.menu['Start Tautulli at Login'].state = plexpy.CONFIG.LAUNCH_STARTUP
self.tray_icon.menu = self.menu
def set_startup(): def set_startup():