diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-12-26 14:33:41 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-12-26 14:33:41 +0300 |
commit | 1d176259cbc8d6eb2658a9dd0b337f9768fc02c4 (patch) | |
tree | 518ddd0a148f9c7b8d3ec594584ad52ee0f81b41 /source/blender/editors/space_action | |
parent | c0475a785931ed0c5690ca5b3f6f5fa2db0ec237 (diff) |
2.5 -
Renaming operators to follow new naming convention set out by Ton
Diffstat (limited to 'source/blender/editors/space_action')
-rw-r--r-- | source/blender/editors/space_action/action_intern.h | 8 | ||||
-rw-r--r-- | source/blender/editors/space_action/action_ops.c | 32 | ||||
-rw-r--r-- | source/blender/editors/space_action/action_select.c | 16 |
3 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index 51c6c3c7a1d..27d8ada37ac 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -48,10 +48,10 @@ void action_header_buttons(const struct bContext *C, struct ARegion *ar); /* ***************************************** */ /* action_select.c */ -void ED_ACT_OT_keyframes_deselectall(struct wmOperatorType *ot); -void ED_ACT_OT_keyframes_borderselect(struct wmOperatorType *ot); -void ED_ACT_OT_keyframes_columnselect(struct wmOperatorType *ot); -void ED_ACT_OT_keyframes_clickselect(struct wmOperatorType *ot); +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_clickselect(struct wmOperatorType *ot); /* defines for left-right select tool */ enum { diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index ceaa8117de7..19850917a9c 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -62,10 +62,10 @@ void action_operatortypes(void) /* channels */ /* keyframes */ - WM_operatortype_append(ED_ACT_OT_keyframes_clickselect); - WM_operatortype_append(ED_ACT_OT_keyframes_deselectall); - WM_operatortype_append(ED_ACT_OT_keyframes_borderselect); - WM_operatortype_append(ED_ACT_OT_keyframes_columnselect); + 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); } /* ************************** registration - keymaps **********************************/ @@ -74,25 +74,25 @@ static void action_keymap_keyframes (ListBase *keymap) { /* action_select.c - selection tools */ /* click-select */ - WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "column_select", 1); - RNA_boolean_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend_select", 1); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "left_right", ACTKEYS_LRSEL_TEST); + 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_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, "ED_ACT_OT_keyframes_deselectall", AKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_deselectall", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); + 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); /* borderselect */ - WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_borderselect", BKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_borderselect", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1); + 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); /* column select */ - RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_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_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); } /* --------------- */ diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index cd454388a57..de41b7e4604 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -401,11 +401,11 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ED_ACT_OT_keyframes_deselectall (wmOperatorType *ot) +void ACT_OT_keyframes_deselectall (wmOperatorType *ot) { /* identifiers */ ot->name= "Select All"; - ot->idname= "ED_ACT_OT_keyframes_deselectall"; + ot->idname= "ACT_OT_keyframes_deselectall"; /* api callbacks */ ot->exec= actkeys_deselectall_exec; @@ -564,11 +564,11 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ED_ACT_OT_keyframes_borderselect(wmOperatorType *ot) +void ACT_OT_keyframes_borderselect(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "ED_ACT_OT_keyframes_borderselect"; + ot->idname= "ACT_OT_keyframes_borderselect"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -797,13 +797,13 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ED_ACT_OT_keyframes_columnselect (wmOperatorType *ot) +void ACT_OT_keyframes_columnselect (wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ ot->name= "Select All"; - ot->idname= "ED_ACT_OT_keyframes_columnselect"; + ot->idname= "ACT_OT_keyframes_columnselect"; /* api callbacks */ ot->exec= actkeys_columnselect_exec; @@ -1172,13 +1172,13 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even return OPERATOR_FINISHED; } -void ED_ACT_OT_keyframes_clickselect (wmOperatorType *ot) +void ACT_OT_keyframes_clickselect (wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ ot->name= "Mouse Select Keys"; - ot->idname= "ED_ACT_OT_keyframes_clickselect"; + ot->idname= "ACT_OT_keyframes_clickselect"; /* api callbacks */ ot->invoke= actkeys_clickselect_invoke; |