diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 45c082feee9..058569399b0 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5122,6 +5122,9 @@ def km_popup_toolbar(_params): {"items": [ op_tool("builtin.select", {"type": 'W', "value": 'PRESS'}), op_tool("builtin.transform", {"type": 'T', "value": 'PRESS'}), + op_tool("builtin.move", {"type": 'G', "value": 'PRESS'}), + op_tool("builtin.rotate", {"type": 'R', "value": 'PRESS'}), + op_tool("builtin.scale", {"type": 'S', "value": 'PRESS'}), op_tool("builtin.measure", {"type": 'M', "value": 'PRESS'}), ]}, ) diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index dee2fa3c5f8..225cc7e2b65 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -82,6 +82,12 @@ class _template_widget: scene = context.scene orient_slot = scene.transform_orientation_slots[index] layout.prop(orient_slot, "type") + class IMAGE_GGT_gizmo2d: + @staticmethod + def draw_settings_with_index(context, layout, index): + scene = context.scene + orient_slot = scene.transform_orientation_slots[index] + layout.prop(orient_slot, "type") class _defs_view3d_generic: @@ -1107,6 +1113,42 @@ class _defs_image_uv_transform: # No keymap default action, only for gizmo! ) + @ToolDef.from_fn + def translate(): + return dict( + idname="builtin.move", + label="Move", + description=( + "Move selected items" + ), + icon="ops.transform.translate", + widget="IMAGE_GGT_gizmo2d", + ) + + @ToolDef.from_fn + def rotate(): + return dict( + idname="builtin.rotate", + label="Rotate", + description=( + "Rotate selected items" + ), + icon="ops.transform.rotate", + widget="IMAGE_GGT_gizmo2d", + ) + + @ToolDef.from_fn + def scale(): + return dict( + idname="builtin.scale", + label="Scale", + description=( + "Scale (resize) selected items" + ), + icon="ops.transform.resize", + widget="IMAGE_GGT_gizmo2d", + ) + class _defs_image_uv_select: @@ -1166,7 +1208,6 @@ class _defs_image_uv_select: draw_settings=draw_settings, ) - class _defs_image_uv_sculpt: @staticmethod @@ -1527,9 +1568,12 @@ class IMAGE_PT_tools_active(ToolSelectPanelHelper, Panel): # for reuse _tools_transform = ( - _defs_image_uv_transform.transform, + _defs_image_uv_transform.transform, + _defs_image_uv_transform.translate, + _defs_image_uv_transform.rotate, + _defs_image_uv_transform.scale, ) - + _tools_select = ( ( _defs_image_uv_select.select, diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index deeb5f10918..d61ddd9cced 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5060,6 +5060,9 @@ def km_popup_toolbar(_params): {"items": [ op_tool("builtin.select", {"type": 'W', "value": 'PRESS'}), op_tool("builtin.transform", {"type": 'T', "value": 'PRESS'}), + op_tool("builtin.move", {"type": 'G', "value": 'PRESS'}), + op_tool("builtin.rotate", {"type": 'R', "value": 'PRESS'}), + op_tool("builtin.scale", {"type": 'S', "value": 'PRESS'}), op_tool("builtin.measure", {"type": 'M', "value": 'PRESS'}), ]}, ) diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 6423c7eb6cd..31971abd49e 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -82,6 +82,12 @@ class _template_widget: scene = context.scene orient_slot = scene.transform_orientation_slots[index] layout.prop(orient_slot, "type") + class IMAGE_GGT_gizmo2d: + @staticmethod + def draw_settings_with_index(context, layout, index): + scene = context.scene + orient_slot = scene.transform_orientation_slots[index] + layout.prop(orient_slot, "type") class _defs_view3d_generic: @@ -1113,6 +1119,42 @@ class _defs_image_uv_transform: # No keymap default action, only for gizmo! ) + @ToolDef.from_fn + def translate(): + return dict( + idname="builtin.move", + label="Move", + description=( + "Move selected items" + ), + icon="ops.transform.translate", + widget="IMAGE_GGT_gizmo2d", + ) + + @ToolDef.from_fn + def rotate(): + return dict( + idname="builtin.rotate", + label="Rotate", + description=( + "Rotate selected items" + ), + icon="ops.transform.rotate", + widget="IMAGE_GGT_gizmo2d", + ) + + @ToolDef.from_fn + def scale(): + return dict( + idname="builtin.scale", + label="Scale", + description=( + "Scale (resize) selected items" + ), + icon="ops.transform.resize", + widget="IMAGE_GGT_gizmo2d", + ) + class _defs_image_uv_select: @@ -1178,7 +1220,6 @@ class _defs_image_uv_select: draw_settings=draw_settings, ) - class _defs_image_uv_sculpt: @staticmethod @@ -1551,9 +1592,12 @@ class IMAGE_PT_tools_active(ToolSelectPanelHelper, Panel): # for reuse _tools_transform = ( - _defs_image_uv_transform.transform, + _defs_image_uv_transform.transform, + _defs_image_uv_transform.translate, + _defs_image_uv_transform.rotate, + _defs_image_uv_transform.scale, ) - + _tools_select = ( ( _defs_image_uv_select.select,