diff --git a/data/interfaces/default/images/logo-circle-update.ico b/data/interfaces/default/images/logo-circle-update.ico deleted file mode 100644 index ab1404fd..00000000 Binary files a/data/interfaces/default/images/logo-circle-update.ico and /dev/null differ diff --git a/plexpy/macos.py b/plexpy/macos.py index 0cae859f..a03796d7 100644 --- a/plexpy/macos.py +++ b/plexpy/macos.py @@ -44,11 +44,12 @@ else: class MacOSSystemTray(object): def __init__(self): self.image_dir = os.path.join(plexpy.PROG_DIR, 'data/interfaces/', plexpy.CONFIG.INTERFACE, 'images') + self.icon = os.path.join(self.image_dir, 'logo-flat-white.ico') if plexpy.UPDATE_AVAILABLE: - self.icon = os.path.join(self.image_dir, 'logo-circle-update.ico') + self.title = common.PRODUCT + ' - Update Available!' else: - self.icon = os.path.join(self.image_dir, 'logo-circle.ico') + self.title = common.PRODUCT self.menu = [ rumps.MenuItem('Open Tautulli', callback=self.tray_open), @@ -65,7 +66,8 @@ class MacOSSystemTray(object): self.menu[2].state = plexpy.CONFIG.LAUNCH_STARTUP self.menu[3].state = plexpy.CONFIG.LAUNCH_BROWSER - self.tray_icon = rumps.App(common.PRODUCT, icon=self.icon, menu=self.menu, quit_button=None) + self.tray_icon = rumps.App(common.PRODUCT, title=self.title, + icon=self.icon, menu=self.menu, quit_button=None) def start(self): logger.info("Launching MacOS menu bar icon.") @@ -80,6 +82,8 @@ class MacOSSystemTray(object): def update(self, **kwargs): if 'icon' in kwargs: self.tray_icon.icon = kwargs['icon'] + if 'title' in kwargs: + self.tray_icon.title = kwargs['title'] def tray_open(self, tray_icon): plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, plexpy.HTTP_PORT, plexpy.HTTP_ROOT) @@ -107,10 +111,10 @@ class MacOSSystemTray(object): def change_tray_update_icon(self): if plexpy.UPDATE_AVAILABLE: - self.icon = os.path.join(self.image_dir, 'logo-circle-update.ico') + self.title = common.PRODUCT + ' - Update Available!' else: - self.icon = os.path.join(self.image_dir, 'logo-circle.ico') - self.update(icon=self.icon) + self.title = common.PRODUCT + ' - No Update Available' + self.update(title=self.title) def change_tray_icons(self): self.tray_icon.menu['Start Tautulli at Login'].state = plexpy.CONFIG.LAUNCH_STARTUP diff --git a/plexpy/windows.py b/plexpy/windows.py index 0c93afed..390a6414 100644 --- a/plexpy/windows.py +++ b/plexpy/windows.py @@ -43,12 +43,11 @@ else: class WindowsSystemTray(object): def __init__(self): self.image_dir = os.path.join(plexpy.PROG_DIR, 'data/interfaces/', plexpy.CONFIG.INTERFACE, 'images') + self.icon = os.path.join(self.image_dir, 'logo-circle.ico') if plexpy.UPDATE_AVAILABLE: - self.icon = os.path.join(self.image_dir, 'logo-circle-update.ico') self.hover_text = common.PRODUCT + ' - Update Available!' else: - self.icon = os.path.join(self.image_dir, 'logo-circle.ico') self.hover_text = common.PRODUCT if plexpy.CONFIG.LAUNCH_STARTUP: @@ -116,12 +115,10 @@ class WindowsSystemTray(object): def change_tray_update_icon(self): if plexpy.UPDATE_AVAILABLE: - self.icon = os.path.join(self.image_dir, 'logo-circle-update.ico') self.hover_text = common.PRODUCT + ' - Update Available!' else: - self.icon = os.path.join(self.image_dir, 'logo-circle.ico') self.hover_text = common.PRODUCT + ' - No Update Available' - self.update(icon=self.icon, hover_text=self.hover_text) + self.update(hover_text=self.hover_text) def change_tray_icons(self): if plexpy.CONFIG.LAUNCH_STARTUP: