ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: expose all keymaps in the preferences

Browse source 
Many key maps were missing from the preferences,
expose them based on updated tests (see !162440).

Also ensure "Generic" tool keymaps use an "EMPTY" space type,
since they are shared between spaces.

Ref !162440
This commit is contained in:
Campbell Barton 2026-08-11 06:34:00 +00:00
parent e169264762
commit 3eb7bf0f32
2 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

55
scripts/modules/bl_keymap_utils/keymap_hierarchy.py
View file

@ -53,6 +53,7 @@ _km_hierarchy = [
('View2D Buttons List', 'EMPTY', 'WINDOW', []), # view 2d with buttons navigation
('User Interface', 'EMPTY', 'WINDOW', []),
('Toolbar Popup', 'EMPTY', 'TEMPORARY', []), # tool switching popup
('3D View', 'VIEW_3D', 'WINDOW', [ # view 3d navigation and generic stuff (select, transform)
('Object Mode', 'EMPTY', 'WINDOW', [
@ -64,7 +65,9 @@ _km_hierarchy = [
('Curve', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('VIEW_3D', 'EDIT_CURVE'),
]),
('Curves', 'EMPTY', 'WINDOW', []),
('Curves', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('VIEW_3D', 'EDIT_CURVES'),
]),
('Armature', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('VIEW_3D', 'EDIT_ARMATURE'),
]),
@ -99,9 +102,7 @@ _km_hierarchy = [
_km_expand_from_toolsystem('VIEW_3D', 'SCULPT'),
]),
('Sculpt Curves', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('VIEW_3D', 'CURVES_SCULPT'),
]),
('Sculpt Curves', 'EMPTY', 'WINDOW', []),
('Particle', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('VIEW_3D', 'PARTICLE'),
@ -150,14 +151,11 @@ _km_hierarchy = [
('UV Editor', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('IMAGE_EDITOR', 'UV'),
]),
('UV Sculpt', 'EMPTY', 'WINDOW', []),
# Image and view3d.
('Image Paint', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('IMAGE_EDITOR', 'PAINT'),
]),
('Image View', 'IMAGE_EDITOR', 'WINDOW', [
_km_expand_from_toolsystem('IMAGE_EDITOR', 'VIEW'),
]),
_km_expand_from_toolsystem('IMAGE_EDITOR', 'VIEW'),
('Image Generic', 'IMAGE_EDITOR', 'WINDOW', [
_km_expand_from_toolsystem('IMAGE_EDITOR', None),
]),
@ -166,15 +164,12 @@ _km_hierarchy = [
('Outliner', 'OUTLINER', 'WINDOW', []),
('Node Editor', 'NODE_EDITOR', 'WINDOW', [
('Node Generic', 'NODE_EDITOR', 'WINDOW', []),
('Node Tool: Tweak', 'NODE_EDITOR', 'WINDOW', []),
('Node Tool: Tweak (fallback)', 'NODE_EDITOR', 'WINDOW', []),
('Node Tool: Select Box', 'NODE_EDITOR', 'WINDOW', []),
('Node Tool: Select Box (fallback)', 'NODE_EDITOR', 'WINDOW', []),
('Node Tool: Select Lasso', 'NODE_EDITOR', 'WINDOW', []),
('Node Tool: Select Lasso (fallback)', 'NODE_EDITOR', 'WINDOW', []),
('Node Tool: Select Circle', 'NODE_EDITOR', 'WINDOW', []),
('Node Tool: Select Circle (fallback)', 'NODE_EDITOR', 'WINDOW', []),
('Node Generic', 'NODE_EDITOR', 'WINDOW', [
# Nodes don't use modes to access different tools, so there is only ever a single context.
_km_expand_from_toolsystem('NODE_EDITOR', None),
]),
('Node Link Modal Map', 'EMPTY', 'WINDOW', []),
('Node Resize Modal Map', 'EMPTY', 'WINDOW', []),
]),
('Spreadsheet Generic', 'SPREADSHEET', 'WINDOW', []),
@ -186,6 +181,8 @@ _km_hierarchy = [
('Preview', 'SEQUENCE_EDITOR', 'WINDOW', [
_km_expand_from_toolsystem('SEQUENCE_EDITOR', 'PREVIEW'),
]),
('Sequencer Channels', 'SEQUENCE_EDITOR', 'WINDOW', []),
('Slip Modal', 'EMPTY', 'WINDOW', []),
]),
('File Browser', 'FILE_BROWSER', 'WINDOW', [
@ -197,6 +194,10 @@ _km_hierarchy = [
('Property Editor', 'PROPERTIES', 'WINDOW', []), # align context menu
('Preferences', 'PREFERENCES', 'WINDOW', [
('Preferences_nav', 'PREFERENCES', 'UI', []), # navigation bar
]),
('Text', 'TEXT_EDITOR', 'WINDOW', [
('Text Generic', 'TEXT_EDITOR', 'WINDOW', []),
]),
@ -205,38 +206,52 @@ _km_hierarchy = [
('Clip Editor', 'CLIP_EDITOR', 'WINDOW', []),
('Clip Graph Editor', 'CLIP_EDITOR', 'WINDOW', []),
('Clip Dopesheet Editor', 'CLIP_EDITOR', 'WINDOW', []),
('Clip Time Scrub', 'CLIP_EDITOR', 'PREVIEW', []),
]),
('Grease Pencil', 'EMPTY', 'WINDOW', [
# Grease Pencil
('Grease Pencil Draw Mode', 'EMPTY', 'WINDOW', []),
('Grease Pencil Draw Mode', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('VIEW_3D', 'PAINT_GREASE_PENCIL'),
]),
('Grease Pencil Brush Stroke', 'EMPTY', 'WINDOW', []),
('Grease Pencil Edit Mode', 'EMPTY', 'WINDOW', []),
('Grease Pencil Edit Mode', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('VIEW_3D', 'EDIT_GREASE_PENCIL'),
]),
('Grease Pencil Sculpt Mode', 'EMPTY', 'WINDOW', []),
('Grease Pencil Weight Paint', 'EMPTY', 'WINDOW', []),
('Grease Pencil Vertex Paint', 'EMPTY', 'WINDOW', []),
('Grease Pencil Selection', 'EMPTY', 'WINDOW', []),
# Grease Pencil Fill Tool
('Grease Pencil Fill Tool', 'EMPTY', 'WINDOW', []),
]),
('Mask Editing', 'EMPTY', 'WINDOW', []),
('Mask Editing', 'EMPTY', 'WINDOW', [
_km_expand_from_toolsystem('IMAGE_EDITOR', 'MASK'),
]),
('Frames', 'EMPTY', 'WINDOW', []), # frame navigation (per region)
('Markers', 'EMPTY', 'WINDOW', []), # markers (per region)
('Animation', 'EMPTY', 'WINDOW', []), # frame change on click, preview range (per region)
('Animation Channels', 'EMPTY', 'WINDOW', []),
('Time Scrub', 'EMPTY', 'WINDOW', []), # frame change by dragging the scrub-bar (per region)
('View3D Gesture Circle', 'EMPTY', 'WINDOW', []),
('Gesture Straight Line', 'EMPTY', 'WINDOW', []),
('Gesture Zoom Border', 'EMPTY', 'WINDOW', []),
('Gesture Box', 'EMPTY', 'WINDOW', []),
('Gesture Lasso', 'EMPTY', 'WINDOW', []),
('Gesture Polyline', 'EMPTY', 'WINDOW', []),
('Standard Modal Map', 'EMPTY', 'WINDOW', []),
('Transform Modal Map', 'EMPTY', 'WINDOW', []),
('Transform Axis Target Modal Map', 'EMPTY', 'WINDOW', []),
('Eyedropper Modal Map', 'EMPTY', 'WINDOW', []),
('Eyedropper ColorRamp PointSampling Map', 'EMPTY', 'WINDOW', []),
('Mesh Filter Modal Map', 'EMPTY', 'WINDOW', []),
# Grease Pencil Fill Tool
('Fill Tool Modal Map', 'EMPTY', 'WINDOW', []),
# Grease Pencil Interpolate Tool
('Interpolate Tool Modal Map', 'EMPTY', 'WINDOW', []),
('Generic Gizmo', 'EMPTY', 'WINDOW', [
('Generic Gizmo Drag', 'EMPTY', 'WINDOW', []),

14
scripts/startup/bl_ui/space_toolsystem_common.py
View file

@ -34,6 +34,9 @@ if "_icon_cache" in locals():
# (icon_name -> icon_value) map
_icon_cache = {}
# Prefix used by key-maps which are shared between spaces, see `keymap_ui_hierarchy`.
_KEYMAP_PREFIX_GENERIC = "Generic Tool:"
def _keymap_fn_from_seq(keymap_data):
@ -570,10 +573,15 @@ class ToolSelectPanelHelper:
continue
visited.add(km_name)
yield (km_name, cls.bl_space_type, 'WINDOW', [])
# Callable types don't use fall-backs.
if isinstance(km_name, str):
yield (km_name + " (fallback)", cls.bl_space_type, 'WINDOW', [])
# Generic tools are shared between spaces, their key-maps use an empty space-type.
# This must match or the key-map is never found, see `rna_keymap_ui.draw_entry`.
km_space_type = 'EMPTY' if km_name.startswith(_KEYMAP_PREFIX_GENERIC) else cls.bl_space_type
yield (km_name, km_space_type, 'WINDOW', [])
yield (km_name + " (fallback)", km_space_type, 'WINDOW', [])
else:
# Callable types don't use fall-backs.
yield (km_name, cls.bl_space_type, 'WINDOW', [])
# -------------------------------------------------------------------------
# Layout Generators