From 8a7a98cbdd7b3f4571185d294801514bb68f1213 Mon Sep 17 00:00:00 2001 From: Shaul Kedem Date: Sun, 12 Apr 2009 20:32:42 +0000 Subject: sequencer op names change --- .../editors/space_sequencer/sequencer_add.c | 20 +++++----- .../editors/space_sequencer/sequencer_edit.c | 4 +- .../editors/space_sequencer/sequencer_header.c | 44 +++++++++++----------- .../editors/space_sequencer/sequencer_intern.h | 12 +++--- .../editors/space_sequencer/sequencer_ops.c | 14 +++---- 5 files changed, 47 insertions(+), 47 deletions(-) (limited to 'source/blender/editors/space_sequencer') diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index c91972ec4f3..6e38ff053be 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -207,12 +207,12 @@ static int sequencer_add_scene_strip_invoke(bContext *C, wmOperator *op, wmEvent } -void SEQUENCER_OT_add_scene_strip(struct wmOperatorType *ot) +void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Add Scene Strip"; - ot->idname= "SEQUENCER_OT_add_scene_strip"; + ot->idname= "SEQUENCER_OT_scene_strip_add"; ot->description= "Add a strip to the sequencer using a blender scene as a source"; /* api callbacks */ @@ -295,12 +295,12 @@ static int sequencer_add_movie_strip_invoke(bContext *C, wmOperator *op, wmEvent } -void SEQUENCER_OT_add_movie_strip(struct wmOperatorType *ot) +void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Add Movie Strip"; - ot->idname= "SEQUENCER_OT_add_movie_strip"; + ot->idname= "SEQUENCER_OT_movie_strip_add"; ot->description= "Add a movie strip to the sequencer"; /* api callbacks */ @@ -396,12 +396,12 @@ static int sequencer_add_sound_strip_invoke(bContext *C, wmOperator *op, wmEvent } -void SEQUENCER_OT_add_sound_strip(struct wmOperatorType *ot) +void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Add Sound Strip"; - ot->idname= "SEQUENCER_OT_add_sound_strip"; + ot->idname= "SEQUENCER_OT_sound_strip_add"; ot->description= "Add a sound strip to the sequencer"; /* api callbacks */ @@ -489,12 +489,12 @@ static int sequencer_add_image_strip_invoke(bContext *C, wmOperator *op, wmEvent } -void SEQUENCER_OT_add_image_strip(struct wmOperatorType *ot) +void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Add Image Strip"; - ot->idname= "SEQUENCER_OT_add_image_strip"; + ot->idname= "SEQUENCER_OT_image_strip_add"; ot->description= "Add an image or image sequence to the sequencer"; /* api callbacks */ @@ -622,11 +622,11 @@ static int sequencer_add_effect_strip_invoke(bContext *C, wmOperator *op, wmEven } } -void SEQUENCER_OT_add_effect_strip(struct wmOperatorType *ot) +void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Add Effect Strip"; - ot->idname= "SEQUENCER_OT_add_effect_strip"; + ot->idname= "SEQUENCER_OT_effect_strip_add"; ot->description= "Add an effect to the sequencer, most are applied ontop of existing strips"; /* api callbacks */ diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 1ae9d19a10e..f6391666cd8 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1981,11 +1981,11 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) } -void SEQUENCER_OT_separate_images(wmOperatorType *ot) +void SEQUENCER_OT_images_separate(wmOperatorType *ot) { /* identifiers */ ot->name= "Separate Images"; - ot->idname= "SEQUENCER_OT_separate_images"; + ot->idname= "SEQUENCER_OT_images_separate"; /* api callbacks */ ot->invoke= WM_operator_confirm; diff --git a/source/blender/editors/space_sequencer/sequencer_header.c b/source/blender/editors/space_sequencer/sequencer_header.c index a701a9dd55b..9cda3ec9929 100644 --- a/source/blender/editors/space_sequencer/sequencer_header.c +++ b/source/blender/editors/space_sequencer/sequencer_header.c @@ -214,21 +214,21 @@ static void seq_addmenu_effectmenu(bContext *C, uiMenuItem *head, void *arg_unus { uiMenuContext(head, WM_OP_INVOKE_REGION_WIN); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_ADD); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_SUB); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_MUL); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_CROSS); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_GAMCROSS); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_ALPHAOVER); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_ALPHAUNDER); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_OVERDROP); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_WIPE); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_GLOW); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_TRANSFORM); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_ADD); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_SUB); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_MUL); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_CROSS); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_GAMCROSS); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_ALPHAOVER); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_ALPHAUNDER); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_OVERDROP); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_WIPE); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_GLOW); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_TRANSFORM); /* Color is an effect but moved to the other menu since its not that exciting */ - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_SPEED); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_SPEED); uiMenuSeparator(head); - uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_PLUGIN); + uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_PLUGIN); } @@ -241,18 +241,18 @@ static void seq_addmenu(bContext *C, uiMenuItem *head, void *arg_unused) uiMenuContext(head, WM_OP_INVOKE_REGION_WIN); #ifdef WITH_FFMPEG - uiMenuItemBooleanO(head, "Audio (RAM)", 0, "SEQUENCER_OT_add_sound_strip", "hd", FALSE); - uiMenuItemBooleanO(head, "Audio (HD)", 0, "SEQUENCER_OT_add_sound_strip", "hd", TRUE); + uiMenuItemBooleanO(head, "Audio (RAM)", 0, "SEQUENCER_OT_sound_strip_add", "hd", FALSE); + uiMenuItemBooleanO(head, "Audio (HD)", 0, "SEQUENCER_OT_sound_strip_add", "hd", TRUE); #else - uiMenuItemO(head, 0, "SEQUENCER_OT_add_sound_strip"); + uiMenuItemO(head, 0, "SEQUENCER_OT_sound_strip_add"); #endif - uiMenuItemEnumO(head, "Add Color Strip", 0, "SEQUENCER_OT_add_effect_strip", "type", SEQ_COLOR); + uiMenuItemEnumO(head, "Add Color Strip", 0, "SEQUENCER_OT_effect_strip_add", "type", SEQ_COLOR); - uiMenuItemO(head, 0, "SEQUENCER_OT_add_image_strip"); - uiMenuItemO(head, 0, "SEQUENCER_OT_add_movie_strip"); - uiMenuItemO(head, 0, "SEQUENCER_OT_add_scene_strip"); + uiMenuItemO(head, 0, "SEQUENCER_OT_image_strip_add"); + uiMenuItemO(head, 0, "SEQUENCER_OT_movie_strip_add"); + uiMenuItemO(head, 0, "SEQUENCER_OT_scene_strip_add"); #ifdef WITH_FFMPEG - uiMenuItemBooleanO(head, "Movie and Sound", 0, "SEQUENCER_OT_add_movie_strip", "sound", TRUE); + uiMenuItemBooleanO(head, "Movie and Sound", 0, "SEQUENCER_OT_movie_strip_add", "sound", TRUE); #endif } @@ -273,7 +273,7 @@ static void seq_editmenu(bContext *C, uiMenuItem *head, void *arg_unused) uiMenuItemEnumO(head, "Cut Hard", 0, "SEQUENCER_OT_cut", "type", SEQ_CUT_HARD); uiMenuItemEnumO(head, "Cut Soft", 0, "SEQUENCER_OT_cut", "type", SEQ_CUT_SOFT); - uiMenuItemO(head, 0, "SEQUENCER_OT_separate_images"); + uiMenuItemO(head, 0, "SEQUENCER_OT_images_separate"); uiMenuSeparator(head); uiMenuItemO(head, 0, "SEQUENCER_OT_duplicate_add"); uiMenuItemO(head, 0, "SEQUENCER_OT_delete"); diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 8a56d15e1da..df6a848696f 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -80,7 +80,7 @@ void SEQUENCER_OT_reload(struct wmOperatorType *ot); void SEQUENCER_OT_refresh_all(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_images_separate(struct wmOperatorType *ot); void SEQUENCER_OT_meta_toggle(struct wmOperatorType *ot); void SEQUENCER_OT_meta_make(struct wmOperatorType *ot); void SEQUENCER_OT_meta_separate(struct wmOperatorType *ot); @@ -102,11 +102,11 @@ void SEQUENCER_OT_select_invert(struct wmOperatorType *ot); /* sequencer_select.c */ -void SEQUENCER_OT_add_scene_strip(struct wmOperatorType *ot); -void SEQUENCER_OT_add_movie_strip(struct wmOperatorType *ot); -void SEQUENCER_OT_add_sound_strip(struct wmOperatorType *ot); -void SEQUENCER_OT_add_image_strip(struct wmOperatorType *ot); -void SEQUENCER_OT_add_effect_strip(struct wmOperatorType *ot); +void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot); +void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot); +void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot); +void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot); +void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot); /* RNA enums, just to be more readable */ enum { diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index a159a4828da..b131061782a 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -73,7 +73,7 @@ void sequencer_operatortypes(void) WM_operatortype_append(SEQUENCER_OT_refresh_all); 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_images_separate); WM_operatortype_append(SEQUENCER_OT_meta_toggle); WM_operatortype_append(SEQUENCER_OT_meta_make); WM_operatortype_append(SEQUENCER_OT_meta_separate); @@ -94,11 +94,11 @@ void sequencer_operatortypes(void) WM_operatortype_append(SEQUENCER_OT_select_border); /* sequencer_add.c */ - WM_operatortype_append(SEQUENCER_OT_add_scene_strip); - WM_operatortype_append(SEQUENCER_OT_add_movie_strip); - WM_operatortype_append(SEQUENCER_OT_add_sound_strip); - WM_operatortype_append(SEQUENCER_OT_add_image_strip); - WM_operatortype_append(SEQUENCER_OT_add_effect_strip); + WM_operatortype_append(SEQUENCER_OT_scene_strip_add); + WM_operatortype_append(SEQUENCER_OT_movie_strip_add); + WM_operatortype_append(SEQUENCER_OT_sound_strip_add); + WM_operatortype_append(SEQUENCER_OT_image_strip_add); + WM_operatortype_append(SEQUENCER_OT_effect_strip_add); } @@ -129,7 +129,7 @@ void sequencer_keymap(wmWindowManager *wm) 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); - WM_keymap_add_item(keymap, "SEQUENCER_OT_separate_images", YKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "SEQUENCER_OT_images_separate", YKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_toggle", TABKEY, KM_PRESS, 0, 0); -- cgit v1.2.3