diff options
Diffstat (limited to 'release/scripts')
3 files changed, 99 insertions, 5 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 4120006edad..a2edf5e541d 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -2588,6 +2588,9 @@ def km_sequencercommon(params): ("wm.context_toggle_enum", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, {"properties": [("data_path", 'space_data.view_type'), ("value_1", 'SEQUENCER'), ("value_2", 'PREVIEW')]}), ("sequencer.refresh_all", {"type": 'R', "value": 'PRESS', "ctrl": True}, None), + ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS'}, None), + ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, + {"properties": [("extend", True)]}), ]) if params.select_mouse == 'LEFTMOUSE' and not params.legacy: @@ -2670,9 +2673,6 @@ def km_sequencer(params): for i in range(10) ) ), - ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS'}, None), - ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, - {"properties": [("extend", True)]}), ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "alt": True}, {"properties": [("linked_handle", True)]}), ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True}, @@ -2749,6 +2749,15 @@ def km_sequencerpreview(params): ("sequencer.view_zoom_ratio", {"type": 'NUMPAD_8', "value": 'PRESS'}, {"properties": [("ratio", 0.125)]}), ("sequencer.sample", {"type": params.action_mouse, "value": 'PRESS'}, None), + ("transform.translate", {"type": 'G', "value": 'PRESS'}, None), + ("transform.resize", {"type": 'S', "value": 'PRESS'}, None), + ("transform.rotate", {"type": 'R', "value": 'PRESS'}, None), + ("sequencer.strip_transform_clear", {"type": 'G', "alt": True, "value": 'PRESS'}, + {"properties": [("property", 'POSITION')]}), + ("sequencer.strip_transform_clear", {"type": 'S', "alt": True, "value": 'PRESS'}, + {"properties": [("property", 'SCALE')]}), + ("sequencer.strip_transform_clear", {"type": 'R', "alt": True, "value": 'PRESS'}, + {"properties": [("property", 'ROTATION')]}), ]) return keymap @@ -7316,6 +7325,39 @@ def km_sequencer_editor_tool_blade(_params): ) +def km_sequencer_editor_tool_move(params): + return ( + "Sequencer Tool: Move", + {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, + {"items": [ + ("transform.translate", {"type": params.tool_tweak, "value": 'ANY'}, + {"properties": [("release_confirm", True)]}), + ]}, + ) + + +def km_sequencer_editor_tool_rotate(params): + return ( + "Sequencer Tool: Rotate", + {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, + {"items": [ + ("transform.rotate", {"type": params.tool_tweak, "value": 'ANY'}, + {"properties": [("release_confirm", True)]}), + ]}, + ) + + +def km_sequencer_editor_tool_scale(params): + return ( + "Sequencer Tool: Scale", + {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, + {"items": [ + ("transform.resize", {"type": params.tool_tweak, "value": 'ANY'}, + {"properties": [("release_confirm", True)]}), + ]}, + ) + + # ------------------------------------------------------------------------------ # Full Configuration @@ -7569,6 +7611,9 @@ def generate_keymaps(params=None): km_sequencer_editor_tool_select_box(params), km_sequencer_editor_tool_blade(params), km_sequencer_editor_tool_generic_sample(params), + km_sequencer_editor_tool_scale(params), + km_sequencer_editor_tool_rotate(params), + km_sequencer_editor_tool_move(params), ] # ------------------------------------------------------------------------------ diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 88cf8db686c..806b6100cc8 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -141,9 +141,14 @@ class SEQUENCER_HT_header(Header): layout.separator_spacer() + tool_settings = context.tool_settings + sequencer_tool_settings = tool_settings.sequencer_tool_settings + + if st.view_type == 'PREVIEW': + layout.prop(sequencer_tool_settings, "pivot_point", text="", icon_only=True) + layout.separator_spacer() + if st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'}: - tool_settings = context.tool_settings - sequencer_tool_settings = tool_settings.sequencer_tool_settings row = layout.row(align=True) row.prop(sequencer_tool_settings, "overlap_mode", text="") row = layout.row(align=True) @@ -209,6 +214,7 @@ class SEQUENCER_PT_preview_overlay(Panel): layout = self.layout layout.active = st.show_strip_overlay + layout.prop(overlay_settings, "show_image_outline") layout.prop(ed, "show_overlay", text="Frame Overlay") layout.prop(overlay_settings, "show_safe_areas", text="Safe Areas") layout.prop(overlay_settings, "show_metadata", text="Metadata") @@ -1756,6 +1762,9 @@ class SEQUENCER_PT_adjust_transform(SequencerButtonsPanel, Panel): col = layout.column(align=True) col.prop(strip.transform, "rotation", text="Rotation") + col = layout.column(align=True) + col.prop(strip.transform, "origin") + row = layout.row(heading="Mirror") sub = row.row(align=True) sub.prop(strip, "use_flip_x", text="X", toggle=True) diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index a513ab4b2d4..77a6ff79598 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -2454,6 +2454,39 @@ class _defs_sequencer_generic: keymap="Sequencer Tool: Sample", ) + @ToolDef.from_fn + def translate(): + return dict( + idname="builtin.move", + label="Move", + icon="ops.transform.translate", + widget="SEQUENCER_GGT_gizmo2d_translate", + operator="transform.translate", + keymap="Sequencer Tool: Move", + ) + + @ToolDef.from_fn + def rotate(): + return dict( + idname="builtin.rotate", + label="Rotate", + icon="ops.transform.rotate", + widget="SEQUENCER_GGT_gizmo2d_rotate", + operator="transform.rotate", + keymap="Sequencer Tool: Rotate", + ) + + @ToolDef.from_fn + def scale(): + return dict( + idname="builtin.scale", + label="Scale", + icon="ops.transform.resize", + widget="SEQUENCER_GGT_gizmo2d_resize", + operator="transform.resize", + keymap="Sequencer Tool: Scale", + ) + class _defs_sequencer_select: @ToolDef.from_fn @@ -3045,6 +3078,10 @@ class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel): None: [ ], 'PREVIEW': [ + *_tools_select, + _defs_sequencer_generic.translate, + _defs_sequencer_generic.rotate, + _defs_sequencer_generic.scale, _defs_sequencer_generic.sample, *_tools_annotate, ], @@ -3054,6 +3091,9 @@ class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel): ], 'SEQUENCER_PREVIEW': [ *_tools_select, + _defs_sequencer_generic.translate, + _defs_sequencer_generic.rotate, + _defs_sequencer_generic.scale, _defs_sequencer_generic.blade, _defs_sequencer_generic.sample, *_tools_annotate, |