[Bf-blender-cvs] [d9215b064cf] blender2.8: Cleanup: keymap wrapper for tool-setting operator

[Campbell Barton]

Commit: d9215b064cfea10267396dda8381fee537d67364
Author: Campbell Barton
Date:   Thu Nov 22 16:58:09 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBd9215b064cfea10267396dda8381fee537d67364

Cleanup: keymap wrapper for tool-setting operator

===================================================================

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py

===================================================================

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 9259d3baf12..af639fac1a1 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -125,6 +125,10 @@ def op_panel(menu, kmi_args, kmi_data=()):
     return ("wm.call_panel", kmi_args, {"properties": [("name", menu), *kmi_data]})
 
 
+def op_tool(tool, kmi_args):
+    return ("wm.tool_set_by_name", kmi_args, {"properties": [("name", tool)]})
+
+
 # ------------------------------------------------------------------------------
 # Keymap Templates
 
@@ -748,8 +752,7 @@ def km_uv_editor(params):
         # Quick switch to select tool, since left select can't easily
         # select with any tool active.
         items.extend([
-            ("wm.tool_set_by_name", {"type": 'W', "value": 'PRESS'},
-             {"properties": [("name", "Select Box")]})
+            op_tool("Select Box", {"type": 'W', "value": 'PRESS'}),
         ])
 
     return keymap
@@ -1092,8 +1095,7 @@ def km_view3d(params):
         # Quick switch to select tool, since left select can't easily
         # select with any tool active.
         items.extend([
-            ("wm.tool_set_by_name", {"type": 'W', "value": 'PRESS'},
-             {"properties": [("name", "Select Box")]})
+            op_tool("Select Box", {"type": 'W', "value": 'PRESS'}),
         ])
 
     return keymap
@@ -4883,12 +4885,9 @@ def km_popup_toolbar(params):
         "Toolbar Popup",
         {"space_type": 'EMPTY', "region_type": 'TEMPORARY'},
         {"items": [
-            ("wm.tool_set_by_name", {"type": 'T', "value": 'PRESS'},
-             {"properties": [("name", "Transform")]}),
-            ("wm.tool_set_by_name", {"type": 'D', "value": 'PRESS'},
-             {"properties": [("name", "Annotate")]}),
-            ("wm.tool_set_by_name", {"type": 'M', "value": 'PRESS'},
-             {"properties": [("name", "Measure")]}),
+            op_tool("Transform", {"type": 'T', "value": 'PRESS'}),
+            op_tool("Annotate", {"type": 'D', "value": 'PRESS'}),
+            op_tool("Measure", {"type": 'M', "value": 'PRESS'}),
         ]},
     )