enhanced tray_init in ftrack and avalon apps

pype/avalon_apps/__init__.py

@@ -1,7 +1,8 @@
 from .avalon_app import AvalonApps
 
 
-def tray_init(tray_widget, main_widget):
+def tray_init(tray_widget, main_widget, parent_menu):
     av_apps = AvalonApps(main_widget, tray_widget)
     av_apps.tray_menu(tray_widget.menu)
+
     return av_apps

pype/avalon_apps/avalon_app.py

@@ -27,20 +27,15 @@ class AvalonApps:
                 self.log.warning('Parent menu is not set')
                 return
 
-        avalon_launcher_icon = launcher_lib.resource("icon", "main.png")
-        aShowLauncher = QtWidgets.QAction(
-            QtGui.QIcon(avalon_launcher_icon), "&Launcher", parent_menu
-        )
-
+        icon = QtGui.QIcon(launcher_lib.resource("icon", "main.png"))
+        aShowLauncher = QtWidgets.QAction(icon, "&Launcher", parent_menu)
         aLibraryLoader = QtWidgets.QAction("&Library", parent_menu)
 
-        parent_menu.addAction(aShowLauncher)
-        parent_menu.addAction(aLibraryLoader)
-
         aShowLauncher.triggered.connect(self.show_launcher)
         aLibraryLoader.triggered.connect(self.show_library_loader)
 
-        return
+        parent_menu.addAction(aShowLauncher)
+        parent_menu.addAction(aLibraryLoader)
 
     def show_launcher(self):
         # if app_launcher don't exist create it/otherwise only show main window
@@ -57,7 +52,6 @@ class AvalonApps:
             io.install()
             APP_PATH = launcher_lib.resource("qml", "main.qml")
             self.app_launcher = launcher_widget.Launcher(root, APP_PATH)
-
         self.app_launcher.window.show()
 
     def show_library_loader(self):

pype/ftrack/__init__.py

@@ -3,7 +3,9 @@ from .ftrack_server import *
 from .ftrack_run import FtrackRunner
 
 
-def tray_init(tray_widget, main_widget):
+def tray_init(tray_widget, main_widget, parent_menu):
     ftrack = FtrackRunner(main_widget, tray_widget)
-    main_widget.menu.addMenu(ftrack.trayMenu(tray_widget.menu))
+    main_widget.menu.addMenu(ftrack.trayMenu(parent_menu))
     ftrack.validate()
+
+    return ftrack