From 510c0facdf809bcf2023d9f09630cf948e3f2e62 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 28 Nov 2009 14:37:21 +0000 Subject: operator renaming for more consistent word ordering (_add/_remmove shold be last, ACT_OT_* --> ACTION_OT_*) ACT_OT_clean --> ACTION_OT_clean ACT_OT_clickselect --> ACTION_OT_clickselect ACT_OT_copy --> ACTION_OT_copy ACT_OT_delete --> ACTION_OT_delete ACT_OT_duplicate --> ACTION_OT_duplicate ACT_OT_extrapolation_type --> ACTION_OT_extrapolation_type ACT_OT_frame_jump --> ACTION_OT_frame_jump ACT_OT_handle_type --> ACTION_OT_handle_type ACT_OT_insert_keyframe --> ACTION_OT_insert_keyframe ACT_OT_insert_keyframe --> ACT_OT_keyframe_insert ACT_OT_interpolation_type --> ACTION_OT_interpolation_type ACT_OT_keyframe_type --> ACTION_OT_keyframe_type ACT_OT_mirror --> ACTION_OT_mirror ACT_OT_new --> ACTION_OT_new ACT_OT_paste --> ACTION_OT_paste ACT_OT_previewrange_set --> ACTION_OT_previewrange_set ACT_OT_properties --> ACTION_OT_properties ACT_OT_sample --> ACTION_OT_sample ACT_OT_select_all_toggle --> ACTION_OT_select_all_toggle ACT_OT_select_border --> ACTION_OT_select_border ACT_OT_select_column --> ACTION_OT_select_column ACT_OT_snap --> ACTION_OT_snap ACT_OT_test --> ACTION_OT_test ACT_OT_unlink --> ACTION_OT_unlink ACT_OT_view_all --> ACTION_OT_view_all ANIM_OT_add_driver_button --> ANIM_OT_driver_button_add ANIM_OT_add_keyingset_button --> ANIM_OT_keyingset_button_add ANIM_OT_delete_keyframe --> ANIM_OT_keyframe_delete ANIM_OT_delete_keyframe_button --> ANIM_OT_keyframe_delete_button ANIM_OT_delete_keyframe_v3d --> ANIM_OT_keyframe_delete_v3d ANIM_OT_insert_keyframe --> ANIM_OT_keyframe_insert ANIM_OT_insert_keyframe_button --> ANIM_OT_keyframe_insert_button ANIM_OT_insert_keyframe_menu --> ANIM_OT_keyframe_insert_menu ANIM_OT_remove_driver_button --> ANIM_OT_driver_button_remove ANIM_OT_remove_keyingset_button --> ANIM_OT_keyingset_button_remove FILE_OT_add_bookmark --> FILE_OT_bookmark_add GRAPH_OT_insert_keyframe --> GRAPH_OT_keyframe_insert NLA_OT_add_actionclip --> NLA_OT_actionclip_add NLA_OT_add_meta --> NLA_OT_meta_add NLA_OT_add_tracks --> NLA_OT_tracks_add NLA_OT_add_transition --> NLA_OT_transition_add NLA_OT_remove_meta --> NLA_OT_meta_remove PARTICLE_OT_remove_target --> PARTICLE_OT_target_remove PTCACHE_OT_add_new --> PTCACHE_OT_add --- source/blender/editors/space_nla/nla_buttons.c | 2 +- source/blender/editors/space_nla/nla_channels.c | 4 ++-- source/blender/editors/space_nla/nla_edit.c | 18 +++++++++--------- source/blender/editors/space_nla/nla_header.c | 12 ++++++------ source/blender/editors/space_nla/nla_intern.h | 10 +++++----- source/blender/editors/space_nla/nla_ops.c | 22 +++++++++++----------- 6 files changed, 34 insertions(+), 34 deletions(-) (limited to 'source/blender/editors/space_nla') diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 205aff27be7..e8eca9de281 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -247,7 +247,7 @@ static void nla_panel_animdata (const bContext *C, Panel *pa) /* Active Action Properties ------------------------------------- */ /* action */ row= uiLayoutRow(layout, 1); - uiTemplateID(row, (bContext *)C, &adt_ptr, "action", "ACT_OT_new", NULL, NULL /*"ACT_OT_unlink"*/); // XXX: need to make these operators + uiTemplateID(row, (bContext *)C, &adt_ptr, "action", "ACTION_OT_new", NULL, NULL /*"ACTION_OT_unlink"*/); // XXX: need to make these operators /* extrapolation */ row= uiLayoutRow(layout, 1); diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index ab447dd974a..5f9d6b03efc 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -429,11 +429,11 @@ static int nlaedit_add_tracks_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NLA_OT_add_tracks (wmOperatorType *ot) +void NLA_OT_tracks_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Track(s)"; - ot->idname= "NLA_OT_add_tracks"; + ot->idname= "NLA_OT_tracks_add"; ot->description= "Add NLA-Tracks above/after the selected tracks."; /* api callbacks */ diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 12e43465a29..0ae3a347872 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -259,7 +259,7 @@ static int nlaedit_add_actionclip_invoke (bContext *C, wmOperator *op, wmEvent * /* loop through Actions in Main database, adding as items in the menu */ for (act= m->action.first; act; act= act->id.next) - uiItemStringO(layout, act->id.name+2, 0, "NLA_OT_add_actionclip", "action", act->id.name); + uiItemStringO(layout, act->id.name+2, 0, "NLA_OT_actionclip_add", "action", act->id.name); uiItemS(layout); uiPupMenuEnd(C, pup); @@ -347,11 +347,11 @@ static int nlaedit_add_actionclip_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NLA_OT_add_actionclip (wmOperatorType *ot) +void NLA_OT_actionclip_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Action Strip"; - ot->idname= "NLA_OT_add_actionclip"; + ot->idname= "NLA_OT_actionclip_add"; ot->description= "Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track."; /* api callbacks */ @@ -467,11 +467,11 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op) } } -void NLA_OT_add_transition (wmOperatorType *ot) +void NLA_OT_transition_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Transition"; - ot->idname= "NLA_OT_add_transition"; + ot->idname= "NLA_OT_transition_add"; ot->description= "Add a transition strip between two adjacent selected strips."; /* api callbacks */ @@ -529,11 +529,11 @@ static int nlaedit_add_meta_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NLA_OT_add_meta (wmOperatorType *ot) +void NLA_OT_meta_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Meta-Strips"; - ot->idname= "NLA_OT_add_meta"; + ot->idname= "NLA_OT_meta_add"; ot->description= "Add new meta-strips incorporating the selected strips."; /* api callbacks */ @@ -581,11 +581,11 @@ static int nlaedit_remove_meta_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NLA_OT_remove_meta (wmOperatorType *ot) +void NLA_OT_meta_remove (wmOperatorType *ot) { /* identifiers */ ot->name= "Remove Meta-Strips"; - ot->idname= "NLA_OT_remove_meta"; + ot->idname= "NLA_OT_meta_remove"; ot->description= "Separate out the strips held by the selected meta-strips."; /* api callbacks */ diff --git a/source/blender/editors/space_nla/nla_header.c b/source/blender/editors/space_nla/nla_header.c index 0c0deaf75ef..2624e7a9255 100644 --- a/source/blender/editors/space_nla/nla_header.c +++ b/source/blender/editors/space_nla/nla_header.c @@ -177,18 +177,18 @@ static void nla_editmenu(bContext *C, uiLayout *layout, void *arg_unused) static void nla_addmenu(bContext *C, uiLayout *layout, void *arg_unused) { - uiItemO(layout, NULL, 0, "NLA_OT_add_actionclip"); - uiItemO(layout, NULL, 0, "NLA_OT_add_transition"); + uiItemO(layout, NULL, 0, "NLA_OT_actionclip_add"); + uiItemO(layout, NULL, 0, "NLA_OT_transition_add"); uiItemS(layout); - uiItemO(layout, NULL, 0, "NLA_OT_add_meta"); - uiItemO(layout, NULL, 0, "NLA_OT_remove_meta"); + uiItemO(layout, NULL, 0, "NLA_OT_meta_add"); + uiItemO(layout, NULL, 0, "NLA_OT_meta_remove"); uiItemS(layout); - uiItemO(layout, NULL, 0, "NLA_OT_add_tracks"); - uiItemBooleanO(layout, "Add Tracks Above Selected", 0, "NLA_OT_add_tracks", "above_selected", 1); + uiItemO(layout, NULL, 0, "NLA_OT_tracks_add"); + uiItemBooleanO(layout, "Add Tracks Above Selected", 0, "NLA_OT_tracks_add", "above_selected", 1); } /* ------------------ */ diff --git a/source/blender/editors/space_nla/nla_intern.h b/source/blender/editors/space_nla/nla_intern.h index 91c1decc576..ca50452b442 100644 --- a/source/blender/editors/space_nla/nla_intern.h +++ b/source/blender/editors/space_nla/nla_intern.h @@ -88,11 +88,11 @@ void NLA_OT_tweakmode_exit(wmOperatorType *ot); /* --- */ -void NLA_OT_add_actionclip(wmOperatorType *ot); -void NLA_OT_add_transition(wmOperatorType *ot); +void NLA_OT_actionclip_add(wmOperatorType *ot); +void NLA_OT_transition_add(wmOperatorType *ot); -void NLA_OT_add_meta(wmOperatorType *ot); -void NLA_OT_remove_meta(wmOperatorType *ot); +void NLA_OT_meta_add(wmOperatorType *ot); +void NLA_OT_meta_remove(wmOperatorType *ot); void NLA_OT_duplicate(wmOperatorType *ot); void NLA_OT_delete(wmOperatorType *ot); @@ -116,7 +116,7 @@ void NLA_OT_fmodifier_add(wmOperatorType *ot); void NLA_OT_channels_click(wmOperatorType *ot); -void NLA_OT_add_tracks(wmOperatorType *ot); +void NLA_OT_tracks_add(wmOperatorType *ot); void NLA_OT_delete_tracks(wmOperatorType *ot); /* **************************************** */ diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index d210016d201..8f057c2d751 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -130,7 +130,7 @@ void nla_operatortypes(void) /* channels */ WM_operatortype_append(NLA_OT_channels_click); - WM_operatortype_append(NLA_OT_add_tracks); + WM_operatortype_append(NLA_OT_tracks_add); WM_operatortype_append(NLA_OT_delete_tracks); /* select */ @@ -142,11 +142,11 @@ void nla_operatortypes(void) WM_operatortype_append(NLA_OT_tweakmode_enter); WM_operatortype_append(NLA_OT_tweakmode_exit); - WM_operatortype_append(NLA_OT_add_actionclip); - WM_operatortype_append(NLA_OT_add_transition); + WM_operatortype_append(NLA_OT_actionclip_add); + WM_operatortype_append(NLA_OT_transition_add); - WM_operatortype_append(NLA_OT_add_meta); - WM_operatortype_append(NLA_OT_remove_meta); + WM_operatortype_append(NLA_OT_meta_add); + WM_operatortype_append(NLA_OT_meta_remove); WM_operatortype_append(NLA_OT_duplicate); WM_operatortype_append(NLA_OT_delete); @@ -178,8 +178,8 @@ static void nla_keymap_channels (wmKeyConfig *keyconf, wmKeyMap *keymap) /* channel operations */ /* add tracks */ - WM_keymap_add_item(keymap, "NLA_OT_add_tracks", AKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "NLA_OT_add_tracks", AKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "above_selected", 1); + WM_keymap_add_item(keymap, "NLA_OT_tracks_add", AKEY, KM_PRESS, KM_SHIFT, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "NLA_OT_tracks_add", AKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "above_selected", 1); /* delete tracks */ WM_keymap_add_item(keymap, "NLA_OT_delete_tracks", XKEY, KM_PRESS, 0, 0); @@ -240,12 +240,12 @@ static void nla_keymap_main (wmKeyConfig *keyconf, wmKeyMap *keymap) WM_keymap_add_item(keymap, "NLA_OT_tweakmode_exit", TABKEY, KM_PRESS, 0, 0); /* add strips */ - WM_keymap_add_item(keymap, "NLA_OT_add_actionclip", AKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "NLA_OT_add_transition", TKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "NLA_OT_actionclip_add", AKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "NLA_OT_transition_add", TKEY, KM_PRESS, KM_SHIFT, 0); /* meta-strips */ - WM_keymap_add_item(keymap, "NLA_OT_add_meta", GKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "NLA_OT_remove_meta", GKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "NLA_OT_meta_add", GKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "NLA_OT_meta_remove", GKEY, KM_PRESS, KM_ALT, 0); /* duplicate */ WM_keymap_add_item(keymap, "NLA_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); -- cgit v1.2.3