From 8a4a89b7e90d96f122987addc526eae7fabc1574 Mon Sep 17 00:00:00 2001
From: John Burnett <github@johnburnett.com>
Date: Wed, 2 Feb 2022 16:55:51 -0800
Subject: [PATCH] Minimize code in userSetup.py

Moves the mGear_menu_loader function in userSetup.py into a function
named mgear.menu.install_main_menu, so that it's easier to initialize
mGear in situations when userSetup.py doesn't run automatically.
---
 release/scripts/mgear/menu.py | 68 +++++++++++++++++++++++++++++++
 release/scripts/userSetup.py  | 76 ++---------------------------------
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/release/scripts/mgear/menu.py b/release/scripts/mgear/menu.py
index 5e9bc0e4..7d46a033 100644
--- a/release/scripts/mgear/menu.py
+++ b/release/scripts/mgear/menu.py
@@ -110,6 +110,74 @@ def install(label, commands, parent=menuId, image=""):
         pm.displayError(message)
 
 
+def install_main_menu():
+    """Create top level mGear menu"""
+
+    # Install mGear Menu
+    import mgear
+    mgear.install()
+
+    # Install Dag Menu option
+    import mgear.core.dagmenu
+    mgear.core.dagmenu.install()
+
+    # Install Shifter Menu
+    import mgear.shifter.menu
+    mgear.shifter.menu.install()
+
+    # Install Simple Rig Menu
+    import mgear.simpleRig.menu
+    mgear.simpleRig.menu.install()
+
+    # Install Skinning Menu
+    import mgear.core.menu
+    mgear.core.menu.install_skinning_menu()
+
+    # Install Rigbits Menu
+    import mgear.rigbits.menu
+    mgear.rigbits.menu.install()
+
+    # Install Animbits Menu
+    import mgear.animbits.menu
+    mgear.animbits.menu.install()
+
+    # Install CFXbits Menu
+    import mgear.cfxbits.menu
+    mgear.cfxbits.menu.install()
+
+    # Install Crank Menu
+    import mgear.crank.menu
+    mgear.crank.menu.install()
+
+    # Install Anim Picker Menu
+    import mgear.anim_picker.menu
+    mgear.anim_picker.menu.install()
+
+    # Install Synoptic Menu
+    import mgear.synoptic.menu
+    mgear.synoptic.menu.install()
+
+    # Install Flex Menu
+    import mgear.flex.menu
+    mgear.flex.menu.install()
+
+    # Install Utilities Menu
+    import mgear.menu
+    m = mgear.menu.install_utils_menu()
+    mgear.core.menu.install_utils_menu(m)
+    mgear.rigbits.menu.install_utils_menu(m)
+
+    # install dragdrop override in utilities
+    import mgear.core.dragdrop
+    mgear.core.dragdrop.install_utils_menu(m)
+
+    # Install Help Menu
+    mgear.menu.install_help_menu()
+
+    # from cvwrap.menu import create_menuitems
+    # create_menuitems()
+
+
 str_web = """
 import webbrowser
 webbrowser.open("http://www.mgear-framework.com/")
diff --git a/release/scripts/userSetup.py b/release/scripts/userSetup.py
index 1c78504e..fdcfedd9 100644
--- a/release/scripts/userSetup.py
+++ b/release/scripts/userSetup.py
@@ -1,10 +1,6 @@
-
-# imports
 from maya import cmds
-from pymel import mayautils
-# from cvwrap.menu import create_menuitems
 
-print("""
+print(r"""
  ____________________________________
 |             _____                  |
 |            / ____|                 |
@@ -17,71 +13,7 @@
 """)
 
 
-def mGear_menu_loader():
-    """Create mGear menu"""
-
-    # Install mGear Menu
-    import mgear
-    mgear.install()
-
-    # Install Dag Menu option
-    import mgear.core.dagmenu
-    mgear.core.dagmenu.install()
-
-    # Install Shifter Menu
-    import mgear.shifter.menu
-    mgear.shifter.menu.install()
-
-    # Install Simple Rig Menu
-    import mgear.simpleRig.menu
-    mgear.simpleRig.menu.install()
-
-    # Install Skinning Menu
-    import mgear.core.menu
-    mgear.core.menu.install_skinning_menu()
-
-    # Install Rigbits Menu
-    import mgear.rigbits.menu
-    mgear.rigbits.menu.install()
-
-    # Install Animbits Menu
-    import mgear.animbits.menu
-    mgear.animbits.menu.install()
-
-    # Install CFXbits Menu
-    import mgear.cfxbits.menu
-    mgear.cfxbits.menu.install()
-
-    # Install Crank Menu
-    import mgear.crank.menu
-    mgear.crank.menu.install()
-
-    # Install Anim Picker Menu
-    import mgear.anim_picker.menu
-    mgear.anim_picker.menu.install()
-
-    # Install Synoptic Menu
-    import mgear.synoptic.menu
-    mgear.synoptic.menu.install()
-
-    # Install Flex Menu
-    import mgear.flex.menu
-    mgear.flex.menu.install()
-
-    # Install Utilities Menu
-    import mgear.menu
-    m = mgear.menu.install_utils_menu()
-    mgear.core.menu.install_utils_menu(m)
-    mgear.rigbits.menu.install_utils_menu(m)
-
-    # install dragdrop override in utilities
-    import mgear.core.dragdrop
-    mgear.core.dragdrop.install_utils_menu(m)
-
-    # Install Help Menu
-    mgear.menu.install_help_menu()
-
-
 if not cmds.about(batch=True):
-    mayautils.executeDeferred(mGear_menu_loader)
-    # mayautils.executeDeferred(create_menuitems)
+    from pymel import mayautils
+    import mgear.menu
+    mayautils.executeDeferred(mgear.menu.install_main_menu)