[Bf-extensions-cvs] [69f875e1] master: Collection Manager: CM popup UX fixes. Task: T69577

[Ryan Inch]

Commit: 69f875e1171ae83b6737fc988411afd14c8c4282
Author: Ryan Inch
Date:   Mon Jul 12 01:28:29 2021 -0400
Branches: master
https://developer.blender.org/rBA69f875e1171ae83b6737fc988411afd14c8c4282

Collection Manager: CM popup UX fixes. Task: T69577

Renamed the Set Collection Operator to Send Objects To Collection
and updated it's tooltip.
Changed it's icon for a collection with no objects
from the grid icon to the import icon for (hopefully)
better discoverability.

Updated the filter bar's invert icon to use the standard arrows icon.
Changed the filter collections by selected objects icon to the selected
objects icon used by the send objects to collection operator.

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

M	object_collection_manager/__init__.py
M	object_collection_manager/cm_init.py
M	object_collection_manager/operators.py
M	object_collection_manager/ui.py

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

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index fab811cd..3936d11b 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, 22, 2),
+    "version": (2, 22, 3),
     "blender": (2, 80, 0),
     "location": "View3D - Object Mode (Shortcut - M)",
     "warning": '',  # used for warning icon and text in addons panel
diff --git a/object_collection_manager/cm_init.py b/object_collection_manager/cm_init.py
index 94301753..a60747a8 100644
--- a/object_collection_manager/cm_init.py
+++ b/object_collection_manager/cm_init.py
@@ -100,7 +100,7 @@ classes = (
     operators.CMRemoveEmptyCollectionsOperator,
     operators.CMSelectCollectionObjectsOperator,
     operators.SelectAllCumulativeObjectsOperator,
-    operators.CMSetCollectionOperator,
+    operators.CMSendObjectsToCollectionOperator,
     operators.CMPhantomModeOperator,
     operators.CMApplyPhantomModeOperator,
     operators.CMDisableObjectsOperator,
diff --git a/object_collection_manager/operators.py b/object_collection_manager/operators.py
index afcfb266..55ca3a62 100644
--- a/object_collection_manager/operators.py
+++ b/object_collection_manager/operators.py
@@ -290,13 +290,13 @@ class SelectAllCumulativeObjectsOperator(Operator):
         return {'FINISHED'}
 
 
-class CMSetCollectionOperator(Operator):
-    bl_label = "Set Object Collection"
+class CMSendObjectsToCollectionOperator(Operator):
+    bl_label = "Send Objects to Collection"
     bl_description = (
-        "  * LMB - Move object to collection.\n"
-        "  * Shift+LMB - Add/Remove object from collection"
+        "  * LMB - Move objects to collection.\n"
+        "  * Shift+LMB - Add/Remove objects from collection"
         )
-    bl_idname = "view3d.set_collection"
+    bl_idname = "view3d.send_objects_to_collection"
     bl_options = {'REGISTER', 'UNDO'}
 
     is_master_collection: BoolProperty()
diff --git a/object_collection_manager/ui.py b/object_collection_manager/ui.py
index 68da7323..b7bc1b32 100644
--- a/object_collection_manager/ui.py
+++ b/object_collection_manager/ui.py
@@ -249,7 +249,7 @@ class CollectionManager(Operator):
 
         collection = context.view_layer.layer_collection.collection
 
-        icon = 'GRID'
+        icon = 'IMPORT'
 
         if collection.objects:
             icon = 'MESH_CUBE'
@@ -275,7 +275,7 @@ class CollectionManager(Operator):
                                 )
 
         # add operator
-        prop = row_setcol.operator("view3d.set_collection", text="",
+        prop = row_setcol.operator("view3d.send_objects_to_collection", text="",
                                    icon=icon, emboss=False)
         prop.is_master_collection = True
         prop.collection_name = 'Scene Collection'
@@ -705,11 +705,11 @@ class CM_UL_items(UIList):
         add_vertical_separator_line(row)
 
 
-        # add set_collection op
+        # add send_objects_to_collection op
         set_obj_col = row.row()
         set_obj_col.operator_context = 'INVOKE_DEFAULT'
 
-        icon = 'GRID'
+        icon = 'IMPORT'
 
         if collection.objects:
             icon = 'MESH_CUBE'
@@ -725,7 +725,7 @@ class CM_UL_items(UIList):
             set_obj_col.enabled = False
 
 
-        prop = set_obj_col.operator("view3d.set_collection", text="",
+        prop = set_obj_col.operator("view3d.send_objects_to_collection", text="",
                                    icon=icon, emboss=False)
         prop.is_master_collection = False
         prop.collection_name = item.name
@@ -863,12 +863,10 @@ class CM_UL_items(UIList):
 
         subrow = row.row(align=True)
         subrow.prop(self, "filter_name", text="")
-
-        icon = 'ZOOM_OUT' if self.use_filter_invert else 'ZOOM_IN'
-        subrow.prop(self, "use_filter_invert", text="", icon=icon)
+        subrow.prop(self, "use_filter_invert", text="", icon='ARROW_LEFTRIGHT')
 
         subrow = row.row(align=True)
-        subrow.prop(self, "filter_by_selected", text="", icon='SNAP_VOLUME')
+        subrow.prop(self, "filter_by_selected", text="", icon='STICKY_UVS_LOC')
 
         if context.preferences.addons[__package__].preferences.enable_qcd:
             subrow.prop(self, "filter_by_qcd", text="", icon='EVENT_Q')