bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename gizmo keymaps

Browse Source 
Don't use plural because single/multiple isn't relevant
for keymap definitions and reads badly for specific gizmo types
that only use a single gizmo.
This commit is contained in:
Campbell Barton 2019-05-28 15:26:18 +10:00
parent 1e51839f1d
commit 671eb29d43
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -4704,9 +4704,9 @@ def km_paint_stroke_modal(_params):
# Fallback for gizmos that don't have custom a custom key-map.
def km_generic_gizmos(_params):
def km_generic_gizmo(_params):
keymap = (
"Generic Gizmos",
"Generic Gizmo",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
{"items": _template_items_gizmo_tweak_value()},
)
@ -4714,9 +4714,9 @@ def km_generic_gizmos(_params):
return keymap
def km_generic_gizmos_click_drag(_params):
def km_generic_gizmo_click_drag(_params):
keymap = (
"Generic Gizmos Click Drag",
"Generic Gizmo Click Drag",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
{"items": _template_items_gizmo_tweak_value_click_drag()},
)
@ -4724,9 +4724,9 @@ def km_generic_gizmos_click_drag(_params):
return keymap
def km_generic_gizmos_select(_params):
def km_generic_gizmo_select(_params):
keymap = (
"Generic Gizmos Select",
"Generic Gizmo Select",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
# TODO, currently in C code.
{"items": _template_items_gizmo_tweak_value()},
@ -4735,7 +4735,7 @@ def km_generic_gizmos_select(_params):
return keymap
def km_generic_gizmos_tweak_modal_map(_params):
def km_generic_gizmo_tweak_modal_map(_params):
keymap = (
"Generic Gizmo Tweak Modal Map",
{"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True},
@ -5841,10 +5841,10 @@ def generate_keymaps(params=None):
km_paint_stroke_modal(params),
# Gizmos.
km_generic_gizmos(params),
km_generic_gizmos_click_drag(params),
km_generic_gizmos_select(params),
km_generic_gizmos_tweak_modal_map(params),
km_generic_gizmo(params),
km_generic_gizmo_click_drag(params),
km_generic_gizmo_select(params),
km_generic_gizmo_tweak_modal_map(params),
# Pop-Up Keymaps.
km_popup_toolbar(params),

16
release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
View File

@ -3519,9 +3519,9 @@ def km_transform_modal_map(_params):
# Gizmo System Keymaps
# Fallback for gizmos that don't have custom a custom key-map.
def km_generic_gizmos(_params):
def km_generic_gizmo(_params):
keymap = (
"Generic Gizmos",
"Generic Gizmo",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
{"items": _template_items_gizmo_tweak_value()},
)
@ -3529,9 +3529,9 @@ def km_generic_gizmos(_params):
return keymap
def km_generic_gizmos_select(_params):
def km_generic_gizmo_select(_params):
keymap = (
"Generic Gizmos Select",
"Generic Gizmo Select",
{"space_type": 'EMPTY', "region_type": 'WINDOW'},
# TODO, currently in C code.
{"items": _template_items_gizmo_tweak_value()},
@ -3540,7 +3540,7 @@ def km_generic_gizmos_select(_params):
return keymap
def km_generic_gizmos_tweak_modal_map(_params):
def km_generic_gizmo_tweak_modal_map(_params):
keymap = (
"Generic Gizmo Tweak Modal Map",
{"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True},
@ -3773,9 +3773,9 @@ def generate_keymaps(params=None):
km_transform_modal_map(params),
# Gizmos.
km_generic_gizmos(params),
km_generic_gizmos_select(params),
km_generic_gizmos_tweak_modal_map(params),
km_generic_gizmo(params),
km_generic_gizmo_select(params),
km_generic_gizmo_tweak_modal_map(params),
# Tool System.
km_3d_view_tool_transform(params),

2
source/blender/editors/space_view3d/view3d_gizmo_navigate.c
View File

@ -229,7 +229,7 @@ static void WIDGETGROUP_navigate_setup(const bContext *C, wmGizmoGroup *gzgroup)
/* When dragging an axis, use this instead. */
wmWindowManager *wm = CTX_wm_manager(C);
gz->keymap = WM_keymap_ensure(
wm->defaultconf, "Generic Gizmos Click Drag", SPACE_EMPTY, RGN_TYPE_WINDOW);
wm->defaultconf, "Generic Gizmo Click Drag", SPACE_EMPTY, RGN_TYPE_WINDOW);
gz->drag_part = 0;
}

4
source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
View File

@ -675,7 +675,7 @@ wmKeyMap *WM_gizmogroup_keymap_generic(const wmGizmoGroupType *UNUSED(gzgt), wmK
.spaceid = SPACE_EMPTY,
.regionid = RGN_TYPE_WINDOW,
};
return WM_gizmogroup_keymap_template_ex(config, "Generic Gizmos", &params);
return WM_gizmogroup_keymap_template_ex(config, "Generic Gizmo", &params);
}
/**
@ -737,7 +737,7 @@ wmKeyMap *WM_gizmogroup_keymap_generic_select(const wmGizmoGroupType *UNUSED(gzg
.spaceid = SPACE_EMPTY,
.regionid = RGN_TYPE_WINDOW,
};
return WM_gizmogroup_keymap_template_select_ex(config, "Generic Gizmos Select", &params);
return WM_gizmogroup_keymap_template_select_ex(config, "Generic Gizmo Select", &params);
}
/** \} */ /* wmGizmoGroup */