diff options
author | Ryan Inch <mythologylover75@gmail.com> | 2020-04-10 08:36:53 +0300 |
---|---|---|
committer | Ryan Inch <mythologylover75@gmail.com> | 2020-04-10 08:36:53 +0300 |
commit | e81912e82e7cb38efe8995031894a1564ba67e7d (patch) | |
tree | 1187062205f1b4689352d149fd0518552887bd13 | |
parent | 19e2083f9f6c4cca169c3d763456340029c54fd8 (diff) |
Collection Manager: Update tooltips. Task: T69577
Shorten and standardize tooltips.
Add label to RTO filter popover panel.
-rw-r--r-- | object_collection_manager/__init__.py | 12 | ||||
-rw-r--r-- | object_collection_manager/operators.py | 107 | ||||
-rw-r--r-- | object_collection_manager/qcd_move_widget.py | 2 | ||||
-rw-r--r-- | object_collection_manager/qcd_operators.py | 11 | ||||
-rw-r--r-- | object_collection_manager/ui.py | 5 |
5 files changed, 104 insertions, 33 deletions
diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py index 455670fc..52267e0e 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,5,3), + "version": (2,5,4), "blender": (2, 80, 0), "location": "View3D - Object Mode (Shortcut - M)", "warning": '', # used for warning icon and text in addons panel @@ -68,11 +68,11 @@ class CollectionManagerProperties(PropertyGroup): cm_list_collection: CollectionProperty(type=internals.CMListCollection) cm_list_index: IntProperty(update=ui.update_selection) - show_exclude: BoolProperty(default=True, name="Exclude from View Layer") - show_selectable: BoolProperty(default=True, name="Selectable") - show_hide_viewport: BoolProperty(default=True, name="Hide in Viewport") - show_disable_viewport: BoolProperty(default=False, name="Disable in Viewports") - show_render: BoolProperty(default=False, name="Disable in Renders") + show_exclude: BoolProperty(default=True, name="[EC] Exclude from View Layer") + show_selectable: BoolProperty(default=True, name="[SS] Disable Selection") + show_hide_viewport: BoolProperty(default=True, name="[VV] Hide in Viewport") + show_disable_viewport: BoolProperty(default=False, name="[DV] Disable in Viewports") + show_render: BoolProperty(default=False, name="[RR] Disable in Renders") in_phantom_mode: BoolProperty(default=False) diff --git a/object_collection_manager/operators.py b/object_collection_manager/operators.py index 1aca6c3c..1590e42f 100644 --- a/object_collection_manager/operators.py +++ b/object_collection_manager/operators.py @@ -84,8 +84,13 @@ class ExpandAllOperator(Operator): expand_history = {"target": "", "history": []} class ExpandSublevelOperator(Operator): - ''' * Ctrl-Click to expand/collapse all sublevels\n * Shift-Click to isolate/restore tree\n * Alt-Click to discard history''' + '''''' bl_label = "Expand Sublevel Items" + bl_description = ( + " * Ctrl+LMB - Expand/Collapse all sublevels\n" + " * Shift+LMB - Isolate tree/Restore\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.expand_sublevel" bl_options = {'REGISTER', 'UNDO'} @@ -183,8 +188,11 @@ class ExpandSublevelOperator(Operator): class CMSetCollectionOperator(Operator): - ''' * Click to move object to collection.\n * Shift-Click to add/remove object from collection''' bl_label = "Set Object Collection" + bl_description = ( + " * LMB - Move object to collection.\n" + " * Shift+LMB - Add/Remove object from collection" + ) bl_idname = "view3d.set_collection" bl_options = {'REGISTER', 'UNDO'} @@ -262,8 +270,13 @@ class CMSetCollectionOperator(Operator): class CMExcludeOperator(Operator): - ''' * Shift-Click to isolate/restore previous state\n * Ctrl-Click to toggle children\n * Shift-Ctrl-Click to toggle nested isolation\n * Alt-Click to discard history''' - bl_label = "Exclude Collection from View Layer" + bl_label = "[EC] Exclude from View Layer" + bl_description = ( + " * Shift+LMB - Isolate/Restore.\n" + " * Shift+Ctrl+LMB - Isolate nested/Restore.\n" + " * Ctrl+LMB - Toggle nested.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.exclude_collection" bl_options = {'REGISTER', 'UNDO'} @@ -463,8 +476,14 @@ class CMExcludeOperator(Operator): class CMUnExcludeAllOperator(Operator): - ''' * Click to toggle between current excluded state and all included.\n * Shift-Click to invert excluded status of all collections\n * Ctrl-Click to Copy/Paste RTOs\n * Ctrl-Alt-Click to swap RTOs\n * Alt-Click to discard history and copy/swap actions''' - bl_label = "Toggle Excluded Status Of All Collections" + bl_label = "[EC Global] Exclude from View Layer" + bl_description = ( + " * LMB - Enable all/Restore.\n" + " * Shift+LMB - Invert.\n" + " * Ctrl+LMB - Copy/Paste RTOs.\n" + " * Ctrl+Alt+LMB - Swap RTOs.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.un_exclude_all_collections" bl_options = {'REGISTER', 'UNDO'} @@ -593,8 +612,13 @@ class CMUnExcludeAllOperator(Operator): class CMRestrictSelectOperator(Operator): - ''' * Shift-Click to isolate/restore previous state\n * Ctrl-Click to toggle children\n * Shift-Ctrl-Click to toggle nested isolation\n * Alt-Click to discard history''' - bl_label = "Disable Selection of Collection" + bl_label = "[SS] Disable Selection" + bl_description = ( + " * Shift+LMB - Isolate/Restore.\n" + " * Shift+Ctrl+LMB - Isolate nested/Restore.\n" + " * Ctrl+LMB - Toggle nested.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.restrict_select_collection" bl_options = {'REGISTER', 'UNDO'} @@ -789,8 +813,14 @@ class CMRestrictSelectOperator(Operator): class CMUnRestrictSelectAllOperator(Operator): - ''' * Click to toggle between current selectable state and all selectable.\n * Shift-Click to invert selectable status of all collections\n * Ctrl-Click to Copy/Paste RTOs\n * Ctrl-Alt-Click to swap RTOs\n * Alt-Click to discard history and copy/swap actions''' - bl_label = "Toggle Selectable Status Of All Collections" + bl_label = "[SS Global] Disable Selection" + bl_description = ( + " * LMB - Enable all/Restore.\n" + " * Shift+LMB - Invert.\n" + " * Ctrl+LMB - Copy/Paste RTOs.\n" + " * Ctrl+Alt+LMB - Swap RTOs.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.un_restrict_select_all_collections" bl_options = {'REGISTER', 'UNDO'} @@ -915,8 +945,13 @@ class CMUnRestrictSelectAllOperator(Operator): class CMHideOperator(Operator): - ''' * Shift-Click to isolate/restore previous state\n * Ctrl-Click to toggle children\n * Shift-Ctrl-Click to toggle nested isolation\n * Alt-Click to discard history''' - bl_label = "Hide Collection" + bl_label = "[VV] Hide in Viewport" + bl_description = ( + " * Shift+LMB - Isolate/Restore.\n" + " * Shift+Ctrl+LMB - Isolate nested/Restore.\n" + " * Ctrl+LMB - Toggle nested.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.hide_collection" bl_options = {'REGISTER', 'UNDO'} @@ -1111,8 +1146,14 @@ class CMHideOperator(Operator): class CMUnHideAllOperator(Operator): - ''' * Click to toggle between current visibility state and all visible.\n * Shift-Click to invert visibility status of all collections\n * Ctrl-Click to Copy/Paste RTOs\n * Ctrl-Alt-Click to swap RTOs\n * Alt-Click to discard history and copy/swap actions''' - bl_label = "Toggle Hidden Status Of All Collections" + bl_label = "[VV Global] Hide in Viewport" + bl_description = ( + " * LMB - Enable all/Restore.\n" + " * Shift+LMB - Invert.\n" + " * Ctrl+LMB - Copy/Paste RTOs.\n" + " * Ctrl+Alt+LMB - Swap RTOs.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.un_hide_all_collections" bl_options = {'REGISTER', 'UNDO'} @@ -1235,8 +1276,13 @@ class CMUnHideAllOperator(Operator): class CMDisableViewportOperator(Operator): - ''' * Shift-Click to isolate/restore previous state\n * Ctrl-Click to toggle children\n * Shift-Ctrl-Click to toggle nested isolation\n * Alt-Click to discard history''' - bl_label = "Disable Collection in Viewport" + bl_label = "[DV] Disable in Viewports" + bl_description = ( + " * Shift+LMB - Isolate/Restore.\n" + " * Shift+Ctrl+LMB - Isolate nested/Restore.\n" + " * Ctrl+LMB - Toggle nested.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.disable_viewport_collection" bl_options = {'REGISTER', 'UNDO'} @@ -1431,8 +1477,14 @@ class CMDisableViewportOperator(Operator): class CMUnDisableViewportAllOperator(Operator): - ''' * Click to toggle between current viewport display and all enabled.\n * Shift-Click to invert viewport display of all collections\n * Ctrl-Click to Copy/Paste RTOs\n * Ctrl-Alt-Click to swap RTOs\n * Alt-Click to discard history and copy/swap actions''' - bl_label = "Toggle Viewport Display of All Collections" + bl_label = "[DV Global] Disable in Viewports" + bl_description = ( + " * LMB - Enable all/Restore.\n" + " * Shift+LMB - Invert.\n" + " * Ctrl+LMB - Copy/Paste RTOs.\n" + " * Ctrl+Alt+LMB - Swap RTOs.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.un_disable_viewport_all_collections" bl_options = {'REGISTER', 'UNDO'} @@ -1557,8 +1609,13 @@ class CMUnDisableViewportAllOperator(Operator): class CMDisableRenderOperator(Operator): - ''' * Shift-Click to isolate/restore previous state\n * Ctrl-Click to toggle children\n * Shift-Ctrl-Click to toggle nested isolation\n * Alt-Click to discard history''' - bl_label = "Disable Collection in Render" + bl_label = "[RR] Disable in Renders" + bl_description = ( + " * Shift+LMB - Isolate/Restore.\n" + " * Shift+Ctrl+LMB - Isolate nested/Restore.\n" + " * Ctrl+LMB - Toggle nested.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.disable_render_collection" bl_options = {'REGISTER', 'UNDO'} @@ -1754,8 +1811,14 @@ class CMDisableRenderOperator(Operator): class CMUnDisableRenderAllOperator(Operator): - ''' * Click to toggle between current render status and all rendered.\n * Shift-Click to invert render status of all collections\n * Ctrl-Click to Copy/Paste RTOs\n * Ctrl-Alt-Click to swap RTOs\n * Alt-Click to discard history and copy/swap actions''' - bl_label = "Toggle Render Status of All Collections" + bl_label = "[RR Global] Disable in Renders" + bl_description = ( + " * LMB - Enable all/Restore.\n" + " * Shift+LMB - Invert.\n" + " * Ctrl+LMB - Copy/Paste RTOs.\n" + " * Ctrl+Alt+LMB - Swap RTOs.\n" + " * Alt+LMB - Discard history" + ) bl_idname = "view3d.un_disable_render_all_collections" bl_options = {'REGISTER', 'UNDO'} diff --git a/object_collection_manager/qcd_move_widget.py b/object_collection_manager/qcd_move_widget.py index 13212146..95e25058 100644 --- a/object_collection_manager/qcd_move_widget.py +++ b/object_collection_manager/qcd_move_widget.py @@ -912,7 +912,7 @@ def draw_callback_px(self, context): if self.draw_tooltip: slot_name = qcd_slots.get_name(f"{tooltip_slot_idx}") slot_string = f"QCD Slot {tooltip_slot_idx}: \"{slot_name}\"\n" - hotkey_string = " * Shift-Click to toggle objects\' slot." + hotkey_string = " * Shift+LMB - Toggle objects\' slot." draw_tooltip(self, context, shader, f"{slot_string}{hotkey_string}") diff --git a/object_collection_manager/qcd_operators.py b/object_collection_manager/qcd_operators.py index c39a9cf3..ac62db50 100644 --- a/object_collection_manager/qcd_operators.py +++ b/object_collection_manager/qcd_operators.py @@ -137,9 +137,9 @@ class ViewMoveQCDSlot(Operator): slot_string = f"QCD Slot {properties.slot}: \"{slot_name}\"\n" hotkey_string = ( - " * Shift-Click to toggle QCD slot.\n" - " * Ctrl-Click to move objects to QCD slot.\n" - " * Ctrl-Shift-Click to toggle objects' slot" + " * Shift+LMB - Toggle QCD slot.\n" + " * Ctrl+LMB - Move objects to QCD slot.\n" + " * Ctrl+Shift+Click - Toggle objects' slot" ) return f"{slot_string}{hotkey_string}" @@ -250,8 +250,11 @@ class ViewQCDSlot(Operator): class RenumerateQCDSlots(Operator): - '''Re-numerate QCD slots\n * Ctrl-Click to include collections marked by the user as non QCD slots''' bl_label = "Re-numerate QCD Slots" + bl_description = ( + "Re-numerate QCD slots\n" + " * Ctrl+LMB - Include collections marked by the user as non QCD slots" + ) bl_idname = "view3d.renumerate_qcd_slots" bl_options = {'REGISTER', 'UNDO'} diff --git a/object_collection_manager/ui.py b/object_collection_manager/ui.py index 9de8f3e4..93b78853 100644 --- a/object_collection_manager/ui.py +++ b/object_collection_manager/ui.py @@ -583,6 +583,11 @@ class CMRestrictionTogglesPanel(Panel): cm = context.scene.collection_manager layout = self.layout + + name_row = layout.row() + name_row.alignment = 'LEFT' + name_row.label(text="Filter Restriction Toggles") + row = layout.row() row.prop(cm, "show_exclude", icon='CHECKBOX_HLT', icon_only=True) |