From 931527e648acfbc2c7b71b59ce661dad9a4c1038 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Mar 2009 02:15:13 +0000 Subject: - 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 --- .../blender/editors/space_sequencer/sequencer_edit.c | 4 ++-- .../blender/editors/space_sequencer/sequencer_header.c | 6 +++--- .../blender/editors/space_sequencer/sequencer_intern.h | 8 ++++---- source/blender/editors/space_sequencer/sequencer_ops.c | 18 +++++++++--------- .../blender/editors/space_sequencer/sequencer_select.c | 16 ++++++++-------- 5 files changed, 26 insertions(+), 26 deletions(-) (limited to 'source/blender/editors/space_sequencer') 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; -- cgit v1.2.3