Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-03-29 06:15:13 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-03-29 06:15:13 +0400
commit931527e648acfbc2c7b71b59ce661dad9a4c1038 (patch)
treea00b98e524fb8ea459d1f915524ee3a08fb7c747 /source/blender/editors/animation/anim_channels.c
parent4a164ce520c8b8a5f4e8ff90aef7050694562dc9 (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/animation/anim_channels.c')
-rw-r--r--source/blender/editors/animation/anim_channels.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/editors/animation/anim_channels.c b/source/blender/editors/animation/anim_channels.c
index 8dfb1c20bbe..80615ab3c0d 100644
--- a/source/blender/editors/animation/anim_channels.c
+++ b/source/blender/editors/animation/anim_channels.c
@@ -804,11 +804,11 @@ static int animchannels_setflag_exec(bContext *C, wmOperator *op)
}
-void ANIM_OT_channels_enable_setting (wmOperatorType *ot)
+void ANIM_OT_channels_setting_enable (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Enable Channel Setting";
- ot->idname= "ANIM_OT_channels_enable_setting";
+ ot->idname= "ANIM_OT_channels_setting_enable";
/* api callbacks */
ot->invoke= WM_menu_invoke;
@@ -825,11 +825,11 @@ void ANIM_OT_channels_enable_setting (wmOperatorType *ot)
RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", "");
}
-void ANIM_OT_channels_disable_setting (wmOperatorType *ot)
+void ANIM_OT_channels_setting_disable (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Disable Channel Setting";
- ot->idname= "ANIM_OT_channels_disable_setting";
+ ot->idname= "ANIM_OT_channels_setting_disable";
/* api callbacks */
ot->invoke= WM_menu_invoke;
@@ -846,11 +846,11 @@ void ANIM_OT_channels_disable_setting (wmOperatorType *ot)
RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", "");
}
-void ANIM_OT_channels_toggle_setting (wmOperatorType *ot)
+void ANIM_OT_channels_setting_toggle (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Toggle Channel Setting";
- ot->idname= "ANIM_OT_channels_toggle_setting";
+ ot->idname= "ANIM_OT_channels_setting_toggle";
/* api callbacks */
ot->invoke= WM_menu_invoke;
@@ -868,11 +868,11 @@ void ANIM_OT_channels_toggle_setting (wmOperatorType *ot)
}
// XXX currently, this is a separate operator, but perhaps we could in future specify in keymaps whether to call invoke or exec?
-void ANIM_OT_channels_toggle_editable (wmOperatorType *ot)
+void ANIM_OT_channels_editable_toggle (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Toggle Channel Editability";
- ot->idname= "ANIM_OT_channels_toggle_editable";
+ ot->idname= "ANIM_OT_channels_editable_toggle";
/* api callbacks */
ot->exec= animchannels_setflag_exec;
@@ -910,11 +910,11 @@ static int animchannels_deselectall_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-void ANIM_OT_channels_deselectall (wmOperatorType *ot)
+void ANIM_OT_channels_select_all_toggle (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select All";
- ot->idname= "ANIM_OT_channels_deselectall";
+ ot->idname= "ANIM_OT_channels_select_all_toggle";
/* api callbacks */
ot->exec= animchannels_deselectall_exec;
@@ -1028,11 +1028,11 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-void ANIM_OT_channels_borderselect(wmOperatorType *ot)
+void ANIM_OT_channels_select_border(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Border Select";
- ot->idname= "ANIM_OT_channels_borderselect";
+ ot->idname= "ANIM_OT_channels_select_border";
/* api callbacks */
ot->invoke= WM_border_select_invoke;
@@ -1365,9 +1365,9 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent *
mval[1]= (event->y - ar->winrct.ymin);
/* select mode is either replace (deselect all, then add) or add/extend */
- if (RNA_boolean_get(op->ptr, "extend_select"))
+ if (RNA_boolean_get(op->ptr, "extend"))
selectmode= SELECT_INVERT;
- else if (RNA_boolean_get(op->ptr, "select_children_only"))
+ else if (RNA_boolean_get(op->ptr, "children_only"))
selectmode= -1; /* this is a bit of a special case for ActionGroups only... should it be removed or extended to all instead? */
else
selectmode= SELECT_REPLACE;
@@ -1403,8 +1403,8 @@ void ANIM_OT_channels_mouseclick (wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* id-props */
- RNA_def_boolean(ot->srna, "extend_select", 0, "Extend Select", ""); // SHIFTKEY
- RNA_def_boolean(ot->srna, "select_children_only", 0, "Select Children Only", ""); // CTRLKEY|SHIFTKEY
+ RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY
+ RNA_def_boolean(ot->srna, "children_only", 0, "Select Children Only", ""); // CTRLKEY|SHIFTKEY
}
/* ************************************************************************** */
@@ -1412,16 +1412,16 @@ void ANIM_OT_channels_mouseclick (wmOperatorType *ot)
void ED_operatortypes_animchannels(void)
{
- WM_operatortype_append(ANIM_OT_channels_deselectall);
- WM_operatortype_append(ANIM_OT_channels_borderselect);
+ WM_operatortype_append(ANIM_OT_channels_select_all_toggle);
+ WM_operatortype_append(ANIM_OT_channels_select_border);
WM_operatortype_append(ANIM_OT_channels_mouseclick);
- WM_operatortype_append(ANIM_OT_channels_enable_setting);
- WM_operatortype_append(ANIM_OT_channels_disable_setting);
- WM_operatortype_append(ANIM_OT_channels_toggle_setting);
+ WM_operatortype_append(ANIM_OT_channels_setting_enable);
+ WM_operatortype_append(ANIM_OT_channels_setting_disable);
+ WM_operatortype_append(ANIM_OT_channels_setting_toggle);
// XXX does this need to be a separate operator?
- WM_operatortype_append(ANIM_OT_channels_toggle_editable);
+ WM_operatortype_append(ANIM_OT_channels_editable_toggle);
// XXX these need to be updated for new system... todo...
//WM_operatortype_append(ANIM_OT_channels_move_up);
@@ -1440,23 +1440,23 @@ void ED_keymap_animchannels(wmWindowManager *wm)
/* click-select */
// XXX for now, only leftmouse....
WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, 0, 0);
- RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend_select", 1);
- RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "select_children_only", 1);
+ RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select", 1);
+ RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "children_only", 1);
/* deselect all */
- WM_keymap_add_item(keymap, "ANIM_OT_channels_deselectall", AKEY, KM_PRESS, 0, 0);
- RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_deselectall", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
+ WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all_toggle", AKEY, KM_PRESS, 0, 0);
+ RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
/* borderselect */
- WM_keymap_add_item(keymap, "ANIM_OT_channels_borderselect", BKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "ANIM_OT_channels_select_border", BKEY, KM_PRESS, 0, 0);
/* settings */
- WM_keymap_add_item(keymap, "ANIM_OT_channels_toggle_setting", WKEY, KM_PRESS, KM_SHIFT, 0);
- WM_keymap_add_item(keymap, "ANIM_OT_channels_enable_setting", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
- WM_keymap_add_item(keymap, "ANIM_OT_channels_disable_setting", WKEY, KM_PRESS, KM_ALT, 0);
+ WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_toggle", WKEY, KM_PRESS, KM_SHIFT, 0);
+ WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_enable", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
+ WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_disable", WKEY, KM_PRESS, KM_ALT, 0);
/* settings - specialised hotkeys */
- WM_keymap_add_item(keymap, "ANIM_OT_channels_toggle_editable", TABKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "ANIM_OT_channels_editable_toggle", TABKEY, KM_PRESS, 0, 0);
/* rearranging - actions only */
//WM_keymap_add_item(keymap, "ANIM_OT_channels_move_up", PAGEUPKEY, KM_PRESS, KM_SHIFT, 0);