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/curve | |
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/curve')
-rw-r--r-- | source/blender/editors/curve/curve_intern.h | 26 | ||||
-rw-r--r-- | source/blender/editors/curve/curve_ops.c | 48 | ||||
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 32 | ||||
-rw-r--r-- | source/blender/editors/curve/editfont.c | 20 |
4 files changed, 63 insertions, 63 deletions
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; |