Revision: 19441
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19441
Author: campbellbarton
Date: 2009-03-29 04:15:13 +0200 (Sun, 29 Mar 2009)
Log Message:
-----------
- 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
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h
branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c
branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
branches/blender2.5/blender/source/blender/editors/curve/editfont.c
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
branches/blender2.5/blender/source/blender/editors/object/editgroup.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
branches/blender2.5/blender/source/blender/editors/object/object_ops.c
branches/blender2.5/blender/source/blender/editors/physics/editparticle.c
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_intern.h
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_ops.c
branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
branches/blender2.5/blender/source/blender/editors/space_action/action_intern.h
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
branches/blender2.5/blender/source/blender/editors/space_file/file_intern.h
branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
branches/blender2.5/blender/source/blender/editors/space_file/space_file.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_edit.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_intern.h
branches/blender2.5/blender/source/blender/editors/space_graph/graph_ops.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_select.c
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
branches/blender2.5/blender/source/blender/editors/space_image/image_intern.h
branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
branches/blender2.5/blender/source/blender/editors/space_image/space_image.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
branches/blender2.5/blender/source/blender/editors/space_node/node_state.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_intern.h
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_select.c
branches/blender2.5/blender/source/blender/editors/space_text/space_text.c
branches/blender2.5/blender/source/blender/editors/space_text/text_header.c
branches/blender2.5/blender/source/blender/editors/space_text/text_intern.h
branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_view.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
2009-03-29 00:34:56 UTC (rev 19440)
+++
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
2009-03-29 02:15:13 UTC (rev 19441)
@@ -804,11 +804,11 @@
}
-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 @@
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 @@
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 @@
}
// 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 @@
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 @@
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 @@
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 @@
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 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 @@
/* 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);
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
2009-03-29 00:34:56 UTC (rev 19440)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
2009-03-29 02:15:13 UTC (rev 19441)
@@ -629,21 +629,17 @@
return OPERATOR_PASS_THROUGH;
}
-static int ed_marker_select_extend_invoke(bContext *C, wmOperator *op, wmEvent
*evt)
-{
- return ed_marker_select(C, evt, 1);
-}
-
static int ed_marker_select_invoke(bContext *C, wmOperator *op, wmEvent *evt)
{
- return ed_marker_select(C, evt, 0);
+ short extend= RNA_boolean_get(op->ptr, "extend");
+ return ed_marker_select(C, evt, extend);
}
-static void MARKER_OT_mouseselect(wmOperatorType *ot)
+static void MARKER_OT_select(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Time Marker";
- ot->idname= "MARKER_OT_mouseselect";
+ ot->idname= "MARKER_OT_select";
/* api callbacks */
ot->invoke= ed_marker_select_invoke;
@@ -651,20 +647,8 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-static void MARKER_OT_mouseselect_extend(wmOperatorType *ot)
-{
- /* identifiers */
- ot->name= "Extend Select Time Marker";
- ot->idname= "MARKER_OT_mouseselect_extend";
-
- /* api callbacks */
- ot->invoke= ed_marker_select_extend_invoke;
- ot->poll= ED_operator_areaactive;
-
- /* flags */
- ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+ RNA_def_boolean(ot->srna, "extend", 0, "Extend", "extend the
selection");
}
/* *************************** border select markers **************** */
@@ -731,11 +715,11 @@
return 1;
}
-static void MARKER_OT_border_select(wmOperatorType *ot)
+static void MARKER_OT_select_border(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Marker Border select";
- ot->idname= "MARKER_OT_border_select";
+ ot->idname= "MARKER_OT_select_border";
/* api callbacks */
ot->exec= ed_marker_border_select_exec;
@@ -796,11 +780,11 @@
return ed_marker_select_all_exec(C, op);
}
-static void MARKER_OT_select_all(wmOperatorType *ot)
+static void MARKER_OT_select_all_toggle(wmOperatorType *ot)
{
/* identifiers */
ot->name= "(De)select all markers";
- ot->idname= "MARKER_OT_select_all";
+ ot->idname= "MARKER_OT_select_all_toggle";
/* api callbacks */
ot->exec= ed_marker_select_all_exec;
@@ -866,10 +850,9 @@
WM_operatortype_append(MARKER_OT_add);
WM_operatortype_append(MARKER_OT_move);
WM_operatortype_append(MARKER_OT_duplicate);
- WM_operatortype_append(MARKER_OT_mouseselect);
- WM_operatortype_append(MARKER_OT_mouseselect_extend);
- WM_operatortype_append(MARKER_OT_border_select);
- WM_operatortype_append(MARKER_OT_select_all);
+ WM_operatortype_append(MARKER_OT_select);
+ WM_operatortype_append(MARKER_OT_select_border);
+ WM_operatortype_append(MARKER_OT_select_all_toggle);
WM_operatortype_append(MARKER_OT_delete);
}
@@ -881,10 +864,10 @@
WM_keymap_verify_item(keymap, "MARKER_OT_add", MKEY, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "MARKER_OT_move", EVT_TWEAK_S, KM_ANY, 0,
0);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
