Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-29 18:25:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-29 18:52:27 +0300
commite9cd2fb23b837d351bea6c5e5aa887ddc547197b (patch)
tree9e40b0a87e6f5016ca59d6299d34738e19d810b9 /release
parent929c78e33c06f55af4a3d98240959c4afcf9f39c (diff)
Keymap: partially implement changes from T55162
- Use Tab key for search. - Number keys switch modes. - The number of the current mode can open a submode menu (currently only works for edit-mode) - Ctrl-Tab, Ctrl-Shift-Tab - cycle workspaces.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_operators/wm.py7
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_common.py12
2 files changed, 1 insertions, 18 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index f18464a6614..021085b8d75 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -2369,9 +2369,7 @@ class WM_OT_toolbar(Operator):
cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type)
if cls is None:
- # self.report({'WARNING'}, f"Toolbar not found for {space_type!r}")
- # Passthrough to running search directly.
- bpy.ops.wm.search_menu('INVOKE_DEFAULT')
+ self.report({'WARNING'}, f"Toolbar not found for {space_type!r}")
return {'CANCELLED'}
wm = context.window_manager
@@ -2381,9 +2379,6 @@ class WM_OT_toolbar(Operator):
layout = popover.layout
cls.draw_cls(layout, context, detect_layout=False)
- layout.operator_context = 'INVOKE_DEFAULT'
- layout.operator("wm.search_menu")
-
wm.popover(draw_menu, keymap=keymap)
return {'FINISHED'}
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 8a494369cf5..d8708781c59 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -594,10 +594,6 @@ def keymap_from_context(context, space_type):
for kmi in keymap.keymap_items:
keymap.keymap_items.remove(kmi)
-
- kmi_search = wm.keyconfigs.find_item_from_operator(idname="wm.toolbar")[1]
- kmi_search_type = None if not kmi_search else kmi_search.type
-
items = []
cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type)
for i, item in enumerate(
@@ -637,14 +633,6 @@ def keymap_from_context(context, space_type):
)
kmi.properties.name = item.text
- # Disallow overlap
- if kmi_search_type == kmi_found_type:
- kmi_search_type = None
-
- # Support double-tap for search.
- if kmi_search_type:
- keymap.keymap_items.new("wm.search_menu", type=kmi_search_type, value='PRESS')
-
wm.keyconfigs.update()
return keymap