diff --git a/Tautulli.py b/Tautulli.py index f22dd60a..c0f36a41 100755 --- a/Tautulli.py +++ b/Tautulli.py @@ -257,15 +257,12 @@ def main(): plexpy.HTTP_ROOT) if common.PLATFORM == 'Darwin' and plexpy.CONFIG.SYS_TRAY_ICON: - try: - import AppKit - import Foundation - except ImportError: + if not macos.HAS_PYOBJC: logger.warn("The pyobjc module is missing. Install this " - "module to enable the menu bar icon.") + "module to enable the MacOS menu bar icon.") plexpy.CONFIG.SYS_TRAY_ICON = False - if plexpy.CONFIG.SYS_TRAY_ICON and macos.has_rumps: + if plexpy.CONFIG.SYS_TRAY_ICON: # MacOS menu bar 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() diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css index 3fe49cd6..a906e450 100644 --- a/data/interfaces/default/css/tautulli.css +++ b/data/interfaces/default/css/tautulli.css @@ -2161,7 +2161,7 @@ div.advanced-setting { li.advanced-setting { border-left: 1px solid #cc7b19; } -.docker-setting { +.setting-message { color: #cc7b19; margin-left: 10px; } diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 487d684a..df43ca30 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -8,7 +8,7 @@ from plexpy.helpers import anon_url, checked docker_setting = 'disabled' if plexpy.DOCKER else '' - docker_msg = '(Controlled by Docker Container)' if plexpy.DOCKER else '' + docker_msg = ' ' if plexpy.DOCKER else '' available_notification_agents = sorted(notifiers.available_notification_agents(), key=lambda k: k['label'].lower()) available_newsletter_agents = sorted(newsletters.available_newsletter_agents(), key=lambda k: k['label'].lower()) @@ -460,10 +460,16 @@ % if common.PLATFORM in ('Windows', 'Darwin'): <% tray = {'Windows': 'System Tray', 'Darwin': 'Menu Bar'} + tray_disabled = tray_disabled_msg = '' + if common.PLATFORM == 'Darwin': + from plexpy.macos import HAS_PYOBJC + if not HAS_PYOBJC: + tray_disabled = 'disabled' + tray_disabled_msg = ' ' %>
Show Tautulli shortcut in the ${tray[common.PLATFORM].lower()}.