diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index 50c27ebe78e..e66bc8cb4a1 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -8732,9 +8732,9 @@ def km_sequencer_editor_tool_generic_select_timeline_lcs(params, fallback): ] -def km_sequencer_editor_tool_generic_select_timeline(params, *, fallback): +def km_sequencer_editor_tool_generic_select(params, *, fallback): return ( - _fallback_id("Sequencer Timeline Tool: Tweak", fallback), + _fallback_id("Sequencer Tool: Tweak", fallback), {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, {"items": [ *(km_sequencer_editor_tool_generic_select_timeline_rcs(params, fallback) if (params.select_mouse == 'RIGHTMOUSE') @@ -8743,9 +8743,9 @@ def km_sequencer_editor_tool_generic_select_timeline(params, *, fallback): ) -def km_sequencer_editor_tool_generic_select_box_timeline(params, *, fallback): +def km_sequencer_editor_tool_generic_select_box(params, *, fallback): return ( - _fallback_id("Sequencer Timeline Tool: Select Box", fallback), + _fallback_id("Sequencer Tool: Select Box", fallback), {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, {"items": [ # Don't use `tool_maybe_tweak_event`, see comment for this slot. @@ -8754,6 +8754,7 @@ def km_sequencer_editor_tool_generic_select_box_timeline(params, *, fallback): **(params.select_tweak_event if (fallback and params.use_fallback_tool_select_mouse) else params.tool_tweak_event), properties=[("tweak", params.select_mouse == 'LEFTMOUSE')])), + # RMB select can already set the frame, match the tweak tool. # Ignored for preview. *(_template_items_change_frame(params) @@ -8762,36 +8763,6 @@ def km_sequencer_editor_tool_generic_select_box_timeline(params, *, fallback): ) -def km_sequencer_editor_tool_generic_select_preview(params, *, fallback): - return ( - _fallback_id("Sequencer Preview Tool: Tweak", fallback), - {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, - {"items": [ - *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select( - params, "sequencer.select", "sequencer.cursor_set", cursor_prioritize=True, fallback=fallback)), - - *([] if params.use_fallback_tool_select_handled else - _template_sequencer_preview_select( - type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)), - ]}, - ) - - -def km_sequencer_editor_tool_generic_select_box_preview(params, *, fallback): - return ( - _fallback_id("Sequencer Preview Tool: Select Box", fallback), - {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, - {"items": [ - # Don't use `tool_maybe_tweak_event`, see comment for this slot. - *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple( - "sequencer.select_box", - **(params.select_tweak_event if (fallback and params.use_fallback_tool_select_mouse) else - params.tool_tweak_event), - properties=[("tweak", params.select_mouse == 'LEFTMOUSE')])), - ]}, - ) - - def km_sequencer_editor_tool_generic_cursor(params): return ( "Sequencer Tool: Cursor", @@ -9150,11 +9121,9 @@ def generate_keymaps(params=None): km_3d_view_tool_sculpt_gpencil_select_box(params), km_3d_view_tool_sculpt_gpencil_select_circle(params), km_3d_view_tool_sculpt_gpencil_select_lasso(params), - *(km_sequencer_editor_tool_generic_select_timeline(params, fallback=fallback) for fallback in (False, True)), - *(km_sequencer_editor_tool_generic_select_box_timeline(params, fallback=fallback) for fallback in (False, True)), - *(km_sequencer_editor_tool_generic_select_preview(params, fallback=fallback) for fallback in (False, True)), - *(km_sequencer_editor_tool_generic_select_box_preview(params, fallback=fallback) for fallback in (False, True)), km_3d_view_tool_paint_grease_pencil_cutter(params), + *(km_sequencer_editor_tool_generic_select(params, fallback=fallback) for fallback in (False, True)), + *(km_sequencer_editor_tool_generic_select_box(params, fallback=fallback) for fallback in (False, True)), km_sequencer_editor_tool_generic_cursor(params), km_sequencer_editor_tool_blade(params), km_sequencer_editor_tool_sample(params), diff --git a/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/scripts/startup/bl_ui/space_toolsystem_toolbar.py index b98cce0b47d..6ba88ce096f 100644 --- a/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -2988,43 +2988,17 @@ class _defs_sequencer_generic: class _defs_sequencer_select: @ToolDef.from_fn - def select_timeline(): - return dict( - idname="builtin.select", - label="Tweak", - icon="ops.generic.select", - widget=None, - keymap="Sequencer Timeline Tool: Tweak", - ) - - @ToolDef.from_fn - def box_timeline(): - def draw_settings(_context, layout, tool): - props = tool.operator_properties("sequencer.select_box") - row = layout.row() - row.use_property_split = False - row.prop(props, "mode", text="", expand=True, icon_only=True) - return dict( - idname="builtin.select_box", - label="Select Box", - icon="ops.generic.select_box", - widget=None, - keymap="Sequencer Timeline Tool: Select Box", - draw_settings=draw_settings, - ) - - @ToolDef.from_fn - def select_preview(): + def select(): return dict( idname="builtin.select", label="Tweak", icon="ops.generic.select", widget=None, - keymap="Sequencer Preview Tool: Tweak", + keymap="Sequencer Tool: Tweak", ) @ToolDef.from_fn - def box_preview(): + def box(): def draw_settings(_context, layout, tool): props = tool.operator_properties("sequencer.select_box") row = layout.row() @@ -3035,7 +3009,7 @@ class _defs_sequencer_select: label="Select Box", icon="ops.generic.select_box", widget=None, - keymap="Sequencer Preview Tool: Select Box", + keymap="Sequencer Tool: Select Box", draw_settings=draw_settings, ) @@ -3644,6 +3618,13 @@ class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel): yield from cls._tools.items() # Private tool lists for convenient reuse in `_tools`. + + _tools_select = ( + ( + _defs_sequencer_select.select, + _defs_sequencer_select.box, + ), + ) _tools_annotate = ( ( _defs_annotate.scribble, @@ -3660,10 +3641,7 @@ class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel): None: [ ], 'PREVIEW': [ - ( - _defs_sequencer_select.select_preview, - _defs_sequencer_select.box_preview, - ), + *_tools_select, _defs_sequencer_generic.cursor, None, _defs_sequencer_generic.translate, @@ -3675,13 +3653,12 @@ class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel): *_tools_annotate, ], 'SEQUENCER': [ - ( - _defs_sequencer_select.select_timeline, - _defs_sequencer_select.box_timeline, - ), + *_tools_select, _defs_sequencer_generic.blade, ], 'SEQUENCER_PREVIEW': [ + *_tools_select, + None, *_tools_annotate, None, _defs_sequencer_generic.blade,