diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-04 19:43:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-04 19:45:37 +0300 |
commit | 3c146283810fd8257b8405005e74bb37db035107 (patch) | |
tree | 8d8840a7784ca94329305750b4acaebacf01014c | |
parent | fc517cb0790df03eb7bfbe98ad581b9017d4989e (diff) |
Cleanup: make context menu last in keymaps
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 18a28582f80..58e11a160b5 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -1448,7 +1448,6 @@ def km_graph_editor(params): ("graph.bake", {"type": 'C', "value": 'PRESS', "alt": True}, None), op_menu("GRAPH_MT_delete", {"type": 'X', "value": 'PRESS'}), op_menu("GRAPH_MT_delete", {"type": 'DEL', "value": 'PRESS'}), - op_menu("GRAPH_MT_context_menu", params.context_menu_event), ("graph.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None), ("graph.keyframe_insert", {"type": 'I', "value": 'PRESS'}, None), ("graph.click_insert", {"type": params.action_mouse, "value": 'CLICK', "ctrl": True}, @@ -1479,6 +1478,7 @@ def km_graph_editor(params): op_menu_pie("GRAPH_MT_pivot_pie", {"type": 'PERIOD', "value": 'PRESS'}), ("marker.add", {"type": 'M', "value": 'PRESS'}, None), ("marker.rename", {"type": 'M', "value": 'PRESS', "ctrl": True}, None), + op_menu("GRAPH_MT_context_menu", params.context_menu_event), ]) if params.select_mouse == 'LEFTMOUSE' and not params.legacy: @@ -1582,9 +1582,9 @@ def km_image(params): ) ), op_menu_pie("IMAGE_MT_pivot_pie", {"type": 'PERIOD', "value": 'PRESS'}), - op_menu("IMAGE_MT_mask_context_menu", params.context_menu_event), ("image.render_border", {"type": 'B', "value": 'PRESS', "ctrl": True}, None), ("image.clear_render_border", {"type": 'B', "value": 'PRESS', "ctrl": True, "alt": True}, None), + op_menu("IMAGE_MT_mask_context_menu", params.context_menu_event), ]) if params.legacy: @@ -1671,7 +1671,6 @@ def km_node_editor(params): {"properties": [("factor", 1.2)]}), ("node.backimage_fit", {"type": 'HOME', "value": 'PRESS', "alt": True}, None), ("node.backimage_sample", {"type": params.action_mouse, "value": 'PRESS', "alt": True}, None), - op_menu("NODE_MT_context_menu", params.context_menu_event), ("node.link_make", {"type": 'F', "value": 'PRESS'}, {"properties": [("replace", False)]}), ("node.link_make", {"type": 'F', "value": 'PRESS', "shift": True}, @@ -1737,6 +1736,7 @@ def km_node_editor(params): {"properties": [("data_path", 'tool_settings.use_snap')]}), ("wm.context_menu_enum", {"type": 'TAB', "value": 'PRESS', "shift": True, "ctrl": True}, {"properties": [("data_path", 'tool_settings.snap_node_element')]}), + op_menu("NODE_MT_context_menu", params.context_menu_event), ]) return keymap @@ -1983,7 +1983,6 @@ def km_dopesheet(params): ("action.interpolation_type", {"type": 'T', "value": 'PRESS'}, None), ("action.extrapolation_type", {"type": 'E', "value": 'PRESS', "shift": True}, None), ("action.keyframe_type", {"type": 'R', "value": 'PRESS'}, None), - op_menu("DOPESHEET_MT_context_menu", params.context_menu_event), ("action.sample", {"type": 'O', "value": 'PRESS', "shift": True, "alt": True}, None), op_menu("DOPESHEET_MT_delete", {"type": 'X', "value": 'PRESS'}), op_menu("DOPESHEET_MT_delete", {"type": 'DEL', "value": 'PRESS'}), @@ -2015,6 +2014,7 @@ def km_dopesheet(params): op_menu_pie("VIEW3D_MT_proportional_editing_falloff_pie", {"type": 'O', "value": 'PRESS', "shift": True}), ("marker.add", {"type": 'M', "value": 'PRESS'}, None), ("marker.rename", {"type": 'M', "value": 'PRESS', "ctrl": True}, None), + op_menu("DOPESHEET_MT_context_menu", params.context_menu_event), ]) return keymap @@ -2128,7 +2128,6 @@ def km_nla_editor(params): ("nla.apply_scale", {"type": 'A', "value": 'PRESS', "ctrl": True}, None), ("nla.clear_scale", {"type": 'S', "value": 'PRESS', "alt": True}, None), op_menu_pie("NLA_MT_snap_pie", {"type": 'S', "value": 'PRESS', "shift": True}), - op_menu("NLA_MT_context_menu", params.context_menu_event), ("nla.fmodifier_add", {"type": 'M', "value": 'PRESS', "shift": True, "ctrl": True}, None), ("transform.transform", {"type": 'G', "value": 'PRESS'}, {"properties": [("mode", 'TRANSLATION')]}), @@ -2140,6 +2139,7 @@ def km_nla_editor(params): {"properties": [("mode", 'TIME_SCALE')]}), ("marker.add", {"type": 'M', "value": 'PRESS'}, None), ("marker.rename", {"type": 'M', "value": 'PRESS', "ctrl": True}, None), + op_menu("NLA_MT_context_menu", params.context_menu_event), ]) return keymap @@ -2299,9 +2299,9 @@ def km_text(params): {"properties": [("lines", 1)]}), ("text.line_break", {"type": 'RET', "value": 'PRESS'}, None), ("text.line_break", {"type": 'NUMPAD_ENTER', "value": 'PRESS'}, None), - op_menu("TEXT_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), ("text.autocomplete", {"type": 'SPACE', "value": 'PRESS', "ctrl": True}, None), ("text.line_number", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), + op_menu("TEXT_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), ("text.insert", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), ]) @@ -2429,7 +2429,6 @@ def km_sequencer(params): ("sequencer.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True}, None), op_menu("SEQUENCER_MT_add", {"type": 'A', "value": 'PRESS', "shift": True}), op_menu("SEQUENCER_MT_change", {"type": 'C', "value": 'PRESS'}), - op_menu("SEQUENCER_MT_context_menu", params.context_menu_event), ("sequencer.slip", {"type": 'S', "value": 'PRESS'}, None), ("wm.context_set_int", {"type": 'O', "value": 'PRESS'}, {"properties": [("data_path", 'scene.sequence_editor.overlay_frame'), ("value", 0)]}), @@ -2443,6 +2442,7 @@ def km_sequencer(params): {"properties": [("left_right", 'LEFT'), ("linked_time", True)]}), ("sequencer.select", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, {"properties": [("left_right", 'RIGHT'), ("linked_time", True)]}), + op_menu("SEQUENCER_MT_context_menu", params.context_menu_event), ]) return keymap @@ -2539,8 +2539,8 @@ def km_console(params): {"properties": [("text", '\t')]}), ("console.indent", {"type": 'TAB', "value": 'PRESS'}, None), ("console.unindent", {"type": 'TAB', "value": 'PRESS', "shift": True}, None), - ("console.insert", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), op_menu("CONSOLE_MT_context_menu", params.context_menu_event), + ("console.insert", {"type": 'TEXTINPUT', "value": 'ANY', "any": True}, None), ]) return keymap @@ -2667,7 +2667,6 @@ def km_clip_editor(params): ("clip.keyframe_insert", {"type": 'I', "value": 'PRESS'}, None), ("clip.keyframe_delete", {"type": 'I', "value": 'PRESS', "alt": True}, None), ("clip.join_tracks", {"type": 'J', "value": 'PRESS', "ctrl": True}, None), - op_menu("CLIP_MT_tracking_context_menu", params.context_menu_event), ("clip.lock_selection_toggle", {"type": 'L', "value": 'PRESS'}, None), ("wm.context_toggle", {"type": 'D', "value": 'PRESS', "alt": True}, {"properties": [("data_path", 'space_data.show_disabled')]}), @@ -2689,6 +2688,7 @@ def km_clip_editor(params): op_menu_pie("CLIP_MT_pivot_pie", {"type": 'PERIOD', "value": 'PRESS'}), ("clip.copy_tracks", {"type": 'C', "value": 'PRESS', "ctrl": True}, None), ("clip.paste_tracks", {"type": 'V', "value": 'PRESS', "ctrl": True}, None), + op_menu("CLIP_MT_tracking_context_menu", params.context_menu_event), ]) if params.legacy: @@ -3049,8 +3049,6 @@ def km_grease_pencil_stroke_edit_mode(params): ("gpencil.blank_frame_add", {"type": 'I', "value": 'PRESS', "shift": True}, None), ("gpencil.active_frames_delete_all", {"type": 'X', "value": 'PRESS', "shift": True}, None), ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), - # Context menu - op_menu("VIEW3D_MT_gpencil_edit_context_menu", params.context_menu_event), # Separate ("gpencil.stroke_separate", {"type": 'P', "value": 'PRESS'}, None), # Split and joint strokes @@ -3105,6 +3103,8 @@ def km_grease_pencil_stroke_edit_mode(params): {"properties": [("mode", 1)]}), ("gpencil.selectmode_toggle", {"type": 'THREE', "value": 'PRESS'}, {"properties": [("mode", 2)]}), + # Context menu + op_menu("VIEW3D_MT_gpencil_edit_context_menu", params.context_menu_event), ]) if params.legacy: @@ -3131,8 +3131,6 @@ def km_grease_pencil_stroke_paint_mode(params): # Brush size ("wm.radial_control", {"type": 'F', "value": 'PRESS'}, {"properties": [("data_path_primary", 'tool_settings.gpencil_paint.brush.size')]}), - # Draw context menu - op_panel("VIEW3D_PT_gpencil_draw_context_menu", params.context_menu_event), # Draw delete menu op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'X', "value": 'PRESS'}), # Animation menu @@ -3148,6 +3146,8 @@ def km_grease_pencil_stroke_paint_mode(params): {"properties": [("unselected", False)]}), ("gpencil.hide", {"type": 'H', "value": 'PRESS', "shift": True}, {"properties": [("unselected", True)]}), + # Draw context menu + op_panel("VIEW3D_PT_gpencil_draw_context_menu", params.context_menu_event), ]) return keymap @@ -3278,12 +3278,12 @@ def km_grease_pencil_stroke_sculpt_mode(params): # Brush size ("wm.radial_control", {"type": 'F', "value": 'PRESS'}, {"properties": [("data_path_primary", 'tool_settings.gpencil_sculpt.brush.size')]}), - # Context menu - op_panel("VIEW3D_PT_gpencil_sculpt_context_menu", params.context_menu_event), # Copy ("gpencil.copy", {"type": 'C', "value": 'PRESS', "ctrl": True}, None), # Display *_grease_pencil_display(), + # Context menu + op_panel("VIEW3D_PT_gpencil_sculpt_context_menu", params.context_menu_event), ]) return keymap @@ -3425,7 +3425,6 @@ def km_pose(params): ("pose.push", {"type": 'E', "value": 'PRESS', "ctrl": True}, None), ("pose.relax", {"type": 'E', "value": 'PRESS', "alt": True}, None), ("pose.breakdown", {"type": 'E', "value": 'PRESS', "shift": True}, None), - op_menu("VIEW3D_MT_pose_context_menu", params.context_menu_event), op_menu("VIEW3D_MT_pose_propagate", {"type": 'P', "value": 'PRESS', "alt": True}), *( (("object.hide_collection", @@ -3434,6 +3433,7 @@ def km_pose(params): for i in range(10) ) ), + op_menu("VIEW3D_MT_pose_context_menu", params.context_menu_event), ]) return keymap @@ -3496,7 +3496,6 @@ def km_object_mode(params): ("collection.objects_remove_all", {"type": 'G', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, None), ("collection.objects_add_active", {"type": 'G', "value": 'PRESS', "shift": True, "ctrl": True}, None), ("collection.objects_remove_active", {"type": 'G', "value": 'PRESS', "shift": True, "alt": True}, None), - op_menu("VIEW3D_MT_object_context_menu", params.context_menu_event), *_template_items_object_subdivision_set(), ("object.move_to_collection", {"type": 'M', "value": 'PRESS'}, None), ("object.link_to_collection", {"type": 'M', "value": 'PRESS', "shift": True}, None), @@ -3513,6 +3512,7 @@ def km_object_mode(params): for i in range(10) ) ), + op_menu("VIEW3D_MT_object_context_menu", params.context_menu_event), ]) if params.legacy: @@ -3613,9 +3613,9 @@ def km_curve(params): {"properties": [("unselected", True)]}), ("curve.normals_make_consistent", {"type": 'N', "value": 'PRESS', "ctrl" if params.legacy else "shift": True}, None), ("object.vertex_parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, None), - op_menu("VIEW3D_MT_edit_curve_context_menu", params.context_menu_event), op_menu("VIEW3D_MT_hook", {"type": 'H', "value": 'PRESS', "ctrl": True}), *_template_items_proportional_editing(connected=True), + op_menu("VIEW3D_MT_edit_curve_context_menu", params.context_menu_event), ]) return keymap @@ -3917,8 +3917,8 @@ def km_sculpt(params): ("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True}, {"properties": [("data_path", 'tool_settings.sculpt.brush.use_smooth_stroke')]}), op_menu("VIEW3D_MT_angle_control", {"type": 'R', "value": 'PRESS'}), + op_menu_pie("VIEW3D_MT_sculpt_mask_edit_pie", {"type" : 'A', "value": 'PRESS'}), op_panel("VIEW3D_PT_sculpt_context_menu", params.context_menu_event), - op_menu_pie("VIEW3D_MT_sculpt_mask_edit_pie", {"type" : 'A', "value": 'PRESS'}) ]) if params.legacy: @@ -4022,7 +4022,6 @@ def km_mesh(params): {"properties": [("use_occlude_geometry", True), ("only_selected", False)]}), ("object.vertex_parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, None), # Menus. - op_menu("VIEW3D_MT_edit_mesh_context_menu", params.context_menu_event), op_menu("VIEW3D_MT_edit_mesh_faces", {"type": 'F', "value": 'PRESS', "ctrl": True}), op_menu("VIEW3D_MT_edit_mesh_edges", {"type": 'E', "value": 'PRESS', "ctrl": True}), op_menu("VIEW3D_MT_edit_mesh_vertices", {"type": 'V', "value": 'PRESS', "ctrl": True}), @@ -4032,6 +4031,7 @@ def km_mesh(params): op_menu("VIEW3D_MT_edit_mesh_normals", {"type": 'N', "value": 'PRESS', "alt" : True}), ("object.vertex_group_remove_from", {"type": 'G', "value": 'PRESS', "ctrl": True, "alt": True}, None), *_template_items_proportional_editing(connected=True), + op_menu("VIEW3D_MT_edit_mesh_context_menu", params.context_menu_event), ]) if params.use_mouse_emulate_3_button and params.select_mouse == 'LEFTMOUSE': @@ -4188,8 +4188,8 @@ def km_lattice(params): ("object.vertex_parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, None), ("lattice.flip", {"type": 'F', "value": 'PRESS', "alt": True}, None), op_menu("VIEW3D_MT_hook", {"type": 'H', "value": 'PRESS', "ctrl": True}), - op_menu("VIEW3D_MT_edit_lattice_context_menu", params.context_menu_event), *_template_items_proportional_editing(connected=False), + op_menu("VIEW3D_MT_edit_lattice_context_menu", params.context_menu_event), ]) return keymap @@ -4225,7 +4225,6 @@ def km_particle(params): {"properties": [("data_path_primary", 'tool_settings.particle_edit.brush.size')]}), ("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True}, {"properties": [("data_path_primary", 'tool_settings.particle_edit.brush.strength')]}), - op_menu("VIEW3D_MT_particle_context_menu", params.context_menu_event), ("particle.weight_set", {"type": 'K', "value": 'PRESS', "shift": True}, None), *( (("wm.context_set_enum", @@ -4235,6 +4234,7 @@ def km_particle(params): ) ), *_template_items_proportional_editing(connected=False), + op_menu("VIEW3D_MT_particle_context_menu", params.context_menu_event), ]) return keymap |