[Bf-extensions-cvs] [52edc5f4] master: Collection Manager: Add to menus. Task: T69577

[Ryan Inch]

Commit: 52edc5f41f231eac04415f3722a354ab5972b03a
Author: Ryan Inch
Date:   Sat Jul 18 00:32:07 2020 -0400
Branches: master
https://developer.blender.org/rBA52edc5f41f231eac04415f3722a354ab5972b03a

Collection Manager: Add to menus. Task: T69577

Add the main collection manager window and the QCD move widget
to the Object->Collection menu, formerly these were only accessible
through hotkeys.  Improve tooltips to better describe what these
do.

===================================================================

M	object_collection_manager/__init__.py
M	object_collection_manager/qcd_move_widget.py
M	object_collection_manager/ui.py

===================================================================

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index 928a62ec..e8b8f25c 100644
--- a/object_collection_manager/__init__.py
+++ b/object_collection_manager/__init__.py
@@ -22,7 +22,7 @@ bl_info = {
     "name": "Collection Manager",
     "description": "Manage collections and their objects",
     "author": "Ryan Inch",
-    "version": (2, 9, 2),
+    "version": (2, 9, 3),
     "blender": (2, 80, 0),
     "location": "View3D - Object Mode (Shortcut - M)",
     "warning": '',  # used for warning icon and text in addons panel
@@ -133,6 +133,18 @@ def undo_redo_post_handler(dummy):
     internals.move_selection.clear()
     internals.move_active = None
 
+
+def menu_addition(self, context):
+    layout = self.layout
+
+    layout.operator('view3d.collection_manager')
+
+    if bpy.context.preferences.addons[__package__].preferences.enable_qcd:
+        layout.operator('view3d.qcd_move_widget')
+
+    layout.separator()
+
+
 def register():
     for cls in classes:
         bpy.utils.register_class(cls)
@@ -145,6 +157,9 @@ def register():
     kmi = km.keymap_items.new('view3d.collection_manager', 'M', 'PRESS')
     addon_keymaps.append((km, kmi))
 
+    # Add Collection Manager & QCD Move Widget to the Object->Collections menu
+    bpy.types.VIEW3D_MT_object_collection.prepend(menu_addition)
+
     bpy.app.handlers.depsgraph_update_post.append(depsgraph_update_post_handler)
     bpy.app.handlers.undo_post.append(undo_redo_post_handler)
     bpy.app.handlers.redo_post.append(undo_redo_post_handler)
@@ -159,6 +174,9 @@ def unregister():
     for cls in classes:
         bpy.utils.unregister_class(cls)
 
+    # Remove Collection Manager & QCD Move Widget from the Object->Collections menu
+    bpy.types.VIEW3D_MT_object_collection.remove(menu_addition)
+
     bpy.app.handlers.depsgraph_update_post.remove(depsgraph_update_post_handler)
     bpy.app.handlers.undo_post.remove(undo_redo_post_handler)
     bpy.app.handlers.redo_post.remove(undo_redo_post_handler)
diff --git a/object_collection_manager/qcd_move_widget.py b/object_collection_manager/qcd_move_widget.py
index 95e25058..85f63f58 100644
--- a/object_collection_manager/qcd_move_widget.py
+++ b/object_collection_manager/qcd_move_widget.py
@@ -372,7 +372,7 @@ def update_area_dimensions(area, w=0, h=0):
     area["height"] += h
 
 class QCDMoveWidget(Operator):
-    """QCD Move Widget"""
+    """Move objects to QCD Slots"""
     bl_idname = "view3d.qcd_move_widget"
     bl_label = "QCD Move Widget"
 
diff --git a/object_collection_manager/ui.py b/object_collection_manager/ui.py
index 3bd614a6..76c44bb0 100644
--- a/object_collection_manager/ui.py
+++ b/object_collection_manager/ui.py
@@ -58,6 +58,7 @@ last_icon_theme_text_sel = None
 
 
 class CollectionManager(Operator):
+    '''Manage and control collections, with advanced features, in a popup UI'''
     bl_label = "Collection Manager"
     bl_idname = "view3d.collection_manager"