From 6b28501b4c69e0716ef92870ad68691a978aea43 Mon Sep 17 00:00:00 2001 From: aardschok Date: Tue, 5 Sep 2017 11:58:05 +0200 Subject: [PATCH] simplified deferred function --- colorbleed/maya/menu.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/colorbleed/maya/menu.py b/colorbleed/maya/menu.py index 1aaf3bc372..330507d90e 100644 --- a/colorbleed/maya/menu.py +++ b/colorbleed/maya/menu.py @@ -14,28 +14,25 @@ log = logging.getLogger(__name__) def deferred(): - - from scriptsmenu import launchformaya - import scriptsmenu.scriptsmenu as menu + import scriptsmenu.launchformaya as launchformaya + import scriptsmenu.scriptsmenu as scriptsmenu log.info("Attempting to install ...") # load configuration of custom menu config_path = os.path.join(os.path.dirname(__file__), "menu.json") - config = menu.load_configuration(config_path) + config = scriptsmenu.load_configuration(config_path) - # get Maya menubar - parent = launchformaya._maya_main_menubar() - cb_menu = menu.ScriptsMenu(objectName=self._menu, - title=self._menu.title(), - parent=parent) + # run the launcher for Maya menu + cb_menu = launchformaya.main(title=self._menu.title(), + objectName=self._menu) # register modifiers modifiers = QtCore.Qt.ControlModifier | QtCore.Qt.ShiftModifier cb_menu.register_callback(modifiers, launchformaya.to_shelf) # apply configuration - menu.load_from_configuration(cb_menu, config) + cb_menu.build_from_configuration(cb_menu, config) def uninstall():