diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-03-29 06:15:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-03-29 06:15:13 +0400 |
| commit | 931527e648acfbc2c7b71b59ce661dad9a4c1038 (patch) | |
| tree | a00b98e524fb8ea459d1f915524ee3a08fb7c747 /source/blender/editors | |
| parent | 4a164ce520c8b8a5f4e8ff90aef7050694562dc9 (diff) | |
- use clear, set, add, enable, disable and toggle as a prefix in operator names
- use select as a suffix eg UV_OT_loop_select -> UV_OT_select_loop
- Each select all operator was using slightly different wording...
select_all, deselect_all, de_select_all, select_de_select_all -> select_all_toggle
- selection -> select
- POSE_OT_select_connected -> POSE_OT_select_linked to match other operators
- NODE_OT_delete_selection -> NODE_OT_delete since its not used in other operators
- ANIM_OT_previewrange_define -> ANIM_OT_previewrange_set to match other operators
- NODE_OT_fit_all -> NODE_OT_view_all to match other operators
- View2D_OT_* -> VIEW2D_OT_* to match VIEW3D
- View2D_OT_view_downscroll -> VIEW2D_OT_scroll_down more logical
- removed MARKER_OT_mouseselect_extend and made extend a boolean property of MARKER_OT_mouseselect
- MARKER_OT_mouseselect -> MARKER_OT_select
- GROUP_OT_group_remove -> GROUP_OT_objects_remove more logical since its removing objects from groups
- MESH_OT_removedoublesflag -> MESH_OT_remove_doubles
- redundant words MESH_OT_split_mesh -> MESH_OT_split, OBJECT_OT_object_delete -> OBJECT_OT_delete
renamed selection operator properties
extend_select -> extend
column_select -> column
select_children_only -> children_only
... Since these are all in the context of selection operators there is no need for the extra 'select' in the property name.
Updated docs
http://www.graphicall.org/ftp/ideasman42/html/bpyoperator-module.html
Diffstat (limited to 'source/blender/editors')
61 files changed, 546 insertions, 562 deletions
diff --git a/source/blender/editors/animation/anim_channels.c b/source/blender/editors/animation/anim_channels.c index 8dfb1c20bbe..80615ab3c0d 100644 --- a/source/blender/editors/animation/anim_channels.c +++ b/source/blender/editors/animation/anim_channels.c @@ -804,11 +804,11 @@ static int animchannels_setflag_exec(bContext *C, wmOperator *op) } -void ANIM_OT_channels_enable_setting (wmOperatorType *ot) +void ANIM_OT_channels_setting_enable (wmOperatorType *ot) { /* identifiers */ ot->name= "Enable Channel Setting"; - ot->idname= "ANIM_OT_channels_enable_setting"; + ot->idname= "ANIM_OT_channels_setting_enable"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -825,11 +825,11 @@ void ANIM_OT_channels_enable_setting (wmOperatorType *ot) RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } -void ANIM_OT_channels_disable_setting (wmOperatorType *ot) +void ANIM_OT_channels_setting_disable (wmOperatorType *ot) { /* identifiers */ ot->name= "Disable Channel Setting"; - ot->idname= "ANIM_OT_channels_disable_setting"; + ot->idname= "ANIM_OT_channels_setting_disable"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -846,11 +846,11 @@ void ANIM_OT_channels_disable_setting (wmOperatorType *ot) RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } -void ANIM_OT_channels_toggle_setting (wmOperatorType *ot) +void ANIM_OT_channels_setting_toggle (wmOperatorType *ot) { /* identifiers */ ot->name= "Toggle Channel Setting"; - ot->idname= "ANIM_OT_channels_toggle_setting"; + ot->idname= "ANIM_OT_channels_setting_toggle"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -868,11 +868,11 @@ void ANIM_OT_channels_toggle_setting (wmOperatorType *ot) } // XXX currently, this is a separate operator, but perhaps we could in future specify in keymaps whether to call invoke or exec? -void ANIM_OT_channels_toggle_editable (wmOperatorType *ot) +void ANIM_OT_channels_editable_toggle (wmOperatorType *ot) { /* identifiers */ ot->name= "Toggle Channel Editability"; - ot->idname= "ANIM_OT_channels_toggle_editable"; + ot->idname= "ANIM_OT_channels_editable_toggle"; /* api callbacks */ ot->exec= animchannels_setflag_exec; @@ -910,11 +910,11 @@ static int animchannels_deselectall_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ANIM_OT_channels_deselectall (wmOperatorType *ot) +void ANIM_OT_channels_select_all_toggle (wmOperatorType *ot) { /* identifiers */ ot->name= "Select All"; - ot->idname= "ANIM_OT_channels_deselectall"; + ot->idname= "ANIM_OT_channels_select_all_toggle"; /* api callbacks */ ot->exec= animchannels_deselectall_exec; @@ -1028,11 +1028,11 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ANIM_OT_channels_borderselect(wmOperatorType *ot) +void ANIM_OT_channels_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "ANIM_OT_channels_borderselect"; + ot->idname= "ANIM_OT_channels_select_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -1365,9 +1365,9 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent * mval[1]= (event->y - ar->winrct.ymin); /* select mode is either replace (deselect all, then add) or add/extend */ - if (RNA_boolean_get(op->ptr, "extend_select")) + if (RNA_boolean_get(op->ptr, "extend")) selectmode= SELECT_INVERT; - else if (RNA_boolean_get(op->ptr, "select_children_only")) + else if (RNA_boolean_get(op->ptr, "children_only")) selectmode= -1; /* this is a bit of a special case for ActionGroups only... should it be removed or extended to all instead? */ else selectmode= SELECT_REPLACE; @@ -1403,8 +1403,8 @@ void ANIM_OT_channels_mouseclick (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - RNA_def_boolean(ot->srna, "extend_select", 0, "Extend Select", ""); // SHIFTKEY - RNA_def_boolean(ot->srna, "select_children_only", 0, "Select Children Only", ""); // CTRLKEY|SHIFTKEY + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "children_only", 0, "Select Children Only", ""); // CTRLKEY|SHIFTKEY } /* ************************************************************************** */ @@ -1412,16 +1412,16 @@ void ANIM_OT_channels_mouseclick (wmOperatorType *ot) void ED_operatortypes_animchannels(void) { - WM_operatortype_append(ANIM_OT_channels_deselectall); - WM_operatortype_append(ANIM_OT_channels_borderselect); + WM_operatortype_append(ANIM_OT_channels_select_all_toggle); + WM_operatortype_append(ANIM_OT_channels_select_border); WM_operatortype_append(ANIM_OT_channels_mouseclick); - WM_operatortype_append(ANIM_OT_channels_enable_setting); - WM_operatortype_append(ANIM_OT_channels_disable_setting); - WM_operatortype_append(ANIM_OT_channels_toggle_setting); + WM_operatortype_append(ANIM_OT_channels_setting_enable); + WM_operatortype_append(ANIM_OT_channels_setting_disable); + WM_operatortype_append(ANIM_OT_channels_setting_toggle); // XXX does this need to be a separate operator? - WM_operatortype_append(ANIM_OT_channels_toggle_editable); + WM_operatortype_append(ANIM_OT_channels_editable_toggle); // XXX these need to be updated for new system... todo... //WM_operatortype_append(ANIM_OT_channels_move_up); @@ -1440,23 +1440,23 @@ void ED_keymap_animchannels(wmWindowManager *wm) /* click-select */ // XXX for now, only leftmouse.... WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend_select", 1); - RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "select_children_only", 1); + RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select", 1); + RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "children_only", 1); /* deselect all */ - WM_keymap_add_item(keymap, "ANIM_OT_channels_deselectall", AKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_deselectall", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); + WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all_toggle", AKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); /* borderselect */ - WM_keymap_add_item(keymap, "ANIM_OT_channels_borderselect", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ANIM_OT_channels_select_border", BKEY, KM_PRESS, 0, 0); /* settings */ - WM_keymap_add_item(keymap, "ANIM_OT_channels_toggle_setting", WKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ANIM_OT_channels_enable_setting", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ANIM_OT_channels_disable_setting", WKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_toggle", WKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_enable", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_disable", WKEY, KM_PRESS, KM_ALT, 0); /* settings - specialised hotkeys */ - WM_keymap_add_item(keymap, "ANIM_OT_channels_toggle_editable", TABKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ANIM_OT_channels_editable_toggle", TABKEY, KM_PRESS, 0, 0); /* rearranging - actions only */ //WM_keymap_add_item(keymap, "ANIM_OT_channels_move_up", PAGEUPKEY, KM_PRESS, KM_SHIFT, 0); diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 7817afc929c..fc52d9c4511 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -629,21 +629,17 @@ static int ed_marker_select(bContext *C, wmEvent *evt, int extend) return OPERATOR_PASS_THROUGH; } -static int ed_marker_select_extend_invoke(bContext *C, wmOperator *op, wmEvent *evt) -{ - return ed_marker_select(C, evt, 1); -} - static int ed_marker_select_invoke(bContext *C, wmOperator *op, wmEvent *evt) { - return ed_marker_select(C, evt, 0); + short extend= RNA_boolean_get(op->ptr, "extend"); + return ed_marker_select(C, evt, extend); } -static void MARKER_OT_mouseselect(wmOperatorType *ot) +static void MARKER_OT_select(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Time Marker"; - ot->idname= "MARKER_OT_mouseselect"; + ot->idname= "MARKER_OT_select"; /* api callbacks */ ot->invoke= ed_marker_select_invoke; @@ -651,20 +647,8 @@ static void MARKER_OT_mouseselect(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; -} -static void MARKER_OT_mouseselect_extend(wmOperatorType *ot) -{ - /* identifiers */ - ot->name= "Extend Select Time Marker"; - ot->idname= "MARKER_OT_mouseselect_extend"; - - /* api callbacks */ - ot->invoke= ed_marker_select_extend_invoke; - ot->poll= ED_operator_areaactive; - - /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "extend the selection"); } /* *************************** border select markers **************** */ @@ -731,11 +715,11 @@ static int ed_marker_border_select_exec(bContext *C, wmOperator *op) return 1; } -static void MARKER_OT_border_select(wmOperatorType *ot) +static void MARKER_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Marker Border select"; - ot->idname= "MARKER_OT_border_select"; + ot->idname= "MARKER_OT_select_border"; /* api callbacks */ ot->exec= ed_marker_border_select_exec; @@ -796,11 +780,11 @@ static int ed_marker_select_all_invoke(bContext *C, wmOperator *op, wmEvent *evt return ed_marker_select_all_exec(C, op); } -static void MARKER_OT_select_all(wmOperatorType *ot) +static void MARKER_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "(De)select all markers"; - ot->idname= "MARKER_OT_select_all"; + ot->idname= "MARKER_OT_select_all_toggle"; /* api callbacks */ ot->exec= ed_marker_select_all_exec; @@ -866,10 +850,9 @@ void ED_marker_operatortypes(void) WM_operatortype_append(MARKER_OT_add); WM_operatortype_append(MARKER_OT_move); WM_operatortype_append(MARKER_OT_duplicate); - WM_operatortype_append(MARKER_OT_mouseselect); - WM_operatortype_append(MARKER_OT_mouseselect_extend); - WM_operatortype_append(MARKER_OT_border_select); - WM_operatortype_append(MARKER_OT_select_all); + WM_operatortype_append(MARKER_OT_select); + WM_operatortype_append(MARKER_OT_select_border); + WM_operatortype_append(MARKER_OT_select_all_toggle); WM_operatortype_append(MARKER_OT_delete); } @@ -881,10 +864,10 @@ void ED_marker_keymap(wmWindowManager *wm) WM_keymap_verify_item(keymap, "MARKER_OT_add", MKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "MARKER_OT_move", EVT_TWEAK_S, KM_ANY, 0, 0); WM_keymap_verify_item(keymap, "MARKER_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_verify_item(keymap, "MARKER_OT_mouseselect", SELECTMOUSE, KM_PRESS, 0, 0); - WM_keymap_verify_item(keymap, "MARKER_OT_mouseselect_extend", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0); - WM_keymap_verify_item(keymap, "MARKER_OT_border_select", BKEY, KM_PRESS, 0, 0); - WM_keymap_verify_item(keymap, "MARKER_OT_select_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "MARKER_OT_select", SELECTMOUSE, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "MARKER_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1); + WM_keymap_verify_item(keymap, "MARKER_OT_select_border", BKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "MARKER_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MARKER_OT_move", GKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index b51fa223eb3..f8c7cc909ae 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -243,11 +243,11 @@ static int previewrange_define_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ANIM_OT_previewrange_define(wmOperatorType *ot) +void ANIM_OT_previewrange_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Preview Range"; - ot->idname= "ANIM_OT_previewrange_define"; + ot->idname= "ANIM_OT_previewrange_set"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -374,7 +374,7 @@ void ED_operatortypes_anim(void) WM_operatortype_append(ANIM_OT_change_frame); WM_operatortype_append(ANIM_OT_time_toggle); - WM_operatortype_append(ANIM_OT_previewrange_define); + WM_operatortype_append(ANIM_OT_previewrange_set); WM_operatortype_append(ANIM_OT_previewrange_clear); // XXX this is used all over... maybe for screen instead? @@ -397,6 +397,6 @@ void ED_keymap_anim(wmWindowManager *wm) WM_keymap_verify_item(keymap, "ANIM_OT_time_toggle", TKEY, KM_PRESS, KM_CTRL, 0); /* preview range */ - WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_define", PKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_clear", PKEY, KM_PRESS, KM_ALT, 0); } diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index d13001d4ad5..8142189b61b 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -41,11 +41,11 @@ void ARMATURE_OT_subdivide_simple(struct wmOperatorType *ot); void ARMATURE_OT_subdivide_multi(struct wmOperatorType *ot); void ARMATURE_OT_parent_set(struct wmOperatorType *ot); void ARMATURE_OT_parent_clear(struct wmOperatorType *ot); -void ARMATURE_OT_de_select_all(struct wmOperatorType *ot); -void ARMATURE_OT_selection_invert(struct wmOperatorType *ot); +void ARMATURE_OT_select_all_toggle(struct wmOperatorType *ot); +void ARMATURE_OT_select_invert(struct wmOperatorType *ot); void ARMATURE_OT_select_hierarchy(struct wmOperatorType *ot); -void ARMATURE_OT_select_connected(struct wmOperatorType *ot); -void ARMATURE_OT_delete_selected(struct wmOperatorType *ot); +void ARMATURE_OT_select_linked(struct wmOperatorType *ot); +void ARMATURE_OT_delete(struct wmOperatorType *ot); void ARMATURE_OT_duplicate_selected(struct wmOperatorType *ot); void ARMATURE_OT_extrude(struct wmOperatorType *ot); void ARMATURE_OT_click_extrude(struct wmOperatorType *ot); @@ -55,11 +55,11 @@ void POSE_OT_reveal(struct wmOperatorType *ot); void POSE_OT_rot_clear(struct wmOperatorType *ot); void POSE_OT_loc_clear(struct wmOperatorType *ot); void POSE_OT_scale_clear(struct wmOperatorType *ot); -void POSE_OT_de_select_all(struct wmOperatorType *ot); -void POSE_OT_selection_invert(struct wmOperatorType *ot); +void POSE_OT_select_all_toggle(struct wmOperatorType *ot); +void POSE_OT_select_invert(struct wmOperatorType *ot); void POSE_OT_select_parent(struct wmOperatorType *ot); void POSE_OT_select_hierarchy(struct wmOperatorType *ot); -void POSE_OT_select_connected(struct wmOperatorType *ot); +void POSE_OT_select_linked(struct wmOperatorType *ot); void SKETCH_OT_gesture(struct wmOperatorType *ot); void SKETCH_OT_delete(struct wmOperatorType *ot); diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index 2a629838127..f8157da9d01 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -120,12 +120,12 @@ void ED_operatortypes_armature(void) WM_operatortype_append(ARMATURE_OT_parent_set); WM_operatortype_append(ARMATURE_OT_parent_clear); - WM_operatortype_append(ARMATURE_OT_de_select_all); - WM_operatortype_append(ARMATURE_OT_selection_invert); + WM_operatortype_append(ARMATURE_OT_select_all_toggle); + WM_operatortype_append(ARMATURE_OT_select_invert); WM_operatortype_append(ARMATURE_OT_select_hierarchy); - WM_operatortype_append(ARMATURE_OT_select_connected); + WM_operatortype_append(ARMATURE_OT_select_linked); - WM_operatortype_append(ARMATURE_OT_delete_selected); + WM_operatortype_append(ARMATURE_OT_delete); WM_operatortype_append(ARMATURE_OT_duplicate_selected); WM_operatortype_append(ARMATURE_OT_extrude); WM_operatortype_append(ARMATURE_OT_click_extrude); @@ -147,12 +147,12 @@ void ED_operatortypes_armature(void) WM_operatortype_append(POSE_OT_loc_clear); WM_operatortype_append(POSE_OT_scale_clear); - WM_operatortype_append(POSE_OT_de_select_all); - WM_operatortype_append(POSE_OT_selection_invert); + WM_operatortype_append(POSE_OT_select_all_toggle); + WM_operatortype_append(POSE_OT_select_invert); WM_operatortype_append(POSE_OT_select_parent); WM_operatortype_append(POSE_OT_select_hierarchy); - WM_operatortype_append(POSE_OT_select_connected); + WM_operatortype_append(POSE_OT_select_linked); WM_operatortype_append(ARMATURE_OT_test); // XXX temp test for context iterators... to be removed } @@ -176,11 +176,11 @@ void ED_keymap_armature(wmWindowManager *wm) /* only the menu-version of subdivide is registered in keymaps for now */ WM_keymap_add_item(keymap, "ARMATURE_OT_subdivs", SKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "ARMATURE_OT_set_parent", PKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "ARMATURE_OT_clear_parent", PKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "ARMATURE_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "ARMATURE_OT_parent_clear", PKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "ARMATURE_OT_de_select_all", AKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ARMATURE_OT_selection_invert", IKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "ARMATURE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ARMATURE_OT_select_invert", IKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "ARMATURE_OT_test", TKEY, KM_PRESS, 0, 0); // XXX temp test for context iterators... to be removed @@ -198,8 +198,8 @@ void ED_keymap_armature(wmWindowManager *wm) RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_CHILD); RNA_boolean_set(kmi->ptr, "add_to_sel", 1); - WM_keymap_add_item(keymap, "ARMATURE_OT_select_connected", LKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ARMATURE_OT_delete_selected", XKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ARMATURE_OT_select_linked", LKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ARMATURE_OT_delete", XKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "ARMATURE_OT_duplicate_selected", DKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "ARMATURE_OT_extrude", EKEY, KM_PRESS, 0, 0); kmi= WM_keymap_add_item(keymap, "ARMATURE_OT_extrude", EKEY, KM_PRESS, KM_SHIFT, 0); @@ -225,8 +225,8 @@ void ED_keymap_armature(wmWindowManager *wm) WM_keymap_add_item(keymap, "POSE_OT_loc_clear", GKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "POSE_OT_scale_clear", SKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "POSE_OT_de_select_all", AKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "POSE_OT_selection_invert", IKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "POSE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "POSE_OT_select_invert", IKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "POSE_OT_select_parent", PKEY, KM_PRESS, KM_SHIFT, 0); @@ -244,6 +244,6 @@ void ED_keymap_armature(wmWindowManager *wm) RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_CHILD); RNA_boolean_set(kmi->ptr, "add_to_sel", 1); - WM_keymap_add_item(keymap, "POSE_OT_select_connected", LKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "POSE_OT_select_linked", LKEY, KM_PRESS, 0, 0); } diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 3ac6f1838c1..523c4948e22 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -1351,11 +1351,11 @@ static int pose_select_connected_invoke(bContext *C, wmOperator *op, wmEvent *ev return OPERATOR_FINISHED; } -void POSE_OT_select_connected(wmOperatorType *ot) +void POSE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Connected"; - ot->idname= "POSE_OT_select_connected"; + ot->idname= "POSE_OT_select_linked"; /* api callbacks */ ot->exec= NULL; @@ -1373,7 +1373,7 @@ void POSE_OT_select_connected(wmOperatorType *ot) /* called in space.c */ /* previously "selectconnected_armature" */ -static int armature_select_connected_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int armature_select_linked_invoke(bContext *C, wmOperator *op, wmEvent *event) { bArmature *arm; EditBone *bone, *curBone, *next; @@ -1445,15 +1445,15 @@ static int armature_select_connected_invoke(bContext *C, wmOperator *op, wmEvent return OPERATOR_FINISHED; } -void ARMATURE_OT_select_connected(wmOperatorType *ot) +void ARMATURE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Connected"; - ot->idname= "ARMATURE_OT_select_connected"; + ot->idname= "ARMATURE_OT_select_linked"; /* api callbacks */ ot->exec= NULL; - ot->invoke= armature_select_connected_invoke; + ot->invoke= armature_select_linked_invoke; ot->poll= ED_operator_editarmature; /* flags */ @@ -1676,11 +1676,11 @@ static int armature_delete_selected_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ARMATURE_OT_delete_selected(wmOperatorType *ot) +void ARMATURE_OT_delete(wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Selected Bone(s)"; - ot->idname= "ARMATURE_OT_delete_selected"; + ot->idname= "ARMATURE_OT_delete"; /* api callbacks */ ot->invoke = WM_operator_confirm; @@ -3754,11 +3754,11 @@ static int armature_parent_set_invoke(bContext *C, wmOperator *op, wmEvent *even } CTX_DATA_END; - uiMenuItemEnumO(head, "", 0, "ARMATURE_OT_set_parent", "type", ARM_PAR_CONNECT); + uiMenuItemEnumO(head, "", 0, "ARMATURE_OT_parent_set", "type", ARM_PAR_CONNECT); /* ob becomes parent, make the associated menus */ if (allchildbones) - uiMenuItemEnumO(head, "", 0, "ARMATURE_OT_set_parent", "type", ARM_PAR_OFFSET); + uiMenuItemEnumO(head, "", 0, "ARMATURE_OT_parent_set", "type", ARM_PAR_OFFSET); uiPupMenuEnd(C, head); @@ -3769,7 +3769,7 @@ void ARMATURE_OT_parent_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Make Parent"; - ot->idname= "ARMATURE_OT_set_parent"; + ot->idname= "ARMATURE_OT_parent_set"; /* api callbacks */ ot->invoke = armature_parent_set_invoke; @@ -3822,7 +3822,7 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot) { /* identifiers */ ot->name= "Clear Parent"; - ot->idname= "ARMATURE_OT_clear_parent"; + ot->idname= "ARMATURE_OT_parent_clear"; /* api callbacks */ ot->invoke = WM_menu_invoke; @@ -3837,7 +3837,7 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot) /* **************** Selections ******************/ -static int armature_selection_invert_exec(bContext *C, wmOperator *op) +static int armature_select_invert_exec(bContext *C, wmOperator *op) { /* Set the flags */ CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones) { @@ -3852,15 +3852,15 @@ static int armature_selection_invert_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ARMATURE_OT_selection_invert(wmOperatorType *ot) +void ARMATURE_OT_select_invert(wmOperatorType *ot) { /* identifiers */ ot->name= "Invert Selection"; - ot->idname= "ARMATURE_OT_selection_invert"; + ot->idname= "ARMATURE_OT_select_invert"; /* api callbacks */ - ot->exec= armature_selection_invert_exec; + ot->exec= armature_select_invert_exec; ot->poll= ED_operator_editarmature; /* flags */ @@ -3895,12 +3895,12 @@ static int armature_de_select_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ARMATURE_OT_de_select_all(wmOperatorType *ot) +void ARMATURE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "deselect all editbone"; - ot->idname= "ARMATURE_OT_de_select_all"; + ot->idname= "ARMATURE_OT_select_all_toggle"; /* api callbacks */ ot->exec= armature_de_select_all_exec; @@ -3990,7 +3990,7 @@ void ARMATURE_OT_select_hierarchy(wmOperatorType *ot) /* props */ RNA_def_enum(ot->srna, "direction", direction_items, BONE_SELECT_PARENT, "Direction", ""); - RNA_def_boolean(ot->srna, "add_to_sel", 0, "Add to Selection", ""); + RNA_def_boolean(ot->srna, "extend", 0, "Add to Selection", ""); } /* ***************** EditBone Alignment ********************* */ @@ -4821,7 +4821,7 @@ void POSE_OT_rot_clear(wmOperatorType *ot) /* ***************** selections ********************** */ -static int pose_selection_invert_exec(bContext *C, wmOperator *op) +static int pose_select_invert_exec(bContext *C, wmOperator *op) { /* Set the flags */ @@ -4836,15 +4836,15 @@ static int pose_selection_invert_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void POSE_OT_selection_invert(wmOperatorType *ot) +void POSE_OT_select_invert(wmOperatorType *ot) { /* identifiers */ ot->name= "Invert Selection"; - ot->idname= "POSE_OT_selection_invert"; + ot->idname= "POSE_OT_select_invert"; /* api callbacks */ - ot->exec= pose_selection_invert_exec; + ot->exec= pose_select_invert_exec; ot->poll= ED_operator_posemode; /* flags */ @@ -4872,12 +4872,12 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void POSE_OT_de_select_all(wmOperatorType *ot) +void POSE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "deselect all bones"; - ot->idname= "POSE_OT_de_select_all"; + ot->idname= "POSE_OT_select_all_toggle"; /* api callbacks */ ot->exec= pose_de_select_all_exec; diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index bb7a5b500a7..000a07511b9 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -45,11 +45,11 @@ void FONT_OT_insert_text(struct wmOperatorType *ot); void FONT_OT_line_break(struct wmOperatorType *ot); void FONT_OT_insert_lorem(struct wmOperatorType *ot); -void FONT_OT_toggle_case(struct wmOperatorType *ot); -void FONT_OT_set_case(struct wmOperatorType *ot); -void FONT_OT_toggle_style(struct wmOperatorType *ot); -void FONT_OT_set_style(struct wmOperatorType *ot); -void FONT_OT_set_material(struct wmOperatorType *ot); +void FONT_OT_case_toggle(struct wmOperatorType *ot); +void FONT_OT_case_set(struct wmOperatorType *ot); +void FONT_OT_style_toggle(struct wmOperatorType *ot); +void FONT_OT_style_set(struct wmOperatorType *ot); +void FONT_OT_material_set(struct wmOperatorType *ot); void FONT_OT_copy_text(struct wmOperatorType *ot); void FONT_OT_cut_text(struct wmOperatorType *ot); @@ -72,19 +72,19 @@ void CURVE_OT_separate(struct wmOperatorType *ot); void CURVE_OT_duplicate(struct wmOperatorType *ot); void CURVE_OT_delete(struct wmOperatorType *ot); -void CURVE_OT_set_weight(struct wmOperatorType *ot); -void CURVE_OT_set_radius(struct wmOperatorType *ot); -void CURVE_OT_set_spline_type(struct wmOperatorType *ot); -void CURVE_OT_set_handle_type(struct wmOperatorType *ot); -void CURVE_OT_set_smooth(struct wmOperatorType *ot); -void CURVE_OT_clear_tilt(struct wmOperatorType *ot); +void CURVE_OT_spline_type_set(struct wmOperatorType *ot); +void CURVE_OT_radius_set(struct wmOperatorType *ot); +void CURVE_OT_spline_weight_set(struct wmOperatorType *ot); +void CURVE_OT_handle_type_set(struct wmOperatorType *ot); +void CURVE_OT_smooth_set(struct wmOperatorType *ot); +void CURVE_OT_tilt_clear(struct wmOperatorType *ot); void CURVE_OT_smooth(struct wmOperatorType *ot); void CURVE_OT_smooth_radius(struct wmOperatorType *ot); void CURVE_OT_de_select_first(struct wmOperatorType *ot); void CURVE_OT_de_select_last(struct wmOperatorType *ot); -void CURVE_OT_de_select_all(struct wmOperatorType *ot); +void CURVE_OT_select_all_toggle(struct wmOperatorType *ot); void CURVE_OT_select_inverse(struct wmOperatorType *ot); void CURVE_OT_select_linked(struct wmOperatorType *ot); void CURVE_OT_select_row(struct wmOperatorType *ot); @@ -101,7 +101,7 @@ void CURVE_OT_make_segment(struct wmOperatorType *ot); void CURVE_OT_spin(struct wmOperatorType *ot); void CURVE_OT_add_vertex(struct wmOperatorType *ot); void CURVE_OT_extrude(struct wmOperatorType *ot); -void CURVE_OT_toggle_cyclic(struct wmOperatorType *ot); +void CURVE_OT_cyclic_toggle(struct wmOperatorType *ot); void CURVE_OT_specials_menu(struct wmOperatorType *ot); diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c index a53acb2e9b7..45057aad405 100644 --- a/source/blender/editors/curve/curve_ops.c +++ b/source/blender/editors/curve/curve_ops.c @@ -72,8 +72,8 @@ static int specials_menu_invoke(bContext *C, wmOperator *op, wmEvent *event) head= uiPupMenuBegin("Specials", 0); uiMenuItemO(head, 0, "CURVE_OT_subdivide"); uiMenuItemO(head, 0, "CURVE_OT_switch_direction"); - uiMenuItemO(head, 0, "CURVE_OT_set_weight"); - uiMenuItemO(head, 0, "CURVE_OT_set_radius"); + uiMenuItemO(head, 0, "CURVE_OT_spline_weight_set"); + uiMenuItemO(head, 0, "CURVE_OT_radius_set"); uiMenuItemO(head, 0, "CURVE_OT_smooth"); uiMenuItemO(head, 0, "CURVE_OT_smooth_radius"); uiPupMenuEnd(C, head); @@ -100,11 +100,11 @@ void ED_operatortypes_curve(void) WM_operatortype_append(FONT_OT_line_break); WM_operatortype_append(FONT_OT_insert_lorem); - WM_operatortype_append(FONT_OT_toggle_case); - WM_operatortype_append(FONT_OT_set_case); - WM_operatortype_append(FONT_OT_toggle_style); - WM_operatortype_append(FONT_OT_set_style); - WM_operatortype_append(FONT_OT_set_material); + WM_operatortype_append(FONT_OT_case_toggle); + WM_operatortype_append(FONT_OT_case_set); + WM_operatortype_append(FONT_OT_style_toggle); + WM_operatortype_append(FONT_OT_style_set); + WM_operatortype_append(FONT_OT_material_set); WM_operatortype_append(FONT_OT_copy_text); WM_operatortype_append(FONT_OT_cut_text); @@ -126,19 +126,19 @@ void ED_operatortypes_curve(void) WM_operatortype_append(CURVE_OT_duplicate); WM_operatortype_append(CURVE_OT_delete); - WM_operatortype_append(CURVE_OT_set_weight); - WM_operatortype_append(CURVE_OT_set_radius); - WM_operatortype_append(CURVE_OT_set_spline_type); - WM_operatortype_append(CURVE_OT_set_handle_type); - WM_operatortype_append(CURVE_OT_set_smooth); - WM_operatortype_append(CURVE_OT_clear_tilt); + WM_operatortype_append(CURVE_OT_spline_type_set); + WM_operatortype_append(CURVE_OT_radius_set); + WM_operatortype_append(CURVE_OT_spline_weight_set); + WM_operatortype_append(CURVE_OT_handle_type_set); + WM_operatortype_append(CURVE_OT_smooth_set); + WM_operatortype_append(CURVE_OT_tilt_clear); WM_operatortype_append(CURVE_OT_smooth); WM_operatortype_append(CURVE_OT_smooth_radius); WM_operatortype_append(CURVE_OT_de_select_first); WM_operatortype_append(CURVE_OT_de_select_last); - WM_operatortype_append(CURVE_OT_de_select_all); + WM_operatortype_append(CURVE_OT_select_all_toggle); WM_operatortype_append(CURVE_OT_select_inverse); WM_operatortype_append(CURVE_OT_select_linked); WM_operatortype_append(CURVE_OT_select_row); @@ -155,7 +155,7 @@ void ED_operatortypes_curve(void) WM_operatortype_append(CURVE_OT_spin); WM_operatortype_append(CURVE_OT_add_vertex); WM_operatortype_append(CURVE_OT_extrude); - WM_operatortype_append(CURVE_OT_toggle_cyclic); + WM_operatortype_append(CURVE_OT_cyclic_toggle); WM_operatortype_append(CURVE_OT_specials_menu); } @@ -165,9 +165,9 @@ void ED_keymap_curve(wmWindowManager *wm) ListBase *keymap= WM_keymap_listbase(wm, "Font", 0, 0); /* only set in editmode font, by space_view3d listener */ - RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_toggle_style", BKEY, KM_PRESS, KM_CTRL, 0)->ptr, "style", CU_BOLD); - RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_toggle_style", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "style", CU_ITALIC); - RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_toggle_style", UKEY, KM_PRESS, KM_CTRL, 0)->ptr, "style", CU_UNDERLINE); + RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_style_toggle", BKEY, KM_PRESS, KM_CTRL, 0)->ptr, "style", CU_BOLD); + RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_style_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "style", CU_ITALIC); + RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_style_toggle", UKEY, KM_PRESS, KM_CTRL, 0)->ptr, "style", CU_UNDERLINE); RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_delete", DELKEY, KM_PRESS, 0, 0)->ptr, "type", DEL_NEXT_SEL); RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_delete", BACKSPACEKEY, KM_PRESS, 0, 0)->ptr, "type", DEL_PREV_SEL); @@ -213,7 +213,7 @@ void ED_keymap_curve(wmWindowManager *wm) WM_keymap_add_item(keymap, "OBJECT_OT_curve_add", AKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "CURVE_OT_add_vertex", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "CURVE_OT_de_select_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "CURVE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "CURVE_OT_select_row", RKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "CURVE_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "CURVE_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0); @@ -224,15 +224,15 @@ void ED_keymap_curve(wmWindowManager *wm) WM_keymap_add_item(keymap, "CURVE_OT_extrude", EKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "CURVE_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "CURVE_OT_make_segment", FKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "CURVE_OT_toggle_cyclic", CKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "CURVE_OT_cyclic_toggle", CKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "CURVE_OT_delete", XKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "CURVE_OT_delete", DELKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "CURVE_OT_clear_tilt", TKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "CURVE_OT_tilt_clear", TKEY, KM_PRESS, KM_ALT, 0); RNA_enum_set(WM_keymap_add_item(keymap, "TFM_OT_transform", TKEY, KM_PRESS, 0, 0)->ptr, "mode", TFM_TILT); - RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_set_handle_type", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", 1); - RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_set_handle_type", HKEY, KM_PRESS, 0, 0)->ptr, "type", 3); - RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_set_handle_type", VKEY, KM_PRESS, 0, 0)->ptr, "type", 2); + RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", 1); + RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", HKEY, KM_PRESS, 0, 0)->ptr, "type", 3); + RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", VKEY, KM_PRESS, 0, 0)->ptr, "type", 2); WM_keymap_add_item(keymap, "CURVE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, KM_ALT|KM_CTRL, 0); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index cc1d7fb1f81..16c39ef34a7 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1061,11 +1061,11 @@ static int set_weight_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void CURVE_OT_set_weight(wmOperatorType *ot) +void CURVE_OT_spline_weight_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Curve Weight"; - ot->idname= "CURVE_OT_set_weight"; + ot->idname= "CURVE_OT_spline_weight_set"; /* api callbacks */ ot->exec= set_weight_exec; @@ -1113,11 +1113,11 @@ static int set_radius_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void CURVE_OT_set_radius(wmOperatorType *ot) +void CURVE_OT_radius_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Curve Radius"; - ot->idname= "CURVE_OT_set_radius"; + ot->idname= "CURVE_OT_radius_set"; /* api callbacks */ ot->exec= set_radius_exec; @@ -1595,11 +1595,11 @@ static int de_select_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void CURVE_OT_de_select_all(wmOperatorType *ot) +void CURVE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Select or Deselect All"; - ot->idname= "CURVE_OT_de_select_all"; + ot->idname= "CURVE_OT_select_all_toggle"; /* api callbacks */ ot->exec= de_select_all_exec; @@ -2476,7 +2476,7 @@ static int set_spline_type_exec(bContext *C, wmOperator *op) return (changed)? OPERATOR_FINISHED: OPERATOR_CANCELLED; } -void CURVE_OT_set_spline_type(wmOperatorType *ot) +void CURVE_OT_spline_type_set(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { {CU_POLY, "POLY", "Poly", ""}, @@ -2488,7 +2488,7 @@ void CURVE_OT_set_spline_type(wmOperatorType *ot) /* identifiers */ ot->name= "Set Spline Type"; - ot->idname= "CURVE_OT_set_spline_type"; + ot->idname= "CURVE_OT_spline_type_set"; /* api callbacks */ ot->exec= set_spline_type_exec; @@ -2517,7 +2517,7 @@ static int set_handle_type_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void CURVE_OT_set_handle_type(wmOperatorType *ot) +void CURVE_OT_handle_type_set(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { {1, "AUTOMATIC", "Automatic", ""}, @@ -2529,7 +2529,7 @@ void CURVE_OT_set_handle_type(wmOperatorType *ot) /* identifiers */ ot->name= "Set Handle Type"; - ot->idname= "CURVE_OT_set_handle_type"; + ot->idname= "CURVE_OT_handle_type_set"; /* api callbacks */ ot->exec= set_handle_type_exec; @@ -3581,7 +3581,7 @@ static int toggle_cyclic_invoke(bContext *C, wmOperator *op, wmEvent *event) return toggle_cyclic_exec(C, op); } -void CURVE_OT_toggle_cyclic(wmOperatorType *ot) +void CURVE_OT_cyclic_toggle(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { {0, "CYCLIC_U", "Cyclic U", ""}, @@ -3590,7 +3590,7 @@ void CURVE_OT_toggle_cyclic(wmOperatorType *ot) /* identifiers */ ot->name= "Toggle Cyclic"; - ot->idname= "CURVE_OT_toggle_cyclic"; + ot->idname= "CURVE_OT_cyclic_toggle"; /* api callbacks */ ot->exec= toggle_cyclic_exec; @@ -4577,11 +4577,11 @@ static int set_smooth_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void CURVE_OT_set_smooth(wmOperatorType *ot) +void CURVE_OT_smooth_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Smooth"; - ot->idname= "CURVE_OT_set_smooth"; + ot->idname= "CURVE_OT_smooth_set"; /* api callbacks */ ot->exec= set_smooth_exec; @@ -5129,11 +5129,11 @@ static int clear_tilt_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void CURVE_OT_clear_tilt(wmOperatorType *ot) +void CURVE_OT_tilt_clear(wmOperatorType *ot) { /* identifiers */ ot->name= "Clear Tilt"; - ot->idname= "CURVE_OT_clear_tilt"; + ot->idname= "CURVE_OT_tilt_clear"; /* api callbacks */ ot->exec= clear_tilt_exec; diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 722dfcdbd1d..e6992009056 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -646,11 +646,11 @@ static int set_style_exec(bContext *C, wmOperator *op) return set_style(C, style, clear); } -void FONT_OT_set_style(wmOperatorType *ot) +void FONT_OT_style_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Style"; - ot->idname= "FONT_OT_set_style"; + ot->idname= "FONT_OT_style_set"; /* api callbacks */ ot->exec= set_style_exec; @@ -683,11 +683,11 @@ static int toggle_style_exec(bContext *C, wmOperator *op) return set_style(C, style, clear); } -void FONT_OT_toggle_style(wmOperatorType *ot) +void FONT_OT_style_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Toggle Style"; - ot->idname= "FONT_OT_toggle_style"; + ot->idname= "FONT_OT_style_toggle"; /* api callbacks */ ot->exec= toggle_style_exec; @@ -727,11 +727,11 @@ static int set_material_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void FONT_OT_set_material(wmOperatorType *ot) +void FONT_OT_material_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Material"; - ot->idname= "FONT_OT_set_material"; + ot->idname= "FONT_OT_material_set"; /* api callbacks */ ot->exec= set_material_exec; @@ -1509,11 +1509,11 @@ static int set_case_exec(bContext *C, wmOperator *op) return set_case(C, RNA_enum_get(op->ptr, "case")); } -void FONT_OT_set_case(wmOperatorType *ot) +void FONT_OT_case_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Case"; - ot->idname= "FONT_OT_set_case"; + ot->idname= "FONT_OT_case_set"; /* api callbacks */ ot->exec= set_case_exec; @@ -1551,11 +1551,11 @@ static int toggle_case_exec(bContext *C, wmOperator *op) return set_case(C, ccase); } -void FONT_OT_toggle_case(wmOperatorType *ot) +void FONT_OT_case_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Toggle Case"; - ot->idname= "FONT_OT_toggle_case"; + ot->idname= "FONT_OT_case_toggle"; /* api callbacks */ ot->exec= toggle_case_exec; diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 95df3ef9c53..6da9512f9e0 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -239,11 +239,11 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_RUNNING_MODAL; } -void View2D_OT_view_pan(wmOperatorType *ot) +void VIEW2D_OT_pan(wmOperatorType *ot) { /* identifiers */ ot->name= "Pan View"; - ot->idname= "View2D_OT_view_pan"; + ot->idname= "VIEW2D_OT_pan"; /* api callbacks */ ot->exec= view_pan_exec; @@ -287,11 +287,11 @@ static int view_scrollright_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void View2D_OT_view_scrollright(wmOperatorType *ot) +void VIEW2D_OT_scroll_right(wmOperatorType *ot) { /* identifiers */ ot->name= "Scroll Right"; - ot->idname= "View2D_OT_view_rightscroll"; + ot->idname= "VIEW2D_OT_scroll_right"; /* api callbacks */ ot->exec= view_scrollright_exec; @@ -333,11 +333,11 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void View2D_OT_view_scrollleft(wmOperatorType *ot) +void VIEW2D_OT_scroll_left(wmOperatorType *ot) { /* identifiers */ ot->name= "Scroll Left"; - ot->idname= "View2D_OT_view_leftscroll"; + ot->idname= "VIEW2D_OT_scroll_left"; /* api callbacks */ ot->exec= view_scrollleft_exec; @@ -378,11 +378,11 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void View2D_OT_view_scrolldown(wmOperatorType *ot) +void VIEW2D_OT_scroll_down(wmOperatorType *ot) { /* identifiers */ ot->name= "Scroll Down"; - ot->idname= "View2D_OT_view_downscroll"; + ot->idname= "VIEW2D_OT_scroll_down"; /* api callbacks */ ot->exec= view_scrolldown_exec; @@ -424,11 +424,11 @@ static int view_scrollup_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void View2D_OT_view_scrollup(wmOperatorType *ot) +void VIEW2D_OT_scroll_up(wmOperatorType *ot) { /* identifiers */ ot->name= "Scroll Up"; - ot->idname= "View2D_OT_view_upscroll"; + ot->idname= "VIEW2D_OT_scroll_up"; /* api callbacks */ ot->exec= view_scrollup_exec; @@ -524,11 +524,11 @@ static int view_zoomin_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void View2D_OT_view_zoomin(wmOperatorType *ot) +void VIEW2D_OT_zoom_in(wmOperatorType *ot) { /* identifiers */ ot->name= "Zoom In"; - ot->idname= "View2D_OT_view_zoomin"; + ot->idname= "VIEW2D_OT_zoom_in"; /* api callbacks */ ot->exec= view_zoomin_exec; @@ -560,11 +560,11 @@ static int view_zoomout_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void View2D_OT_view_zoomout(wmOperatorType *ot) +void VIEW2D_OT_zoom_out(wmOperatorType *ot) { /* identifiers */ ot->name= "Zoom Out"; - ot->idname= "View2D_OT_view_zoomout"; + ot->idname= "VIEW2D_OT_zoom_out"; /* api callbacks */ ot->exec= view_zoomout_exec; @@ -794,11 +794,11 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_RUNNING_MODAL; } -void View2D_OT_view_zoom(wmOperatorType *ot) +void VIEW2D_OT_zoom(wmOperatorType *ot) { /* identifiers */ ot->name= "Zoom View"; - ot->idname= "View2D_OT_view_zoom"; + ot->idname= "VIEW2D_OT_zoom"; /* api callbacks */ ot->exec= view_zoomdrag_exec; @@ -892,11 +892,11 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void View2D_OT_view_borderzoom(wmOperatorType *ot) +void VIEW2D_OT_zoom_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Zoom to Border"; - ot->idname= "View2D_OT_view_borderzoom"; + ot->idname= "VIEW2D_OT_zoom_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -1232,11 +1232,11 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) } /* LMB-Drag in Scrollers - not repeatable operator! */ -void View2D_OT_scroller_activate(wmOperatorType *ot) +void VIEW2D_OT_scroller_activate(wmOperatorType *ot) { /* identifiers */ ot->name= "Scroller Activate"; - ot->idname= "View2D_OT_scroller_activate"; + ot->idname= "VIEW2D_OT_scroller_activate"; /* api callbacks */ ot->invoke= scroller_activate_invoke; @@ -1248,20 +1248,20 @@ void View2D_OT_scroller_activate(wmOperatorType *ot) void ui_view2d_operatortypes(void) { - WM_operatortype_append(View2D_OT_view_pan); + WM_operatortype_append(VIEW2D_OT_pan); - WM_operatortype_append(View2D_OT_view_scrollleft); - WM_operatortype_append(View2D_OT_view_scrollright); - WM_operatortype_append(View2D_OT_view_scrollup); - WM_operatortype_append(View2D_OT_view_scrolldown); + WM_operatortype_append(VIEW2D_OT_scroll_left); + WM_operatortype_append(VIEW2D_OT_scroll_right); + WM_operatortype_append(VIEW2D_OT_scroll_up); + WM_operatortype_append(VIEW2D_OT_scroll_down); - WM_operatortype_append(View2D_OT_view_zoomin); - WM_operatortype_append(View2D_OT_view_zoomout); + WM_operatortype_append(VIEW2D_OT_zoom_in); + WM_operatortype_append(VIEW2D_OT_zoom_out); - WM_operatortype_append(View2D_OT_view_zoom); - WM_operatortype_append(View2D_OT_view_borderzoom); + WM_operatortype_append(VIEW2D_OT_zoom); + WM_operatortype_append(VIEW2D_OT_zoom_border); - WM_operatortype_append(View2D_OT_scroller_activate); + WM_operatortype_append(VIEW2D_OT_scroller_activate); } void UI_view2d_keymap(wmWindowManager *wm) @@ -1269,43 +1269,43 @@ void UI_view2d_keymap(wmWindowManager *wm) ListBase *keymap= WM_keymap_listbase(wm, "View2D", 0, 0); /* pan/scroll */ - WM_keymap_add_item(keymap, "View2D_OT_view_pan", MIDDLEMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_pan", MIDDLEMOUSE, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_pan", MIDDLEMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_pan", MIDDLEMOUSE, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_rightscroll", WHEELDOWNMOUSE, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_leftscroll", WHEELUPMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_right", WHEELDOWNMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", WHEELUPMOUSE, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_downscroll", WHEELDOWNMOUSE, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_upscroll", WHEELUPMOUSE, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_down", WHEELDOWNMOUSE, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_up", WHEELUPMOUSE, KM_PRESS, KM_SHIFT, 0); /* zoom - single step */ - WM_keymap_add_item(keymap, "View2D_OT_view_zoomout", WHEELOUTMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_zoomin", WHEELINMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_zoomout", PADMINUS, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_zoomin", PADPLUSKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_out", WHEELOUTMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_in", WHEELINMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_out", PADMINUS, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_in", PADPLUSKEY, KM_PRESS, 0, 0); /* scroll up/down - no modifiers, only when zoom fails */ /* these may fail if zoom is disallowed, in which case they should pass on event */ - WM_keymap_add_item(keymap, "View2D_OT_view_downscroll", WHEELDOWNMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_upscroll", WHEELUPMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_down", WHEELDOWNMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_up", WHEELUPMOUSE, KM_PRESS, 0, 0); /* these may be necessary if vertical scroll is disallowed */ - WM_keymap_add_item(keymap, "View2D_OT_view_rightscroll", WHEELDOWNMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_leftscroll", WHEELUPMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_right", WHEELDOWNMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", WHEELUPMOUSE, KM_PRESS, 0, 0); /* zoom - drag */ - WM_keymap_add_item(keymap, "View2D_OT_view_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); /* borderzoom - drag */ - WM_keymap_add_item(keymap, "View2D_OT_view_borderzoom", BKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_border", BKEY, KM_PRESS, KM_SHIFT, 0); /* scrollers */ - WM_keymap_add_item(keymap, "View2D_OT_scroller_activate", LEFTMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroller_activate", LEFTMOUSE, KM_PRESS, 0, 0); /* Alternative keymap for buttons listview */ keymap= WM_keymap_listbase(wm, "View2D Buttons List", 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_pan", MIDDLEMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_downscroll", WHEELDOWNMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_upscroll", WHEELUPMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "View2D_OT_view_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_pan", MIDDLEMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_down", WHEELDOWNMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_up", WHEELUPMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW2D_OT_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); } diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index aa4c132bf3a..04d90453d57 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -351,11 +351,11 @@ static int make_fgon_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void MESH_OT_make_fgon(struct wmOperatorType *ot) +void MESH_OT_fgon_make(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Make F-gon"; - ot->idname= "MESH_OT_make_fgon"; + ot->idname= "MESH_OT_fgon_make"; /* api callbacks */ ot->exec= make_fgon_exec; @@ -380,11 +380,11 @@ static int clear_fgon_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void MESH_OT_clear_fgon(struct wmOperatorType *ot) +void MESH_OT_fgon_clear(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Clear F-gon"; - ot->idname= "MESH_OT_clear_fgon"; + ot->idname= "MESH_OT_fgon_clear"; /* api callbacks */ ot->exec= clear_fgon_exec; diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 8d2925ee1b6..74defeea9f1 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -815,11 +815,11 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void MESH_OT_similar_face_select(wmOperatorType *ot) +void MESH_OT_select_face_similar(wmOperatorType *ot) { /* identifiers */ ot->name= "Similar Face Select"; - ot->idname= "MESH_OT_similar_face_select"; + ot->idname= "MESH_OT_select_face_similar"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1074,11 +1074,11 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void MESH_OT_similar_edge_select(wmOperatorType *ot) +void MESH_OT_select_edge_similar(wmOperatorType *ot) { /* identifiers */ ot->name= "Similar Edge Select"; - ot->idname= "MESH_OT_similar_edge_select"; + ot->idname= "MESH_OT_select_edge_similar"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1231,11 +1231,11 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void MESH_OT_similar_vertex_select(wmOperatorType *ot) +void MESH_OT_select_vertex_similar(wmOperatorType *ot) { /* identifiers */ ot->name= "Similar Vertex Select"; - ot->idname= "MESH_OT_similar_vertex_select"; + ot->idname= "MESH_OT_select_vertex_similar"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1956,11 +1956,11 @@ static int loop_multiselect(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_select_multi_loop(wmOperatorType *ot) +void MESH_OT_select_loop_multi(wmOperatorType *ot) { /* identifiers */ ot->name= "Multi Select Loops"; - ot->idname= "MESH_OT_select_multi_loop"; + ot->idname= "MESH_OT_select_loop_multi"; /* api callbacks */ ot->exec= loop_multiselect; @@ -2022,7 +2022,7 @@ static void mouse_mesh_loop(bContext *C, short mval[2], short extend, short ring } } -static int mesh_loop_select_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int mesh_select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event) { view3d_operator_needs_opengl(C); @@ -2034,14 +2034,14 @@ static int mesh_loop_select_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_FINISHED; } -void MESH_OT_loop_select(wmOperatorType *ot) +void MESH_OT_select_loop(wmOperatorType *ot) { /* identifiers */ ot->name= "Loop Select"; - ot->idname= "MESH_OT_loop_select"; + ot->idname= "MESH_OT_select_loop"; /* api callbacks */ - ot->invoke= mesh_loop_select_invoke; + ot->invoke= mesh_select_loop_invoke; ot->poll= ED_operator_editmesh; /* flags */ @@ -2133,11 +2133,11 @@ static int mesh_shortest_path_select_invoke(bContext *C, wmOperator *op, wmEvent return OPERATOR_FINISHED; } -void MESH_OT_shortest_path_select(wmOperatorType *ot) +void MESH_OT_select_path_shortest(wmOperatorType *ot) { /* identifiers */ ot->name= "Shortest Path Select"; - ot->idname= "MESH_OT_shortest_path_select"; + ot->idname= "MESH_OT_select_path_shortest"; /* api callbacks */ ot->invoke= mesh_shortest_path_select_invoke; @@ -3204,11 +3204,11 @@ static int toggle_select_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_de_select_all(wmOperatorType *ot) +void MESH_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Select or Deselect All"; - ot->idname= "MESH_OT_de_select_all"; + ot->idname= "MESH_OT_select_all_toggle"; /* api callbacks */ ot->exec= toggle_select_all_exec; @@ -3532,7 +3532,7 @@ void MESH_OT_selection_type(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "type", prop_mesh_edit_types, 0, "Type", "Select the mesh selection type"); + RNA_def_enum(ot->srna, "type", prop_mesh_edit_types, 0, "Type", "Set the mesh selection type"); } /* ************************* SEAMS AND EDGES **************** */ diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 76f6085ca31..abd42f60e23 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -503,11 +503,11 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_removedoublesflag(wmOperatorType *ot) +void MESH_OT_remove_doubles(wmOperatorType *ot) { /* identifiers */ ot->name= "Remove Doubles"; - ot->idname= "MESH_OT_removedoublesflag"; + ot->idname= "MESH_OT_remove_doubles"; /* api callbacks */ ot->exec= removedoublesflag_exec; @@ -765,11 +765,11 @@ static int split_mesh(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_split_mesh(wmOperatorType *ot) +void MESH_OT_split(wmOperatorType *ot) { /* identifiers */ ot->name= "Split Mesh"; - ot->idname= "MESH_OT_split_mesh"; + ot->idname= "MESH_OT_split"; /* api callbacks */ ot->exec= split_mesh; @@ -3696,11 +3696,11 @@ static int edge_rotate_selected(bContext *C, wmOperator *op) } -void MESH_OT_edge_rotate_selected(wmOperatorType *ot) +void MESH_OT_edge_rotate(wmOperatorType *ot) { /* identifiers */ ot->name= "Rotate Selected Edge"; - ot->idname= "MESH_OT_edge_rotate_selected"; + ot->idname= "MESH_OT_edge_rotate"; /* api callbacks */ ot->exec= edge_rotate_selected; diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index e89db4fabca..24e3a3cc4bf 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -85,8 +85,8 @@ void MESH_OT_add_primitive_ico_sphere(struct wmOperatorType *ot); void MESH_OT_dupli_extrude_cursor(struct wmOperatorType *ot); void MESH_OT_add_edge_face(struct wmOperatorType *ot); -void MESH_OT_make_fgon(struct wmOperatorType *ot); -void MESH_OT_clear_fgon(struct wmOperatorType *ot); +void MESH_OT_fgon_make(struct wmOperatorType *ot); +void MESH_OT_fgon_clear(struct wmOperatorType *ot); /* ******************* editmesh_lib.c */ void EM_stats_update(EditMesh *em); @@ -144,8 +144,8 @@ extern struct EditFace *EM_face_from_faces(EditMesh *em, struct EditFace *efa1, void MESH_OT_knife_cut(struct wmOperatorType *ot); /* ******************* editmesh_mods.c */ -void MESH_OT_loop_select(struct wmOperatorType *ot); -void MESH_OT_de_select_all(struct wmOperatorType *ot); +void MESH_OT_select_loop(struct wmOperatorType *ot); +void MESH_OT_select_all_toggle(struct wmOperatorType *ot); void MESH_OT_select_more(struct wmOperatorType *ot); void MESH_OT_select_less(struct wmOperatorType *ot); void MESH_OT_select_invert(struct wmOperatorType *ot); @@ -157,14 +157,14 @@ void MESH_OT_reveal(struct wmOperatorType *ot); void MESH_OT_consistant_normals(struct wmOperatorType *ot); void MESH_OT_select_linked_flat_faces(struct wmOperatorType *ot); void MESH_OT_select_sharp_edges(struct wmOperatorType *ot); -void MESH_OT_shortest_path_select(struct wmOperatorType *ot); -void MESH_OT_similar_vertex_select(struct wmOperatorType *ot); -void MESH_OT_similar_edge_select(struct wmOperatorType *ot); -void MESH_OT_similar_face_select(struct wmOperatorType *ot); +void MESH_OT_select_path_shortest(struct wmOperatorType *ot); +void MESH_OT_select_vertex_similar(struct wmOperatorType *ot); +void MESH_OT_select_edge_similar(struct wmOperatorType *ot); +void MESH_OT_select_face_similar(struct wmOperatorType *ot); void MESH_OT_select_random(struct wmOperatorType *ot); void MESH_OT_vertices_to_sphere(struct wmOperatorType *ot); void MESH_OT_selection_type(struct wmOperatorType *ot); -void MESH_OT_select_multi_loop(struct wmOperatorType *ot); +void MESH_OT_select_loop_multi(struct wmOperatorType *ot); void MESH_OT_mark_seam(struct wmOperatorType *ot); void MESH_OT_mark_sharp(struct wmOperatorType *ot); void MESH_OT_smooth_vertex(struct wmOperatorType *ot); @@ -202,12 +202,12 @@ int removedoublesflag(EditMesh *em, short flag, short automerge, float limit); void esubdivideflag(Object *obedit, EditMesh *em, int flag, float rad, int beauty, int numcuts, int seltype); int EdgeSlide(EditMesh *em, wmOperator *op, short immediate, float imperc); -void MESH_OT_subdivs(struct wmOperatorType *ot); void MESH_OT_subdivide(struct wmOperatorType *ot); +void MESH_OT_subdivs(struct wmOperatorType *ot); void MESH_OT_subdivide_multi(struct wmOperatorType *ot); void MESH_OT_subdivide_multi_fractal(struct wmOperatorType *ot); void MESH_OT_subdivide_smooth(struct wmOperatorType *ot); -void MESH_OT_removedoublesflag(struct wmOperatorType *ot); +void MESH_OT_remove_doubles(struct wmOperatorType *ot); void MESH_OT_extrude(struct wmOperatorType *ot); void MESH_OT_spin(struct wmOperatorType *ot); void MESH_OT_screw(struct wmOperatorType *ot); @@ -219,9 +219,9 @@ void MESH_OT_convert_tris_to_quads(struct wmOperatorType *ot); void MESH_OT_edge_flip(struct wmOperatorType *ot); void MESH_OT_faces_shade_smooth(struct wmOperatorType *ot); void MESH_OT_faces_shade_solid(struct wmOperatorType *ot); -void MESH_OT_split_mesh(struct wmOperatorType *ot); +void MESH_OT_split(struct wmOperatorType *ot); void MESH_OT_extrude_repeat(struct wmOperatorType *ot); -void MESH_OT_edge_rotate_selected(struct wmOperatorType *ot); +void MESH_OT_edge_rotate(struct wmOperatorType *ot); void MESH_OT_loop_to_region(struct wmOperatorType *ot); void MESH_OT_region_to_loop(struct wmOperatorType *ot); diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index d0d7e834fcf..5c108c501b6 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -84,12 +84,12 @@ static int mesh_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event return OPERATOR_FINISHED; } -static void MESH_OT_add_duplicate(wmOperatorType *ot) +static void MESH_OT_duplicate_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Duplicate"; - ot->idname= "MESH_OT_add_duplicate"; + ot->idname= "MESH_OT_duplicate_add"; /* api callbacks */ ot->invoke= mesh_add_duplicate_invoke; @@ -106,7 +106,7 @@ static void MESH_OT_add_duplicate(wmOperatorType *ot) void ED_operatortypes_mesh(void) { - WM_operatortype_append(MESH_OT_de_select_all); + WM_operatortype_append(MESH_OT_select_all_toggle); WM_operatortype_append(MESH_OT_select_more); WM_operatortype_append(MESH_OT_select_less); WM_operatortype_append(MESH_OT_select_invert); @@ -135,18 +135,18 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_add_primitive_monkey); WM_operatortype_append(MESH_OT_add_primitive_uv_sphere); WM_operatortype_append(MESH_OT_add_primitive_ico_sphere); - WM_operatortype_append(MESH_OT_clear_fgon); - WM_operatortype_append(MESH_OT_make_fgon); - WM_operatortype_append(MESH_OT_add_duplicate); - WM_operatortype_append(MESH_OT_removedoublesflag); + WM_operatortype_append(MESH_OT_fgon_clear); + WM_operatortype_append(MESH_OT_fgon_make); + WM_operatortype_append(MESH_OT_duplicate_add); + WM_operatortype_append(MESH_OT_remove_doubles); WM_operatortype_append(MESH_OT_extrude); WM_operatortype_append(MESH_OT_spin); WM_operatortype_append(MESH_OT_screw); WM_operatortype_append(MESH_OT_vertices_to_sphere); - WM_operatortype_append(MESH_OT_split_mesh); + WM_operatortype_append(MESH_OT_split); WM_operatortype_append(MESH_OT_extrude_repeat); - WM_operatortype_append(MESH_OT_edge_rotate_selected); + WM_operatortype_append(MESH_OT_edge_rotate); WM_operatortype_append(MESH_OT_loop_to_region); WM_operatortype_append(MESH_OT_region_to_loop); @@ -167,13 +167,13 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_separate); WM_operatortype_append(MESH_OT_dupli_extrude_cursor); - WM_operatortype_append(MESH_OT_loop_select); + WM_operatortype_append(MESH_OT_select_loop); WM_operatortype_append(MESH_OT_add_edge_face); - WM_operatortype_append(MESH_OT_shortest_path_select); - WM_operatortype_append(MESH_OT_similar_vertex_select); - WM_operatortype_append(MESH_OT_similar_edge_select); - WM_operatortype_append(MESH_OT_similar_face_select); - WM_operatortype_append(MESH_OT_select_multi_loop); + WM_operatortype_append(MESH_OT_select_path_shortest); + WM_operatortype_append(MESH_OT_select_vertex_similar); + WM_operatortype_append(MESH_OT_select_edge_similar); + WM_operatortype_append(MESH_OT_select_face_similar); + WM_operatortype_append(MESH_OT_select_loop_multi); WM_operatortype_append(MESH_OT_mark_seam); WM_operatortype_append(MESH_OT_mark_sharp); WM_operatortype_append(MESH_OT_smooth_vertex); @@ -191,18 +191,18 @@ void ED_keymap_mesh(wmWindowManager *wm) /* selecting */ /* standard mouse selection goes via space_view3d */ - WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0); - kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0); + WM_keymap_add_item(keymap, "MESH_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_ALT, 0); + kmi= WM_keymap_add_item(keymap, "MESH_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0); RNA_boolean_set(kmi->ptr, "extend", 1); - kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0); + kmi= WM_keymap_add_item(keymap, "MESH_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0); RNA_boolean_set(kmi->ptr, "ring", 1); - kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT|KM_CTRL, 0); + kmi= WM_keymap_add_item(keymap, "MESH_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT|KM_CTRL, 0); RNA_boolean_set(kmi->ptr, "extend", 1); RNA_boolean_set(kmi->ptr, "ring", 1); - WM_keymap_add_item(keymap, "MESH_OT_shortest_path_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "MESH_OT_select_path_shortest", SELECTMOUSE, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "MESH_OT_de_select_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "MESH_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MESH_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_select_invert", IKEY, KM_PRESS, KM_CTRL, 0); @@ -225,9 +225,9 @@ void ED_keymap_mesh(wmWindowManager *wm) RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_mark_sharp", TWOKEY, KM_PRESS, KM_ALT , 0)->ptr,"set",1); /* temp hotkeys! */ - WM_keymap_add_item(keymap, "MESH_OT_similar_vertex_select", GKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "MESH_OT_similar_edge_select", GKEY, KM_PRESS, KM_SHIFT2|KM_CTRL, 0); - WM_keymap_add_item(keymap, "MESH_OT_similar_face_select", GKEY, KM_PRESS, KM_SHIFT|KM_CTRL2, 0); + WM_keymap_add_item(keymap, "MESH_OT_select_vertex_similar", GKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "MESH_OT_select_edge_similar", GKEY, KM_PRESS, KM_SHIFT2|KM_CTRL, 0); + WM_keymap_add_item(keymap, "MESH_OT_select_face_similar", GKEY, KM_PRESS, KM_SHIFT|KM_CTRL2, 0); /* selection mode */ WM_keymap_add_item(keymap, "MESH_OT_selection_type", TABKEY, KM_PRESS, KM_CTRL, 0); @@ -247,7 +247,7 @@ void ED_keymap_mesh(wmWindowManager *wm) /*WM_keymap_add_item(keymap, "MESH_OT_subdivide_multi", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0); WM_keymap_add_item(keymap, "MESH_OT_subdivide_multi_fractal", WKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "MESH_OT_subdivide_smooth", WKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);*/ - WM_keymap_add_item(keymap, "MESH_OT_removedoublesflag", VKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "MESH_OT_remove_doubles", VKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_extrude", EKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MESH_OT_spin", RKEY, KM_PRESS, KM_ALT, 0); @@ -259,9 +259,9 @@ void ED_keymap_mesh(wmWindowManager *wm) WM_keymap_add_item(keymap, "MESH_OT_convert_quads_to_tris", TKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_convert_tris_to_quads", JKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "MESH_OT_split_mesh", FOURKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "MESH_OT_split", FOURKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_extrude_repeat", FOURKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "MESH_OT_edge_rotate_selected", FIVEKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "MESH_OT_edge_rotate", FIVEKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_loop_to_region",SIXKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_region_to_loop",SIXKEY, KM_PRESS, KM_ALT, 0); @@ -275,7 +275,7 @@ void ED_keymap_mesh(wmWindowManager *wm) /* add/remove */ WM_keymap_add_item(keymap, "MESH_OT_add_edge_face", FKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "MESH_OT_add_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "MESH_OT_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "OBJECT_OT_mesh_add", AKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "MESH_OT_separate", PKEY, KM_PRESS, KM_SHIFT, 0); /* use KM_RELEASE because same key is used for tweaks */ @@ -283,8 +283,8 @@ void ED_keymap_mesh(wmWindowManager *wm) WM_keymap_add_item(keymap, "MESH_OT_delete", XKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "MESH_OT_make_fgon", FKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "MESH_OT_clear_fgon", FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0); + WM_keymap_add_item(keymap, "MESH_OT_fgon_make", FKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "MESH_OT_fgon_clear", FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0); WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0); diff --git a/source/blender/editors/object/editgroup.c b/source/blender/editors/object/editgroup.c index 17542cc4817..b49e2040b03 100644 --- a/source/blender/editors/object/editgroup.c +++ b/source/blender/editors/object/editgroup.c @@ -196,13 +196,13 @@ static int group_remove_exec(bContext *C, wmOperator *op) } -void GROUP_OT_group_remove(wmOperatorType *ot) +void GROUP_OT_objects_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "remove Selected from group"; - ot->description = "remove an object from the group."; - ot->idname= "GROUP_OT_group_remove"; + ot->name= "Remove from group"; + ot->description = "Remove selected objects from all groups."; + ot->idname= "GROUP_OT_objects_remove"; /* api callbacks */ ot->exec= group_remove_exec; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 57fc49f7304..29e3d880c16 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -710,13 +710,13 @@ static int object_delete_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_object_delete(wmOperatorType *ot) +void OBJECT_OT_delete(wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Objects"; ot->description = "Delete the object."; - ot->idname= "OBJECT_OT_object_delete"; + ot->idname= "OBJECT_OT_delete"; /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -1767,13 +1767,13 @@ static int object_select_de_select_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_select_de_select_all(wmOperatorType *ot) +void OBJECT_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "deselect all"; ot->description = "(de)select all visible objects in scene."; - ot->idname= "OBJECT_OT_select_de_select_all"; + ot->idname= "OBJECT_OT_select_all_toggle"; /* api callbacks */ ot->exec= object_select_de_select_all_exec; diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index a5d509b80d7..1c56b0c7115 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -44,7 +44,7 @@ void OBJECT_OT_parent_set(struct wmOperatorType *ot); void OBJECT_OT_parent_clear(struct wmOperatorType *ot); void OBJECT_OT_track_set(struct wmOperatorType *ot); void OBJECT_OT_track_clear(struct wmOperatorType *ot); -void OBJECT_OT_select_de_select_all(struct wmOperatorType *ot); +void OBJECT_OT_select_all_toggle(struct wmOperatorType *ot); void OBJECT_OT_select_invert(struct wmOperatorType *ot); void OBJECT_OT_select_random(struct wmOperatorType *ot); void OBJECT_OT_select_by_type(struct wmOperatorType *ot); @@ -62,7 +62,7 @@ void OBJECT_OT_center_set(struct wmOperatorType *ot); void OBJECT_OT_dupli_set_real(struct wmOperatorType *ot); void OBJECT_OT_object_add(struct wmOperatorType *ot); void OBJECT_OT_duplicate_add(struct wmOperatorType *ot); -void OBJECT_OT_object_delete(struct wmOperatorType *ot); +void OBJECT_OT_delete(struct wmOperatorType *ot); void OBJECT_OT_mesh_add(struct wmOperatorType *ot); void OBJECT_OT_curve_add(struct wmOperatorType *ot); @@ -80,7 +80,7 @@ void remake_editLatt(Object *obedit); /* editgroup.c */ void GROUP_OT_group_create(struct wmOperatorType *ot); -void GROUP_OT_group_remove(struct wmOperatorType *ot); +void GROUP_OT_objects_remove(struct wmOperatorType *ot); void GROUP_OT_objects_add_active(struct wmOperatorType *ot); void GROUP_OT_objects_remove_active(struct wmOperatorType *ot); diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 2c922f80887..8cbf9bf5287 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -70,7 +70,7 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_track_clear); WM_operatortype_append(OBJECT_OT_select_invert); WM_operatortype_append(OBJECT_OT_select_random); - WM_operatortype_append(OBJECT_OT_select_de_select_all); + WM_operatortype_append(OBJECT_OT_select_all_toggle); WM_operatortype_append(OBJECT_OT_select_by_type); WM_operatortype_append(OBJECT_OT_select_by_layer); WM_operatortype_append(OBJECT_OT_select_linked); @@ -86,11 +86,11 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_dupli_set_real); WM_operatortype_append(OBJECT_OT_duplicate_add); WM_operatortype_append(GROUP_OT_group_create); - WM_operatortype_append(GROUP_OT_group_remove); + WM_operatortype_append(GROUP_OT_objects_remove); WM_operatortype_append(GROUP_OT_objects_add_active); WM_operatortype_append(GROUP_OT_objects_remove_active); - WM_operatortype_append(OBJECT_OT_object_delete); + WM_operatortype_append(OBJECT_OT_delete); WM_operatortype_append(OBJECT_OT_mesh_add); WM_operatortype_append(OBJECT_OT_curve_add); WM_operatortype_append(OBJECT_OT_text_add); @@ -111,7 +111,7 @@ void ED_keymap_object(wmWindowManager *wm) /* Note: this keymap gets disabled in non-objectmode, */ keymap= WM_keymap_listbase(wm, "Object Mode", 0, 0); - WM_keymap_add_item(keymap, "OBJECT_OT_select_de_select_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "OBJECT_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "OBJECT_OT_select_invert", IKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "OBJECT_OT_select_random", PADASTERKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "OBJECT_OT_select_by_type", PADASTERKEY, KM_PRESS, KM_CTRL, 0); @@ -131,7 +131,7 @@ void ED_keymap_object(wmWindowManager *wm) WM_keymap_verify_item(keymap, "OBJECT_OT_restrictview_clear", HKEY, KM_PRESS, KM_ALT, 0); WM_keymap_verify_item(keymap, "OBJECT_OT_restrictview_set", HKEY, KM_PRESS, 0, 0); - WM_keymap_verify_item(keymap, "OBJECT_OT_object_delete", XKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "OBJECT_OT_delete", XKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "OBJECT_OT_primitive_add", AKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_verify_item(keymap, "OBJECT_OT_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0); @@ -140,7 +140,7 @@ void ED_keymap_object(wmWindowManager *wm) WM_keymap_verify_item(keymap, "ANIM_OT_delete_keyframe_old", IKEY, KM_PRESS, KM_ALT, 0); WM_keymap_verify_item(keymap, "GROUP_OT_group_create", GKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_verify_item(keymap, "GROUP_OT_group_remove", GKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); + WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove", GKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); WM_keymap_verify_item(keymap, "GROUP_OT_objects_add_active", GKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0); WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove_active", GKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0); diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c index 272383ab651..33d1bd66676 100644 --- a/source/blender/editors/physics/editparticle.c +++ b/source/blender/editors/physics/editparticle.c @@ -1209,11 +1209,11 @@ static int de_select_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void PARTICLE_OT_de_select_all(wmOperatorType *ot) +void PARTICLE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Select or Deselect All"; - ot->idname= "PARTICLE_OT_de_select_all"; + ot->idname= "PARTICLE_OT_select_all_toggle"; /* api callbacks */ ot->exec= de_select_all_exec; @@ -2581,11 +2581,11 @@ static int set_brush_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void PARTICLE_OT_set_brush(wmOperatorType *ot) +void PARTICLE_OT_brush_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Brush"; - ot->idname= "PARTICLE_OT_set_brush"; + ot->idname= "PARTICLE_OT_brush_set"; /* api callbacks */ ot->exec= set_brush_exec; @@ -3778,11 +3778,11 @@ static int set_editable_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void PARTICLE_OT_set_editable(wmOperatorType *ot) +void PARTICLE_OT_editable_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Editable"; - ot->idname= "PARTICLE_OT_set_editable"; + ot->idname= "PARTICLE_OT_editable_set"; /* api callbacks */ ot->exec= set_editable_exec; @@ -3871,7 +3871,7 @@ void PARTICLE_OT_specials_menu(wmOperatorType *ot) void ED_operatortypes_particle(void) { - WM_operatortype_append(PARTICLE_OT_de_select_all); + WM_operatortype_append(PARTICLE_OT_select_all_toggle); WM_operatortype_append(PARTICLE_OT_select_first); WM_operatortype_append(PARTICLE_OT_select_last); WM_operatortype_append(PARTICLE_OT_select_linked); @@ -3887,21 +3887,21 @@ void ED_operatortypes_particle(void) WM_operatortype_append(PARTICLE_OT_delete); WM_operatortype_append(PARTICLE_OT_mirror); - WM_operatortype_append(PARTICLE_OT_set_brush); + WM_operatortype_append(PARTICLE_OT_brush_set); WM_operatortype_append(PARTICLE_OT_brush_edit); WM_operatortype_append(PARTICLE_OT_brush_radial_control); WM_operatortype_append(PARTICLE_OT_specials_menu); WM_operatortype_append(PARTICLE_OT_particle_edit_toggle); - WM_operatortype_append(PARTICLE_OT_set_editable); + WM_operatortype_append(PARTICLE_OT_editable_set); } void ED_keymap_particle(wmWindowManager *wm) { ListBase *keymap= WM_keymap_listbase(wm, "Particle", 0, 0); - WM_keymap_add_item(keymap, "PARTICLE_OT_de_select_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "PARTICLE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "PARTICLE_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "PARTICLE_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index bff2e0dd81b..1ce5f3a348b 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -5048,11 +5048,11 @@ static int set_clone_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) return set_clone_cursor_exec(C, op); } -void PAINT_OT_set_clone_cursor(wmOperatorType *ot) +void PAINT_OT_clone_cursor_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Clone Cursor"; - ot->idname= "PAINT_OT_set_clone_cursor"; + ot->idname= "PAINT_OT_clone_cursor_set"; /* api callbacks */ ot->exec= set_clone_cursor_exec; diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 7e1ecd9629a..b630975c934 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -50,7 +50,7 @@ void PAINT_OT_image_paint(struct wmOperatorType *ot); void PAINT_OT_image_paint_radial_control(struct wmOperatorType *ot); void PAINT_OT_grab_clone(struct wmOperatorType *ot); void PAINT_OT_sample_color(struct wmOperatorType *ot); -void PAINT_OT_set_clone_cursor(struct wmOperatorType *ot); +void PAINT_OT_clone_cursor_set(struct wmOperatorType *ot); void PAINT_OT_texture_paint_toggle(struct wmOperatorType *ot); void PAINT_OT_texture_paint_radial_control(struct wmOperatorType *ot); diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 6b3a36de826..e9263ddabf0 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -17,7 +17,7 @@ void ED_operatortypes_paint(void) WM_operatortype_append(PAINT_OT_image_paint_radial_control); WM_operatortype_append(PAINT_OT_sample_color); WM_operatortype_append(PAINT_OT_grab_clone); - WM_operatortype_append(PAINT_OT_set_clone_cursor); + WM_operatortype_append(PAINT_OT_clone_cursor_set); /* weight */ WM_operatortype_append(PAINT_OT_weight_paint_toggle); diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index fcfddf80330..adb5d749f71 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -172,11 +172,11 @@ static int actkeys_previewrange_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_set_previewrange (wmOperatorType *ot) +void ACT_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ ot->name= "Auto-Set Preview Range"; - ot->idname= "ACT_OT_set_previewrange"; + ot->idname= "ACT_OT_previewrange_set"; /* api callbacks */ ot->exec= actkeys_previewrange_exec; @@ -852,11 +852,11 @@ static int actkeys_expo_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_keyframes_extrapolation_type (wmOperatorType *ot) +void ACT_OT_keyframes_extrapolation_type_set (wmOperatorType *ot) { /* identifiers */ ot->name= "Set Keyframe Extrapolation"; - ot->idname= "ACT_OT_keyframes_extrapolation_type"; + ot->idname= "ACT_OT_keyframes_extrapolation_type_set"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1028,11 +1028,11 @@ static int actkeys_handletype_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_keyframes_handletype (wmOperatorType *ot) +void ACT_OT_keyframes_handle_type_set (wmOperatorType *ot) { /* identifiers */ ot->name= "Set Keyframe Handle Type"; - ot->idname= "ACT_OT_keyframes_handletype"; + ot->idname= "ACT_OT_keyframes_handle_type_set"; /* api callbacks */ ot->invoke= WM_menu_invoke; diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index 7d21ac263c3..b4d2528b3b4 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -53,9 +53,9 @@ void action_header_buttons(const struct bContext *C, struct ARegion *ar); /* ***************************************** */ /* action_select.c */ -void ACT_OT_keyframes_deselectall(struct wmOperatorType *ot); -void ACT_OT_keyframes_borderselect(struct wmOperatorType *ot); -void ACT_OT_keyframes_columnselect(struct wmOperatorType *ot); +void ACT_OT_keyframes_select_all_toggle(struct wmOperatorType *ot); +void ACT_OT_keyframes_select_border(struct wmOperatorType *ot); +void ACT_OT_keyframes_select_column(struct wmOperatorType *ot); void ACT_OT_keyframes_clickselect(struct wmOperatorType *ot); /* defines for left-right select tool */ @@ -77,7 +77,7 @@ enum { /* ***************************************** */ /* action_edit.c */ -void ACT_OT_set_previewrange(struct wmOperatorType *ot); +void ACT_OT_previewrange_set(struct wmOperatorType *ot); void ACT_OT_view_all(struct wmOperatorType *ot); void ACT_OT_keyframes_copy(struct wmOperatorType *ot); @@ -89,9 +89,9 @@ void ACT_OT_keyframes_delete(struct wmOperatorType *ot); void ACT_OT_keyframes_clean(struct wmOperatorType *ot); void ACT_OT_keyframes_sample(struct wmOperatorType *ot); -void ACT_OT_keyframes_handletype(struct wmOperatorType *ot); +void ACT_OT_keyframes_handle_type_set(struct wmOperatorType *ot); void ACT_OT_keyframes_interpolation_type(struct wmOperatorType *ot); -void ACT_OT_keyframes_extrapolation_type(struct wmOperatorType *ot); +void ACT_OT_keyframes_extrapolation_type_set(struct wmOperatorType *ot); void ACT_OT_keyframes_cfrasnap(struct wmOperatorType *ot); void ACT_OT_keyframes_snap(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 081b5539524..eedf4868391 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -64,17 +64,17 @@ void action_operatortypes(void) /* keyframes */ /* selection */ WM_operatortype_append(ACT_OT_keyframes_clickselect); - WM_operatortype_append(ACT_OT_keyframes_deselectall); - WM_operatortype_append(ACT_OT_keyframes_borderselect); - WM_operatortype_append(ACT_OT_keyframes_columnselect); + WM_operatortype_append(ACT_OT_keyframes_select_all_toggle); + WM_operatortype_append(ACT_OT_keyframes_select_border); + WM_operatortype_append(ACT_OT_keyframes_select_column); /* editing */ WM_operatortype_append(ACT_OT_keyframes_snap); WM_operatortype_append(ACT_OT_keyframes_mirror); WM_operatortype_append(ACT_OT_keyframes_cfrasnap); - WM_operatortype_append(ACT_OT_keyframes_handletype); + WM_operatortype_append(ACT_OT_keyframes_handle_type_set); WM_operatortype_append(ACT_OT_keyframes_interpolation_type); - WM_operatortype_append(ACT_OT_keyframes_extrapolation_type); + WM_operatortype_append(ACT_OT_keyframes_extrapolation_type_set); WM_operatortype_append(ACT_OT_keyframes_sample); WM_operatortype_append(ACT_OT_keyframes_clean); WM_operatortype_append(ACT_OT_keyframes_delete); @@ -83,7 +83,7 @@ void action_operatortypes(void) WM_operatortype_append(ACT_OT_keyframes_copy); WM_operatortype_append(ACT_OT_keyframes_paste); - WM_operatortype_append(ACT_OT_set_previewrange); + WM_operatortype_append(ACT_OT_previewrange_set); WM_operatortype_append(ACT_OT_view_all); } @@ -95,23 +95,23 @@ static void action_keymap_keyframes (wmWindowManager *wm, ListBase *keymap) /* click-select */ // TODO: column to alt, left-right to ctrl (for select-linked consistency) WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "column_select", 1); - RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend_select", 1); + RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "column", 1); + RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1); RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "left_right", ACTKEYS_LRSEL_TEST); /* deselect all */ - WM_keymap_add_item(keymap, "ACT_OT_keyframes_deselectall", AKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_deselectall", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); + WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_all_toggle", AKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); /* borderselect */ - WM_keymap_add_item(keymap, "ACT_OT_keyframes_borderselect", BKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_borderselect", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1); + WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_border", BKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_border", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1); /* column select */ - RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS); - RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA); - RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN); - RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN); + RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_column", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS); + RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_column", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA); + RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_column", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN); + RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_column", KKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN); /* action_edit.c */ /* snap - current frame to selected keys */ @@ -122,9 +122,9 @@ static void action_keymap_keyframes (wmWindowManager *wm, ListBase *keymap) WM_keymap_add_item(keymap, "ACT_OT_keyframes_mirror", MKEY, KM_PRESS, KM_SHIFT, 0); /* menu + set setting */ - WM_keymap_add_item(keymap, "ACT_OT_keyframes_handletype", HKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ACT_OT_keyframes_handle_type_set", HKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "ACT_OT_keyframes_interpolation_type", TKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ACT_OT_keyframes_extrapolation_type", EKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ACT_OT_keyframes_extrapolation_type_set", EKEY, KM_PRESS, KM_SHIFT, 0); /* destructive */ WM_keymap_add_item(keymap, "ACT_OT_keyframes_clean", OKEY, KM_PRESS, 0, 0); @@ -141,7 +141,7 @@ static void action_keymap_keyframes (wmWindowManager *wm, ListBase *keymap) WM_keymap_add_item(keymap, "ACT_OT_keyframes_paste", VKEY, KM_PRESS, KM_CTRL, 0); /* auto-set range */ - WM_keymap_add_item(keymap, "ACT_OT_set_previewrange", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); + WM_keymap_add_item(keymap, "ACT_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); WM_keymap_add_item(keymap, "ACT_OT_view_all", HOMEKEY, KM_PRESS, 0, 0); /* transform system */ diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 5cf92abb664..5fb39376fd0 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -328,11 +328,11 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_keyframes_deselectall (wmOperatorType *ot) +void ACT_OT_keyframes_select_all_toggle (wmOperatorType *ot) { /* identifiers */ ot->name= "Select All"; - ot->idname= "ACT_OT_keyframes_deselectall"; + ot->idname= "ACT_OT_keyframes_select_all_toggle"; /* api callbacks */ ot->exec= actkeys_deselectall_exec; @@ -487,11 +487,11 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_keyframes_borderselect(wmOperatorType *ot) +void ACT_OT_keyframes_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "ACT_OT_keyframes_borderselect"; + ot->idname= "ACT_OT_keyframes_select_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -723,11 +723,11 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_keyframes_columnselect (wmOperatorType *ot) +void ACT_OT_keyframes_select_column (wmOperatorType *ot) { /* identifiers */ ot->name= "Select All"; - ot->idname= "ACT_OT_keyframes_columnselect"; + ot->idname= "ACT_OT_keyframes_select_column"; /* api callbacks */ ot->exec= actkeys_columnselect_exec; @@ -1067,7 +1067,7 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even /* select mode is either replace (deselect all, then add) or add/extend */ // XXX this is currently only available for normal select only - if (RNA_boolean_get(op->ptr, "extend_select")) + if (RNA_boolean_get(op->ptr, "extend")) selectmode= SELECT_INVERT; else selectmode= SELECT_REPLACE; @@ -1085,7 +1085,7 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even selectkeys_leftright(&ac, RNA_enum_get(op->ptr, "left_right"), selectmode); } - else if (RNA_boolean_get(op->ptr, "column_select")) { + else if (RNA_boolean_get(op->ptr, "column")) { /* select all the keyframes that occur on the same frame as where the mouse clicked */ float x; @@ -1122,8 +1122,8 @@ void ACT_OT_keyframes_clickselect (wmOperatorType *ot) /* id-props */ // XXX should we make this into separate operators? RNA_def_enum(ot->srna, "left_right", NULL /* XXX prop_actkeys_clickselect_items */, 0, "Left Right", ""); // ALTKEY - RNA_def_boolean(ot->srna, "extend_select", 0, "Extend Select", ""); // SHIFTKEY - RNA_def_boolean(ot->srna, "column_select", 0, "Column Select", ""); // CTRLKEY + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "column", 0, "Column Select", ""); // CTRLKEY } /* ************************************************************************** */ diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index 6a75303696b..80b7eb21818 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -53,8 +53,8 @@ struct wmOperator; struct wmEvent; void FILE_OT_highlight(struct wmOperatorType *ot); void FILE_OT_select(struct wmOperatorType *ot); -void FILE_OT_select_all(struct wmOperatorType *ot); -void FILE_OT_border_select(struct wmOperatorType *ot); +void FILE_OT_select_all_toggle(struct wmOperatorType *ot); +void FILE_OT_select_border(struct wmOperatorType *ot); void FILE_OT_select_bookmark(struct wmOperatorType *ot); void FILE_OT_loadimages(struct wmOperatorType *ot); void FILE_OT_exec(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index bafd81ae73e..3d845ac4be6 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -216,11 +216,11 @@ static int file_border_select_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void FILE_OT_border_select(wmOperatorType *ot) +void FILE_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Activate/Select File"; - ot->idname= "FILE_OT_border_select"; + ot->idname= "FILE_OT_select_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -302,11 +302,11 @@ static int file_select_all_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_FINISHED; } -void FILE_OT_select_all(wmOperatorType *ot) +void FILE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Select/Deselect all files"; - ot->idname= "FILE_OT_select_all"; + ot->idname= "FILE_OT_select_all_toggle"; /* api callbacks */ ot->invoke= file_select_all_invoke; diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index b2fad2a387c..084fcf1e5f6 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -266,8 +266,8 @@ static void file_main_area_draw(const bContext *C, ARegion *ar) void file_operatortypes(void) { WM_operatortype_append(FILE_OT_select); - WM_operatortype_append(FILE_OT_select_all); - WM_operatortype_append(FILE_OT_border_select); + WM_operatortype_append(FILE_OT_select_all_toggle); + WM_operatortype_append(FILE_OT_select_border); WM_operatortype_append(FILE_OT_select_bookmark); WM_operatortype_append(FILE_OT_loadimages); WM_operatortype_append(FILE_OT_highlight); @@ -283,8 +283,8 @@ void file_keymap(struct wmWindowManager *wm) { ListBase *keymap= WM_keymap_listbase(wm, "File", SPACE_FILE, 0); WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "FILE_OT_select_all", AKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "FILE_OT_border_select", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "FILE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "FILE_OT_select_border", BKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_highlight", MOUSEMOVE, KM_ANY, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_parent", PKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 4036452649c..de020e8ce70 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -177,11 +177,11 @@ static int graphkeys_previewrange_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void GRAPHEDIT_OT_set_previewrange (wmOperatorType *ot) +void GRAPHEDIT_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ ot->name= "Auto-Set Preview Range"; - ot->idname= "GRAPHEDIT_OT_set_previewrange"; + ot->idname= "GRAPHEDIT_OT_previewrange_set"; /* api callbacks */ ot->exec= graphkeys_previewrange_exec; diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h index ab915a97232..06fda53fc67 100644 --- a/source/blender/editors/space_graph/graph_intern.h +++ b/source/blender/editors/space_graph/graph_intern.h @@ -55,8 +55,8 @@ void graph_header_buttons(const bContext *C, struct ARegion *ar); /* ***************************************** */ /* graph_select.c */ -void GRAPHEDIT_OT_keyframes_deselectall(struct wmOperatorType *ot); -void GRAPHEDIT_OT_keyframes_borderselect(struct wmOperatorType *ot); +void GRAPHEDIT_OT_keyframes_select_all_toggle(struct wmOperatorType *ot); +void GRAPHEDIT_OT_keyframes_select_border(struct wmOperatorType *ot); void GRAPHEDIT_OT_keyframes_columnselect(struct wmOperatorType *ot); void GRAPHEDIT_OT_keyframes_clickselect(struct wmOperatorType *ot); @@ -79,7 +79,7 @@ enum { /* ***************************************** */ /* graph_edit.c */ -void GRAPHEDIT_OT_set_previewrange(struct wmOperatorType *ot); +void GRAPHEDIT_OT_previewrange_set(struct wmOperatorType *ot); void GRAPHEDIT_OT_view_all(struct wmOperatorType *ot); void GRAPHEDIT_OT_keyframes_copy(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 91cc7557476..4ff566489ae 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -84,7 +84,7 @@ void GRAPHEDIT_OT_view_togglehandles (wmOperatorType *ot) { /* identification */ ot->name= "Show/Hide All Handles"; - ot->idname= "GRAPHEDIT_OT_view_toggle_handles"; + ot->idname= "GRAPHEDIT_OT_handles_view_toggle"; /* callbacks */ ot->exec= view_toggle_handles_exec; @@ -97,15 +97,15 @@ void graphedit_operatortypes(void) { /* view */ WM_operatortype_append(GRAPHEDIT_OT_view_togglehandles); - WM_operatortype_append(GRAPHEDIT_OT_set_previewrange); + WM_operatortype_append(GRAPHEDIT_OT_previewrange_set); WM_operatortype_append(GRAPHEDIT_OT_view_all); WM_operatortype_append(GRAPHEDIT_OT_properties); /* keyframes */ /* selection */ WM_operatortype_append(GRAPHEDIT_OT_keyframes_clickselect); - WM_operatortype_append(GRAPHEDIT_OT_keyframes_deselectall); - WM_operatortype_append(GRAPHEDIT_OT_keyframes_borderselect); + WM_operatortype_append(GRAPHEDIT_OT_keyframes_select_all_toggle); + WM_operatortype_append(GRAPHEDIT_OT_keyframes_select_border); WM_operatortype_append(GRAPHEDIT_OT_keyframes_columnselect); /* editing */ @@ -137,23 +137,23 @@ void graphedit_operatortypes(void) static void graphedit_keymap_keyframes (wmWindowManager *wm, ListBase *keymap) { /* view */ - WM_keymap_add_item(keymap, "GRAPHEDIT_OT_view_toggle_handles", HKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "GRAPHEDIT_OT_handles_view_toggle", HKEY, KM_PRESS, KM_CTRL, 0); /* graph_select.c - selection tools */ /* click-select */ // TODO: column to alt, left-right to ctrl (for select-linked consistency) WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "column_select", 1); - RNA_boolean_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend_select", 1); + RNA_boolean_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "column", 1); + RNA_boolean_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1); RNA_enum_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "left_right", GRAPHKEYS_LRSEL_TEST); /* deselect all */ - WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_deselectall", AKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_deselectall", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); + WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_select_all_toggle", AKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); /* borderselect */ - WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_borderselect", BKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_borderselect", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1); + WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_select_border", BKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_select_border", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1); /* column select */ // XXX KKEY would be nice to keep for 'keyframe' lines @@ -196,7 +196,7 @@ static void graphedit_keymap_keyframes (wmWindowManager *wm, ListBase *keymap) WM_keymap_add_item(keymap, "GRAPHEDIT_OT_keyframes_paste", VKEY, KM_PRESS, KM_CTRL, 0); /* auto-set range */ - WM_keymap_add_item(keymap, "GRAPHEDIT_OT_set_previewrange", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); + WM_keymap_add_item(keymap, "GRAPHEDIT_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); WM_keymap_add_item(keymap, "GRAPHEDIT_OT_view_all", HOMEKEY, KM_PRESS, 0, 0); /* F-Curve Modifiers */ diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 96173bf8ca5..d6f738b5285 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -176,11 +176,11 @@ static int graphkeys_deselectall_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void GRAPHEDIT_OT_keyframes_deselectall (wmOperatorType *ot) +void GRAPHEDIT_OT_keyframes_select_all_toggle (wmOperatorType *ot) { /* identifiers */ ot->name= "Select All"; - ot->idname= "GRAPHEDIT_OT_keyframes_deselectall"; + ot->idname= "GRAPHEDIT_OT_keyframes_select_all_toggle"; /* api callbacks */ ot->exec= graphkeys_deselectall_exec; @@ -307,11 +307,11 @@ static int graphkeys_borderselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void GRAPHEDIT_OT_keyframes_borderselect(wmOperatorType *ot) +void GRAPHEDIT_OT_keyframes_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "GRAPHEDIT_OT_keyframes_borderselect"; + ot->idname= "GRAPHEDIT_OT_keyframes_select_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -854,7 +854,7 @@ static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *ev /* select mode is either replace (deselect all, then add) or add/extend */ // XXX this is currently only available for normal select only - if (RNA_boolean_get(op->ptr, "extend_select")) + if (RNA_boolean_get(op->ptr, "extend")) selectmode= SELECT_INVERT; else selectmode= SELECT_REPLACE; @@ -872,7 +872,7 @@ static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *ev graphkeys_select_leftright(&ac, RNA_enum_get(op->ptr, "left_right"), selectmode); } - else if (RNA_boolean_get(op->ptr, "column_select")) { + else if (RNA_boolean_get(op->ptr, "column")) { /* select all the keyframes that occur on the same frame as where the mouse clicked */ float x; @@ -905,8 +905,8 @@ void GRAPHEDIT_OT_keyframes_clickselect (wmOperatorType *ot) /* id-props */ // XXX should we make this into separate operators? RNA_def_enum(ot->srna, "left_right", NULL /* XXX prop_graphkeys_clickselect_items */, 0, "Left Right", ""); // ALTKEY - RNA_def_boolean(ot->srna, "extend_select", 0, "Extend Select", ""); // SHIFTKEY - RNA_def_boolean(ot->srna, "column_select", 0, "Column Select", ""); // CTRLKEY + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "column", 0, "Column Select", ""); // CTRLKEY } /* ************************************************************************** */ diff --git a/source/blender/editors/space_image/image_header.c b/source/blender/editors/space_image/image_header.c index 2b6078b71a8..ef59252dbc7 100644 --- a/source/blender/editors/space_image/image_header.c +++ b/source/blender/editors/space_image/image_header.c @@ -164,12 +164,12 @@ static void image_viewmenu(bContext *C, uiMenuItem *head, void *arg_unused) static void image_selectmenu(bContext *C, uiMenuItem *head, void *arg_unused) { - uiMenuItemO(head, 0, "UV_OT_border_select"); - uiMenuItemBooleanO(head, "Border Select Pinned", 0, "UV_OT_border_select", "pinned", 1); // Border Select Pinned|Shift B + uiMenuItemO(head, 0, "UV_OT_select_border"); + uiMenuItemBooleanO(head, "Border Select Pinned", 0, "UV_OT_select_border", "pinned", 1); // Border Select Pinned|Shift B uiMenuSeparator(head); - uiMenuItemO(head, 0, "UV_OT_de_select_all"); + uiMenuItemO(head, 0, "UV_OT_select_all_toggle"); uiMenuItemO(head, 0, "UV_OT_select_invert"); uiMenuItemO(head, 0, "UV_OT_unlink_selection"); diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index 20f12fecaf5..c592e2cb004 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -75,7 +75,7 @@ void IMAGE_OT_pack(struct wmOperatorType *ot); void IMAGE_OT_unpack(struct wmOperatorType *ot); void IMAGE_OT_sample(struct wmOperatorType *ot); -void IMAGE_OT_set_curves_point(struct wmOperatorType *ot); +void IMAGE_OT_curves_point_set(struct wmOperatorType *ot); void IMAGE_OT_record_composite(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 8038e6a00ff..934d58926e2 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1403,7 +1403,7 @@ void IMAGE_OT_sample(wmOperatorType *ot) /******************** set curve point operator ********************/ -void IMAGE_OT_set_curves_point(wmOperatorType *ot) +void IMAGE_OT_curves_point_set(wmOperatorType *ot) { static EnumPropertyItem point_items[]= { {0, "BLACK_POINT", "Black Point", ""}, @@ -1412,7 +1412,7 @@ void IMAGE_OT_set_curves_point(wmOperatorType *ot) /* identifiers */ ot->name= "Set Curves Point"; - ot->idname= "IMAGE_OT_set_curves_point"; + ot->idname= "IMAGE_OT_curves_point_set"; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index deff9935b7e..bfe2f778c9b 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -192,7 +192,7 @@ void image_operatortypes(void) WM_operatortype_append(IMAGE_OT_unpack); WM_operatortype_append(IMAGE_OT_sample); - WM_operatortype_append(IMAGE_OT_set_curves_point); + WM_operatortype_append(IMAGE_OT_curves_point_set); WM_operatortype_append(IMAGE_OT_record_composite); @@ -237,8 +237,8 @@ void image_keymap(struct wmWindowManager *wm) RNA_enum_set(WM_keymap_add_item(keymap, "PAINT_OT_image_paint_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_RADIALCONTROL_STRENGTH); WM_keymap_add_item(keymap, "IMAGE_OT_sample", ACTIONMOUSE, KM_PRESS, 0, 0); - RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_set_curves_point", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "point", 0); - RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_set_curves_point", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "point", 1); + RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_curves_point_set", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "point", 0); + RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_curves_point_set", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "point", 1); WM_keymap_add_item(keymap, "IMAGE_OT_toolbox", SPACEKEY, KM_PRESS, 0, 0); } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 68e9d38e192..d77d2aa09cb 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2518,12 +2518,12 @@ static int node_delete_selection_exec(bContext *C, wmOperator *op) /* operators */ -void NODE_OT_delete_selection(wmOperatorType *ot) +void NODE_OT_delete(wmOperatorType *ot) { /* identifiers */ ot->name= "Delete"; - ot->idname= "NODE_OT_delete_selection"; + ot->idname= "NODE_OT_delete"; /* api callbacks */ ot->exec= node_delete_selection_exec; diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c index d2e7df55e54..14545b87cd4 100644 --- a/source/blender/editors/space_node/node_header.c +++ b/source/blender/editors/space_node/node_header.c @@ -75,7 +75,7 @@ static void do_node_selectmenu(bContext *C, void *arg, int event) switch(event) { case 1: /* border select */ - WM_operator_name_call(C, "NODE_OT_border_select", WM_OP_INVOKE_REGION_WIN, NULL); + WM_operator_name_call(C, "NODE_OT_select_border", WM_OP_INVOKE_REGION_WIN, NULL); break; case 2: /* select/deselect all */ // XXX node_deselectall(snode, 1); @@ -582,13 +582,13 @@ static void do_node_viewmenu(bContext *C, void *arg, int event) switch(event) { case 1: /* Zoom in */ - WM_operator_name_call(C, "View2D_OT_view_zoomin", WM_OP_EXEC_REGION_WIN, NULL); + WM_operator_name_call(C, "VIEW2D_OT_zoom_in", WM_OP_EXEC_REGION_WIN, NULL); break; case 2: /* View all */ - WM_operator_name_call(C, "View2D_OT_view_zoomout", WM_OP_EXEC_REGION_WIN, NULL); + WM_operator_name_call(C, "VIEW2D_OT_zoom_out", WM_OP_EXEC_REGION_WIN, NULL); break; case 3: /* View all */ - WM_operator_name_call(C, "NODE_OT_fit_all", WM_OP_EXEC_REGION_WIN, NULL); + WM_operator_name_call(C, "NODE_OT_view_all", WM_OP_EXEC_REGION_WIN, NULL); break; case 4: /* Grease Pencil */ // XXX add_blockhandler(sa, NODES_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW); diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index de3999ae5cb..4796db98e95 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -55,10 +55,10 @@ void node_keymap(wmWindowManager *wm); /* node_select.c */ void NODE_OT_select(struct wmOperatorType *ot); -void NODE_OT_extend_select(struct wmOperatorType *ot); +void NODE_OT_select_extend(struct wmOperatorType *ot); void NODE_OT_visibility_toggle(struct wmOperatorType *ot); -void NODE_OT_fit_all(struct wmOperatorType *ot); -void NODE_OT_border_select(struct wmOperatorType *ot); +void NODE_OT_view_all(struct wmOperatorType *ot); +void NODE_OT_select_border(struct wmOperatorType *ot); /* drawnode.c */ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link); @@ -83,7 +83,7 @@ bNode *snode_get_editgroup(SpaceNode *snode); void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag); void NODE_OT_link(struct wmOperatorType *ot); -void NODE_OT_delete_selection(struct wmOperatorType *ot); +void NODE_OT_delete(struct wmOperatorType *ot); void NODE_OT_size_widget(struct wmOperatorType *ot); void NODE_OT_links_cut(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index dc6ae03cef9..cef867faa1f 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -51,11 +51,11 @@ void node_operatortypes(void) { WM_operatortype_append(NODE_OT_select); - WM_operatortype_append(NODE_OT_extend_select); + WM_operatortype_append(NODE_OT_select_extend); WM_operatortype_append(NODE_OT_visibility_toggle); - WM_operatortype_append(NODE_OT_fit_all); - WM_operatortype_append(NODE_OT_border_select); - WM_operatortype_append(NODE_OT_delete_selection); + WM_operatortype_append(NODE_OT_view_all); + WM_operatortype_append(NODE_OT_select_border); + WM_operatortype_append(NODE_OT_delete); WM_operatortype_append(NODE_OT_link); WM_operatortype_append(NODE_OT_size_widget); WM_operatortype_append(NODE_OT_links_cut); @@ -68,17 +68,17 @@ void node_keymap(struct wmWindowManager *wm) /* mouse select in nodes used to be both keys, it's UI elements... */ RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select", ACTIONMOUSE, KM_PRESS, 0, 0)->ptr, "select_type", NODE_SELECT_MOUSE); RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select", SELECTMOUSE, KM_PRESS, 0, 0)->ptr, "select_type", NODE_SELECT_MOUSE); - RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_extend_select", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE); - RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_extend_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE); + RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select_extend", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE); + RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select_extend", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE); WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_size_widget", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_visibility_toggle", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "NODE_OT_fit_all", HOMEKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NODE_OT_border_select", BKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NODE_OT_delete_selection", XKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "NODE_OT_view_all", HOMEKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "NODE_OT_select_border", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "NODE_OT_delete", XKEY, KM_PRESS, 0, 0); transform_keymap_for_space(wm, keymap, SPACE_NODE); } diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index 0006d227d1a..3c37793e8d6 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -180,11 +180,12 @@ static EnumPropertyItem prop_select_items[] = { {NODE_SELECT_MOUSE, "NORMAL", "Normal Select", "Select using the mouse"}, {0, NULL, NULL, NULL}}; -void NODE_OT_extend_select(wmOperatorType *ot) +void NODE_OT_select_extend(wmOperatorType *ot) { + // XXX - Todo - This should just be a toggle option for NODE_OT_select not its own op /* identifiers */ ot->name= "Activate/Select (Shift)"; - ot->idname= "NODE_OT_extend_select"; + ot->idname= "NODE_OT_select_extend"; /* api callbacks */ ot->invoke= node_extend_select_invoke; @@ -265,11 +266,11 @@ static int node_borderselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NODE_OT_border_select(wmOperatorType *ot) +void NODE_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "NODE_OT_border_select"; + ot->idname= "NODE_OT_select_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c index ee3bfbf0fbf..f05a24ef05a 100644 --- a/source/blender/editors/space_node/node_state.c +++ b/source/blender/editors/space_node/node_state.c @@ -193,11 +193,11 @@ static int node_fit_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NODE_OT_fit_all(wmOperatorType *ot) +void NODE_OT_view_all(wmOperatorType *ot) { /* identifiers */ ot->name= "Fit All"; - ot->idname= "NODE_OT_fit_all"; + ot->idname= "NODE_OT_view_all"; /* api callbacks */ ot->exec= node_fit_all_exec; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 0aad0cdd775..1ae9d19a10e 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1805,12 +1805,12 @@ static int sequencer_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent * return OPERATOR_FINISHED; } -void SEQUENCER_OT_add_duplicate(wmOperatorType *ot) +void SEQUENCER_OT_duplicate_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Duplicate"; - ot->idname= "SEQUENCER_OT_add_duplicate"; + ot->idname= "SEQUENCER_OT_duplicate_add"; /* api callbacks */ ot->invoke= sequencer_add_duplicate_invoke; diff --git a/source/blender/editors/space_sequencer/sequencer_header.c b/source/blender/editors/space_sequencer/sequencer_header.c index 71d7ff728d3..a701a9dd55b 100644 --- a/source/blender/editors/space_sequencer/sequencer_header.c +++ b/source/blender/editors/space_sequencer/sequencer_header.c @@ -158,7 +158,7 @@ static void seq_selectmenu(bContext *C, uiMenuItem *head, void *arg_unused) uiMenuItemO(head, 0, "SEQUENCER_OT_select_linked"); uiMenuSeparator(head); uiMenuItemO(head, 0, "SEQUENCER_OT_select_linked"); - uiMenuItemO(head, 0, "SEQUENCER_OT_deselect_all"); + uiMenuItemO(head, 0, "SEQUENCER_OT_select_all_toggle"); uiMenuItemO(head, 0, "SEQUENCER_OT_select_invert"); } @@ -275,7 +275,7 @@ static void seq_editmenu(bContext *C, uiMenuItem *head, void *arg_unused) uiMenuItemO(head, 0, "SEQUENCER_OT_separate_images"); uiMenuSeparator(head); - uiMenuItemO(head, 0, "SEQUENCER_OT_add_duplicate"); + uiMenuItemO(head, 0, "SEQUENCER_OT_duplicate_add"); uiMenuItemO(head, 0, "SEQUENCER_OT_delete"); if (ed && ed->act_seq) { @@ -439,7 +439,7 @@ void sequencer_header_buttons(const bContext *C, ARegion *ar) 0, 0, 0, 0, "Zooms view in and out (Ctrl MiddleMouse)"); xco += XIC; - uiDefIconButO(block, BUT, "View2D_OT_view_borderzoom", WM_OP_INVOKE_REGION_WIN, ICON_BORDERMOVE, xco,yco,XIC,YIC, "Zooms view to fit area"); + uiDefIconButO(block, BUT, "VIEW2D_OT_zoom_border", WM_OP_INVOKE_REGION_WIN, ICON_BORDERMOVE, xco,yco,XIC,YIC, "Zooms view to fit area"); uiBlockEndAlign(block); xco += 8 + XIC; diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 18c08d94094..8a56d15e1da 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -78,7 +78,7 @@ void SEQUENCER_OT_lock(struct wmOperatorType *ot); void SEQUENCER_OT_unlock(struct wmOperatorType *ot); void SEQUENCER_OT_reload(struct wmOperatorType *ot); void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot); -void SEQUENCER_OT_add_duplicate(struct wmOperatorType *ot); +void SEQUENCER_OT_duplicate_add(struct wmOperatorType *ot); void SEQUENCER_OT_delete(struct wmOperatorType *ot); void SEQUENCER_OT_separate_images(struct wmOperatorType *ot); void SEQUENCER_OT_meta_toggle(struct wmOperatorType *ot); @@ -89,15 +89,15 @@ void SEQUENCER_OT_view_all(struct wmOperatorType *ot); void SEQUENCER_OT_view_selected(struct wmOperatorType *ot); /* sequencer_select.c */ -void SEQUENCER_OT_deselect_all(struct wmOperatorType *ot); +void SEQUENCER_OT_select_all_toggle(struct wmOperatorType *ot); void SEQUENCER_OT_select(struct wmOperatorType *ot); void SEQUENCER_OT_select_more(struct wmOperatorType *ot); void SEQUENCER_OT_select_less(struct wmOperatorType *ot); void SEQUENCER_OT_select_linked(struct wmOperatorType *ot); -void SEQUENCER_OT_select_pick_linked(struct wmOperatorType *ot); +void SEQUENCER_OT_select_linked_pick(struct wmOperatorType *ot); void SEQUENCER_OT_select_handles(struct wmOperatorType *ot); void SEQUENCER_OT_select_active_side(struct wmOperatorType *ot); -void SEQUENCER_OT_borderselect(struct wmOperatorType *ot); +void SEQUENCER_OT_select_border(struct wmOperatorType *ot); void SEQUENCER_OT_select_invert(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index d7ca063f4c5..a159a4828da 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -71,7 +71,7 @@ void sequencer_operatortypes(void) WM_operatortype_append(SEQUENCER_OT_unlock); WM_operatortype_append(SEQUENCER_OT_reload); WM_operatortype_append(SEQUENCER_OT_refresh_all); - WM_operatortype_append(SEQUENCER_OT_add_duplicate); + WM_operatortype_append(SEQUENCER_OT_duplicate_add); WM_operatortype_append(SEQUENCER_OT_delete); WM_operatortype_append(SEQUENCER_OT_separate_images); WM_operatortype_append(SEQUENCER_OT_meta_toggle); @@ -82,16 +82,16 @@ void sequencer_operatortypes(void) WM_operatortype_append(SEQUENCER_OT_view_selected); /* sequencer_select.c */ - WM_operatortype_append(SEQUENCER_OT_deselect_all); + WM_operatortype_append(SEQUENCER_OT_select_all_toggle); WM_operatortype_append(SEQUENCER_OT_select_invert); WM_operatortype_append(SEQUENCER_OT_select); WM_operatortype_append(SEQUENCER_OT_select_more); WM_operatortype_append(SEQUENCER_OT_select_less); - WM_operatortype_append(SEQUENCER_OT_select_pick_linked); + WM_operatortype_append(SEQUENCER_OT_select_linked_pick); WM_operatortype_append(SEQUENCER_OT_select_linked); WM_operatortype_append(SEQUENCER_OT_select_handles); WM_operatortype_append(SEQUENCER_OT_select_active_side); - WM_operatortype_append(SEQUENCER_OT_borderselect); + WM_operatortype_append(SEQUENCER_OT_select_border); /* sequencer_add.c */ WM_operatortype_append(SEQUENCER_OT_add_scene_strip); @@ -107,7 +107,7 @@ void sequencer_keymap(wmWindowManager *wm) ListBase *keymap= WM_keymap_listbase(wm, "Sequencer", SPACE_SEQ, 0); wmKeymapItem *kmi; - WM_keymap_add_item(keymap, "SEQUENCER_OT_deselect_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "SEQUENCER_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SEQUENCER_OT_select_invert", IKEY, KM_PRESS, KM_CTRL, 0); RNA_enum_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_cut", KKEY, KM_PRESS, 0, 0)->ptr, "type", SEQ_CUT_SOFT); @@ -124,7 +124,7 @@ void sequencer_keymap(wmWindowManager *wm) WM_keymap_add_item(keymap, "SEQUENCER_OT_reload", RKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "SEQUENCER_OT_add_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "SEQUENCER_OT_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "SEQUENCER_OT_delete", XKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SEQUENCER_OT_delete", DELKEY, KM_PRESS, 0, 0); @@ -168,12 +168,12 @@ void sequencer_keymap(wmWindowManager *wm) WM_keymap_add_item(keymap, "SEQUENCER_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "SEQUENCER_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "SEQUENCER_OT_select_pick_linked", LKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_select_pick_linked", LKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1); + WM_keymap_add_item(keymap, "SEQUENCER_OT_select_linked_pick", LKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_select_linked_pick", LKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1); WM_keymap_add_item(keymap, "SEQUENCER_OT_select_linked", LKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "SEQUENCER_OT_borderselect", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "SEQUENCER_OT_select_border", BKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "ANIM_OT_change_frame", LEFTMOUSE, KM_PRESS, 0, 0); diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index f7548aa556a..bfd89ccdffb 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -227,11 +227,11 @@ static int sequencer_deselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void SEQUENCER_OT_deselect_all(struct wmOperatorType *ot) +void SEQUENCER_OT_select_all_toggle(struct wmOperatorType *ot) { /* identifiers */ ot->name= "(De)Select All"; - ot->idname= "SEQUENCER_OT_deselect_all"; + ot->idname= "SEQUENCER_OT_select_all_toggle"; /* api callbacks */ ot->exec= sequencer_deselect_exec; @@ -575,7 +575,7 @@ void SEQUENCER_OT_select_less(wmOperatorType *ot) /* select pick linked operator (uses the mouse) */ -static int sequencer_select_pick_linked_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int sequencer_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event) { Scene *scene= CTX_data_scene(C); ARegion *ar= CTX_wm_region(C); @@ -611,14 +611,14 @@ static int sequencer_select_pick_linked_invoke(bContext *C, wmOperator *op, wmEv return OPERATOR_FINISHED; } -void SEQUENCER_OT_select_pick_linked(wmOperatorType *ot) +void SEQUENCER_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ ot->name= "Select pick linked"; - ot->idname= "SEQUENCER_OT_select_pick_linked"; + ot->idname= "SEQUENCER_OT_select_linked_pick"; /* api callbacks */ - ot->invoke= sequencer_select_pick_linked_invoke; + ot->invoke= sequencer_select_linked_pick_invoke; ot->poll= ED_operator_sequencer_active; /* flags */ @@ -794,11 +794,11 @@ static int sequencer_borderselect_exec(bContext *C, wmOperator *op) /* ****** Border Select ****** */ -void SEQUENCER_OT_borderselect(wmOperatorType *ot) +void SEQUENCER_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "SEQUENCER_OT_borderselect"; + ot->idname= "SEQUENCER_OT_select_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index 363d3016adf..90abd516c5a 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -163,7 +163,7 @@ static void text_operatortypes(void) WM_operatortype_append(TEXT_OT_unindent); WM_operatortype_append(TEXT_OT_indent); - WM_operatortype_append(TEXT_OT_clear_all_markers); + WM_operatortype_append(TEXT_OT_markers_clear); WM_operatortype_append(TEXT_OT_next_marker); WM_operatortype_append(TEXT_OT_previous_marker); @@ -174,9 +174,9 @@ static void text_operatortypes(void) WM_operatortype_append(TEXT_OT_move); WM_operatortype_append(TEXT_OT_move_select); WM_operatortype_append(TEXT_OT_delete); - WM_operatortype_append(TEXT_OT_toggle_overwrite); + WM_operatortype_append(TEXT_OT_overwrite_toggle); - WM_operatortype_append(TEXT_OT_set_cursor); + WM_operatortype_append(TEXT_OT_cursor_set); WM_operatortype_append(TEXT_OT_scroll); WM_operatortype_append(TEXT_OT_scroll_bar); WM_operatortype_append(TEXT_OT_line_number); @@ -268,12 +268,12 @@ static void text_keymap(struct wmWindowManager *wm) RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_delete", DELKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", DEL_NEXT_WORD); RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_delete", BACKSPACEKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", DEL_PREV_WORD); - WM_keymap_add_item(keymap, "TEXT_OT_toggle_overwrite", INSERTKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "TEXT_OT_overwrite_toggle", INSERTKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "TEXT_OT_scroll", MIDDLEMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "TEXT_OT_scroll_bar", LEFTMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "TEXT_OT_set_cursor", LEFTMOUSE, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "TEXT_OT_set_cursor", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select", 1); + WM_keymap_add_item(keymap, "TEXT_OT_cursor_set", LEFTMOUSE, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "TEXT_OT_cursor_set", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select", 1); RNA_int_set(WM_keymap_add_item(keymap, "TEXT_OT_scroll", WHEELUPMOUSE, KM_PRESS, 0, 0)->ptr, "lines", -1); RNA_int_set(WM_keymap_add_item(keymap, "TEXT_OT_scroll", WHEELDOWNMOUSE, KM_PRESS, 0, 0)->ptr, "lines", 1); diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index a72e66e76ee..63fd5e6dae6 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -169,7 +169,7 @@ static void text_editmenu_selectmenu(bContext *C, uiMenuItem *head, void *arg_un static void text_editmenu_markermenu(bContext *C, uiMenuItem *head, void *arg_unused) { - uiMenuItemO(head, 0, "TEXT_OT_clear_all_markers"); + uiMenuItemO(head, 0, "TEXT_OT_markers_clear"); uiMenuItemO(head, 0, "TEXT_OT_next_marker"); uiMenuItemO(head, 0, "TEXT_OT_previous_marker"); } diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index 45360a9392d..746858a9fdd 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -125,7 +125,7 @@ void TEXT_OT_indent(struct wmOperatorType *ot); void TEXT_OT_line_break(struct wmOperatorType *ot); void TEXT_OT_insert(struct wmOperatorType *ot); -void TEXT_OT_clear_all_markers(struct wmOperatorType *ot); +void TEXT_OT_markers_clear(struct wmOperatorType *ot); void TEXT_OT_next_marker(struct wmOperatorType *ot); void TEXT_OT_previous_marker(struct wmOperatorType *ot); @@ -136,11 +136,11 @@ void TEXT_OT_jump(struct wmOperatorType *ot); void TEXT_OT_move(struct wmOperatorType *ot); void TEXT_OT_move_select(struct wmOperatorType *ot); void TEXT_OT_delete(struct wmOperatorType *ot); -void TEXT_OT_toggle_overwrite(struct wmOperatorType *ot); +void TEXT_OT_overwrite_toggle(struct wmOperatorType *ot); void TEXT_OT_scroll(struct wmOperatorType *ot); void TEXT_OT_scroll_bar(struct wmOperatorType *ot); -void TEXT_OT_set_cursor(struct wmOperatorType *ot); +void TEXT_OT_cursor_set(struct wmOperatorType *ot); void TEXT_OT_line_number(struct wmOperatorType *ot); void TEXT_OT_properties(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index f98c5bf17dd..fb1fed6b175 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -1157,11 +1157,11 @@ static int clear_all_markers_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void TEXT_OT_clear_all_markers(wmOperatorType *ot) +void TEXT_OT_markers_clear(wmOperatorType *ot) { /* identifiers */ ot->name= "Clear All Markers"; - ot->idname= "TEXT_OT_clear_all_markers"; + ot->idname= "TEXT_OT_markers_clear"; /* api callbacks */ ot->exec= clear_all_markers_exec; @@ -1573,11 +1573,11 @@ static int toggle_overwrite_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void TEXT_OT_toggle_overwrite(wmOperatorType *ot) +void TEXT_OT_overwrite_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Toggle Overwrite"; - ot->idname= "TEXT_OT_toggle_overwrite"; + ot->idname= "TEXT_OT_overwrite_toggle"; /* api callbacks */ ot->exec= toggle_overwrite_exec; @@ -2038,11 +2038,11 @@ static int set_cursor_cancel(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void TEXT_OT_set_cursor(wmOperatorType *ot) +void TEXT_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Cursor"; - ot->idname= "TEXT_OT_set_cursor"; + ot->idname= "TEXT_OT_cursor_set"; /* api callbacks */ ot->invoke= set_cursor_invoke; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 6be8cd55d16..b4b35be3ef3 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -826,12 +826,12 @@ static int viewzoom_invoke(bContext *C, wmOperator *op, wmEvent *event) } -void VIEW3D_OT_viewzoom(wmOperatorType *ot) +void VIEW3D_OT_zoom(wmOperatorType *ot) { /* identifiers */ ot->name= "Zoom view"; ot->description = "Zoom in/out in the view."; - ot->idname= "VIEW3D_OT_viewzoom"; + ot->idname= "VIEW3D_OT_zoom"; /* api callbacks */ ot->invoke= viewzoom_invoke; @@ -1292,13 +1292,13 @@ static int view3d_border_zoom_invoke(bContext *C, wmOperator *op, wmEvent *event return OPERATOR_PASS_THROUGH; } -void VIEW3D_OT_border_zoom(wmOperatorType *ot) +void VIEW3D_OT_zoom_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Zoom"; ot->description = "Zoom in the view to the nearest object contained in the border."; - ot->idname= "VIEW3D_OT_border_zoom"; + ot->idname= "VIEW3D_OT_zoom_border"; /* api callbacks */ ot->invoke= view3d_border_zoom_invoke; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 2010591d334..e9262a24b5e 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -634,8 +634,8 @@ static void view3d_view_viewnavmenu(bContext *C, uiMenuItem *head, void *arg_unu uiMenuSeparator(head); - uiMenuItemFloatO(head, "Zoom in", 0, "VIEW3D_OT_viewzoom", "delta", 1.0f); - uiMenuItemFloatO(head, "Zoom out", 0, "VIEW3D_OT_viewzoom", "delta", -1.0f); + uiMenuItemFloatO(head, "Zoom in", 0, "VIEW3D_OT_zoom", "delta", 1.0f); + uiMenuItemFloatO(head, "Zoom out", 0, "VIEW3D_OT_zoom", "delta", -1.0f); } static void view3d_view_alignviewmenu(bContext *C, uiMenuItem *head, void *arg_unused) @@ -685,7 +685,7 @@ static void view3d_viewmenu(bContext *C, uiMenuItem *head, void *arg_unused) uiMenuContext(head, WM_OP_INVOKE_REGION_WIN); uiMenuItemO(head, 0, "VIEW3D_OT_clipping"); - uiMenuItemO(head, 0, "VIEW3D_OT_border_zoom"); + uiMenuItemO(head, 0, "VIEW3D_OT_zoom_border"); uiMenuSeparator(head); @@ -1035,15 +1035,15 @@ static uiBlock *view3d_select_objectmenu(bContext *C, ARegion *ar, void *arg_unu uiDefIconTextBlockBut(block, view3d_select_object_linkedmenu, NULL, ICON_RIGHTARROW_THIN, "Linked", 0, yco-=20, 120, 19, ""); uiDefIconTextBlockBut(block, view3d_select_object_groupedmenu, NULL, ICON_RIGHTARROW_THIN, "Grouped", 0, yco-=20, 120, 19, ""); #endif - uiDefMenuButO(block, "VIEW3D_OT_borderselect", "Border Select"); + uiDefMenuButO(block, "VIEW3D_OT_select_border", "Border Select"); uiDefMenuSep(block); - uiDefMenuButO(block, "OBJECT_OT_selection_de_select_all", "Select/Deselect All"); - uiDefMenuButO(block, "OBJECT_OT_selection_invert", "Inverse"); - uiDefMenuButO(block, "OBJECT_OT_selection_random", "Random"); - uiDefMenuButO(block, "OBJECT_OT_selection_by_layer", "Select All by Layer"); - uiDefMenuButO(block, "OBJECT_OT_selection_by_type", "Select All by Type"); + uiDefMenuButO(block, "OBJECT_OT_select_all_toggle", "Select/Deselect All"); + uiDefMenuButO(block, "OBJECT_OT_select_invert", "Inverse"); + uiDefMenuButO(block, "OBJECT_OT_select_random", "Random"); + uiDefMenuButO(block, "OBJECT_OT_select_by_layer", "Select All by Layer"); + uiDefMenuButO(block, "OBJECT_OT_select_by_type", "Select All by Type"); if(ar->alignment==RGN_ALIGN_TOP) { @@ -1212,12 +1212,12 @@ static void view3d_select_curvemenu(bContext *C, uiMenuItem *head, void *arg_unu { Object *obedit= CTX_data_edit_object(C); - uiMenuItemO(head, 0, "VIEW3D_OT_borderselect"); - uiMenuItemO(head, 0, "VIEW3D_OT_circle_select"); + uiMenuItemO(head, 0, "VIEW3D_OT_select_border"); + uiMenuItemO(head, 0, "VIEW3D_OT_select_circle"); uiMenuSeparator(head); - uiMenuItemO(head, 0, "CURVE_OT_de_select_all"); + uiMenuItemO(head, 0, "CURVE_OT_select_all_toggle"); uiMenuItemO(head, 0, "CURVE_OT_select_inverse"); uiMenuItemO(head, 0, "CURVE_OT_select_random"); // Random... uiMenuItemO(head, 0, "CURVE_OT_select_every_nth"); // Every Nth.. @@ -3294,14 +3294,14 @@ static void view3d_edit_curve_controlpointsmenu(bContext *C, uiMenuItem *head, v if(obedit->type == OB_CURVE) { uiMenuItemEnumO(head, "", 0, "TFM_OT_transform", "mode", TFM_TILT); - uiMenuItemO(head, 0, "CURVE_OT_clear_tilt"); + uiMenuItemO(head, 0, "CURVE_OT_tilt_clear"); uiMenuItemO(head, 0, "CURVE_OT_separate"); uiMenuSeparator(head); - uiMenuItemEnumO(head, "", 0, "CURVE_OT_set_handle_type", "type", 1); - uiMenuItemEnumO(head, "", 0, "CURVE_OT_set_handle_type", "type", 3); - uiMenuItemEnumO(head, "", 0, "CURVE_OT_set_handle_type", "type", 2); + uiMenuItemEnumO(head, "", 0, "CURVE_OT_handle_type_set", "type", 1); + uiMenuItemEnumO(head, "", 0, "CURVE_OT_handle_type_set", "type", 3); + uiMenuItemEnumO(head, "", 0, "CURVE_OT_handle_type_set", "type", 2); uiMenuSeparator(head); } @@ -3351,7 +3351,7 @@ static void view3d_edit_curvemenu(bContext *C, uiMenuItem *head, void *arg_unuse uiMenuItemO(head, 0, "CURVE_OT_duplicate"); uiMenuItemO(head, 0, "CURVE_OT_separate"); uiMenuItemO(head, 0, "CURVE_OT_make_segment"); - uiMenuItemO(head, 0, "CURVE_OT_toggle_cyclic"); + uiMenuItemO(head, 0, "CURVE_OT_cyclic_toggle"); uiMenuItemO(head, 0, "CURVE_OT_delete"); // Delete... uiMenuSeparator(head); @@ -4701,11 +4701,11 @@ static void view3d_select_particlemenu(bContext *C, uiMenuItem *head, void *arg_ { Scene *scene= CTX_data_scene(C); - uiMenuItemO(head, 0, "VIEW3D_OT_borderselect"); + uiMenuItemO(head, 0, "VIEW3D_OT_select_border"); uiMenuSeparator(head); - uiMenuItemO(head, 0, "PARTICLE_OT_de_select_all"); + uiMenuItemO(head, 0, "PARTICLE_OT_select_all_toggle"); uiMenuItemO(head, 0, "PARTICLE_OT_select_linked"); if(scene->selectmode & SCE_SELECT_POINT) { diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 6e26a9a7ad8..ae77b4293bf 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -62,7 +62,7 @@ void view3d_operatortypes(void); void view3d_keymap(struct wmWindowManager *wm); /* view3d_edit.c */ -void VIEW3D_OT_viewzoom(struct wmOperatorType *ot); +void VIEW3D_OT_zoom(struct wmOperatorType *ot); void VIEW3D_OT_viewmove(struct wmOperatorType *ot); void VIEW3D_OT_viewrotate(struct wmOperatorType *ot); void VIEW3D_OT_viewhome(struct wmOperatorType *ot); @@ -74,7 +74,7 @@ void VIEW3D_OT_view_orbit(struct wmOperatorType *ot); void VIEW3D_OT_clipping(struct wmOperatorType *ot); void VIEW3D_OT_cursor3d(struct wmOperatorType *ot); void VIEW3D_OT_render_border(struct wmOperatorType *ot); -void VIEW3D_OT_border_zoom(struct wmOperatorType *ot); +void VIEW3D_OT_zoom_border(struct wmOperatorType *ot); void VIEW3D_OT_drawtype(struct wmOperatorType *ot); void VIEW3D_OT_editmesh_face_toolbox(struct wmOperatorType *ot); @@ -109,9 +109,9 @@ void view3d_update_depths(struct ARegion *ar, View3D *v3d); /* view3d_select.c */ void VIEW3D_OT_select(struct wmOperatorType *ot); void VIEW3D_OT_select_extend(struct wmOperatorType *ot); -void VIEW3D_OT_circle_select(struct wmOperatorType *ot); -void VIEW3D_OT_borderselect(struct wmOperatorType *ot); -void VIEW3D_OT_lasso_select(struct wmOperatorType *ot); +void VIEW3D_OT_select_circle(struct wmOperatorType *ot); +void VIEW3D_OT_select_border(struct wmOperatorType *ot); +void VIEW3D_OT_select_lasso(struct wmOperatorType *ot); /* view3d_view.c */ void VIEW3D_OT_smoothview(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index b8bf2a61cae..1cda1b9e4c8 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -65,7 +65,7 @@ void view3d_operatortypes(void) { WM_operatortype_append(VIEW3D_OT_viewrotate); WM_operatortype_append(VIEW3D_OT_viewmove); - WM_operatortype_append(VIEW3D_OT_viewzoom); + WM_operatortype_append(VIEW3D_OT_zoom); WM_operatortype_append(VIEW3D_OT_viewhome); WM_operatortype_append(VIEW3D_OT_viewnumpad); WM_operatortype_append(VIEW3D_OT_view_orbit); @@ -73,14 +73,14 @@ void view3d_operatortypes(void) WM_operatortype_append(VIEW3D_OT_view_persportho); WM_operatortype_append(VIEW3D_OT_viewcenter); WM_operatortype_append(VIEW3D_OT_select); - WM_operatortype_append(VIEW3D_OT_borderselect); + WM_operatortype_append(VIEW3D_OT_select_border); WM_operatortype_append(VIEW3D_OT_clipping); - WM_operatortype_append(VIEW3D_OT_circle_select); + WM_operatortype_append(VIEW3D_OT_select_circle); WM_operatortype_append(VIEW3D_OT_smoothview); WM_operatortype_append(VIEW3D_OT_render_border); - WM_operatortype_append(VIEW3D_OT_border_zoom); + WM_operatortype_append(VIEW3D_OT_zoom_border); WM_operatortype_append(VIEW3D_OT_cursor3d); - WM_operatortype_append(VIEW3D_OT_lasso_select); + WM_operatortype_append(VIEW3D_OT_select_lasso); WM_operatortype_append(VIEW3D_OT_setcameratoview); WM_operatortype_append(VIEW3D_OT_drawtype); WM_operatortype_append(VIEW3D_OT_editmesh_face_toolbox); @@ -118,7 +118,7 @@ void view3d_keymap(wmWindowManager *wm) WM_keymap_add_item(keymap, "PAINT_OT_image_paint", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "PAINT_OT_sample_color", RIGHTMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "PAINT_OT_set_clone_cursor", LEFTMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "PAINT_OT_clone_cursor_set", LEFTMOUSE, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0); @@ -136,15 +136,15 @@ void view3d_keymap(wmWindowManager *wm) WM_keymap_verify_item(keymap, "VIEW3D_OT_viewrotate", MIDDLEMOUSE, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "VIEW3D_OT_viewmove", MIDDLEMOUSE, KM_PRESS, KM_SHIFT, 0); - WM_keymap_verify_item(keymap, "VIEW3D_OT_viewzoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_verify_item(keymap, "VIEW3D_OT_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); WM_keymap_verify_item(keymap, "VIEW3D_OT_viewcenter", PADPERIOD, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "VIEW3D_OT_smoothview", TIMER1, KM_ANY, KM_ANY, 0); - RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewzoom", PADPLUSKEY, KM_PRESS, 0, 0)->ptr, "delta", 1); - RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewzoom", PADMINUS, KM_PRESS, 0, 0)->ptr, "delta", -1); - RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewzoom", WHEELINMOUSE, KM_PRESS, 0, 0)->ptr, "delta", 1); - RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewzoom", WHEELOUTMOUSE, KM_PRESS, 0, 0)->ptr, "delta", -1); + RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_zoom", PADPLUSKEY, KM_PRESS, 0, 0)->ptr, "delta", 1); + RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_zoom", PADMINUS, KM_PRESS, 0, 0)->ptr, "delta", -1); + RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_zoom", WHEELINMOUSE, KM_PRESS, 0, 0)->ptr, "delta", 1); + RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_zoom", WHEELOUTMOUSE, KM_PRESS, 0, 0)->ptr, "delta", -1); RNA_boolean_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewhome", HOMEKEY, KM_PRESS, 0, 0)->ptr, "center", 0); RNA_boolean_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewhome", CKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "center", 1); @@ -198,16 +198,16 @@ void view3d_keymap(wmWindowManager *wm) /* selection*/ WM_keymap_add_item(keymap, "VIEW3D_OT_select", SELECTMOUSE, KM_PRESS, 0, 0); RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "type", 1); - WM_keymap_add_item(keymap, "VIEW3D_OT_borderselect", BKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "VIEW3D_OT_lasso_select", EVT_TWEAK_A, KM_ANY, KM_CTRL, 0); - RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_lasso_select", EVT_TWEAK_A, KM_ANY, KM_SHIFT|KM_CTRL, 0)->ptr, "type", 1); - WM_keymap_add_item(keymap, "VIEW3D_OT_circle_select", CKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_select_border", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL, 0); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_SHIFT|KM_CTRL, 0)->ptr, "type", 1); + WM_keymap_add_item(keymap, "VIEW3D_OT_select_circle", CKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "VIEW3D_OT_clipping", BKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "VIEW3D_OT_border_zoom", BKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_zoom_border", BKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "VIEW3D_OT_render_border", BKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "VIEW3D_OT_set_camera_to_view", PAD0, KM_PRESS, KM_ALT|KM_CTRL, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_camera_to_view", PAD0, KM_PRESS, KM_ALT|KM_CTRL, 0); WM_keymap_add_item(keymap, "VIEW3D_OT_snap_menu", SKEY, KM_PRESS, KM_SHIFT, 0); diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index b6098e52a89..d03586da2d5 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -754,10 +754,10 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op) return OPERATOR_PASS_THROUGH; } -void VIEW3D_OT_lasso_select(wmOperatorType *ot) +void VIEW3D_OT_select_lasso(wmOperatorType *ot) { ot->name= "Lasso Select"; - ot->idname= "VIEW3D_OT_lasso_select"; + ot->idname= "VIEW3D_OT_select_lasso"; ot->invoke= WM_gesture_lasso_invoke; ot->modal= WM_gesture_lasso_modal; @@ -1532,11 +1532,11 @@ static EnumPropertyItem prop_select_types[] = { }; /* ****** Border Select ****** */ -void VIEW3D_OT_borderselect(wmOperatorType *ot) +void VIEW3D_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "VIEW3D_OT_borderselect"; + ot->idname= "VIEW3D_OT_select_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -1823,10 +1823,10 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void VIEW3D_OT_circle_select(wmOperatorType *ot) +void VIEW3D_OT_select_circle(wmOperatorType *ot) { ot->name= "Circle Select"; - ot->idname= "VIEW3D_OT_circle_select"; + ot->idname= "VIEW3D_OT_select_circle"; ot->invoke= WM_gesture_circle_invoke; ot->modal= WM_gesture_circle_modal; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 66f540bffc1..2aade74dcca 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -411,7 +411,7 @@ void VIEW3D_OT_setcameratoview(wmOperatorType *ot) /* identifiers */ ot->name= "Align Camera To View"; - ot->idname= "VIEW3D_OT_set_camera_to_view"; + ot->idname= "VIEW3D_OT_camera_to_view"; /* api callbacks */ ot->exec= view3d_setcameratoview_exec; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 60cfbfd0f39..e379820d42a 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1379,11 +1379,11 @@ static int de_select_all_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void UV_OT_de_select_all(wmOperatorType *ot) +void UV_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Select or Deselect All"; - ot->idname= "UV_OT_de_select_all"; + ot->idname= "UV_OT_select_all_toggle"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ @@ -1718,7 +1718,7 @@ void UV_OT_select(wmOperatorType *ot) /* ******************** loop select operator **************** */ -static int loop_select_exec(bContext *C, wmOperator *op) +static int select_loop_exec(bContext *C, wmOperator *op) { float co[2]; int extend, loop; @@ -1730,7 +1730,7 @@ static int loop_select_exec(bContext *C, wmOperator *op) return mouse_select(C, co, extend, loop); } -static int loop_select_invoke(bContext *C, wmOperator *op, wmEvent *event) +static int select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event) { ARegion *ar= CTX_wm_region(C); float co[2]; @@ -1742,19 +1742,19 @@ static int loop_select_invoke(bContext *C, wmOperator *op, wmEvent *event) UI_view2d_region_to_view(&ar->v2d, x, y, &co[0], &co[1]); RNA_float_set_array(op->ptr, "location", co); - return loop_select_exec(C, op); + return select_loop_exec(C, op); } -void UV_OT_loop_select(wmOperatorType *ot) +void UV_OT_select_loop(wmOperatorType *ot) { /* identifiers */ ot->name= "Loop Select"; - ot->idname= "UV_OT_loop_select"; + ot->idname= "UV_OT_select_loop"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= loop_select_exec; - ot->invoke= loop_select_invoke; + ot->exec= select_loop_exec; + ot->invoke= select_loop_invoke; ot->poll= ED_operator_uvedit; /* properties */ @@ -2117,11 +2117,11 @@ static int border_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void UV_OT_border_select(wmOperatorType *ot) +void UV_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "UV_OT_border_select"; + ot->idname= "UV_OT_select_border"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -2918,11 +2918,11 @@ static int set_2d_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) return set_2d_cursor_exec(C, op); } -void UV_OT_set_2d_cursor(wmOperatorType *ot) +void UV_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set 3D Cursor"; - ot->idname= "UV_OT_set_2d_cursor"; + ot->idname= "UV_OT_cursor_set"; /* api callbacks */ ot->exec= set_2d_cursor_exec; @@ -2983,11 +2983,11 @@ static int set_tile_invoke(bContext *C, wmOperator *op, wmEvent *event) return set_tile_exec(C, op); } -void UV_OT_set_tile(wmOperatorType *ot) +void UV_OT_tile_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Tile"; - ot->idname= "UV_OT_set_tile"; + ot->idname= "UV_OT_tile_set"; /* api callbacks */ ot->exec= set_tile_exec; @@ -3005,14 +3005,14 @@ void UV_OT_set_tile(wmOperatorType *ot) void ED_operatortypes_uvedit(void) { - WM_operatortype_append(UV_OT_de_select_all); + WM_operatortype_append(UV_OT_select_all_toggle); WM_operatortype_append(UV_OT_select_invert); WM_operatortype_append(UV_OT_select); - WM_operatortype_append(UV_OT_loop_select); + WM_operatortype_append(UV_OT_select_loop); WM_operatortype_append(UV_OT_select_linked); WM_operatortype_append(UV_OT_unlink_selection); WM_operatortype_append(UV_OT_select_pinned); - WM_operatortype_append(UV_OT_border_select); + WM_operatortype_append(UV_OT_select_border); WM_operatortype_append(UV_OT_circle_select); WM_operatortype_append(UV_OT_snap_cursor); @@ -3038,8 +3038,8 @@ void ED_operatortypes_uvedit(void) WM_operatortype_append(UV_OT_reveal); WM_operatortype_append(UV_OT_hide); - WM_operatortype_append(UV_OT_set_2d_cursor); - WM_operatortype_append(UV_OT_set_tile); + WM_operatortype_append(UV_OT_cursor_set); + WM_operatortype_append(UV_OT_tile_set); } void ED_keymap_uvedit(wmWindowManager *wm) @@ -3049,18 +3049,18 @@ void ED_keymap_uvedit(wmWindowManager *wm) /* pick selection */ WM_keymap_add_item(keymap, "UV_OT_select", SELECTMOUSE, KM_PRESS, 0, 0); RNA_boolean_set(WM_keymap_add_item(keymap, "UV_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1); - WM_keymap_add_item(keymap, "UV_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "UV_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0)->ptr, "extend", 1); + WM_keymap_add_item(keymap, "UV_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_ALT, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "UV_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0)->ptr, "extend", 1); /* border/circle selection */ - WM_keymap_add_item(keymap, "UV_OT_border_select", BKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "UV_OT_border_select", BKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "pinned", 1); + WM_keymap_add_item(keymap, "UV_OT_select_border", BKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "UV_OT_select_border", BKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "pinned", 1); WM_keymap_add_item(keymap, "UV_OT_circle_select", CKEY, KM_PRESS, 0, 0); /* selection manipulation */ WM_keymap_add_item(keymap, "UV_OT_select_linked", LKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "UV_OT_unlink_selection", LKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "UV_OT_de_select_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "UV_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "UV_OT_select_invert", IKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "UV_OT_select_pinned", PKEY, KM_PRESS, KM_SHIFT, 0); @@ -3081,8 +3081,8 @@ void ED_keymap_uvedit(wmWindowManager *wm) WM_keymap_add_item(keymap, "UV_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0); /* cursor */ - WM_keymap_add_item(keymap, "UV_OT_set_2d_cursor", ACTIONMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "UV_OT_set_tile", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "UV_OT_tile_set", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0); transform_keymap_for_space(wm, keymap, SPACE_IMAGE); } |