From 6fcfb869a5aa4f3aafacf26293c2696f75377f28 Mon Sep 17 00:00:00 2001 From: Ryan Inch Date: Tue, 12 Jan 2021 22:55:30 -0500 Subject: Collection Manager: Polish. Task: T69577 Update QVT hotkeys. Add warning to QCD Select All Objects operator. --- object_collection_manager/__init__.py | 2 +- object_collection_manager/qcd_init.py | 44 ++++++++++++++---------------- object_collection_manager/qcd_operators.py | 15 ++++------ 3 files changed, 27 insertions(+), 34 deletions(-) (limited to 'object_collection_manager') diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py index 6a93ecd1..f9edfac6 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, 19, 0), + "version": (2, 19, 1), "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/qcd_init.py b/object_collection_manager/qcd_init.py index dca4d5cf..6511b7d5 100644 --- a/object_collection_manager/qcd_init.py +++ b/object_collection_manager/qcd_init.py @@ -167,10 +167,6 @@ def register_qcd_view_hotkeys(): kmi = km.keymap_items.new('view3d.enable_all_qcd_slots', 'PLUS', 'PRESS', shift=True) addon_qcd_view_hotkey_keymaps.append((km, kmi)) - km = wm.keyconfigs.addon.keymaps.new(name=mode) - kmi = km.keymap_items.new('view3d.enable_all_qcd_slots_isolated', 'PLUS', 'PRESS', shift=True, alt=True) - addon_qcd_view_hotkey_keymaps.append((km, kmi)) - km = wm.keyconfigs.addon.keymaps.new(name=mode) kmi = km.keymap_items.new('view3d.isolate_selected_objects_collections', 'EQUAL', 'PRESS') addon_qcd_view_hotkey_keymaps.append((km, kmi)) @@ -180,17 +176,17 @@ def register_qcd_view_hotkeys(): addon_qcd_view_hotkey_keymaps.append((km, kmi)) km = wm.keyconfigs.addon.keymaps.new(name=mode) - kmi = km.keymap_items.new('view3d.disable_all_non_qcd_slots', 'PLUS', 'PRESS', shift=True, ctrl=True) + kmi = km.keymap_items.new('view3d.disable_all_non_qcd_slots', 'PLUS', 'PRESS', shift=True, alt=True) addon_qcd_view_hotkey_keymaps.append((km, kmi)) km = wm.keyconfigs.addon.keymaps.new(name=mode) kmi = km.keymap_items.new('view3d.disable_all_collections', 'EQUAL', 'PRESS', alt=True, ctrl=True) addon_qcd_view_hotkey_keymaps.append((km, kmi)) - if mode == 'Object Mode': - km = wm.keyconfigs.addon.keymaps.new(name=mode) - kmi = km.keymap_items.new('view3d.select_all_qcd_objects', 'EQUAL', 'PRESS', alt=True) - addon_qcd_view_hotkey_keymaps.append((km, kmi)) + + km = wm.keyconfigs.addon.keymaps.new(name=mode) + kmi = km.keymap_items.new('view3d.discard_qcd_history', 'EQUAL', 'PRESS', alt=True) + addon_qcd_view_hotkey_keymaps.append((km, kmi)) def register_qcd_view_edit_mode_hotkeys(): @@ -234,25 +230,25 @@ def register_qcd_view_edit_mode_hotkeys(): kmi.properties.toggle = True addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) - km = wm.keyconfigs.addon.keymaps.new(name=mode) - kmi = km.keymap_items.new('view3d.enable_all_qcd_slots', 'PLUS', 'PRESS', shift=True) - addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) + km = wm.keyconfigs.addon.keymaps.new(name=mode) + kmi = km.keymap_items.new('view3d.enable_all_qcd_slots', 'PLUS', 'PRESS', shift=True) + addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) - km = wm.keyconfigs.addon.keymaps.new(name=mode) - kmi = km.keymap_items.new('view3d.isolate_selected_objects_collections', 'EQUAL', 'PRESS') - addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) + km = wm.keyconfigs.addon.keymaps.new(name=mode) + kmi = km.keymap_items.new('view3d.isolate_selected_objects_collections', 'EQUAL', 'PRESS') + addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) - km = wm.keyconfigs.addon.keymaps.new(name=mode) - kmi = km.keymap_items.new('view3d.enable_all_qcd_slots_isolated', 'PLUS', 'PRESS', shift=True, alt=True) - addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) + km = wm.keyconfigs.addon.keymaps.new(name=mode) + kmi = km.keymap_items.new('view3d.disable_all_non_qcd_slots', 'PLUS', 'PRESS', shift=True, alt=True) + addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) - km = wm.keyconfigs.addon.keymaps.new(name=mode) - kmi = km.keymap_items.new('view3d.disable_all_non_qcd_slots', 'PLUS', 'PRESS', shift=True, ctrl=True) - addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) + km = wm.keyconfigs.addon.keymaps.new(name=mode) + kmi = km.keymap_items.new('view3d.disable_all_collections', 'EQUAL', 'PRESS', alt=True, ctrl=True) + addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) - km = wm.keyconfigs.addon.keymaps.new(name=mode) - kmi = km.keymap_items.new('view3d.disable_all_collections', 'EQUAL', 'PRESS', alt=True, ctrl=True) - addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) + km = wm.keyconfigs.addon.keymaps.new(name=mode) + kmi = km.keymap_items.new('view3d.discard_qcd_history', 'EQUAL', 'PRESS', alt=True) + addon_qcd_view_edit_mode_hotkey_keymaps.append((km, kmi)) km = wm.keyconfigs.addon.keymaps.new(name="Mesh") diff --git a/object_collection_manager/qcd_operators.py b/object_collection_manager/qcd_operators.py index 6093257c..5f465eb5 100644 --- a/object_collection_manager/qcd_operators.py +++ b/object_collection_manager/qcd_operators.py @@ -146,16 +146,9 @@ class EnableAllQCDSlotsMeta(Operator): @classmethod def description(cls, context, properties): - selection_hotkeys = "" - - if context.mode == 'OBJECT': - selection_hotkeys = ( - " * Alt+LMB - Select all objects in QCD slots.\n" - ) - hotkey_string = ( " * LMB - Enable all slots/Restore.\n" - + selection_hotkeys + + " * Alt+LMB - Discard History.\n" " * LMB+Hold - Menu" ) @@ -169,7 +162,7 @@ class EnableAllQCDSlotsMeta(Operator): qab.meta_op = True if modifiers == {"alt"}: - bpy.ops.view3d.select_all_qcd_objects() + bpy.ops.view3d.discard_qcd_history() else: qab.init(context) @@ -487,6 +480,7 @@ class SelectAllQCDObjects(Operator): qab = QCDAllBase if context.mode != 'OBJECT': + self.report({"WARNING"}, "Can only be executed in Object Mode") return {'CANCELLED'} if not context.selectable_objects: @@ -539,6 +533,9 @@ class DiscardQCDHistory(Operator): del internals.qcd_history[view_layer] qab.clear() + # update header UI + update_qcd_header() + return {'FINISHED'} -- cgit v1.2.3